diff -uNr a/mp-wp/manifest b/mp-wp/manifest --- a/mp-wp/manifest 32a1554660dc266a80310dcfaefdb9ae997addc1d6dc33519a307e289b947e540ba81a59d4d0e751d96756d13e35db368fe9b948a04db2e1e16264a06a8fc2cc +++ b/mp-wp/manifest acf6b4c38d37946380913eea64e19b5b8d8a497e6721d8969f6dda318111b93d0699141210cc0298be41af8b65b332a2268560b7e726f290fadadcb4dbdafcb9 @@ -2,3 +2,4 @@ 558366 mp-wp_add-footnotes-and-textselectionjs billymg Add the footnotes and text selection features to mp-wp as seen on Trilema and other republican blogs 558370 mp-wp_update-image-references-to-svg billymg Update all internal image references to use .svg extensions 568792 mp-wp_html-comments-regrind hanbot Anonymous function in kses.php given variables to allow for html and other desired tags in comments compatible with PHP versions 5 and above. Also, trilema-specific database parameter for spam cleanup converted to (reground: correct) variable table name for compatibility. Spurious trilema-specific commented-out code deleted. +569483 mp-wp_remove-tinymce-and-other-crud billymg Remove tinymce, most of the importers, the self-update feature, and the google gears and press-this plugins diff -uNr a/mp-wp/wp-admin/admin-header.php b/mp-wp/wp-admin/admin-header.php --- a/mp-wp/wp-admin/admin-header.php 7f26248b17a055714d3bb69da16617f6075af65b5d594788f6aa394eb1f783df1fd090e734dd2422a86536b2f8abb382383eb9545e9e7fcf48d6ec045e966b9a +++ b/mp-wp/wp-admin/admin-header.php 34f1ef463ad4d0ffbb338851cab80259f68f8a133728d15279c40b181f47635009c33776fb83203ed9d86357e5d857464ad465622a3c64ef7db587fe0862fd2e @@ -52,11 +52,6 @@ //]]>
-

%2$s'), 'profile.php', $user_identity) ?> - | +

%2$s'), 'profile.php', $user_identity) ?> |

diff -uNr a/mp-wp/wp-admin/css/colors-classic.css b/mp-wp/wp-admin/css/colors-classic.css --- a/mp-wp/wp-admin/css/colors-classic.css 6ee1f926d034bed1935dc5b236b97d490af9cb763e09d17ec2471f278b4b95ffa69a5288e98b454ef80843c85162a6b70928ff9c17aca46d0d4d6bbcf0f66f1f +++ b/mp-wp/wp-admin/css/colors-classic.css 39b755fafd1e9c60473f1355dfd9eb98d15d65c8c0e9a41b68792c390d585e40339b51152c4b93b40b3fda9a43c3dad38feed579325f786175521b1ab55b2d7c @@ -470,15 +470,6 @@ color: #1C6280; } -/* Because we don't want visited on these links */ -body.press-this .ui-tabs-selected a, -body.press-this .ui-tabs-selected a:hover { - background-color: #fff; - border-color: #c6d9e9; - border-bottom-color: #fff; - color: #d54e21; -} - #adminmenu #awaiting-mod, #adminmenu .update-plugins, #sidemenu a .update-plugins, @@ -608,8 +599,7 @@ } .checkbox, -.side-info, -#your-profile #rich_editing { +.side-info { background-color: #fff; } @@ -768,10 +758,6 @@ background: #ddd; } -#poststuff .wp_themeSkin .mceStatusbar { - border-color: #EDEDED; -} - #poststuff #edButtonPreview, #poststuff #edButtonHTML { background-color: #f1f1f1; @@ -785,211 +771,6 @@ color: #333; } -/* TinyMCE */ -#post-status-info { - background-color: #EDEDED; -} - -.wp_themeSkin *, -.wp_themeSkin a:hover, -.wp_themeSkin a:link, -.wp_themeSkin a:visited, -.wp_themeSkin a:active { - color: #000; -} - -/* Containers */ -.wp_themeSkin iframe { - background: #fff; -} - -/* Layout */ -.wp_themeSkin .mceStatusbar { - color: #000; - background-color: #f5f5f5; -} - -/* Button */ -.wp_themeSkin .mceButton { - background-color: #e9e8e8; - border-color: #B2B2B2; -} - -.wp_themeSkin a.mceButtonEnabled:hover, -.wp_themeSkin a.mceButtonActive, -.wp_themeSkin a.mceButtonSelected { - background-color: #d5d5d5; - border-color: #777 !important; -} - -.wp_themeSkin .mceButtonDisabled { - border-color: #ccc !important; -} - -/* ListBox */ -.wp_themeSkin .mceListBox .mceText, -.wp_themeSkin .mceListBox .mceOpen { - border-color: #B2B2B2; - background-color: #d5d5d5; -} - -.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, -.wp_themeSkin .mceListBoxHover .mceOpen, -.wp_themeSkin .mceListBoxSelected .mceOpen, -.wp_themeSkin .mceListBoxSelected .mceText { - border-color: #777 !important; - background-color: #d5d5d5; -} - -.wp_themeSkin table.mceListBoxEnabled:hover .mceText, -.wp_themeSkin .mceListBoxHover .mceText { - border-color: #777 !important; -} - -.wp_themeSkin select.mceListBox { - border-color: #B2B2B2; - background-color: #fff; -} - -/* SplitButton */ -.wp_themeSkin .mceSplitButton a.mceAction, -.wp_themeSkin .mceSplitButton a.mceOpen { - background-color: #e8e8e8; - border-color: #B2B2B2; -} - -.wp_themeSkin .mceSplitButton a.mceOpen:hover, -.wp_themeSkin .mceSplitButtonSelected a.mceOpen, -.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction, -.wp_themeSkin .mceSplitButton a.mceAction:hover { - background-color: #d5d5d5; - border-color: #777 !important; -} - -.wp_themeSkin .mceSplitButtonActive { - background-color: #B2B2B2; -} - -/* ColorSplitButton */ -.wp_themeSkin div.mceColorSplitMenu table { - background-color: #ebebeb; - border-color: #B2B2B2; -} - -.wp_themeSkin .mceColorSplitMenu a { - border-color: #B2B2B2; -} - -.wp_themeSkin .mceColorSplitMenu a.mceMoreColors { - border-color: #fff; -} - -.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover { - border-color: #0A246A; - background-color: #B6BDD2; -} - -.wp_themeSkin a.mceMoreColors:hover { - border-color: #0A246A; -} - -/* Menu */ -.wp_themeSkin .mceMenu { - border-color: #ddd; -} - -.wp_themeSkin .mceMenu table { - background-color: #ebeaeb; -} - -.wp_themeSkin .mceMenu .mceText { - color: #000; -} - -.wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover, -.wp_themeSkin .mceMenu .mceMenuItemActive { - background-color: #f5f5f5; -} -.wp_themeSkin td.mceMenuItemSeparator { - background-color: #aaa; -} -.wp_themeSkin .mceMenuItemTitle a { - background-color: #ccc; - border-bottom-color: #aaa; -} -.wp_themeSkin .mceMenuItemTitle span.mceText { - color: #000; -} -.wp_themeSkin .mceMenuItemDisabled .mceText { - color: #888; -} - -.wp_themeSkin tr.mceFirst td.mceToolbar { - background-color: #dfdfdf; - border-color: #dfdfdf; -} - -.wp-admin #mceModalBlocker { - background: #000; -} - -.wp-admin .clearlooks2 .mceFocus .mceTop .mceLeft { - background: #444444; - border-left: 1px solid #999; - border-top: 1px solid #999; - -moz-border-radius: 4px 0 0 0; - -webkit-border-top-left-radius: 4px; - -khtml-border-top-left-radius: 4px; - border-top-left-radius: 4px; -} - -.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight { - background: #444444; - border-right: 1px solid #999; - border-top: 1px solid #999; - border-top-right-radius: 4px; - -khtml-border-top-right-radius: 4px; - -webkit-border-top-right-radius: 4px; - -moz-border-radius: 0 4px 0 0; -} - -.wp-admin .clearlooks2 .mceMiddle .mceLeft { - background: #f1f1f1; - border-left: 1px solid #999; -} - -.wp-admin .clearlooks2 .mceMiddle .mceRight { - background: #f1f1f1; - border-right: 1px solid #999; -} - -.wp-admin .clearlooks2 .mceBottom { - background: #f1f1f1; - border-bottom: 1px solid #999; -} - -.wp-admin .clearlooks2 .mceBottom .mceLeft { - background: #f1f1f1; - border-bottom: 1px solid #999; - border-left: 1px solid #999; -} - -.wp-admin .clearlooks2 .mceBottom .mceCenter { - background: #f1f1f1; - border-bottom: 1px solid #999; -} - -.wp-admin .clearlooks2 .mceBottom .mceRight { - background: #f1f1f1; - border-bottom: 1px solid #999; - border-right: 1px solid #999; -} - -.wp-admin .clearlooks2 .mceFocus .mceTop span { - color: #e5e5e5; -} -/* end TinyMCE */ - #editorcontainer, #post-status-info, #titlediv #title { diff -uNr a/mp-wp/wp-admin/css/colors-fresh.css b/mp-wp/wp-admin/css/colors-fresh.css --- a/mp-wp/wp-admin/css/colors-fresh.css 4607c5644e79991e4ee69a146234fdcbbd314619bc1cffe5e33054054c300988032bf28163029f443e34b86c1be961e78230d61de8e3a5d2e910976924a673a3 +++ b/mp-wp/wp-admin/css/colors-fresh.css f42d54825380efb049d4161bc4390cc607bcce5b672bbab2d0d81c06b43b19eda5cb492bf807cab5aac877ebc9b7da016a9cf31a5a709caba1c7317f43252c90 @@ -470,15 +470,6 @@ color: #21759b; } -/* Because we don't want visited on these links */ -body.press-this .ui-tabs-selected a, -body.press-this .ui-tabs-selected a:hover { - background-color: #fff; - border-color: #c6d9e9; - border-bottom-color: #fff; - color: #d54e21; -} - #adminmenu #awaiting-mod, #adminmenu .update-plugins, #sidemenu a .update-plugins, @@ -608,8 +599,7 @@ } .checkbox, -.side-info, -#your-profile #rich_editing { +.side-info { background-color: #fff; } @@ -768,10 +758,6 @@ background: #ddd; } -#poststuff .wp_themeSkin .mceStatusbar { - border-color: #EDEDED; -} - #poststuff #edButtonPreview, #poststuff #edButtonHTML { background-color: #f1f1f1; @@ -785,211 +771,6 @@ color: #333; } -/* TinyMCE */ -#post-status-info { - background-color: #EDEDED; -} - -.wp_themeSkin *, -.wp_themeSkin a:hover, -.wp_themeSkin a:link, -.wp_themeSkin a:visited, -.wp_themeSkin a:active { - color: #000; -} - -/* Containers */ -.wp_themeSkin iframe { - background: #fff; -} - -/* Layout */ -.wp_themeSkin .mceStatusbar { - color: #000; - background-color: #f5f5f5; -} - -/* Button */ -.wp_themeSkin .mceButton { - background-color: #e9e8e8; - border-color: #B2B2B2; -} - -.wp_themeSkin a.mceButtonEnabled:hover, -.wp_themeSkin a.mceButtonActive, -.wp_themeSkin a.mceButtonSelected { - background-color: #d5d5d5; - border-color: #777 !important; -} - -.wp_themeSkin .mceButtonDisabled { - border-color: #ccc !important; -} - -/* ListBox */ -.wp_themeSkin .mceListBox .mceText, -.wp_themeSkin .mceListBox .mceOpen { - border-color: #B2B2B2; - background-color: #d5d5d5; -} - -.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, -.wp_themeSkin .mceListBoxHover .mceOpen, -.wp_themeSkin .mceListBoxSelected .mceOpen, -.wp_themeSkin .mceListBoxSelected .mceText { - border-color: #777 !important; - background-color: #d5d5d5; -} - -.wp_themeSkin table.mceListBoxEnabled:hover .mceText, -.wp_themeSkin .mceListBoxHover .mceText { - border-color: #777 !important; -} - -.wp_themeSkin select.mceListBox { - border-color: #B2B2B2; - background-color: #fff; -} - -/* SplitButton */ -.wp_themeSkin .mceSplitButton a.mceAction, -.wp_themeSkin .mceSplitButton a.mceOpen { - background-color: #e8e8e8; - border-color: #B2B2B2; -} - -.wp_themeSkin .mceSplitButton a.mceOpen:hover, -.wp_themeSkin .mceSplitButtonSelected a.mceOpen, -.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction, -.wp_themeSkin .mceSplitButton a.mceAction:hover { - background-color: #d5d5d5; - border-color: #777 !important; -} - -.wp_themeSkin .mceSplitButtonActive { - background-color: #B2B2B2; -} - -/* ColorSplitButton */ -.wp_themeSkin div.mceColorSplitMenu table { - background-color: #ebebeb; - border-color: #B2B2B2; -} - -.wp_themeSkin .mceColorSplitMenu a { - border-color: #B2B2B2; -} - -.wp_themeSkin .mceColorSplitMenu a.mceMoreColors { - border-color: #fff; -} - -.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover { - border-color: #0A246A; - background-color: #B6BDD2; -} - -.wp_themeSkin a.mceMoreColors:hover { - border-color: #0A246A; -} - -/* Menu */ -.wp_themeSkin .mceMenu { - border-color: #ddd; -} - -.wp_themeSkin .mceMenu table { - background-color: #ebeaeb; -} - -.wp_themeSkin .mceMenu .mceText { - color: #000; -} - -.wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover, -.wp_themeSkin .mceMenu .mceMenuItemActive { - background-color: #f5f5f5; -} -.wp_themeSkin td.mceMenuItemSeparator { - background-color: #aaa; -} -.wp_themeSkin .mceMenuItemTitle a { - background-color: #ccc; - border-bottom-color: #aaa; -} -.wp_themeSkin .mceMenuItemTitle span.mceText { - color: #000; -} -.wp_themeSkin .mceMenuItemDisabled .mceText { - color: #888; -} - -.wp_themeSkin tr.mceFirst td.mceToolbar { - background-color: #dfdfdf; - border-color: #dfdfdf; -} - -.wp-admin #mceModalBlocker { - background: #000; -} - -.wp-admin .clearlooks2 .mceFocus .mceTop .mceLeft { - background: #444444; - border-left: 1px solid #999; - border-top: 1px solid #999; - -moz-border-radius: 4px 0 0 0; - -webkit-border-top-left-radius: 4px; - -khtml-border-top-left-radius: 4px; - border-top-left-radius: 4px; -} - -.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight { - background: #444444; - border-right: 1px solid #999; - border-top: 1px solid #999; - border-top-right-radius: 4px; - -khtml-border-top-right-radius: 4px; - -webkit-border-top-right-radius: 4px; - -moz-border-radius: 0 4px 0 0; -} - -.wp-admin .clearlooks2 .mceMiddle .mceLeft { - background: #f1f1f1; - border-left: 1px solid #999; -} - -.wp-admin .clearlooks2 .mceMiddle .mceRight { - background: #f1f1f1; - border-right: 1px solid #999; -} - -.wp-admin .clearlooks2 .mceBottom { - background: #f1f1f1; - border-bottom: 1px solid #999; -} - -.wp-admin .clearlooks2 .mceBottom .mceLeft { - background: #f1f1f1; - border-bottom: 1px solid #999; - border-left: 1px solid #999; -} - -.wp-admin .clearlooks2 .mceBottom .mceCenter { - background: #f1f1f1; - border-bottom: 1px solid #999; -} - -.wp-admin .clearlooks2 .mceBottom .mceRight { - background: #f1f1f1; - border-bottom: 1px solid #999; - border-right: 1px solid #999; -} - -.wp-admin .clearlooks2 .mceFocus .mceTop span { - color: #e5e5e5; -} -/* end TinyMCE */ - #editorcontainer, #post-status-info, #titlediv #title { diff -uNr a/mp-wp/wp-admin/css/ie.css b/mp-wp/wp-admin/css/ie.css --- a/mp-wp/wp-admin/css/ie.css 3d3a6c4b0c7f73bd00ffde232f529d46fbe4f786193c6d3d4fa81873302eca2d2679b3af275d9b5ee88be684ee0bf33a80ea71418eed76007e1a019aeb4d6787 +++ b/mp-wp/wp-admin/css/ie.css 3ece7e10f20be0bc3dc6c9dae1dc4fc625b52326d2ffe0bd7c0d0eafd27c674f4098d4f295a52f3102db8c6b2c7c63d3b67c1c0ba8fffb063c8c3bb848d8365b @@ -231,7 +231,6 @@ #wpcontent, #post, #wrap, -#postdivrich, #postdiv, #poststuff, .metabox-holder, diff -uNr a/mp-wp/wp-admin/css/press-this-rtl.css b/mp-wp/wp-admin/css/press-this-rtl.css --- a/mp-wp/wp-admin/css/press-this-rtl.css a612e90d94ca1b65a1efe56b01d23770b32c9b1f0b268bfb22fba7b004002ab3d26eddb4ae3af38678852d74d82c2ee5edd7dc2321f48e0e820a5635ea2d1260 +++ b/mp-wp/wp-admin/css/press-this-rtl.css false @@ -1,106 +0,0 @@ -body { - font-family: Tahoma, Arial; -} -#poststuff #edButtonPreview, -#poststuff #edButtonHTML { - margin: 0px 0 0 5px; - float: right; -} -/* Editor/Main Column */ -div#poststuff { - padding-left: 0; - padding-right: 10px; -} -.posting { - margin-right: 0; - margin-left: 228px; - left:auto; - right: 0; -} -#side-info-column { - float: left; - right: auto; - left: 0; - margin-right: 0; - margin-left: 10px; -} -#side-info-column .sleeve { - padding-left: 0; - padding-right: 10px; -} -h3.tb { - margin-left: 0; - margin-right: 5px; -} -#actions { - float: left; -} -#extra_fields #actions { - right: auto; - left: 4px; -} -#actions li { - float: right; - margin-right: 0; - margin-left: 10px; -} -#extra_fields .button { - margin-right: 0; - margin-left: 5px; -} -/* Photo Styles */ -#img_container a { - float: right; -} -#category-add input, #category-add select { - font-family: Tahoma, Arial; -} -#categorydiv ul.categorychecklist ul { - margin-left: 0; - margin-right: 18px; -} -/* Tags */ -#tagsdiv #newtag { - margin-right: 0; - margin-left: 5px; -} -#tagadd { - margin-left: 0; - margin-right: 3px; -} -#tagchecklist span { - margin-left: .5em; - margin-right: 10px; - float: right; -} -#tagchecklist span a { - margin: 6px -9px 0 0; - float: right; -} -#content { - margin-left: 0; - margin-right: 1%; -} -.submit input, -.button, -.button-primary, -.button-secondary, -.button-highlighted, -#postcustomstuff .submit input { - font-family: tahoma; -} -.ac_results li { - text-align: right; -} -#TB_ajaxContent #options { - right: auto; - left: 25px; -} -#post_status { - margin-left: 0; - margin-right: 10px; -} -/* Footer */ -#footer { - padding: 10px 60px 0 0; -} diff -uNr a/mp-wp/wp-admin/css/press-this.css b/mp-wp/wp-admin/css/press-this.css --- a/mp-wp/wp-admin/css/press-this.css 10f06d2b44cd7998b637bb63277d21bc460847ad419d5257df1e11b51e49add2eb87af6937ada4d70ce051260ff3029487aa5a54dfc5a6cb0cc18615aa501e3b +++ b/mp-wp/wp-admin/css/press-this.css false @@ -1,571 +0,0 @@ -body { - font: 13px "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif; - color: #333; - margin: 0; - padding: 0; -} - -img { - border: none; -} - -/* Header */ -#wphead { - border-top: none; - padding-top: 4px; - background: #444 !important; -} - -#poststuff #edButtonPreview, -#poststuff #edButtonHTML { - -moz-border-radius-bottomleft: 0; - -moz-border-radius-bottomright: 0; - -moz-border-radius-topleft: 3px; - -moz-border-radius-topright: 3px; - -khtml-border-radius-bottomleft: 0; - -khtml-border-radius-bottomright: 0; - -khtml-border-radius-topleft: 3px; - -khtml-border-radius-topright: 3px; - -webkit-border-radius-bottomleft: 0; - -webkit-border-radius-bottomright: 0; - -webkit-border-radius-topleft: 3px; - -webkit-border-radius-topright: 3px; - border-radius-bottomleft: 0; - border-radius-bottomright: 0; - border-radius-topleft: 3px; - border-radius-topright: 3px; - border-style: solid; - border-width: 1px; - cursor: pointer; - display: block; - height: 18px; - margin: 0px 5px 0 0; - padding: 0px 5px 0px; - background-color: #E9E9E9; - border-bottom-color: #E9E9E9; - color: #333333; - font-size: 10px; - line-height: 18px; - float: left; -} - -.howto { - margin-top: 2px; - margin-bottom: 3px; - font-size: 11px; - font-style: italic; - display: block; -} - -input.text { - outline-color: -moz-use-text-color; - outline-style: none; - outline-width: medium; - width: 100%; -} - -#message { - -moz-border-radius: 6px; - -khtml-border-radius: 6px; - -webkit-border-radius: 6px; - border-radius: 6px; -} - -/* Editor/Main Column */ -div#poststuff { - padding-left: 10px; - margin-top: 10px; -} - -div.zerosize { - border: 0 none; - height: 0; - margin: 0; - overflow: hidden; - padding: 0; - position: absolute; - width: 0; -} - -#poststuff #edButtonPreview.active, -#poststuff #edButtonHTML.active { - display: none; -} - -.posting { - margin-right: 228px; - position: relative; - left: 0; -} - -#side-info-column { - float: right; - width: 218px; - position: absolute; - right: 0; - margin-right: 10px; -} - -#side-info-column .sleeve { - padding-left: 10px; -} - -#poststuff .inside { - font-size: 11px; - margin: 0 12px 12px; -} - -#poststuff h2, #poststuff h3 { - font-size: 14px; - font-weight: bold; - padding: 7px; - margin: 0 0 10px; - background-image: url(../images/postbox-bg.svg); - background-position: left top; - background-repeat: repeat-x; - font-size: 12px; - font-weight: bold; - line-height: 1; - margin: 0 0 10px; - padding: 7px 9px; - text-shadow: 0 1px 0 #FFFFFF; -} - -h3.tb { - text-shadow: 0 1px 0 #FFFFFF; - font-weight: bold; - font-size: 12px; - margin-left: 5px; -} - -#TB_window { - border: 1px solid #333; - -moz-border-radius: 6px; - -khtml-border-radius: 6px; - -webkit-border-radius: 6px; - border-radius: 6px; -} - -.metabox-holder .postbox, -.postbox, -.stuffbox { - margin-bottom: 10px; - border-width: 1px; - border-style: solid; - line-height: 1; - -moz-border-radius: 6px; - -khtml-border-radius: 6px; - -webkit-border-radius: 6px; - border-radius: 6px; - border-color: #DFDFDF; -} - -.titlediv { - border-color: #DFDFDF; -} - -#title, .tbtitle { - -moz-border-radius: 6px; - -khtml-border-radius: 6px; - -webkit-border-radius: 6px; - border-radius: 6px; - border-style: solid; - border-width: 1px; - font-size: 1.7em; - outline: none; - padding: 3px 4px; - border-color: #DFDFDF; -} - -.tbtitle { - font-size: 12px; - padding: 3px; -} - -#title { - width: 98%; -} - -.postbox h2 { - background-image: url(../images/postbox-bg.svg); - background-position: left top; - background-repeat: repeat-x; - background-color: #DFDFDF; -} - -.editor-container { - -moz-border-radius: 6px; - -khtml-border-radius: 6px; - -webkit-border-radius: 6px; - border-radius: 6px; - border-collapse: separate; - border-style: solid; - border-width: 1px; - border-color: #DFDFDF; -} - -.postdivrich { - position: relative; - padding-top: 25px; -} - -#actions { - clear: both; - float: right; - margin-top: -19px; - position: relative; -} -#extra_fields #actions { - clear: both; - position: absolute; - right: 4px; - top: 6px; - margin: 0; -} - -#actions li { - float: left; - list-style: none; - margin-right: 10px; -} -#extra_fields .button { - margin-right: 5px; -} - -/* Photo Styles */ -.photolist { - margin-top: -10px; -} - -#photo_saving { - margin: 0 8px 8px; - vertical-align: middle; -} - -#img_container { - background-color: #fff; - height: 101px; - width: 100%; -} - -#extra_fields { - margin-top: 10px; - position: relative; -} - -#extra_fields .postbox { - margin-bottom: 5px; -} - -#extra_fields .titlewrap { - padding: 0; - overflow: auto; - height: 100px; -} - -#img_container { - position: relative; -} - -#img_container a { - display: block; - float: left; - overflow: hidden; - vertical-align: center; -} - -#img_container img, #img_container a { - width: 68px; - height: 68px; -} - -#img_container img { - width: 68px; - height: 68px; - border: none; - background-color: #f4f4f4; - cursor: pointer; -} - -#img_container a, -#img_container a:link, -#img_container a:visited { - border: 1px solid #ccc; - display: block; - position: relative; -} - -#img_container a:hover, -#img_container a:active { - border-color: #000; - z-index: 1000; - border-width: 2px; - margin: -1px; -} - -/* Video */ -#embed-code { - width: 100%; - height: 98px; -} - -/* Submit Column */ -#viewsite { - padding: 0; - margin: 0 0 20px 0; - font-size: 10px; - clear: both; -} - -#viewsite .button { - margin: 0 0 0px 0; - display: block; -} - -.wp-hidden-children .wp-hidden-child { - display: none; -} - -#category-adder { - padding: 4px 0; -} - -#category-adder h4 { - margin: 0 0 8px; -} - -#category-add input { - width: 94%; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 13px; - margin: 1px; - padding: 3px; -} - -#category-add select { - width: 70%; - -x-system-font: none; - border-style: solid; - border-width: 1px; - font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif; - font-size: 12px; - height: 2em; - line-height: 20px; - padding: 2px; - margin: 1px; - vertical-align: top; -} - -#category-add input#category-add-sumbit { - width: auto; -} - -/* Categories */ -#categorydiv ul, #linkcategorydiv ul { - list-style: none; - padding: 0; - margin: 0; -} - -#categorydiv ul.categorychecklist ul { - margin-left: 18px; -} - -#categorydiv div.ui-tabs-panel { - height: 150px; - overflow: auto; -} - -ul.categorychecklist li { - margin: 0; - padding: 0; - line-height: 19px; -} - -/* Tags */ -#tagsdiv #newtag { - padding: 3px; - margin-right: 5px; - width: 16em; -} - -#jaxtag { - clear: both; - margin: 0; -} - -#tagadd { - margin-left: 3px; -} - -#tagchecklist { - margin-top: 3px; - margin-bottom: 1em; - font-size: 12px; - overflow: auto; -} - -#tagchecklist strong { - position: absolute; - font-size: .75em; -} - -#tagchecklist span { - margin-right: .5em; - margin-left: 10px; - display: block; - float: left; - font-size: 11px; - line-height: 1.8em; - white-space: nowrap; - cursor: default; -} - -#tagchecklist span a { - margin: 6px 0 0 -9px; - cursor: pointer; - width: 10px; - height: 10px; - display: block; - float: left; - text-indent: -9999px; - overflow: hidden; - position: absolute; -} - -#content { - width: 96% !important; - margin-left: 1%; - margin-bottom: 10px; - border: 1px solid #f1f1f1; -} - -/* Submit */ - -#saving { - display: inline; -} - -.submit input, -.button, -.button-primary, -.button-secondary, -.button-highlighted, -#postcustomstuff .submit input { - font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif; - text-decoration: none; - font-size: 11px !important; - line-height: 16px; - padding: 2px 8px; - cursor: pointer; - border-width: 1px; - border-style: solid; - -moz-border-radius: 11px; - -khtml-border-radius: 11px; - -webkit-border-radius: 11px; - border-radius: 11px; -} - -.button-primary { - background: #21759B url(../images/button-grad.svg) repeat-x scroll left top; - border-color: #21759B; - color: #FFFFFF; -} - -.ac_results { - padding: 0; - margin: 0; - list-style: none; - position: absolute; - z-index: 10000; - display: none; - border-width: 1px; - border-style: solid; -} - -.ac_results li { - padding: 2px 5px; - white-space: nowrap; - text-align: left; -} - -.ac_over { - cursor: pointer; -} - -.ac_match { - text-decoration: underline; -} - -#TB_ajaxContent #options { - position: absolute; - top: 20px; - right: 25px; - padding: 5px; -} - -#TB_ajaxContent h3 { - margin-bottom: .25em; -} - -.updated { - margin: 10px 0; - padding: 0; - border-width: 1px; - border-style: solid; - width: 99%; -} - -.updated p, -.error p { - margin: 0.6em 0; - padding: 0 0.6em; -} - -.error a { - text-decoration: underline; -} - -.updated a { - text-decoration: none; - padding-bottom: 2px; -} - -#post_status { - margin-left: 10px; - margin-bottom: 1em; - display: block; -} - -/* Footer */ -#footer { - height: 65px; - display: block; - width: 640px; - padding: 10px 0 0 60px; - margin: 0; - position: absolute; - bottom: 0; - font-size: 12px; -} - -#footer p { - margin: 0; - padding: 7px 0; -} - -#footer p a { - text-decoration: none; -} -#footer p a:hover { - text-decoration: underline; -} - -/* Utility Classes */ -.centered { - text-align: center; -} - -.hidden { - display: none; -} diff -uNr a/mp-wp/wp-admin/edit-form-advanced.php b/mp-wp/wp-admin/edit-form-advanced.php --- a/mp-wp/wp-admin/edit-form-advanced.php 2a27a67e90c058ced5de50dfa328cda47f4894f216a5ad40c62f76c2730217d393f93f1e37813fe962d7964e38511d8923102f545f1f0a75dd51e1a5bb5d9096 +++ b/mp-wp/wp-admin/edit-form-advanced.php 08558b087cf3e86ef88e3c07596f32dd005d467318e34350e5338c5ea72a30fa069632805b4e1d1f3094483b030f9852803b3285c1d8ffc6afdfffb5c1b650c8 @@ -565,7 +565,7 @@ -
+
post_content); ?> diff -uNr a/mp-wp/wp-admin/edit-page-form.php b/mp-wp/wp-admin/edit-page-form.php --- a/mp-wp/wp-admin/edit-page-form.php 86fd23e1bdaee66780c0e6abad986574fabc356be898629f73db5e705d06cb41e5828befa072c69156c9cb7b6a7f2c12a40e99abda3f52e35092d8415c006ee5 +++ b/mp-wp/wp-admin/edit-page-form.php 460d8cc71819108bcd5b7c75f9b98ffa739cbd9e88c167e1bddf4327084370f6b1fc00ca497454b3c61c7118b478b11ed22ed531af867aa92b51325f1333dadf @@ -447,7 +447,7 @@
-
+
post_content); ?>
diff -uNr a/mp-wp/wp-admin/gears-manifest.php b/mp-wp/wp-admin/gears-manifest.php --- a/mp-wp/wp-admin/gears-manifest.php d25acc5a65cbf7c45ac4e1af9bbedab42f0b72a673c94ea9a7fb9fde145ba43d7476e059ce84cd8f4b17f95678dc8ac23d516efb24e1dcdb325c21c37284b337 +++ b/mp-wp/wp-admin/gears-manifest.php false @@ -1,317 +0,0 @@ -registered as $script ) { - if ( empty($script->src) ) continue; - $ver = empty($script->ver) ? $wp_version : $script->ver; - if ( 'editor' == $script->handle ) $mce_ver = $script->ver; - $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $script->src ); - $defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n"; - $man_version .= $ver; -} - -foreach ( $wp_styles->registered as $style ) { - if ( empty($style->src) ) continue; - - $ver = empty($style->ver) ? $wp_version : $style->ver; - $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->src ); - if ( 'colors' == $style->handle ) $src = 'css/colors-classic.css'; - $defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n"; - - if ( isset($style->extra['rtl']) && $style->extra['rtl'] ) { - if ( is_bool( $style->extra['rtl'] ) ) - $rtl_href = str_replace( '.css', '-rtl.css', $src ); - else - $rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] ); - - $defaults .= '{ "url" : "' . $rtl_href . '?ver=' . $ver . '" },' . "\n"; - } - $man_version .= $ver; -} - -$man_version = md5($man_version); - -header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' ); -header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' ); -header( 'Cache-Control: no-cache, must-revalidate, max-age=0' ); -header( 'Pragma: no-cache' ); -header( 'Content-Type: application/x-javascript; charset=UTF-8' ); -?> -{ -"betaManifestVersion" : 1, -"version" : "_20081201", -"entries" : [ - - -{ "url" : "images/align-center.svg" }, -{ "url" : "images/align-left.svg" }, -{ "url" : "images/align-none.svg" }, -{ "url" : "images/align-right.svg" }, -{ "url" : "images/archive-link.svg" }, -{ "url" : "images/blue-grad.svg" }, -{ "url" : "images/browse-happy.svg" }, -{ "url" : "images/bubble_bg.svg" }, -{ "url" : "images/bubble_bg-rtl.svg" }, -{ "url" : "images/button-grad.svg" }, -{ "url" : "images/button-grad-active.svg" }, -{ "url" : "images/comment-grey-bubble.svg" }, -{ "url" : "images/date-button.svg" }, -{ "url" : "images/ed-bg.svg" }, -{ "url" : "images/fade-butt.svg" }, -{ "url" : "images/fav.svg" }, -{ "url" : "images/fav-arrow.svg" }, -{ "url" : "images/fav-arrow-rtl.svg" }, -{ "url" : "images/fav-top.svg" }, -{ "url" : "images/generic.svg" }, -{ "url" : "images/gray-grad.svg" }, -{ "url" : "images/icons32.svg" }, -{ "url" : "images/icons32-vs.svg" }, -{ "url" : "images/list.svg" }, -{ "url" : "images/list-vs.svg" }, -{ "url" : "images/loading.svg" }, -{ "url" : "images/loading-publish.svg" }, -{ "url" : "images/logo.svg" }, -{ "url" : "images/logo-ghost.svg" }, -{ "url" : "images/logo-login.svg" }, -{ "url" : "images/media-button-image.svg" }, -{ "url" : "images/media-button-music.svg" }, -{ "url" : "images/media-button-other.svg" }, -{ "url" : "images/media-button-video.svg" }, -{ "url" : "images/menu.svg" }, -{ "url" : "images/menu-vs.svg" }, -{ "url" : "images/menu-arrows.svg" }, -{ "url" : "images/menu-bits.svg" }, -{ "url" : "images/menu-bits-rtl.svg" }, -{ "url" : "images/menu-dark.svg" }, -{ "url" : "images/menu-dark-rtl.svg" }, -{ "url" : "images/no.svg" }, -{ "url" : "images/required.svg" }, -{ "url" : "images/resize.svg" }, -{ "url" : "images/screen-options-left.svg" }, -{ "url" : "images/screen-options-right.svg" }, -{ "url" : "images/screen-options-right-up.svg" }, -{ "url" : "images/se.svg" }, -{ "url" : "images/star.svg" }, -{ "url" : "images/toggle-arrow.svg" }, -{ "url" : "images/toggle-arrow-rtl.svg" }, -{ "url" : "images/white-grad.svg" }, -{ "url" : "images/white-grad-active.svg" }, -{ "url" : "images/wordpress-logo.svg" }, -{ "url" : "images/wp-logo.svg" }, -{ "url" : "images/xit.svg" }, -{ "url" : "images/yes.svg" }, - - -{ "url" : "../wp-includes/js/tinymce/tiny_mce.js", "src" : "../wp-includes/js/tinymce/tiny_mce.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/langs/wp-langs-en.js", "src" : "../wp-includes/js/tinymce/langs/wp-langs-en.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/wordpress.css", "src" : "../wp-includes/js/tinymce/wordpress.css?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js", "src" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/utils/validate.js", "src" : "../wp-includes/js/tinymce/utils/validate.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/utils/form_utils.js", "src" : "../wp-includes/js/tinymce/utils/form_utils.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/utils/editable_selects.js", "src" : "../wp-includes/js/tinymce/utils/editable_selects.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js", "src" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=", "ignoreQuery" : true }, - -{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js", "src" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/image.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/image.htm?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/link.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/link.htm?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/image.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/image.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css?ver=", "ignoreQuery" : true }, - -{ "url" : "../wp-includes/js/tinymce/plugins/autosave/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/autosave/editor_plugin.js?ver=", "ignoreQuery" : true }, - -{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm", "src" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=", "ignoreQuery" : true }, - -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css?ver=", "ignoreQuery" : true }, - -{ "url" : "../wp-includes/js/tinymce/plugins/media/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/media/editor_plugin.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/js/media.js", "src" : "../wp-includes/js/tinymce/plugins/media/js/media.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/media.htm", "src" : "../wp-includes/js/tinymce/plugins/media/media.htm?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/media/css/content.css?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css", "src" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=", "ignoreQuery" : true }, - -{ "url" : "../wp-includes/js/tinymce/plugins/paste/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/paste/editor_plugin.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js", "src" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js", "src" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/blank.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/blank.htm?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css", "src" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css", "src" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=", "ignoreQuery" : true }, - -{ "url" : "../wp-includes/js/tinymce/plugins/safari/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/safari/editor_plugin.js?ver=", "ignoreQuery" : true }, - -{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css?ver=", "ignoreQuery" : true }, - -{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css?ver=", "ignoreQuery" : true }, - -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=", "ignoreQuery" : true }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=", "ignoreQuery" : true }, - -{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js?ver=", "ignoreQuery" : true }, - -{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.svg" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/colorpicker.svg" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/fm.svg" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/gotmoxie.svg" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/img/sflogo.svg" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.svg" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.svg" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.svg" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.svg" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.svg" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.svg" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/img/flash.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/img/flv_player.swf" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/img/quicktime.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/img/realmedia.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/img/shockwave.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/img/windowsmedia.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/img/trans.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/img/wline.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/more.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/more_bug.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/help.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/image.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/media.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/video.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/image.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/delete.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/edit.svg" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/gallery.svg" }, - - -{ "url" : "../wp-includes/images/crystal/archive.svg" }, -{ "url" : "../wp-includes/images/crystal/audio.svg" }, -{ "url" : "../wp-includes/images/crystal/code.svg" }, -{ "url" : "../wp-includes/images/crystal/default.svg" }, -{ "url" : "../wp-includes/images/crystal/document.svg" }, -{ "url" : "../wp-includes/images/crystal/interactive.svg" }, -{ "url" : "../wp-includes/images/crystal/text.svg" }, -{ "url" : "../wp-includes/images/crystal/video.svg" }, -{ "url" : "../wp-includes/images/crystal/spreadsheet.svg" }, -{ "url" : "../wp-includes/images/rss.svg" }, -{ "url" : "../wp-includes/js/thickbox/loadingAnimation.svg" }, -{ "url" : "../wp-includes/js/thickbox/tb-close.svg" } -]} diff -uNr a/mp-wp/wp-admin/images/archive-link.svg b/mp-wp/wp-admin/images/archive-link.svg --- a/mp-wp/wp-admin/images/archive-link.svg 47415221e0cf7e554e014a1adf52c34a52e789280d2a5898356018a9dd3c150414fd3d13969a62b4da50365ce9d5c878750bd9b143803ce92aa28d57c6beaaf0 +++ b/mp-wp/wp-admin/images/archive-link.svg false @@ -1,8 +0,0 @@ - - - diff -uNr a/mp-wp/wp-admin/images/loading-publish.svg b/mp-wp/wp-admin/images/loading-publish.svg --- a/mp-wp/wp-admin/images/loading-publish.svg 0e9deacc9db2b4aac0d2c1c1e101d48d0b2a8c79405667d06573e9f1f7276628d36d78cb40c71ad2c0d088d9b7a7b37bb50f066abe02b914d4558ba0a2c454e5 +++ b/mp-wp/wp-admin/images/loading-publish.svg false @@ -1,104 +0,0 @@ - - - diff -uNr a/mp-wp/wp-admin/images/logo-ghost.svg b/mp-wp/wp-admin/images/logo-ghost.svg --- a/mp-wp/wp-admin/images/logo-ghost.svg 7675d0b9d482f8ab90379547e57d9b2164e6359d741c7cbfc592e7a605473d99e9583f5f517e837fb79d8116a3017ef837fce65c0ebcf74bcb74a5f54848b6cf +++ b/mp-wp/wp-admin/images/logo-ghost.svg false @@ -1,15 +0,0 @@ - - - diff -uNr a/mp-wp/wp-admin/images/resize.svg b/mp-wp/wp-admin/images/resize.svg --- a/mp-wp/wp-admin/images/resize.svg f3f1e0b33edf93ffe9adcf5da9c2441ecd1f25da7316a0942f949b4c8db4f737f543b10c6f8c6e264f4180552b5770a1a25ed2d69f81bb1c23f7416cd161325b +++ b/mp-wp/wp-admin/images/resize.svg false @@ -1,7 +0,0 @@ - - - diff -uNr a/mp-wp/wp-admin/images/toggle-arrow-rtl.svg b/mp-wp/wp-admin/images/toggle-arrow-rtl.svg --- a/mp-wp/wp-admin/images/toggle-arrow-rtl.svg 84abf66c99347a7b5931bf35124e643507550246ab00790e8d9ccef40e5c030d65c82a5a95680f15c9c4ecd3b5f884ca65ab083ec2f043d85c520e055aa23ee5 +++ b/mp-wp/wp-admin/images/toggle-arrow-rtl.svg false @@ -1,7 +0,0 @@ - - - diff -uNr a/mp-wp/wp-admin/images/toggle-arrow.svg b/mp-wp/wp-admin/images/toggle-arrow.svg --- a/mp-wp/wp-admin/images/toggle-arrow.svg 55ae57e83727710d8db8ac426770543094baef39db7cf40d83885dbb28d55e0a88bae87d13678da4b03d2e9e275b9a5bdb581118fcc8686f6b6c3bd5219546f0 +++ b/mp-wp/wp-admin/images/toggle-arrow.svg false @@ -1,7 +0,0 @@ - - - diff -uNr a/mp-wp/wp-admin/import/blogger.php b/mp-wp/wp-admin/import/blogger.php --- a/mp-wp/wp-admin/import/blogger.php 4b8f4fa9b2b81709d307fb19ff5bb38006a93b29f9abd31a6b13026db2aaffbecc26f6e94101315ef8e62fff8ef600c85690b87b20b0d481757dd6760d251bde +++ b/mp-wp/wp-admin/import/blogger.php false @@ -1,1061 +0,0 @@ - - ".screen_icon()." -

$title

-

$welcome

$prereqs

$stepone

-
-

- - - - - -

-
-
\n"; - } - - function uh_oh($title, $message, $info) { - echo "
"; - screen_icon(); - echo "

$title

$message

$info
"; - } - - function auth() { - // We have a single-use token that must be upgraded to a session token. - $token = preg_replace( '/[^-_0-9a-zA-Z]/', '', $_GET['token'] ); - $headers = array( - "GET /accounts/AuthSubSessionToken HTTP/1.0", - "Authorization: AuthSub token=\"$token\"" - ); - $request = join( "\r\n", $headers ) . "\r\n\r\n"; - $sock = $this->_get_auth_sock( ); - if ( ! $sock ) return false; - $response = $this->_txrx( $sock, $request ); - preg_match( '/token=([-_0-9a-z]+)/i', $response, $matches ); - if ( empty( $matches[1] ) ) { - $this->uh_oh( - __( 'Authorization failed' ), - __( 'Something went wrong. If the problem persists, send this info to support:' ), - htmlspecialchars($response) - ); - return false; - } - $this->token = $matches[1]; - - wp_redirect( remove_query_arg( array( 'token', 'noheader' ) ) ); - } - - function get_token_info() { - $headers = array( - "GET /accounts/AuthSubTokenInfo HTTP/1.0", - "Authorization: AuthSub token=\"$this->token\"" - ); - $request = join( "\r\n", $headers ) . "\r\n\r\n"; - $sock = $this->_get_auth_sock( ); - if ( ! $sock ) return; - $response = $this->_txrx( $sock, $request ); - return $this->parse_response($response); - } - - function token_is_valid() { - $info = $this->get_token_info(); - - if ( $info['code'] == 200 ) - return true; - - return false; - } - - function show_blogs($iter = 0) { - if ( empty($this->blogs) ) { - $headers = array( - "GET /feeds/default/blogs HTTP/1.0", - "Host: www.blogger.com", - "Authorization: AuthSub token=\"$this->token\"" - ); - $request = join( "\r\n", $headers ) . "\r\n\r\n"; - $sock = $this->_get_blogger_sock( ); - if ( ! $sock ) return; - $response = $this->_txrx( $sock, $request ); - - // Quick and dirty XML mining. - list( $headers, $xml ) = explode( "\r\n\r\n", $response ); - $p = xml_parser_create(); - xml_parse_into_struct($p, $xml, $vals, $index); - xml_parser_free($p); - - $this->title = $vals[$index['TITLE'][0]]['value']; - - // Give it a few retries... this step often flakes out the first time. - if ( empty( $index['ENTRY'] ) ) { - if ( $iter < 3 ) { - return $this->show_blogs($iter + 1); - } else { - $this->uh_oh( - __('Trouble signing in'), - __('We were not able to gain access to your account. Try starting over.'), - '' - ); - return false; - } - } - - foreach ( $index['ENTRY'] as $i ) { - $blog = array(); - while ( ( $tag = $vals[$i] ) && ! ( $tag['tag'] == 'ENTRY' && $tag['type'] == 'close' ) ) { - if ( $tag['tag'] == 'TITLE' ) { - $blog['title'] = $tag['value']; - } elseif ( $tag['tag'] == 'SUMMARY' ) { - $blog['summary'] == $tag['value']; - } elseif ( $tag['tag'] == 'LINK' ) { - if ( $tag['attributes']['REL'] == 'alternate' && $tag['attributes']['TYPE'] == 'text/html' ) { - $parts = parse_url( $tag['attributes']['HREF'] ); - $blog['host'] = $parts['host']; - } elseif ( $tag['attributes']['REL'] == 'edit' ) - $blog['gateway'] = $tag['attributes']['HREF']; - } - ++$i; - } - if ( ! empty ( $blog ) ) { - $blog['total_posts'] = $this->get_total_results('posts', $blog['host']); - $blog['total_comments'] = $this->get_total_results('comments', $blog['host']); - $blog['mode'] = 'init'; - $this->blogs[] = $blog; - } - } - - if ( empty( $this->blogs ) ) { - $this->uh_oh( - __('No blogs found'), - __('We were able to log in but there were no blogs. Try a different account next time.'), - '' - ); - return false; - } - } -//echo '
'.print_r($this,1).'
'; - $start = js_escape( __('Import') ); - $continue = js_escape( __('Continue') ); - $stop = js_escape( __('Importing...') ); - $authors = js_escape( __('Set Authors') ); - $loadauth = js_escape( __('Preparing author mapping form...') ); - $authhead = js_escape( __('Final Step: Author Mapping') ); - $nothing = js_escape( __('Nothing was imported. Had you already imported this blog?') ); - $title = __('Blogger Blogs'); - $name = __('Blog Name'); - $url = __('Blog URL'); - $action = __('The Magic Button'); - $posts = __('Posts'); - $comments = __('Comments'); - $noscript = __('This feature requires Javascript but it seems to be disabled. Please enable Javascript and then reload this page. Don\'t worry, you can turn it back off when you\'re done.'); - - $interval = STATUS_INTERVAL * 1000; - - foreach ( $this->blogs as $i => $blog ) { - if ( $blog['mode'] == 'init' ) - $value = $start; - elseif ( $blog['mode'] == 'posts' || $blog['mode'] == 'comments' ) - $value = $continue; - else - $value = $authors; - $blogtitle = js_escape( $blog['title'] ); - $pdone = isset($blog['posts_done']) ? (int) $blog['posts_done'] : 0; - $cdone = isset($blog['comments_done']) ? (int) $blog['comments_done'] : 0; - $init .= "blogs[$i]=new blog($i,'$blogtitle','{$blog['mode']}'," . $this->get_js_status($i) . ');'; - $pstat = "
 
$pdone/{$blog['total_posts']}
"; - $cstat = "
 
$cdone/{$blog['total_comments']}
"; - $rows .= "$blogtitle{$blog['host']}$pstat$cstat\n"; - } - - echo "

$title

\n$rows
$name$url$posts$comments$action
"; - echo " - \n"; - } - - // Handy function for stopping the script after a number of seconds. - function have_time() { - global $importer_started; - if ( time() - $importer_started > MAX_EXECUTION_TIME ) - die('continue'); - return true; - } - - function get_total_results($type, $host) { - $headers = array( - "GET /feeds/$type/default?max-results=1&start-index=2 HTTP/1.0", - "Host: $host", - "Authorization: AuthSub token=\"$this->token\"" - ); - $request = join( "\r\n", $headers ) . "\r\n\r\n"; - $sock = $this->_get_blogger_sock( $host ); - if ( ! $sock ) return; - $response = $this->_txrx( $sock, $request ); - $response = $this->parse_response( $response ); - $parser = xml_parser_create(); - xml_parse_into_struct($parser, $response['body'], $struct, $index); - xml_parser_free($parser); - $total_results = $struct[$index['OPENSEARCH:TOTALRESULTS'][0]]['value']; - return (int) $total_results; - } - - function import_blog($blogID) { - global $importing_blog; - $importing_blog = $blogID; - - if ( isset($_GET['authors']) ) - return print($this->get_author_form()); - - header('Content-Type: text/plain'); - - if ( isset($_GET['status']) ) - die($this->get_js_status()); - - if ( isset($_GET['saveauthors']) ) - die($this->save_authors()); - - $blog = $this->blogs[$blogID]; - $total_results = $this->get_total_results('posts', $blog['host']); - $this->blogs[$importing_blog]['total_posts'] = $total_results; - - $start_index = $total_results - MAX_RESULTS + 1; - - if ( isset( $this->blogs[$importing_blog]['posts_start_index'] ) ) - $start_index = (int) $this->blogs[$importing_blog]['posts_start_index']; - elseif ( $total_results > MAX_RESULTS ) - $start_index = $total_results - MAX_RESULTS + 1; - else - $start_index = 1; - - // This will be positive until we have finished importing posts - if ( $start_index > 0 ) { - // Grab all the posts - $this->blogs[$importing_blog]['mode'] = 'posts'; - $query = "start-index=$start_index&max-results=" . MAX_RESULTS; - do { - $index = $struct = $entries = array(); - $headers = array( - "GET /feeds/posts/default?$query HTTP/1.0", - "Host: {$blog['host']}", - "Authorization: AuthSub token=\"$this->token\"" - ); - $request = join( "\r\n", $headers ) . "\r\n\r\n"; - $sock = $this->_get_blogger_sock( $blog['host'] ); - if ( ! $sock ) return; // TODO: Error handling - $response = $this->_txrx( $sock, $request ); - - $response = $this->parse_response( $response ); - - // Extract the entries and send for insertion - preg_match_all( '/]*>.*?<\/entry>/s', $response['body'], $matches ); - if ( count( $matches[0] ) ) { - $entries = array_reverse($matches[0]); - foreach ( $entries as $entry ) { - $entry = "$entry"; - $AtomParser = new AtomParser(); - $AtomParser->parse( $entry ); - $result = $this->import_post($AtomParser->entry); - if ( is_wp_error( $result ) ) - return $result; - unset($AtomParser); - } - } else break; - - // Get the 'previous' query string which we'll use on the next iteration - $query = ''; - $links = preg_match_all('/]*)>/', $response['body'], $matches); - if ( count( $matches[1] ) ) - foreach ( $matches[1] as $match ) - if ( preg_match('/rel=.previous./', $match) ) - $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match) ); - - if ( $query ) { - parse_str($query, $q); - $this->blogs[$importing_blog]['posts_start_index'] = (int) $q['start-index']; - } else - $this->blogs[$importing_blog]['posts_start_index'] = 0; - $this->save_vars(); - } while ( !empty( $query ) && $this->have_time() ); - } - - $total_results = $this->get_total_results( 'comments', $blog['host'] ); - $this->blogs[$importing_blog]['total_comments'] = $total_results; - - if ( isset( $this->blogs[$importing_blog]['comments_start_index'] ) ) - $start_index = (int) $this->blogs[$importing_blog]['comments_start_index']; - elseif ( $total_results > MAX_RESULTS ) - $start_index = $total_results - MAX_RESULTS + 1; - else - $start_index = 1; - - if ( $start_index > 0 ) { - // Grab all the comments - $this->blogs[$importing_blog]['mode'] = 'comments'; - $query = "start-index=$start_index&max-results=" . MAX_RESULTS; - do { - $index = $struct = $entries = array(); - $headers = array( - "GET /feeds/comments/default?$query HTTP/1.0", - "Host: {$blog['host']}", - "Authorization: AuthSub token=\"$this->token\"" - ); - $request = join( "\r\n", $headers ) . "\r\n\r\n"; - $sock = $this->_get_blogger_sock( $blog['host'] ); - if ( ! $sock ) return; // TODO: Error handling - $response = $this->_txrx( $sock, $request ); - - $response = $this->parse_response( $response ); - - // Extract the comments and send for insertion - preg_match_all( '/]*>.*?<\/entry>/s', $response['body'], $matches ); - if ( count( $matches[0] ) ) { - $entries = array_reverse( $matches[0] ); - foreach ( $entries as $entry ) { - $entry = "$entry"; - $AtomParser = new AtomParser(); - $AtomParser->parse( $entry ); - $this->import_comment($AtomParser->entry); - unset($AtomParser); - } - } - - // Get the 'previous' query string which we'll use on the next iteration - $query = ''; - $links = preg_match_all('/]*)>/', $response['body'], $matches); - if ( count( $matches[1] ) ) - foreach ( $matches[1] as $match ) - if ( preg_match('/rel=.previous./', $match) ) - $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match) ); - - parse_str($query, $q); - - $this->blogs[$importing_blog]['comments_start_index'] = (int) $q['start-index']; - $this->save_vars(); - } while ( !empty( $query ) && $this->have_time() ); - } - $this->blogs[$importing_blog]['mode'] = 'authors'; - $this->save_vars(); - if ( !$this->blogs[$importing_blog]['posts_done'] && !$this->blogs[$importing_blog]['comments_done'] ) - die('nothing'); - do_action('import_done', 'blogger'); - die('done'); - } - - function convert_date( $date ) { - preg_match('#([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(?:\.[0-9]+)?(Z|[\+|\-][0-9]{2,4}){0,1}#', $date, $date_bits); - $offset = iso8601_timezone_to_offset( $date_bits[7] ); - $timestamp = gmmktime($date_bits[4], $date_bits[5], $date_bits[6], $date_bits[2], $date_bits[3], $date_bits[1]); - $timestamp -= $offset; // Convert from Blogger local time to GMT - $timestamp += get_option('gmt_offset') * 3600; // Convert from GMT to WP local time - return gmdate('Y-m-d H:i:s', $timestamp); - } - - function no_apos( $string ) { - return str_replace( ''', "'", $string); - } - - function min_whitespace( $string ) { - return preg_replace( '|\s+|', ' ', $string ); - } - - function import_post( $entry ) { - global $importing_blog; - - // The old permalink is all Blogger gives us to link comments to their posts. - if ( isset( $entry->draft ) ) - $rel = 'self'; - else - $rel = 'alternate'; - foreach ( $entry->links as $link ) { - if ( $link['rel'] == $rel ) { - $parts = parse_url( $link['href'] ); - $entry->old_permalink = $parts['path']; - break; - } - } - - $post_date = $this->convert_date( $entry->published ); - $post_content = trim( addslashes( $this->no_apos( html_entity_decode( $entry->content ) ) ) ); - $post_title = trim( addslashes( $this->no_apos( $this->min_whitespace( $entry->title ) ) ) ); - $post_status = isset( $entry->draft ) ? 'draft' : 'publish'; - - // Clean up content - $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content); - $post_content = str_replace('
', '
', $post_content); - $post_content = str_replace('
', '
', $post_content); - - // Checks for duplicates - if ( isset( $this->blogs[$importing_blog]['posts'][$entry->old_permalink] ) ) { - ++$this->blogs[$importing_blog]['posts_skipped']; - } elseif ( $post_id = post_exists( $post_title, $post_content, $post_date ) ) { - $this->blogs[$importing_blog]['posts'][$entry->old_permalink] = $post_id; - ++$this->blogs[$importing_blog]['posts_skipped']; - } else { - $post = compact('post_date', 'post_content', 'post_title', 'post_status'); - - $post_id = wp_insert_post($post); - if ( is_wp_error( $post_id ) ) - return $post_id; - - wp_create_categories( array_map( 'addslashes', $entry->categories ), $post_id ); - - $author = $this->no_apos( strip_tags( $entry->author ) ); - - add_post_meta( $post_id, 'blogger_blog', $this->blogs[$importing_blog]['host'], true ); - add_post_meta( $post_id, 'blogger_author', $author, true ); - add_post_meta( $post_id, 'blogger_permalink', $entry->old_permalink, true ); - - $this->blogs[$importing_blog]['posts'][$entry->old_permalink] = $post_id; - ++$this->blogs[$importing_blog]['posts_done']; - } - $this->save_vars(); - return; - } - - function import_comment( $entry ) { - global $importing_blog; - - // Drop the #fragment and we have the comment's old post permalink. - foreach ( $entry->links as $link ) { - if ( $link['rel'] == 'alternate' ) { - $parts = parse_url( $link['href'] ); - $entry->old_permalink = $parts['fragment']; - $entry->old_post_permalink = $parts['path']; - break; - } - } - - $comment_post_ID = (int) $this->blogs[$importing_blog]['posts'][$entry->old_post_permalink]; - preg_match('#(.+?).*(?:\(.+?))?#', $entry->author, $matches); - $comment_author = addslashes( $this->no_apos( strip_tags( (string) $matches[1] ) ) ); - $comment_author_url = addslashes( $this->no_apos( strip_tags( (string) $matches[2] ) ) ); - $comment_date = $this->convert_date( $entry->updated ); - $comment_content = addslashes( $this->no_apos( html_entity_decode( $entry->content ) ) ); - - // Clean up content - $comment_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $comment_content); - $comment_content = str_replace('
', '
', $comment_content); - $comment_content = str_replace('
', '
', $comment_content); - - // Checks for duplicates - if ( - isset( $this->blogs[$importing_blog]['comments'][$entry->old_permalink] ) || - comment_exists( $comment_author, $comment_date ) - ) { - ++$this->blogs[$importing_blog]['comments_skipped']; - } else { - $comment = compact('comment_post_ID', 'comment_author', 'comment_author_url', 'comment_date', 'comment_content'); - - $comment_id = wp_insert_comment($comment); - - $this->blogs[$importing_blog]['comments'][$entry->old_permalink] = $comment_id; - - ++$this->blogs[$importing_blog]['comments_done']; - } - $this->save_vars(); - } - - function get_js_status($blog = false) { - global $importing_blog; - if ( $blog === false ) - $blog = $this->blogs[$importing_blog]; - else - $blog = $this->blogs[$blog]; - $p1 = isset( $blog['posts_done'] ) ? (int) $blog['posts_done'] : 0; - $p2 = isset( $blog['total_posts'] ) ? (int) $blog['total_posts'] : 0; - $c1 = isset( $blog['comments_done'] ) ? (int) $blog['comments_done'] : 0; - $c2 = isset( $blog['total_comments'] ) ? (int) $blog['total_comments'] : 0; - return "{p1:$p1,p2:$p2,c1:$c1,c2:$c2}"; - } - - function get_author_form($blog = false) { - global $importing_blog, $wpdb, $current_user; - if ( $blog === false ) - $blog = & $this->blogs[$importing_blog]; - else - $blog = & $this->blogs[$blog]; - - if ( !isset( $blog['authors'] ) ) { - $post_ids = array_values($blog['posts']); - $authors = (array) $wpdb->get_col("SELECT DISTINCT meta_value FROM $wpdb->postmeta WHERE meta_key = 'blogger_author' AND post_id IN (" . join( ',', $post_ids ) . ")"); - $blog['authors'] = array_map(null, $authors, array_fill(0, count($authors), $current_user->ID)); - $this->save_vars(); - } - - $directions = __('All posts were imported with the current user as author. Use this form to move each Blogger user\'s posts to a different WordPress user. You may add users and then return to this page and complete the user mapping. This form may be used as many times as you like until you activate the "Restart" function below.'); - $heading = __('Author mapping'); - $blogtitle = "{$blog['title']} ({$blog['host']})"; - $mapthis = __('Blogger username'); - $tothis = __('WordPress login'); - $submit = js_escape( __('Save Changes') ); - - foreach ( $blog['authors'] as $i => $author ) - $rows .= ""; - - return "

$heading

$blogtitle

$directions

$rows
$mapthis$tothis
"; - } - - function get_user_options($current) { - global $importer_users; - if ( ! isset( $importer_users ) ) - $importer_users = (array) get_users_of_blog(); - - foreach ( $importer_users as $user ) { - $sel = ( $user->user_id == $current ) ? " selected='selected'" : ''; - $options .= ""; - } - - return $options; - } - - function save_authors() { - global $importing_blog, $wpdb; - $authors = (array) $_POST['authors']; - - $host = $this->blogs[$importing_blog]['host']; - - // Get an array of posts => authors - $post_ids = (array) $wpdb->get_col( $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = 'blogger_blog' AND meta_value = %s", $host) ); - $post_ids = join( ',', $post_ids ); - $results = (array) $wpdb->get_results("SELECT post_id, meta_value FROM $wpdb->postmeta WHERE meta_key = 'blogger_author' AND post_id IN ($post_ids)"); - foreach ( $results as $row ) - $authors_posts[$row->post_id] = $row->meta_value; - - foreach ( $authors as $author => $user_id ) { - $user_id = (int) $user_id; - - // Skip authors that haven't been changed - if ( $user_id == $this->blogs[$importing_blog]['authors'][$author][1] ) - continue; - - // Get a list of the selected author's posts - $post_ids = (array) array_keys( $authors_posts, $this->blogs[$importing_blog]['authors'][$author][0] ); - $post_ids = join( ',', $post_ids); - - $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_author = %d WHERE id IN ($post_ids)", $user_id) ); - $this->blogs[$importing_blog]['authors'][$author][1] = $user_id; - } - $this->save_vars(); - - wp_redirect('edit.php'); - } - - function _get_auth_sock() { - // Connect to https://www.google.com - if ( !$sock = @ fsockopen('ssl://www.google.com', 443, $errno, $errstr) ) { - $this->uh_oh( - __('Could not connect to https://www.google.com'), - __('There was a problem opening a secure connection to Google. This is what went wrong:'), - "$errstr ($errno)" - ); - return false; - } - return $sock; - } - - function _get_blogger_sock($host = 'www2.blogger.com') { - if ( !$sock = @ fsockopen($host, 80, $errno, $errstr) ) { - $this->uh_oh( - sprintf( __('Could not connect to %s'), $host ), - __('There was a problem opening a connection to Blogger. This is what went wrong:'), - "$errstr ($errno)" - ); - return false; - } - return $sock; - } - - function _txrx( $sock, $request ) { - fwrite( $sock, $request ); - while ( ! feof( $sock ) ) - $response .= @ fread ( $sock, 8192 ); - fclose( $sock ); - return $response; - } - - function revoke($token) { - $headers = array( - "GET /accounts/AuthSubRevokeToken HTTP/1.0", - "Authorization: AuthSub token=\"$token\"" - ); - $request = join( "\r\n", $headers ) . "\r\n\r\n"; - $sock = $this->_get_auth_sock( ); - if ( ! $sock ) return false; - $this->_txrx( $sock, $request ); - } - - function restart() { - global $wpdb; - $options = get_option( 'blogger_importer' ); - - if ( isset( $options['token'] ) ) - $this->revoke( $options['token'] ); - - delete_option('blogger_importer'); - $wpdb->query("DELETE FROM $wpdb->postmeta WHERE meta_key = 'blogger_author'"); - wp_redirect('?import=blogger'); - } - - // Returns associative array of code, header, cookies, body. Based on code from php.net. - function parse_response($this_response) { - // Split response into header and body sections - list($response_headers, $response_body) = explode("\r\n\r\n", $this_response, 2); - $response_header_lines = explode("\r\n", $response_headers); - - // First line of headers is the HTTP response code - $http_response_line = array_shift($response_header_lines); - if(preg_match('@^HTTP/[0-9]\.[0-9] ([0-9]{3})@',$http_response_line, $matches)) { $response_code = $matches[1]; } - - // put the rest of the headers in an array - $response_header_array = array(); - foreach($response_header_lines as $header_line) { - list($header,$value) = explode(': ', $header_line, 2); - $response_header_array[$header] .= $value."\n"; - } - - $cookie_array = array(); - $cookies = explode("\n", $response_header_array["Set-Cookie"]); - foreach($cookies as $this_cookie) { array_push($cookie_array, "Cookie: ".$this_cookie); } - - return array("code" => $response_code, "header" => $response_header_array, "cookies" => $cookie_array, "body" => $response_body); - } - - // Step 9: Congratulate the user - function congrats() { - $blog = (int) $_GET['blog']; - echo '

'.__('Congratulations!').'

'.__('Now that you have imported your Blogger blog into WordPress, what are you going to do? Here are some suggestions:').'

  • '.__('That was hard work! Take a break.').'
  • '; - if ( count($this->import['blogs']) > 1 ) - echo '
  • '.__('In case you haven\'t done it already, you can import the posts from your other blogs:'). $this->show_blogs() . '
  • '; - if ( $n = count($this->import['blogs'][$blog]['newusers']) ) - echo '
  • '.sprintf(__('Go to Authors & Users, where you can modify the new user(s) or delete them. If you want to make all of the imported posts yours, you will be given that option when you delete the new authors.'), 'users.php', '_parent').'
  • '; - echo '
  • '.__('For security, click the link below to reset this importer.').'
  • '; - echo '
'; - } - - // Figures out what to do, then does it. - function start() { - if ( isset($_POST['restart']) ) - $this->restart(); - - $options = get_option('blogger_importer'); - - if ( is_array($options) ) - foreach ( $options as $key => $value ) - $this->$key = $value; - - if ( isset( $_REQUEST['blog'] ) ) { - $blog = is_array($_REQUEST['blog']) ? array_shift( $keys = array_keys( $_REQUEST['blog'] ) ) : $_REQUEST['blog']; - $blog = (int) $blog; - $result = $this->import_blog( $blog ); - if ( is_wp_error( $result ) ) - echo $result->get_error_message(); - } elseif ( isset($_GET['token']) ) - $this->auth(); - elseif ( isset($this->token) && $this->token_is_valid() ) - $this->show_blogs(); - else - $this->greet(); - - $saved = $this->save_vars(); - - if ( $saved && !isset($_GET['noheader']) ) { - $restart = __('Restart'); - $message = __('We have saved some information about your Blogger account in your WordPress database. Clearing this information will allow you to start over. Restarting will not affect any posts you have already imported. If you attempt to re-import a blog, duplicate posts and comments will be skipped.'); - $submit = __('Clear account information'); - echo "

$restart

$message

"; - } - } - - function save_vars() { - $vars = get_object_vars($this); - update_option( 'blogger_importer', $vars ); - - return !empty($vars); - } - - function admin_head() { -?> - -entry = new AtomEntry(); - $this->map_attrs_func = create_function('$k,$v', 'return "$k=\"$v\"";'); - $this->map_xmlns_func = create_function('$p,$n', '$xd = "xmlns"; if(strlen($n[0])>0) $xd .= ":{$n[0]}"; return "{$xd}=\"{$n[1]}\"";'); - } - - function parse($xml) { - - global $app_logging; - array_unshift($this->ns_contexts, array()); - - $parser = xml_parser_create_ns(); - xml_set_object($parser, $this); - xml_set_element_handler($parser, "start_element", "end_element"); - xml_parser_set_option($parser,XML_OPTION_CASE_FOLDING,0); - xml_parser_set_option($parser,XML_OPTION_SKIP_WHITE,0); - xml_set_character_data_handler($parser, "cdata"); - xml_set_default_handler($parser, "_default"); - xml_set_start_namespace_decl_handler($parser, "start_ns"); - xml_set_end_namespace_decl_handler($parser, "end_ns"); - - $contents = ""; - - xml_parse($parser, $xml); - - xml_parser_free($parser); - - return true; - } - - function start_element($parser, $name, $attrs) { - - $tag = array_pop(split(":", $name)); - - array_unshift($this->ns_contexts, $this->ns_decls); - - $this->depth++; - - if(!empty($this->in_content)) { - $attrs_prefix = array(); - - // resolve prefixes for attributes - foreach($attrs as $key => $value) { - $attrs_prefix[$this->ns_to_prefix($key)] = $this->xml_escape($value); - } - $attrs_str = join(' ', array_map($this->map_attrs_func, array_keys($attrs_prefix), array_values($attrs_prefix))); - if(strlen($attrs_str) > 0) { - $attrs_str = " " . $attrs_str; - } - - $xmlns_str = join(' ', array_map($this->map_xmlns_func, array_keys($this->ns_contexts[0]), array_values($this->ns_contexts[0]))); - if(strlen($xmlns_str) > 0) { - $xmlns_str = " " . $xmlns_str; - } - - // handle self-closing tags (case: a new child found right-away, no text node) - if(count($this->in_content) == 2) { - array_push($this->in_content, ">"); - } - - array_push($this->in_content, "<". $this->ns_to_prefix($name) ."{$xmlns_str}{$attrs_str}"); - } else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) { - $this->in_content = array(); - $this->is_xhtml = $attrs['type'] == 'xhtml'; - array_push($this->in_content, array($tag,$this->depth)); - } else if($tag == 'link') { - array_push($this->entry->links, $attrs); - } else if($tag == 'category') { - array_push($this->entry->categories, $attrs['term']); - } - - $this->ns_decls = array(); - } - - function end_element($parser, $name) { - - $tag = array_pop(split(":", $name)); - - if(!empty($this->in_content)) { - if($this->in_content[0][0] == $tag && - $this->in_content[0][1] == $this->depth) { - array_shift($this->in_content); - if($this->is_xhtml) { - $this->in_content = array_slice($this->in_content, 2, count($this->in_content)-3); - } - $this->entry->$tag = join('',$this->in_content); - $this->in_content = array(); - } else { - $endtag = $this->ns_to_prefix($name); - if (strpos($this->in_content[count($this->in_content)-1], '<' . $endtag) !== false) { - array_push($this->in_content, "/>"); - } else { - array_push($this->in_content, ""); - } - } - } - - array_shift($this->ns_contexts); - - #print str_repeat(" ", $this->depth * $this->indent) . "end_element('$name')" ."\n"; - - $this->depth--; - } - - function start_ns($parser, $prefix, $uri) { - #print str_repeat(" ", $this->depth * $this->indent) . "starting: " . $prefix . ":" . $uri . "\n"; - array_push($this->ns_decls, array($prefix,$uri)); - } - - function end_ns($parser, $prefix) { - #print str_repeat(" ", $this->depth * $this->indent) . "ending: #" . $prefix . "#\n"; - } - - function cdata($parser, $data) { - #print str_repeat(" ", $this->depth * $this->indent) . "data: #" . $data . "#\n"; - if(!empty($this->in_content)) { - // handle self-closing tags (case: text node found, need to close element started) - if (strpos($this->in_content[count($this->in_content)-1], '<') !== false) { - array_push($this->in_content, ">"); - } - array_push($this->in_content, $this->xml_escape($data)); - } - } - - function _default($parser, $data) { - # when does this gets called? - } - - - function ns_to_prefix($qname) { - $components = split(":", $qname); - $name = array_pop($components); - - if(!empty($components)) { - $ns = join(":",$components); - foreach($this->ns_contexts as $context) { - foreach($context as $mapping) { - if($mapping[1] == $ns && strlen($mapping[0]) > 0) { - return "$mapping[0]:$name"; - } - } - } - } - return $name; - } - - function xml_escape($string) - { - return str_replace(array('&','"',"'",'<','>'), - array('&','"',''','<','>'), - $string ); - } -} - -?> diff -uNr a/mp-wp/wp-admin/import/blogware.php b/mp-wp/wp-admin/import/blogware.php --- a/mp-wp/wp-admin/import/blogware.php 215899a4bdd06858e9fc56643d867c70dfcfd95467439a88419c6a56ed19b9f906a10dd40bd32d297094e3eeed17e3d70c77719251df3a0ffe921017f333124d +++ b/mp-wp/wp-admin/import/blogware.php false @@ -1,215 +0,0 @@ -'; - screen_icon(); - echo '

'.__('Import Blogware').'

'; - } - - function footer() { - echo '
'; - } - - function unhtmlentities($string) { // From php.net for < 4.3 compat - $trans_tbl = get_html_translation_table(HTML_ENTITIES); - $trans_tbl = array_flip($trans_tbl); - return strtr($string, $trans_tbl); - } - - function greet() { - echo '
'; - echo '

'.__('Howdy! This importer allows you to extract posts from Blogware XML export file into your blog. Pick a Blogware file to upload and click Import.').'

'; - wp_import_upload_form("admin.php?import=blogware&step=1"); - echo '
'; - } - - function import_posts() { - global $wpdb, $current_user; - - set_magic_quotes_runtime(0); - $importdata = file($this->file); // Read the file into an array - $importdata = implode('', $importdata); // squish it - $importdata = str_replace(array ("\r\n", "\r"), "\n", $importdata); - - preg_match_all('|(]+>(.*?))|is', $importdata, $posts); - $posts = $posts[1]; - unset($importdata); - echo '
    '; - foreach ($posts as $post) { - flush(); - preg_match('||is', $post, $post_type); - $post_type = $post_type[1]; - if($post_type == "photo") { - preg_match('|(.*?)|is', $post, $post_title); - } else { - preg_match('|(.*?)|is', $post, $post_title); - } - $post_title = $wpdb->escape(trim($post_title[1])); - - preg_match('|(.*?)|is', $post, $post_date); - $post_date = strtotime($post_date[1]); - $post_date = gmdate('Y-m-d H:i:s', $post_date); - - preg_match_all('|(.*?)|is', $post, $categories); - $categories = $categories[1]; - - $cat_index = 0; - foreach ($categories as $category) { - $categories[$cat_index] = $wpdb->escape($this->unhtmlentities($category)); - $cat_index++; - } - - if(strcasecmp($post_type, "photo") === 0) { - preg_match('|(.*?)|is', $post, $post_content); - $post_content = ''; - $post_content = $this->unhtmlentities($post_content); - } else { - preg_match('|(.*?)|is', $post, $post_content); - $post_content = str_replace(array (''), '', trim($post_content[1])); - $post_content = $this->unhtmlentities($post_content); - } - - // Clean up content - $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content); - $post_content = str_replace('
    ', '
    ', $post_content); - $post_content = str_replace('
    ', '
    ', $post_content); - $post_content = $wpdb->escape($post_content); - - $post_author = $current_user->ID; - preg_match('|(.*?)|is', $post, $post_status); - $post_status = trim($post_status[1]); - - echo '
  1. '; - if ($post_id = post_exists($post_title, $post_content, $post_date)) { - printf(__('Post %s already exists.'), stripslashes($post_title)); - } else { - printf(__('Importing post %s...'), stripslashes($post_title)); - $postdata = compact('post_author', 'post_date', 'post_content', 'post_title', 'post_status'); - $post_id = wp_insert_post($postdata); - if ( is_wp_error( $post_id ) ) { - return $post_id; - } - if (!$post_id) { - _e("Couldn't get post ID"); - echo '
  2. '; - break; - } - if(0 != count($categories)) - wp_create_categories($categories, $post_id); - } - - preg_match_all('|(.*?)|is', $post, $comments); - $comments = $comments[1]; - - if ( $comments ) { - $comment_post_ID = (int) $post_id; - $num_comments = 0; - foreach ($comments as $comment) { - preg_match('|(.*?)|is', $comment, $comment_content); - $comment_content = str_replace(array (''), '', trim($comment_content[1])); - $comment_content = $this->unhtmlentities($comment_content); - - // Clean up content - $comment_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $comment_content); - $comment_content = str_replace('
    ', '
    ', $comment_content); - $comment_content = str_replace('
    ', '
    ', $comment_content); - $comment_content = $wpdb->escape($comment_content); - - preg_match('|(.*?)|is', $comment, $comment_date); - $comment_date = trim($comment_date[1]); - $comment_date = date('Y-m-d H:i:s', strtotime($comment_date)); - - preg_match('|(.*?)|is', $comment, $comment_author); - $comment_author = $wpdb->escape(trim($comment_author[1])); - - $comment_author_email = NULL; - - $comment_approved = 1; - // Check if it's already there - if (!comment_exists($comment_author, $comment_date)) { - $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_date', 'comment_content', 'comment_approved'); - $commentdata = wp_filter_comment($commentdata); - wp_insert_comment($commentdata); - $num_comments++; - } - } - } - if ( $num_comments ) { - echo ' '; - printf( __ngettext('%s comment', '%s comments', $num_comments), $num_comments ); - } - echo ''; - flush(); - ob_flush(); - } - echo '
'; - } - - function import() { - $file = wp_import_handle_upload(); - if ( isset($file['error']) ) { - echo $file['error']; - return; - } - - $this->file = $file['file']; - $result = $this->import_posts(); - if ( is_wp_error( $result ) ) - return $result; - wp_import_cleanup($file['id']); - do_action('import_done', 'blogware'); - echo '

'; - printf(__('All done. Have fun!'), get_option('home')); - echo '

'; - } - - function dispatch() { - if (empty ($_GET['step'])) - $step = 0; - else - $step = (int) $_GET['step']; - - $this->header(); - - switch ($step) { - case 0 : - $this->greet(); - break; - case 1 : - $result = $this->import(); - if ( is_wp_error( $result ) ) - $result->get_error_message(); - break; - } - - $this->footer(); - } - - function BW_Import() { - // Nothing. - } -} - -$blogware_import = new BW_Import(); - -register_importer('blogware', __('Blogware'), __('Import posts from Blogware.'), array ($blogware_import, 'dispatch')); -?> diff -uNr a/mp-wp/wp-admin/import/btt.php b/mp-wp/wp-admin/import/btt.php --- a/mp-wp/wp-admin/import/btt.php 157a7579d966b8160af5d42fb504acb4e959d2529a5f8b2a9187d5139b35109c0f3e0aca21ac88a82221c63627bdab15f04849fbfebf0faa8ad314e9a4098545 +++ b/mp-wp/wp-admin/import/btt.php false @@ -1,130 +0,0 @@ -'; - screen_icon(); - echo '

'.__('Import Bunny’s Technorati Tags').'

'; - echo '

'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

'; - } - - function footer() { - echo '
'; - } - - function greet() { - echo '
'; - echo '

'.__('Howdy! This imports tags from Bunny’s Technorati Tags into WordPress tags.').'

'; - echo '

'.__('This is suitable for Bunny’s Technorati Tags version 0.6.').'

'; - echo '

'.__('All existing Bunny’s Technorati Tags will be removed after import.').'

'; - echo '

'.__('Don’t be stupid - backup your database before proceeding!').'

'; - echo '
'; - wp_nonce_field('import-btt'); - echo '

'; - echo '
'; - echo '
'; - } - - function dispatch() { - if ( empty($_GET['step']) ) - $step = 0; - else - $step = absint($_GET['step']); - - // load the header - $this->header(); - - switch ( $step ) { - case 0 : - $this->greet(); - break; - case 1 : - check_admin_referer('import-btt'); - $this->check_post_keyword( true ); - break; - case 2 : - check_admin_referer('import-btt'); - $this->check_post_keyword( false ); - break; - case 3: - $this->done(); - break; - } - - // load the footer - $this->footer(); - } - - function check_post_keyword($precheck = true) { - global $wpdb; - - echo '
'; - echo '

'.__('Reading Bunny’s Technorati Tags…').'

'; - - // import Bunny's Keywords tags - $metakeys = $wpdb->get_results("SELECT post_id, meta_id, meta_key, meta_value FROM $wpdb->postmeta WHERE $wpdb->postmeta.meta_key = 'tags'"); - if ( !is_array($metakeys)) { - echo '

' . __('No Tags Found!') . '

'; - return false; - } else { - $count = count($metakeys); - echo '

' . sprintf( __ngettext('Done! %s post with tags were read.', 'Done! %s posts with tags were read.', $count), $count ) . '

'; - echo ''; - } - - echo '
'; - wp_nonce_field('import-btt'); - echo '

'; - echo '
'; - echo '
'; - } - - function done() { - echo '
'; - echo '

'.__('Import Complete!').'

'; - echo '
'; - } - - function BunnyTags_Import() { - } - -} - -// create the import object -$btt_import = new BunnyTags_Import(); - -// add it to the import page! -register_importer('btt', 'Bunny’s Technorati Tags', __('Import Bunny’s Technorati Tags into WordPress tags.'), array($btt_import, 'dispatch')); - -?> diff -uNr a/mp-wp/wp-admin/import/dotclear.php b/mp-wp/wp-admin/import/dotclear.php --- a/mp-wp/wp-admin/import/dotclear.php 9bcf079ec550633a2846cb4b8dba0cc6bd939e4e282ee64d5e4a38a3f478cab763722bd97e8ecc5452033b284a9d4592562e520639f3b4da00251dfbbfeef096 +++ b/mp-wp/wp-admin/import/dotclear.php false @@ -1,835 +0,0 @@ -get_var( $wpdb->prepare("SELECT count(*) FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) ); - } -} - -if(!function_exists('link_exists')) -{ - /** - * Check whether link already exists. - * - * @package WordPress - * @subpackage Dotclear_Import - * - * @param string $linkname - * @return int - */ - function link_exists($linkname) - { - global $wpdb; - return $wpdb->get_var( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_name = %s", $linkname) ); - } -} - -/* - Identify UTF-8 text - Taken from http://www.php.net/manual/fr/function.mb-detect-encoding.php#50087 -*/ -// -// utf8 encoding validation developed based on Wikipedia entry at: -// http://en.wikipedia.org/wiki/UTF-8 -// -// Implemented as a recursive descent parser based on a simple state machine -// copyright 2005 Maarten Meijer -// -// This cries out for a C-implementation to be included in PHP core -// - -/** - * @package WordPress - * @subpackage Dotclear_Import - * - * @param string $char - * @return string - */ -function valid_1byte($char) { - if(!is_int($char)) return false; - return ($char & 0x80) == 0x00; -} - -/** - * @package WordPress - * @subpackage Dotclear_Import - * - * @param string $char - * @return string - */ -function valid_2byte($char) { - if(!is_int($char)) return false; - return ($char & 0xE0) == 0xC0; -} - -/** - * @package WordPress - * @subpackage Dotclear_Import - * - * @param string $char - * @return string - */ -function valid_3byte($char) { - if(!is_int($char)) return false; - return ($char & 0xF0) == 0xE0; -} - -/** - * @package WordPress - * @subpackage Dotclear_Import - * - * @param string $char - * @return string - */ -function valid_4byte($char) { - if(!is_int($char)) return false; - return ($char & 0xF8) == 0xF0; -} - -/** - * @package WordPress - * @subpackage Dotclear_Import - * - * @param string $char - * @return string - */ -function valid_nextbyte($char) { - if(!is_int($char)) return false; - return ($char & 0xC0) == 0x80; -} - -/** - * @package WordPress - * @subpackage Dotclear_Import - * - * @param string $string - * @return string - */ -function valid_utf8($string) { - $len = strlen($string); - $i = 0; - while( $i < $len ) { - $char = ord(substr($string, $i++, 1)); - if(valid_1byte($char)) { // continue - continue; - } else if(valid_2byte($char)) { // check 1 byte - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - } else if(valid_3byte($char)) { // check 2 bytes - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - } else if(valid_4byte($char)) { // check 3 bytes - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - if(!valid_nextbyte(ord(substr($string, $i++, 1)))) - return false; - } // goto next char - } - return true; // done -} - -/** - * @package WordPress - * @subpackage Dotclear_Import - * - * @param string $s - * @return string - */ -function csc ($s) { - if (valid_utf8 ($s)) { - return $s; - } else { - return iconv(get_option ("dccharset"),"UTF-8",$s); - } -} - -/** - * @package WordPress - * @subpackage Dotclear_Import - * - * @param string $s - * @return string - */ -function textconv ($s) { - return csc (preg_replace ('|(?)\s*\n|', ' ', $s)); -} - -/** - * Dotclear Importer class - * - * Will process the WordPress eXtended RSS files that you upload from the export - * file. - * - * @package WordPress - * @subpackage Importer - * - * @since unknown - */ -class Dotclear_Import { - - function header() - { - echo '
'; - screen_icon(); - echo '

'.__('Import DotClear').'

'; - echo '

'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

'; - } - - function footer() - { - echo '
'; - } - - function greet() - { - echo '

'.__('Howdy! This importer allows you to extract posts from a DotClear database into your blog. Mileage may vary.').'

'; - echo '

'.__('Your DotClear Configuration settings are as follows:').'

'; - echo '
'; - wp_nonce_field('import-dotclear'); - $this->db_form(); - echo '

'; - echo '
'; - } - - function get_dc_cats() - { - global $wpdb; - // General Housekeeping - $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost')); - set_magic_quotes_runtime(0); - $dbprefix = get_option('dcdbprefix'); - - // Get Categories - return $dcdb->get_results('SELECT * FROM '.$dbprefix.'categorie', ARRAY_A); - } - - function get_dc_users() - { - global $wpdb; - // General Housekeeping - $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost')); - set_magic_quotes_runtime(0); - $dbprefix = get_option('dcdbprefix'); - - // Get Users - - return $dcdb->get_results('SELECT * FROM '.$dbprefix.'user', ARRAY_A); - } - - function get_dc_posts() - { - // General Housekeeping - $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost')); - set_magic_quotes_runtime(0); - $dbprefix = get_option('dcdbprefix'); - - // Get Posts - return $dcdb->get_results('SELECT '.$dbprefix.'post.*, '.$dbprefix.'categorie.cat_libelle_url AS post_cat_name - FROM '.$dbprefix.'post INNER JOIN '.$dbprefix.'categorie - ON '.$dbprefix.'post.cat_id = '.$dbprefix.'categorie.cat_id', ARRAY_A); - } - - function get_dc_comments() - { - global $wpdb; - // General Housekeeping - $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost')); - set_magic_quotes_runtime(0); - $dbprefix = get_option('dcdbprefix'); - - // Get Comments - return $dcdb->get_results('SELECT * FROM '.$dbprefix.'comment', ARRAY_A); - } - - function get_dc_links() - { - //General Housekeeping - $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost')); - set_magic_quotes_runtime(0); - $dbprefix = get_option('dcdbprefix'); - - return $dcdb->get_results('SELECT * FROM '.$dbprefix.'link ORDER BY position', ARRAY_A); - } - - function cat2wp($categories='') - { - // General Housekeeping - global $wpdb; - $count = 0; - $dccat2wpcat = array(); - // Do the Magic - if(is_array($categories)) - { - echo '

'.__('Importing Categories...').'

'; - foreach ($categories as $category) - { - $count++; - extract($category); - - // Make Nice Variables - $name = $wpdb->escape($cat_libelle_url); - $title = $wpdb->escape(csc ($cat_libelle)); - $desc = $wpdb->escape(csc ($cat_desc)); - - if($cinfo = category_exists($name)) - { - $ret_id = wp_insert_category(array('cat_ID' => $cinfo, 'category_nicename' => $name, 'cat_name' => $title, 'category_description' => $desc)); - } - else - { - $ret_id = wp_insert_category(array('category_nicename' => $name, 'cat_name' => $title, 'category_description' => $desc)); - } - $dccat2wpcat[$id] = $ret_id; - } - - // Store category translation for future use - add_option('dccat2wpcat',$dccat2wpcat); - echo '

'.sprintf(__ngettext('Done! %1$s category imported.', 'Done! %1$s categories imported.', $count), $count).'

'; - return true; - } - echo __('No Categories to Import!'); - return false; - } - - function users2wp($users='') - { - // General Housekeeping - global $wpdb; - $count = 0; - $dcid2wpid = array(); - - // Midnight Mojo - if(is_array($users)) - { - echo '

'.__('Importing Users...').'

'; - foreach($users as $user) - { - $count++; - extract($user); - - // Make Nice Variables - $name = $wpdb->escape(csc ($name)); - $RealName = $wpdb->escape(csc ($user_pseudo)); - - if($uinfo = get_userdatabylogin($name)) - { - - $ret_id = wp_insert_user(array( - 'ID' => $uinfo->ID, - 'user_login' => $user_id, - 'user_nicename' => $Realname, - 'user_email' => $user_email, - 'user_url' => 'http://', - 'display_name' => $Realname) - ); - } - else - { - $ret_id = wp_insert_user(array( - 'user_login' => $user_id, - 'user_nicename' => csc ($user_pseudo), - 'user_email' => $user_email, - 'user_url' => 'http://', - 'display_name' => $Realname) - ); - } - $dcid2wpid[$user_id] = $ret_id; - - // Set DotClear-to-WordPress permissions translation - - // Update Usermeta Data - $user = new WP_User($ret_id); - $wp_perms = $user_level + 1; - if(10 == $wp_perms) { $user->set_role('administrator'); } - else if(9 == $wp_perms) { $user->set_role('editor'); } - else if(5 <= $wp_perms) { $user->set_role('editor'); } - else if(4 <= $wp_perms) { $user->set_role('author'); } - else if(3 <= $wp_perms) { $user->set_role('contributor'); } - else if(2 <= $wp_perms) { $user->set_role('contributor'); } - else { $user->set_role('subscriber'); } - - update_usermeta( $ret_id, 'wp_user_level', $wp_perms); - update_usermeta( $ret_id, 'rich_editing', 'false'); - update_usermeta( $ret_id, 'first_name', csc ($user_prenom)); - update_usermeta( $ret_id, 'last_name', csc ($user_nom)); - }// End foreach($users as $user) - - // Store id translation array for future use - add_option('dcid2wpid',$dcid2wpid); - - - echo '

'.sprintf(__('Done! %1$s users imported.'), $count).'

'; - return true; - }// End if(is_array($users) - - echo __('No Users to Import!'); - return false; - - }// End function user2wp() - - function posts2wp($posts='') - { - // General Housekeeping - global $wpdb; - $count = 0; - $dcposts2wpposts = array(); - $cats = array(); - - // Do the Magic - if(is_array($posts)) - { - echo '

'.__('Importing Posts...').'

'; - foreach($posts as $post) - { - $count++; - extract($post); - - // Set DotClear-to-WordPress status translation - $stattrans = array(0 => 'draft', 1 => 'publish'); - $comment_status_map = array (0 => 'closed', 1 => 'open'); - - //Can we do this more efficiently? - $uinfo = ( get_userdatabylogin( $user_id ) ) ? get_userdatabylogin( $user_id ) : 1; - $authorid = ( is_object( $uinfo ) ) ? $uinfo->ID : $uinfo ; - - $Title = $wpdb->escape(csc ($post_titre)); - $post_content = textconv ($post_content); - $post_excerpt = ""; - if ($post_chapo != "") { - $post_excerpt = textconv ($post_chapo); - $post_content = $post_excerpt ."\n\n".$post_content; - } - $post_excerpt = $wpdb->escape ($post_excerpt); - $post_content = $wpdb->escape ($post_content); - $post_status = $stattrans[$post_pub]; - - // Import Post data into WordPress - - if($pinfo = post_exists($Title,$post_content)) - { - $ret_id = wp_insert_post(array( - 'ID' => $pinfo, - 'post_author' => $authorid, - 'post_date' => $post_dt, - 'post_date_gmt' => $post_dt, - 'post_modified' => $post_upddt, - 'post_modified_gmt' => $post_upddt, - 'post_title' => $Title, - 'post_content' => $post_content, - 'post_excerpt' => $post_excerpt, - 'post_status' => $post_status, - 'post_name' => $post_titre_url, - 'comment_status' => $comment_status_map[$post_open_comment], - 'ping_status' => $comment_status_map[$post_open_tb], - 'comment_count' => $post_nb_comment + $post_nb_trackback) - ); - if ( is_wp_error( $ret_id ) ) - return $ret_id; - } - else - { - $ret_id = wp_insert_post(array( - 'post_author' => $authorid, - 'post_date' => $post_dt, - 'post_date_gmt' => $post_dt, - 'post_modified' => $post_modified_gmt, - 'post_modified_gmt' => $post_modified_gmt, - 'post_title' => $Title, - 'post_content' => $post_content, - 'post_excerpt' => $post_excerpt, - 'post_status' => $post_status, - 'post_name' => $post_titre_url, - 'comment_status' => $comment_status_map[$post_open_comment], - 'ping_status' => $comment_status_map[$post_open_tb], - 'comment_count' => $post_nb_comment + $post_nb_trackback) - ); - if ( is_wp_error( $ret_id ) ) - return $ret_id; - } - $dcposts2wpposts[$post_id] = $ret_id; - - // Make Post-to-Category associations - $cats = array(); - $category1 = get_category_by_slug($post_cat_name); - $category1 = $category1->term_id; - - if($cat1 = $category1) { $cats[1] = $cat1; } - - if(!empty($cats)) { wp_set_post_categories($ret_id, $cats); } - } - } - // Store ID translation for later use - add_option('dcposts2wpposts',$dcposts2wpposts); - - echo '

'.sprintf(__('Done! %1$s posts imported.'), $count).'

'; - return true; - } - - function comments2wp($comments='') - { - // General Housekeeping - global $wpdb; - $count = 0; - $dccm2wpcm = array(); - $postarr = get_option('dcposts2wpposts'); - - // Magic Mojo - if(is_array($comments)) - { - echo '

'.__('Importing Comments...').'

'; - foreach($comments as $comment) - { - $count++; - extract($comment); - - // WordPressify Data - $comment_ID = (int) ltrim($comment_id, '0'); - $comment_post_ID = (int) $postarr[$post_id]; - $comment_approved = "$comment_pub"; - $name = $wpdb->escape(csc ($comment_auteur)); - $email = $wpdb->escape($comment_email); - $web = "http://".$wpdb->escape($comment_site); - $message = $wpdb->escape(textconv ($comment_content)); - - if($cinfo = comment_exists($name, $comment_dt)) - { - // Update comments - $ret_id = wp_update_comment(array( - 'comment_ID' => $cinfo, - 'comment_post_ID' => $comment_post_ID, - 'comment_author' => $name, - 'comment_author_email' => $email, - 'comment_author_url' => $web, - 'comment_author_IP' => $comment_ip, - 'comment_date' => $comment_dt, - 'comment_date_gmt' => $comment_dt, - 'comment_content' => $message, - 'comment_approved' => $comment_approved) - ); - } - else - { - // Insert comments - $ret_id = wp_insert_comment(array( - 'comment_post_ID' => $comment_post_ID, - 'comment_author' => $name, - 'comment_author_email' => $email, - 'comment_author_url' => $web, - 'comment_author_IP' => $comment_ip, - 'comment_date' => $comment_dt, - 'comment_date_gmt' => $comment_dt, - 'comment_content' => $message, - 'comment_approved' => $comment_approved) - ); - } - $dccm2wpcm[$comment_ID] = $ret_id; - } - // Store Comment ID translation for future use - add_option('dccm2wpcm', $dccm2wpcm); - - // Associate newly formed categories with posts - get_comment_count($ret_id); - - - echo '

'.sprintf(__('Done! %1$s comments imported.'), $count).'

'; - return true; - } - echo __('No Comments to Import!'); - return false; - } - - function links2wp($links='') - { - // General Housekeeping - global $wpdb; - $count = 0; - - // Deal with the links - if(is_array($links)) - { - echo '

'.__('Importing Links...').'

'; - foreach($links as $link) - { - $count++; - extract($link); - - if ($title != "") { - if ($cinfo = is_term(csc ($title), 'link_category')) { - $category = $cinfo['term_id']; - } else { - $category = wp_insert_term($wpdb->escape (csc ($title)), 'link_category'); - $category = $category['term_id']; - } - } else { - $linkname = $wpdb->escape(csc ($label)); - $description = $wpdb->escape(csc ($title)); - - if($linfo = link_exists($linkname)) { - $ret_id = wp_insert_link(array( - 'link_id' => $linfo, - 'link_url' => $href, - 'link_name' => $linkname, - 'link_category' => $category, - 'link_description' => $description) - ); - } else { - $ret_id = wp_insert_link(array( - 'link_url' => $url, - 'link_name' => $linkname, - 'link_category' => $category, - 'link_description' => $description) - ); - } - $dclinks2wplinks[$link_id] = $ret_id; - } - } - add_option('dclinks2wplinks',$dclinks2wplinks); - echo '

'; - printf(__ngettext('Done! %s link or link category imported.', 'Done! %s links or link categories imported.', $count), $count); - echo '

'; - return true; - } - echo __('No Links to Import!'); - return false; - } - - function import_categories() - { - // Category Import - $cats = $this->get_dc_cats(); - $this->cat2wp($cats); - add_option('dc_cats', $cats); - - - - echo '
'; - wp_nonce_field('import-dotclear'); - printf('

', attribute_escape(__('Import Users'))); - echo '
'; - - } - - function import_users() - { - // User Import - $users = $this->get_dc_users(); - $this->users2wp($users); - - echo '
'; - wp_nonce_field('import-dotclear'); - printf('

', attribute_escape(__('Import Posts'))); - echo '
'; - } - - function import_posts() - { - // Post Import - $posts = $this->get_dc_posts(); - $result = $this->posts2wp($posts); - if ( is_wp_error( $result ) ) - return $result; - - echo '
'; - wp_nonce_field('import-dotclear'); - printf('

', attribute_escape(__('Import Comments'))); - echo '
'; - } - - function import_comments() - { - // Comment Import - $comments = $this->get_dc_comments(); - $this->comments2wp($comments); - - echo '
'; - wp_nonce_field('import-dotclear'); - printf('

', attribute_escape(__('Import Links'))); - echo '
'; - } - - function import_links() - { - //Link Import - $links = $this->get_dc_links(); - $this->links2wp($links); - add_option('dc_links', $links); - - echo '
'; - wp_nonce_field('import-dotclear'); - printf('

', attribute_escape(__('Finish'))); - echo '
'; - } - - function cleanup_dcimport() - { - delete_option('dcdbprefix'); - delete_option('dc_cats'); - delete_option('dcid2wpid'); - delete_option('dccat2wpcat'); - delete_option('dcposts2wpposts'); - delete_option('dccm2wpcm'); - delete_option('dclinks2wplinks'); - delete_option('dcuser'); - delete_option('dcpass'); - delete_option('dcname'); - delete_option('dchost'); - delete_option('dccharset'); - do_action('import_done', 'dotclear'); - $this->tips(); - } - - function tips() - { - echo '

'.__('Welcome to WordPress. We hope (and expect!) that you will find this platform incredibly rewarding! As a new WordPress user coming from DotClear, there are some things that we would like to point out. Hopefully, they will help your transition go as smoothly as possible.').'

'; - echo '

'.__('Users').'

'; - echo '

'.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn\'t have that login in DotClear, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and DotClear uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. Every user has the same username, but their passwords are reset to password123. So Login and change it.'), '/wp-login.php').'

'; - echo '

'.__('Preserving Authors').'

'; - echo '

'.__('Secondly, we have attempted to preserve post authors. If you are the only author or contributor to your blog, then you are safe. In most cases, we are successful in this preservation endeavor. However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'

'; - echo '

'.__('Textile').'

'; - echo '

'.__('Also, since you\'re coming from DotClear, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You\'ll want it.').'

'; - echo '

'.__('WordPress Resources').'

'; - echo '

'.__('Finally, there are numerous WordPress resources around the internet. Some of them are:').'

'; - echo ''; - echo '

'.sprintf(__('That\'s it! What are you waiting for? Go login!'), '../wp-login.php').'

'; - } - - function db_form() - { - echo ''; - printf('', __('DotClear Database User:')); - printf('', __('DotClear Database Password:')); - printf('', __('DotClear Database Name:')); - printf('', __('DotClear Database Host:')); - printf('', __('DotClear Table prefix:')); - printf('', __('Originating character set:')); - echo '
'; - } - - function dispatch() - { - - if (empty ($_GET['step'])) - $step = 0; - else - $step = (int) $_GET['step']; - $this->header(); - - if ( $step > 0 ) - { - check_admin_referer('import-dotclear'); - - if($_POST['dbuser']) - { - if(get_option('dcuser')) - delete_option('dcuser'); - add_option('dcuser', sanitize_user($_POST['dbuser'], true)); - } - if($_POST['dbpass']) - { - if(get_option('dcpass')) - delete_option('dcpass'); - add_option('dcpass', sanitize_user($_POST['dbpass'], true)); - } - - if($_POST['dbname']) - { - if(get_option('dcname')) - delete_option('dcname'); - add_option('dcname', sanitize_user($_POST['dbname'], true)); - } - if($_POST['dbhost']) - { - if(get_option('dchost')) - delete_option('dchost'); - add_option('dchost', sanitize_user($_POST['dbhost'], true)); - } - if($_POST['dccharset']) - { - if(get_option('dccharset')) - delete_option('dccharset'); - add_option('dccharset', sanitize_user($_POST['dccharset'], true)); - } - if($_POST['dbprefix']) - { - if(get_option('dcdbprefix')) - delete_option('dcdbprefix'); - add_option('dcdbprefix', sanitize_user($_POST['dbprefix'], true)); - } - - - } - - switch ($step) - { - default: - case 0 : - $this->greet(); - break; - case 1 : - $this->import_categories(); - break; - case 2 : - $this->import_users(); - break; - case 3 : - $result = $this->import_posts(); - if ( is_wp_error( $result ) ) - echo $result->get_error_message(); - break; - case 4 : - $this->import_comments(); - break; - case 5 : - $this->import_links(); - break; - case 6 : - $this->cleanup_dcimport(); - break; - } - - $this->footer(); - } - - function Dotclear_Import() - { - // Nothing. - } -} - -$dc_import = new Dotclear_Import(); - -register_importer('dotclear', __('DotClear'), __('Import categories, users, posts, comments, and links from a DotClear blog.'), array ($dc_import, 'dispatch')); - -?> diff -uNr a/mp-wp/wp-admin/import/greymatter.php b/mp-wp/wp-admin/import/greymatter.php --- a/mp-wp/wp-admin/import/greymatter.php f45f3c68986e47e93be96141a8b8db6c4a1354b19f75196dccf2d1b49331bf4665c0fba3e9b1c16ec7ee95e0ddd7117fb3d5d7c35589d2ad6fad1dc9597d5636 +++ b/mp-wp/wp-admin/import/greymatter.php false @@ -1,334 +0,0 @@ -'; - screen_icon(); - echo '

'.__('Import GreyMatter').'

'; - } - - function footer() { - echo ''; - } - - function greet() { - $this->header(); -?> -

-

- -

- -

 

- -
- - - -

- - - - - - - - - - - - - -

- so you need to enter the number of the last GM post here.
(if you don't know that number, just log into your FTP and look it out
in the entries' folder)") ?>
-

-
-footer(); - } - - - - function gm2autobr($string) { // transforms GM's |*| into b2's
\n - $string = str_replace("|*|","
\n",$string); - return($string); - } - - function import() { - global $wpdb; - - $wpvarstoreset = array('gmpath', 'archivespath', 'lastentry'); - for ($i=0; $iheader(); -?> -

- -

 

-

-footer(); - return; - } - - function dispatch() { - if (empty ($_GET['step'])) - $step = 0; - else - $step = (int) $_GET['step']; - - switch ($step) { - case 0 : - $this->greet(); - break; - case 1: - check_admin_referer('import-greymatter'); - $result = $this->import(); - if ( is_wp_error( $result ) ) - echo $result->get_error_message(); - break; - } - } - - function GM_Import() { - // Nothing. - } -} - -$gm_import = new GM_Import(); - -register_importer('greymatter', __('GreyMatter'), __('Import users, posts, and comments from a Greymatter blog.'), array ($gm_import, 'dispatch')); -?> diff -uNr a/mp-wp/wp-admin/import/jkw.php b/mp-wp/wp-admin/import/jkw.php --- a/mp-wp/wp-admin/import/jkw.php c8a75bf7f66d82a5103fd28cc587ba172dda2913daa728c7afea256566dc277c809db7b7854beee0011abcda06313658f8c8f3d0704690e700a4f71d91f41f2d +++ b/mp-wp/wp-admin/import/jkw.php false @@ -1,192 +0,0 @@ -'; - screen_icon(); - echo '

'.__('Import Jerome’s Keywords').'

'; - echo '

'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

'; - } - - function footer() { - echo ''; - } - - function greet() { - echo '
'; - echo '

'.__('Howdy! This imports tags from Jerome’s Keywords into WordPress tags.').'

'; - echo '

'.__('This is suitable for Jerome’s Keywords version 1.x and 2.0a.').'

'; - echo '

'.__('All existing Jerome’s Keywords will be removed after import.').'

'; - echo '

'.__('Don’t be stupid - backup your database before proceeding!').'

'; - echo '
'; - wp_nonce_field('import-jkw'); - echo '

'; - echo '
'; - echo '
'; - wp_nonce_field('import-jkw'); - echo '

'; - echo '
'; - echo '
'; - } - - function dispatch() { - if ( empty($_GET['step']) ) - $step = 0; - else - $step = absint($_GET['step']); - - // load the header - $this->header(); - - switch ( $step ) { - case 0 : - $this->greet(); - break; - case 1 : - check_admin_referer('import-jkw'); - $this->check_V1_post_keyword( true ); - break; - case 2 : - check_admin_referer('import-jkw'); - $this->check_V1_post_keyword( false ); - break; - case 3 : - check_admin_referer('import-jkw'); - $this->check_V2_post_keyword( true ); - break; - case 4 : - check_admin_referer('import-jkw'); - $this->check_V2_post_keyword( false ); - break; - case 5: - check_admin_referer('import-jkw'); - $this->cleanup_V2_import(); - break; - case 6: - $this->done(); - break; - } - - // load the footer - $this->footer(); - } - - function check_V1_post_keyword($precheck = true) { - global $wpdb; - - echo '
'; - echo '

'.__('Reading Jerome’s Keywords Tags…').'

'; - - // import Jerome's Keywords tags - $metakeys = $wpdb->get_results("SELECT post_id, meta_id, meta_key, meta_value FROM $wpdb->postmeta WHERE $wpdb->postmeta.meta_key = 'keywords'"); - if ( !is_array($metakeys)) { - echo '

' . __('No Tags Found!') . '

'; - return false; - } else { - $count = count($metakeys); - echo '

' . sprintf( __ngettext('Done! %s post with tags were read.', 'Done! %s posts with tags were read.', $count), $count ) . '

'; - echo ''; - } - - echo '
'; - wp_nonce_field('import-jkw'); - echo '

'; - echo '
'; - echo '
'; - } - - function check_V2_post_keyword($precheck = true) { - global $wpdb; - - echo '
'; - echo '

'.__('Reading Jerome’s Keywords Tags…').'

'; - - // import Jerome's Keywords tags - $tablename = $wpdb->prefix . substr(get_option('jkeywords_keywords_table'), 1, -1); - $metakeys = $wpdb->get_results("SELECT post_id, tag_name FROM $tablename"); - if ( !is_array($metakeys) ) { - echo '

' . __('No Tags Found!') . '

'; - return false; - } else { - $count = count($metakeys); - echo '

' . sprintf( __ngettext('Done! %s tag were read.', 'Done! %s tags were read.', $count), $count ) . '

'; - echo ''; - } - echo '
'; - wp_nonce_field('import-jkw'); - echo '

'; - echo '
'; - echo '
'; - } - - function cleanup_V2_import() { - global $wpdb; - - /* options from V2.0a (jeromes-keywords.php) */ - $options = array('version', 'keywords_table', 'query_varname', 'template', 'meta_always_include', 'meta_includecats', 'meta_autoheader', 'search_strict', 'use_feed_cats', 'post_linkformat', 'post_tagseparator', 'post_includecats', 'post_notagstext', 'cloud_linkformat', 'cloud_tagseparator', 'cloud_includecats', 'cloud_sortorder', 'cloud_displaymax', 'cloud_displaymin', 'cloud_scalemax', 'cloud_scalemin'); - - $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . substr(get_option('jkeywords_keywords_table'), 1, -1)); - - foreach ( $options as $o ) - delete_option('jkeywords_' . $o); - - $this->done(); - } - - function done() { - echo '
'; - echo '

'.__('Import Complete!').'

'; - echo '
'; - } - - function JeromesKeyword_Import() { - } - -} - -// create the import object -$jkw_import = new JeromesKeyword_Import(); - -// add it to the import page! -register_importer('jkw', 'Jerome’s Keywords', __('Import Jerome’s Keywords into WordPress tags.'), array($jkw_import, 'dispatch')); - -?> diff -uNr a/mp-wp/wp-admin/import/livejournal.php b/mp-wp/wp-admin/import/livejournal.php --- a/mp-wp/wp-admin/import/livejournal.php aebae525e0a662a64f5de26803d85d29d63b7a1864f5ecb3d16c5bdf560aefb0c927c051d0916e8fe288f3dc23e27f955790f8fee9b4cc441d3abedb3f751d6c +++ b/mp-wp/wp-admin/import/livejournal.php false @@ -1,193 +0,0 @@ -'; - screen_icon(); - echo '

'.__('Import LiveJournal').'

'; - } - - function footer() { - echo ''; - } - - function unhtmlentities($string) { // From php.net for < 4.3 compat - $trans_tbl = get_html_translation_table(HTML_ENTITIES); - $trans_tbl = array_flip($trans_tbl); - return strtr($string, $trans_tbl); - } - - function greet() { - echo '
'; - echo '

'.__('Howdy! Upload your LiveJournal XML export file and we’ll import the posts into this blog.').'

'; - echo '

'.__('Choose a LiveJournal XML file to upload, then click Upload file and import.').'

'; - wp_import_upload_form("admin.php?import=livejournal&step=1"); - echo '
'; - } - - function import_posts() { - global $wpdb, $current_user; - - set_magic_quotes_runtime(0); - $importdata = file($this->file); // Read the file into an array - $importdata = implode('', $importdata); // squish it - $importdata = str_replace(array ("\r\n", "\r"), "\n", $importdata); - - preg_match_all('|(.*?)|is', $importdata, $posts); - $posts = $posts[1]; - unset($importdata); - echo '
    '; - foreach ($posts as $post) { - preg_match('|(.*?)|is', $post, $post_title); - $post_title = $wpdb->escape(trim($post_title[1])); - if ( empty($post_title) ) { - preg_match('|(.*?)|is', $post, $post_title); - $post_title = $wpdb->escape(trim($post_title[1])); - } - - preg_match('|(.*?)|is', $post, $post_date); - $post_date = strtotime($post_date[1]); - $post_date = date('Y-m-d H:i:s', $post_date); - - preg_match('|(.*?)|is', $post, $post_content); - $post_content = str_replace(array (''), '', trim($post_content[1])); - $post_content = $this->unhtmlentities($post_content); - - // Clean up content - $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content); - $post_content = str_replace('
    ', '
    ', $post_content); - $post_content = str_replace('
    ', '
    ', $post_content); - $post_content = $wpdb->escape($post_content); - - $post_author = $current_user->ID; - $post_status = 'publish'; - - echo '
  1. '; - if ($post_id = post_exists($post_title, $post_content, $post_date)) { - printf(__('Post %s already exists.'), stripslashes($post_title)); - } else { - printf(__('Importing post %s...'), stripslashes($post_title)); - $postdata = compact('post_author', 'post_date', 'post_content', 'post_title', 'post_status'); - $post_id = wp_insert_post($postdata); - if ( is_wp_error( $post_id ) ) - return $post_id; - if (!$post_id) { - _e("Couldn't get post ID"); - echo '
  2. '; - break; - } - } - - preg_match_all('|(.*?)|is', $post, $comments); - $comments = $comments[1]; - - if ( $comments ) { - $comment_post_ID = (int) $post_id; - $num_comments = 0; - foreach ($comments as $comment) { - preg_match('|(.*?)|is', $comment, $comment_content); - $comment_content = str_replace(array (''), '', trim($comment_content[1])); - $comment_content = $this->unhtmlentities($comment_content); - - // Clean up content - $comment_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $comment_content); - $comment_content = str_replace('
    ', '
    ', $comment_content); - $comment_content = str_replace('
    ', '
    ', $comment_content); - $comment_content = $wpdb->escape($comment_content); - - preg_match('|(.*?)|is', $comment, $comment_date); - $comment_date = trim($comment_date[1]); - $comment_date = date('Y-m-d H:i:s', strtotime($comment_date)); - - preg_match('|(.*?)|is', $comment, $comment_author); - $comment_author = $wpdb->escape(trim($comment_author[1])); - - preg_match('|(.*?)|is', $comment, $comment_author_email); - $comment_author_email = $wpdb->escape(trim($comment_author_email[1])); - - $comment_approved = 1; - // Check if it's already there - if (!comment_exists($comment_author, $comment_date)) { - $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_date', 'comment_content', 'comment_approved'); - $commentdata = wp_filter_comment($commentdata); - wp_insert_comment($commentdata); - $num_comments++; - } - } - } - if ( $num_comments ) { - echo ' '; - printf(__ngettext('(%s comment)', '(%s comments)', $num_comments), $num_comments); - } - echo ''; - } - echo '
'; - } - - function import() { - $file = wp_import_handle_upload(); - if ( isset($file['error']) ) { - echo $file['error']; - return; - } - - $this->file = $file['file']; - $result = $this->import_posts(); - if ( is_wp_error( $result ) ) - return $result; - wp_import_cleanup($file['id']); - do_action('import_done', 'livejournal'); - - echo '

'; - printf(__('All done. Have fun!'), get_option('home')); - echo '

'; - } - - function dispatch() { - if (empty ($_GET['step'])) - $step = 0; - else - $step = (int) $_GET['step']; - - $this->header(); - - switch ($step) { - case 0 : - $this->greet(); - break; - case 1 : - check_admin_referer('import-upload'); - $result = $this->import(); - if ( is_wp_error( $result ) ) - echo $result->get_error_message(); - break; - } - - $this->footer(); - } - - function LJ_Import() { - // Nothing. - } -} - -$livejournal_import = new LJ_Import(); - -register_importer('livejournal', __('LiveJournal'), __('Import posts from a LiveJournal XML export file.'), array ($livejournal_import, 'dispatch')); -?> diff -uNr a/mp-wp/wp-admin/import/mt.php b/mp-wp/wp-admin/import/mt.php --- a/mp-wp/wp-admin/import/mt.php 3b5df893bd2ec915e46237523169c3269ae2d414bad0c77bd78e380882a7cfe08a399ae86988c1a6db618810fe2a59039e9128ca98b6060f6708a1302a8c9ab6 +++ b/mp-wp/wp-admin/import/mt.php false @@ -1,512 +0,0 @@ -'; - screen_icon(); - echo '

'.__('Import Movable Type or TypePad').'

'; - } - - function footer() { - echo ''; - } - - function greet() { - $this->header(); -?> -
-

mt-export.txt in your /wp-content/ directory and then click "Import mt-export.txt"'); ?>

- - -
- - -

- -mt-export.txt in your /wp-content/ directory'); ?>

-

- -

-
-

out of memory error try splitting up the import file into pieces.'); ?>

-
-footer(); - } - - function users_form($n) { - global $wpdb; - $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY ID"); -?> - has_gzip() ) - return gzopen($filename, $mode); - return fopen($filename, $mode); - } - - function feof($fp) { - if ( $this->has_gzip() ) - return gzeof($fp); - return feof($fp); - } - - function fgets($fp, $len=8192) { - if ( $this->has_gzip() ) - return gzgets($fp, $len); - return fgets($fp, $len); - } - - function fclose($fp) { - if ( $this->has_gzip() ) - return gzclose($fp); - return fclose($fp); - } - - //function to check the authorname and do the mapping - function checkauthor($author) { - //mtnames is an array with the names in the mt import file - $pass = wp_generate_password(); - if (!(in_array($author, $this->mtnames))) { //a new mt author name is found - ++ $this->j; - $this->mtnames[$this->j] = $author; //add that new mt author name to an array - $user_id = username_exists($this->newauthornames[$this->j]); //check if the new author name defined by the user is a pre-existing wp user - if (!$user_id) { //banging my head against the desk now. - if ($this->newauthornames[$this->j] == 'left_blank') { //check if the user does not want to change the authorname - $user_id = wp_create_user($author, $pass); - $this->newauthornames[$this->j] = $author; //now we have a name, in the place of left_blank. - } else { - $user_id = wp_create_user($this->newauthornames[$this->j], $pass); - } - } else { - return $user_id; // return pre-existing wp username if it exists - } - } else { - $key = array_search($author, $this->mtnames); //find the array key for $author in the $mtnames array - $user_id = username_exists($this->newauthornames[$key]); //use that key to get the value of the author's name from $newauthornames - } - - return $user_id; - } - - function get_mt_authors() { - $temp = array(); - $authors = array(); - - $handle = $this->fopen($this->file, 'r'); - if ( $handle == null ) - return false; - - $in_comment = false; - while ( $line = $this->fgets($handle) ) { - $line = trim($line); - - if ( 'COMMENT:' == $line ) - $in_comment = true; - else if ( '-----' == $line ) - $in_comment = false; - - if ( $in_comment || 0 !== strpos($line,"AUTHOR:") ) - continue; - - $temp[] = trim( substr($line, strlen("AUTHOR:")) ); - } - - //we need to find unique values of author names, while preserving the order, so this function emulates the unique_value(); php function, without the sorting. - $authors[0] = array_shift($temp); - $y = count($temp) + 1; - for ($x = 1; $x < $y; $x ++) { - $next = array_shift($temp); - if (!(in_array($next, $authors))) - array_push($authors, "$next"); - } - - $this->fclose($handle); - - return $authors; - } - - function get_authors_from_post() { - $formnames = array (); - $selectnames = array (); - - foreach ($_POST['user'] as $key => $line) { - $newname = trim(stripslashes($line)); - if ($newname == '') - $newname = 'left_blank'; //passing author names from step 1 to step 2 is accomplished by using POST. left_blank denotes an empty entry in the form. - array_push($formnames, "$newname"); - } // $formnames is the array with the form entered names - - foreach ($_POST['userselect'] as $user => $key) { - $selected = trim(stripslashes($key)); - array_push($selectnames, "$selected"); - } - - $count = count($formnames); - for ($i = 0; $i < $count; $i ++) { - if ($selectnames[$i] != '#NONE#') { //if no name was selected from the select menu, use the name entered in the form - array_push($this->newauthornames, "$selectnames[$i]"); - } else { - array_push($this->newauthornames, "$formnames[$i]"); - } - } - } - - function mt_authors_form() { -?> -
- -

-

-

italics. For each of these names, you can either pick an author in your WordPress installation from the menu, or enter a name for the author in the textbox.'); ?>

-

- get_mt_authors(); - echo '
    '; - echo '
    '; - wp_nonce_field('import-mt'); - $j = -1; - foreach ($authors as $author) { - ++ $j; - echo '
  1. '; - } - - echo '

    '.'
    '; - echo '
    '; - echo '
'; - - } - - function select_authors() { - if ( $_POST['upload_type'] === 'ftp' ) { - $file['file'] = WP_CONTENT_DIR . '/mt-export.txt'; - if ( !file_exists($file['file']) ) - $file['error'] = __('mt-export.txt does not exist'); - } else { - $file = wp_import_handle_upload(); - } - if ( isset($file['error']) ) { - $this->header(); - echo '

'.__('Sorry, there has been an error').'.

'; - echo '

' . $file['error'] . '

'; - $this->footer(); - return; - } - $this->file = $file['file']; - $this->id = (int) $file['id']; - - $this->mt_authors_form(); - } - - function save_post(&$post, &$comments, &$pings) { - // Reset the counter - set_time_limit(30); - $post = get_object_vars($post); - $post = add_magic_quotes($post); - $post = (object) $post; - - if ( $post_id = post_exists($post->post_title, '', $post->post_date) ) { - echo '
  • '; - printf(__('Post %s already exists.'), stripslashes($post->post_title)); - } else { - echo '
  • '; - printf(__('Importing post %s...'), stripslashes($post->post_title)); - - if ( '' != trim( $post->extended ) ) - $post->post_content .= "\n\n$post->extended"; - - $post->post_author = $this->checkauthor($post->post_author); //just so that if a post already exists, new users are not created by checkauthor - $post_id = wp_insert_post($post); - if ( is_wp_error( $post_id ) ) - return $post_id; - - // Add categories. - if ( 0 != count($post->categories) ) { - wp_create_categories($post->categories, $post_id); - } - - // Add tags or keywords - if ( 1 < strlen($post->post_keywords) ) { - // Keywords exist. - printf(__('
    Adding tags %s...'), stripslashes($post->post_keywords)); - wp_add_post_tags($post_id, $post->post_keywords); - } - } - - $num_comments = 0; - foreach ( $comments as $comment ) { - $comment = get_object_vars($comment); - $comment = add_magic_quotes($comment); - - if ( !comment_exists($comment['comment_author'], $comment['comment_date'])) { - $comment['comment_post_ID'] = $post_id; - $comment = wp_filter_comment($comment); - wp_insert_comment($comment); - $num_comments++; - } - } - - if ( $num_comments ) - printf(' '.__ngettext('(%s comment)', '(%s comments)', $num_comments), $num_comments); - - $num_pings = 0; - foreach ( $pings as $ping ) { - $ping = get_object_vars($ping); - $ping = add_magic_quotes($ping); - - if ( !comment_exists($ping['comment_author'], $ping['comment_date'])) { - $ping['comment_content'] = "{$ping['title']}\n\n{$ping['comment_content']}"; - $ping['comment_post_ID'] = $post_id; - $ping = wp_filter_comment($ping); - wp_insert_comment($ping); - $num_pings++; - } - } - - if ( $num_pings ) - printf(' '.__ngettext('(%s ping)', '(%s pings)', $num_pings), $num_pings); - - echo "
  • "; - //ob_flush();flush(); - } - - function process_posts() { - global $wpdb; - - $handle = $this->fopen($this->file, 'r'); - if ( $handle == null ) - return false; - - $context = ''; - $post = new StdClass(); - $comment = new StdClass(); - $comments = array(); - $ping = new StdClass(); - $pings = array(); - - echo "
      "; - - while ( $line = $this->fgets($handle) ) { - $line = trim($line); - - if ( '-----' == $line ) { - // Finishing a multi-line field - if ( 'comment' == $context ) { - $comments[] = $comment; - $comment = new StdClass(); - } else if ( 'ping' == $context ) { - $pings[] = $ping; - $ping = new StdClass(); - } - $context = ''; - } else if ( '--------' == $line ) { - // Finishing a post. - $context = ''; - $result = $this->save_post($post, $comments, $pings); - if ( is_wp_error( $result ) ) - return $result; - $post = new StdClass; - $comment = new StdClass(); - $ping = new StdClass(); - $comments = array(); - $pings = array(); - } else if ( 'BODY:' == $line ) { - $context = 'body'; - } else if ( 'EXTENDED BODY:' == $line ) { - $context = 'extended'; - } else if ( 'EXCERPT:' == $line ) { - $context = 'excerpt'; - } else if ( 'KEYWORDS:' == $line ) { - $context = 'keywords'; - } else if ( 'COMMENT:' == $line ) { - $context = 'comment'; - } else if ( 'PING:' == $line ) { - $context = 'ping'; - } else if ( 0 === strpos($line, "AUTHOR:") ) { - $author = trim( substr($line, strlen("AUTHOR:")) ); - if ( '' == $context ) - $post->post_author = $author; - else if ( 'comment' == $context ) - $comment->comment_author = $author; - } else if ( 0 === strpos($line, "TITLE:") ) { - $title = trim( substr($line, strlen("TITLE:")) ); - if ( '' == $context ) - $post->post_title = $title; - else if ( 'ping' == $context ) - $ping->title = $title; - } else if ( 0 === strpos($line, "STATUS:") ) { - $status = trim( strtolower( substr($line, strlen("STATUS:")) ) ); - if ( empty($status) ) - $status = 'publish'; - $post->post_status = $status; - } else if ( 0 === strpos($line, "ALLOW COMMENTS:") ) { - $allow = trim( substr($line, strlen("ALLOW COMMENTS:")) ); - if ( $allow == 1 ) - $post->comment_status = 'open'; - else - $post->comment_status = 'closed'; - } else if ( 0 === strpos($line, "ALLOW PINGS:") ) { - $allow = trim( substr($line, strlen("ALLOW PINGS:")) ); - if ( $allow == 1 ) - $post->ping_status = 'open'; - else - $post->ping_status = 'closed'; - } else if ( 0 === strpos($line, "CATEGORY:") ) { - $category = trim( substr($line, strlen("CATEGORY:")) ); - if ( '' != $category ) - $post->categories[] = $category; - } else if ( 0 === strpos($line, "PRIMARY CATEGORY:") ) { - $category = trim( substr($line, strlen("PRIMARY CATEGORY:")) ); - if ( '' != $category ) - $post->categories[] = $category; - } else if ( 0 === strpos($line, "DATE:") ) { - $date = trim( substr($line, strlen("DATE:")) ); - $date = strtotime($date); - $date = date('Y-m-d H:i:s', $date); - $date_gmt = get_gmt_from_date($date); - if ( '' == $context ) { - $post->post_modified = $date; - $post->post_modified_gmt = $date_gmt; - $post->post_date = $date; - $post->post_date_gmt = $date_gmt; - } else if ( 'comment' == $context ) { - $comment->comment_date = $date; - } else if ( 'ping' == $context ) { - $ping->comment_date = $date; - } - } else if ( 0 === strpos($line, "EMAIL:") ) { - $email = trim( substr($line, strlen("EMAIL:")) ); - if ( 'comment' == $context ) - $comment->comment_author_email = $email; - else - $ping->comment_author_email = ''; - } else if ( 0 === strpos($line, "IP:") ) { - $ip = trim( substr($line, strlen("IP:")) ); - if ( 'comment' == $context ) - $comment->comment_author_IP = $ip; - else - $ping->comment_author_IP = $ip; - } else if ( 0 === strpos($line, "URL:") ) { - $url = trim( substr($line, strlen("URL:")) ); - if ( 'comment' == $context ) - $comment->comment_author_url = $url; - else - $ping->comment_author_url = $url; - } else if ( 0 === strpos($line, "BLOG NAME:") ) { - $blog = trim( substr($line, strlen("BLOG NAME:")) ); - $ping->comment_author = $blog; - } else { - // Processing multi-line field, check context. - - $line .= "\n"; - if ( 'body' == $context ) { - $post->post_content .= $line; - } else if ( 'extended' == $context ) { - $post->extended .= $line; - } else if ( 'excerpt' == $context ) { - $post->post_excerpt .= $line; - } else if ( 'keywords' == $context ) { - $post->post_keywords .= $line; - } else if ( 'comment' == $context ) { - $comment->comment_content .= $line; - } else if ( 'ping' == $context ) { - $ping->comment_content .= $line; - } - } - } - - $this->fclose($handle); - - echo '
    '; - - wp_import_cleanup($this->id); - do_action('import_done', 'mt'); - - echo '

    '.sprintf(__('All done. Have fun!'), get_option('home')).'

    '; - } - - function import() { - $this->id = (int) $_GET['id']; - if ( $this->id == 0 ) - $this->file = WP_CONTENT_DIR . '/mt-export.txt'; - else - $this->file = get_attached_file($this->id); - $this->get_authors_from_post(); - $result = $this->process_posts(); - if ( is_wp_error( $result ) ) - return $result; - } - - function dispatch() { - if (empty ($_GET['step'])) - $step = 0; - else - $step = (int) $_GET['step']; - - switch ($step) { - case 0 : - $this->greet(); - break; - case 1 : - check_admin_referer('import-upload'); - $this->select_authors(); - break; - case 2: - check_admin_referer('import-mt'); - $result = $this->import(); - if ( is_wp_error( $result ) ) - echo $result->get_error_message(); - break; - } - } - - function MT_Import() { - // Nothing. - } -} - -$mt_import = new MT_Import(); - -register_importer('mt', __('Movable Type and TypePad'), __('Import posts and comments from a Movable Type or Typepad blog.'), array ($mt_import, 'dispatch')); -?> diff -uNr a/mp-wp/wp-admin/import/opml.php b/mp-wp/wp-admin/import/opml.php --- a/mp-wp/wp-admin/import/opml.php 9bcdeec7b98a1d38da2c4d7a070951dbc2c7bf4daf939e26048a7275bfefb566419ecb0a8565c366c7efaee7fef0eb26e05cdf13279f76a5284a8b892f50f55b +++ b/mp-wp/wp-admin/import/opml.php false @@ -1,155 +0,0 @@ - - * @author Mike Little - * @package WordPress - * @subpackage Administration - */ - -/** Load WordPress Administration Bootstrap */ -$parent_file = 'tools.php'; -$submenu_file = 'import.php'; -$title = __('Import Blogroll'); - -class OPML_Import { - - function dispatch() { - global $wpdb, $user_ID; -$step = $_POST['step']; -if (!$step) $step = 0; -?> - - -
    - -

    -
    - - -

    -
    - - -
    -

    - -
    - -
    -

    - -
    - -
    - -


    -

    - -

    -
    - -
    - -
    - -

    - false, 'test_type' => false); - $file = wp_handle_upload($_FILES['userfile'], $overrides); - - if ( isset($file['error']) ) - wp_die($file['error']); - - $url = $file['url']; - $opml_url = $file['file']; - $blogrolling = false; - } - - global $opml, $updated_timestamp, $all_links, $map, $names, $urls, $targets, $descriptions, $feeds; - if ( isset($opml_url) && $opml_url != '' ) { - if ( $blogrolling === true ) { - $opml = wp_remote_fopen($opml_url); - } else { - $opml = file_get_contents($opml_url); - } - - /** Load OPML Parser */ - include_once('link-parse-opml.php'); - - $link_count = count($names); - for ( $i = 0; $i < $link_count; $i++ ) { - if ('Last' == substr($titles[$i], 0, 4)) - $titles[$i] = ''; - if ( 'http' == substr($titles[$i], 0, 4) ) - $titles[$i] = ''; - $link = array( 'link_url' => $urls[$i], 'link_name' => $wpdb->escape($names[$i]), 'link_category' => array($cat_id), 'link_description' => $wpdb->escape($descriptions[$i]), 'link_owner' => $user_ID, 'link_rss' => $feeds[$i]); - wp_insert_link($link); - echo sprintf('

    '.__('Inserted %s').'

    ', $names[$i]); - } -?> - -

    manage those links.'), $link_count, $cat_id, 'link-manager.php') ?>

    - -" . __("You need to supply your OPML url. Press back on your browser and try again") . "

    \n"; -} // end else - -if ( ! $blogrolling ) - do_action( 'wp_delete_file', $opml_url); - @unlink($opml_url); -?> -
    - diff -uNr a/mp-wp/wp-admin/import/rss.php b/mp-wp/wp-admin/import/rss.php --- a/mp-wp/wp-admin/import/rss.php 932fdf7b823f34069393e54b3e58c67f17bc4b5ed208df60d56a64e6e08792cda1cbeba1f42c2bc140421e05e8412d2e71ef6a70a4375e6e9fc03db49d1c8591 +++ b/mp-wp/wp-admin/import/rss.php false @@ -1,198 +0,0 @@ -'; - screen_icon(); - echo '

    '.__('Import RSS').'

    '; - } - - function footer() { - echo ''; - } - - function unhtmlentities($string) { // From php.net for < 4.3 compat - $trans_tbl = get_html_translation_table(HTML_ENTITIES); - $trans_tbl = array_flip($trans_tbl); - return strtr($string, $trans_tbl); - } - - function greet() { - echo '
    '; - echo '

    '.__('Howdy! This importer allows you to extract posts from an RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'

    '; - wp_import_upload_form("admin.php?import=rss&step=1"); - echo '
    '; - } - - function get_posts() { - global $wpdb; - - set_magic_quotes_runtime(0); - $datalines = file($this->file); // Read the file into an array - $importdata = implode('', $datalines); // squish it - $importdata = str_replace(array ("\r\n", "\r"), "\n", $importdata); - - preg_match_all('|(.*?)|is', $importdata, $this->posts); - $this->posts = $this->posts[1]; - $index = 0; - foreach ($this->posts as $post) { - preg_match('|(.*?)|is', $post, $post_title); - $post_title = str_replace(array(''), '', $wpdb->escape( trim($post_title[1]) )); - - preg_match('|(.*?)|is', $post, $post_date_gmt); - - if ($post_date_gmt) { - $post_date_gmt = strtotime($post_date_gmt[1]); - } else { - // if we don't already have something from pubDate - preg_match('|(.*?)|is', $post, $post_date_gmt); - $post_date_gmt = preg_replace('|([-+])([0-9]+):([0-9]+)$|', '\1\2\3', $post_date_gmt[1]); - $post_date_gmt = str_replace('T', ' ', $post_date_gmt); - $post_date_gmt = strtotime($post_date_gmt); - } - - $post_date_gmt = gmdate('Y-m-d H:i:s', $post_date_gmt); - $post_date = get_date_from_gmt( $post_date_gmt ); - - preg_match_all('|(.*?)|is', $post, $categories); - $categories = $categories[1]; - - if (!$categories) { - preg_match_all('|(.*?)|is', $post, $categories); - $categories = $categories[1]; - } - - $cat_index = 0; - foreach ($categories as $category) { - $categories[$cat_index] = $wpdb->escape($this->unhtmlentities($category)); - $cat_index++; - } - - preg_match('|(.*?)|is', $post, $guid); - if ($guid) - $guid = $wpdb->escape(trim($guid[1])); - else - $guid = ''; - - preg_match('|(.*?)|is', $post, $post_content); - $post_content = str_replace(array (''), '', $wpdb->escape(trim($post_content[1]))); - - if (!$post_content) { - // This is for feeds that put content in description - preg_match('|(.*?)|is', $post, $post_content); - $post_content = $wpdb->escape($this->unhtmlentities(trim($post_content[1]))); - } - - // Clean up content - $post_content = preg_replace('|<(/?[A-Z]+)|e', "'<' . strtolower('$1')", $post_content); - $post_content = str_replace('
    ', '
    ', $post_content); - $post_content = str_replace('
    ', '
    ', $post_content); - - $post_author = 1; - $post_status = 'publish'; - $this->posts[$index] = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_status', 'guid', 'categories'); - $index++; - } - } - - function import_posts() { - echo '
      '; - - foreach ($this->posts as $post) { - echo "
    1. ".__('Importing post...'); - - extract($post); - - if ($post_id = post_exists($post_title, $post_content, $post_date)) { - _e('Post already imported'); - } else { - $post_id = wp_insert_post($post); - if ( is_wp_error( $post_id ) ) - return $post_id; - if (!$post_id) { - _e("Couldn't get post ID"); - return; - } - - if (0 != count($categories)) - wp_create_categories($categories, $post_id); - _e('Done !'); - } - echo '
    2. '; - } - - echo '
    '; - - } - - function import() { - $file = wp_import_handle_upload(); - if ( isset($file['error']) ) { - echo $file['error']; - return; - } - - $this->file = $file['file']; - $this->get_posts(); - $result = $this->import_posts(); - if ( is_wp_error( $result ) ) - return $result; - wp_import_cleanup($file['id']); - do_action('import_done', 'rss'); - - echo '

    '; - printf(__('All done. Have fun!'), get_option('home')); - echo '

    '; - } - - function dispatch() { - if (empty ($_GET['step'])) - $step = 0; - else - $step = (int) $_GET['step']; - - $this->header(); - - switch ($step) { - case 0 : - $this->greet(); - break; - case 1 : - check_admin_referer('import-upload'); - $result = $this->import(); - if ( is_wp_error( $result ) ) - echo $result->get_error_message(); - break; - } - - $this->footer(); - } - - function RSS_Import() { - // Nothing. - } -} - -$rss_import = new RSS_Import(); - -register_importer('rss', __('RSS'), __('Import posts from an RSS feed.'), array ($rss_import, 'dispatch')); -?> diff -uNr a/mp-wp/wp-admin/import/stp.php b/mp-wp/wp-admin/import/stp.php --- a/mp-wp/wp-admin/import/stp.php 51989c23b4307626271434576cc48791fbe75f002bf3ca0f1fc0a4b6c7db4752ba7d01b971f148e6b307b3d66a90113f3c0ef10ad6219d10cda58d87ceecbdcc +++ b/mp-wp/wp-admin/import/stp.php false @@ -1,170 +0,0 @@ -'; - screen_icon(); - echo '

    '.__('Import Simple Tagging').'

    '; - echo '

    '.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

    '; - } - - function footer() { - echo ''; - } - - function greet() { - echo '
    '; - echo '

    '.__('Howdy! This imports tags from Simple Tagging 1.6.2 into WordPress tags.').'

    '; - echo '

    '.__('This has not been tested on any other versions of Simple Tagging. Mileage may vary.').'

    '; - echo '

    '.__('To accommodate larger databases for those tag-crazy authors out there, we have made this into an easy 4-step program to help you kick that nasty Simple Tagging habit. Just keep clicking along and we will let you know when you are in the clear!').'

    '; - echo '

    '.__('Don’t be stupid - backup your database before proceeding!').'

    '; - echo '
    '; - wp_nonce_field('import-stp'); - echo '

    '; - echo '
    '; - echo '
    '; - } - - function dispatch () { - if ( empty( $_GET['step'] ) ) { - $step = 0; - } else { - $step = (int) $_GET['step']; - } - // load the header - $this->header(); - switch ( $step ) { - case 0 : - $this->greet(); - break; - case 1 : - check_admin_referer('import-stp'); - $this->import_posts(); - break; - case 2: - check_admin_referer('import-stp'); - $this->import_t2p(); - break; - case 3: - check_admin_referer('import-stp'); - $this->cleanup_import(); - break; - } - // load the footer - $this->footer(); - } - - - function import_posts ( ) { - echo '
    '; - echo '

    '.__('Reading STP Post Tags…').'

    '; - - // read in all the STP tag -> post settings - $posts = $this->get_stp_posts(); - - // if we didn't get any tags back, that's all there is folks! - if ( !is_array($posts) ) { - echo '

    ' . __('No posts were found to have tags!') . '

    '; - return false; - } - else { - // if there's an existing entry, delete it - if ( get_option('stpimp_posts') ) { - delete_option('stpimp_posts'); - } - - add_option('stpimp_posts', $posts); - $count = count($posts); - echo '

    ' . sprintf( __ngettext('Done! %s tag to post relationships were read.', 'Done! %s tags to post relationships were read.', $count), $count ) . '

    '; - } - - echo '
    '; - wp_nonce_field('import-stp'); - echo '

    '; - echo '
    '; - echo '
    '; - } - - - function import_t2p ( ) { - echo '
    '; - echo '

    '.__('Adding Tags to Posts…').'

    '; - - // run that funky magic! - $tags_added = $this->tag2post(); - - echo '

    ' . sprintf( __ngettext('Done! %s tag was added!', 'Done! %s tags were added!', $tags_added), $tags_added ) . '

    '; - echo '
    '; - wp_nonce_field('import-stp'); - echo '

    '; - echo '
    '; - echo '
    '; - } - - function get_stp_posts ( ) { - global $wpdb; - // read in all the posts from the STP post->tag table: should be wp_post2tag - $posts_query = "SELECT post_id, tag_name FROM " . $wpdb->prefix . "stp_tags"; - $posts = $wpdb->get_results($posts_query); - return $posts; - } - - function tag2post ( ) { - global $wpdb; - - // get the tags and posts we imported in the last 2 steps - $posts = get_option('stpimp_posts'); - - // null out our results - $tags_added = 0; - - // loop through each post and add its tags to the db - foreach ( $posts as $this_post ) { - $the_post = (int) $this_post->post_id; - $the_tag = $wpdb->escape($this_post->tag_name); - // try to add the tag - wp_add_post_tags($the_post, $the_tag); - $tags_added++; - } - - // that's it, all posts should be linked to their tags properly, pending any errors we just spit out! - return $tags_added; - } - - function cleanup_import ( ) { - delete_option('stpimp_posts'); - $this->done(); - } - - function done ( ) { - echo '
    '; - echo '

    '.__('Import Complete!').'

    '; - echo '

    ' . __('OK, so we lied about this being a 4-step program! You’re done!') . '

    '; - echo '

    ' . __('Now wasn’t that easy?') . '

    '; - echo '
    '; - } - - function STP_Import ( ) { - // Nothing. - } -} - -// create the import object -$stp_import = new STP_Import(); - -// add it to the import page! -register_importer('stp', 'Simple Tagging', __('Import Simple Tagging tags into WordPress tags.'), array($stp_import, 'dispatch')); -?> diff -uNr a/mp-wp/wp-admin/import/textpattern.php b/mp-wp/wp-admin/import/textpattern.php --- a/mp-wp/wp-admin/import/textpattern.php c57be38c164f3fa4ddd78683d82fae14230a83e4a3d571c83f53689c447eedd0aca7c9d97c1c67eff7fe9da868ed0d7148457caf5eafb2357fd973732b153058 +++ b/mp-wp/wp-admin/import/textpattern.php false @@ -1,700 +0,0 @@ -get_var( $wpdb->prepare("SELECT count(*) FROM $wpdb->comments WHERE comment_post_ID = %d", $post_ID) ); - } -} - -if(!function_exists('link_exists')) -{ - /** - * Check whether link already exists. - * - * @package WordPress - * @subpackage Textpattern_Import - * - * @param string $linkname - * @return int - */ - function link_exists($linkname) - { - global $wpdb; - return $wpdb->get_var( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_name = %s", $linkname) ); - } -} - -/** - * TextPattern Importer Class - * - * @since unknown - */ -class Textpattern_Import { - - function header() - { - echo '
    '; - screen_icon(); - echo '

    '.__('Import Textpattern').'

    '; - echo '

    '.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

    '; - } - - function footer() - { - echo '
    '; - } - - function greet() { - echo '
    '; - echo '

    '.__('Howdy! This imports categories, users, posts, comments, and links from any Textpattern 4.0.2+ into this blog.').'

    '; - echo '

    '.__('This has not been tested on previous versions of Textpattern. Mileage may vary.').'

    '; - echo '

    '.__('Your Textpattern Configuration settings are as follows:').'

    '; - echo '
    '; - wp_nonce_field('import-textpattern'); - $this->db_form(); - echo '

    '; - echo '
    '; - echo '
    '; - } - - function get_txp_cats() - { - global $wpdb; - // General Housekeeping - $txpdb = new wpdb(get_option('txpuser'), get_option('txppass'), get_option('txpname'), get_option('txphost')); - set_magic_quotes_runtime(0); - $prefix = get_option('tpre'); - - // Get Categories - return $txpdb->get_results('SELECT - id, - name, - title - FROM '.$prefix.'txp_category - WHERE type = "article"', - ARRAY_A); - } - - function get_txp_users() - { - global $wpdb; - // General Housekeeping - $txpdb = new wpdb(get_option('txpuser'), get_option('txppass'), get_option('txpname'), get_option('txphost')); - set_magic_quotes_runtime(0); - $prefix = get_option('tpre'); - - // Get Users - - return $txpdb->get_results('SELECT - user_id, - name, - RealName, - email, - privs - FROM '.$prefix.'txp_users', ARRAY_A); - } - - function get_txp_posts() - { - // General Housekeeping - $txpdb = new wpdb(get_option('txpuser'), get_option('txppass'), get_option('txpname'), get_option('txphost')); - set_magic_quotes_runtime(0); - $prefix = get_option('tpre'); - - // Get Posts - return $txpdb->get_results('SELECT - ID, - Posted, - AuthorID, - LastMod, - Title, - Body, - Excerpt, - Category1, - Category2, - Status, - Keywords, - url_title, - comments_count - FROM '.$prefix.'textpattern - ', ARRAY_A); - } - - function get_txp_comments() - { - global $wpdb; - // General Housekeeping - $txpdb = new wpdb(get_option('txpuser'), get_option('txppass'), get_option('txpname'), get_option('txphost')); - set_magic_quotes_runtime(0); - $prefix = get_option('tpre'); - - // Get Comments - return $txpdb->get_results('SELECT * FROM '.$prefix.'txp_discuss', ARRAY_A); - } - - function get_txp_links() - { - //General Housekeeping - $txpdb = new wpdb(get_option('txpuser'), get_option('txppass'), get_option('txpname'), get_option('txphost')); - set_magic_quotes_runtime(0); - $prefix = get_option('tpre'); - - return $txpdb->get_results('SELECT - id, - date, - category, - url, - linkname, - description - FROM '.$prefix.'txp_link', - ARRAY_A); - } - - function cat2wp($categories='') - { - // General Housekeeping - global $wpdb; - $count = 0; - $txpcat2wpcat = array(); - // Do the Magic - if(is_array($categories)) - { - echo '

    '.__('Importing Categories...').'

    '; - foreach ($categories as $category) - { - $count++; - extract($category); - - - // Make Nice Variables - $name = $wpdb->escape($name); - $title = $wpdb->escape($title); - - if($cinfo = category_exists($name)) - { - $ret_id = wp_insert_category(array('cat_ID' => $cinfo, 'category_nicename' => $name, 'cat_name' => $title)); - } - else - { - $ret_id = wp_insert_category(array('category_nicename' => $name, 'cat_name' => $title)); - } - $txpcat2wpcat[$id] = $ret_id; - } - - // Store category translation for future use - add_option('txpcat2wpcat',$txpcat2wpcat); - echo '

    '.sprintf(__ngettext('Done! %1$s category imported.', 'Done! %1$s categories imported.', $count), $count).'

    '; - return true; - } - echo __('No Categories to Import!'); - return false; - } - - function users2wp($users='') - { - // General Housekeeping - global $wpdb; - $count = 0; - $txpid2wpid = array(); - - // Midnight Mojo - if(is_array($users)) - { - echo '

    '.__('Importing Users...').'

    '; - foreach($users as $user) - { - $count++; - extract($user); - - // Make Nice Variables - $name = $wpdb->escape($name); - $RealName = $wpdb->escape($RealName); - - if($uinfo = get_userdatabylogin($name)) - { - - $ret_id = wp_insert_user(array( - 'ID' => $uinfo->ID, - 'user_login' => $name, - 'user_nicename' => $RealName, - 'user_email' => $email, - 'user_url' => 'http://', - 'display_name' => $name) - ); - } - else - { - $ret_id = wp_insert_user(array( - 'user_login' => $name, - 'user_nicename' => $RealName, - 'user_email' => $email, - 'user_url' => 'http://', - 'display_name' => $name) - ); - } - $txpid2wpid[$user_id] = $ret_id; - - // Set Textpattern-to-WordPress permissions translation - $transperms = array(1 => '10', 2 => '9', 3 => '5', 4 => '4', 5 => '3', 6 => '2', 7 => '0'); - - // Update Usermeta Data - $user = new WP_User($ret_id); - if('10' == $transperms[$privs]) { $user->set_role('administrator'); } - if('9' == $transperms[$privs]) { $user->set_role('editor'); } - if('5' == $transperms[$privs]) { $user->set_role('editor'); } - if('4' == $transperms[$privs]) { $user->set_role('author'); } - if('3' == $transperms[$privs]) { $user->set_role('contributor'); } - if('2' == $transperms[$privs]) { $user->set_role('contributor'); } - if('0' == $transperms[$privs]) { $user->set_role('subscriber'); } - - update_usermeta( $ret_id, 'wp_user_level', $transperms[$privs] ); - update_usermeta( $ret_id, 'rich_editing', 'false'); - }// End foreach($users as $user) - - // Store id translation array for future use - add_option('txpid2wpid',$txpid2wpid); - - - echo '

    '.sprintf(__('Done! %1$s users imported.'), $count).'

    '; - return true; - }// End if(is_array($users) - - echo __('No Users to Import!'); - return false; - - }// End function user2wp() - - function posts2wp($posts='') - { - // General Housekeeping - global $wpdb; - $count = 0; - $txpposts2wpposts = array(); - $cats = array(); - - // Do the Magic - if(is_array($posts)) - { - echo '

    '.__('Importing Posts...').'

    '; - foreach($posts as $post) - { - $count++; - extract($post); - - // Set Textpattern-to-WordPress status translation - $stattrans = array(1 => 'draft', 2 => 'private', 3 => 'draft', 4 => 'publish', 5 => 'publish'); - - //Can we do this more efficiently? - $uinfo = ( get_userdatabylogin( $AuthorID ) ) ? get_userdatabylogin( $AuthorID ) : 1; - $authorid = ( is_object( $uinfo ) ) ? $uinfo->ID : $uinfo ; - - $Title = $wpdb->escape($Title); - $Body = $wpdb->escape($Body); - $Excerpt = $wpdb->escape($Excerpt); - $post_status = $stattrans[$Status]; - - // Import Post data into WordPress - - if($pinfo = post_exists($Title,$Body)) - { - $ret_id = wp_insert_post(array( - 'ID' => $pinfo, - 'post_date' => $Posted, - 'post_date_gmt' => $post_date_gmt, - 'post_author' => $authorid, - 'post_modified' => $LastMod, - 'post_modified_gmt' => $post_modified_gmt, - 'post_title' => $Title, - 'post_content' => $Body, - 'post_excerpt' => $Excerpt, - 'post_status' => $post_status, - 'post_name' => $url_title, - 'comment_count' => $comments_count) - ); - if ( is_wp_error( $ret_id ) ) - return $ret_id; - } - else - { - $ret_id = wp_insert_post(array( - 'post_date' => $Posted, - 'post_date_gmt' => $post_date_gmt, - 'post_author' => $authorid, - 'post_modified' => $LastMod, - 'post_modified_gmt' => $post_modified_gmt, - 'post_title' => $Title, - 'post_content' => $Body, - 'post_excerpt' => $Excerpt, - 'post_status' => $post_status, - 'post_name' => $url_title, - 'comment_count' => $comments_count) - ); - if ( is_wp_error( $ret_id ) ) - return $ret_id; - } - $txpposts2wpposts[$ID] = $ret_id; - - // Make Post-to-Category associations - $cats = array(); - $category1 = get_category_by_slug($Category1); - $category1 = $category1->term_id; - $category2 = get_category_by_slug($Category2); - $category2 = $category2->term_id; - if($cat1 = $category1) { $cats[1] = $cat1; } - if($cat2 = $category2) { $cats[2] = $cat2; } - - if(!empty($cats)) { wp_set_post_categories($ret_id, $cats); } - } - } - // Store ID translation for later use - add_option('txpposts2wpposts',$txpposts2wpposts); - - echo '

    '.sprintf(__('Done! %1$s posts imported.'), $count).'

    '; - return true; - } - - function comments2wp($comments='') - { - // General Housekeeping - global $wpdb; - $count = 0; - $txpcm2wpcm = array(); - $postarr = get_option('txpposts2wpposts'); - - // Magic Mojo - if(is_array($comments)) - { - echo '

    '.__('Importing Comments...').'

    '; - foreach($comments as $comment) - { - $count++; - extract($comment); - - // WordPressify Data - $comment_ID = ltrim($discussid, '0'); - $comment_post_ID = $postarr[$parentid]; - $comment_approved = (1 == $visible) ? 1 : 0; - $name = $wpdb->escape($name); - $email = $wpdb->escape($email); - $web = $wpdb->escape($web); - $message = $wpdb->escape($message); - - if($cinfo = comment_exists($name, $posted)) - { - // Update comments - $ret_id = wp_update_comment(array( - 'comment_ID' => $cinfo, - 'comment_post_ID' => $comment_post_ID, - 'comment_author' => $name, - 'comment_author_email' => $email, - 'comment_author_url' => $web, - 'comment_date' => $posted, - 'comment_content' => $message, - 'comment_approved' => $comment_approved) - ); - } - else - { - // Insert comments - $ret_id = wp_insert_comment(array( - 'comment_post_ID' => $comment_post_ID, - 'comment_author' => $name, - 'comment_author_email' => $email, - 'comment_author_url' => $web, - 'comment_author_IP' => $ip, - 'comment_date' => $posted, - 'comment_content' => $message, - 'comment_approved' => $comment_approved) - ); - } - $txpcm2wpcm[$comment_ID] = $ret_id; - } - // Store Comment ID translation for future use - add_option('txpcm2wpcm', $txpcm2wpcm); - - // Associate newly formed categories with posts - get_comment_count($ret_id); - - - echo '

    '.sprintf(__('Done! %1$s comments imported.'), $count).'

    '; - return true; - } - echo __('No Comments to Import!'); - return false; - } - - function links2wp($links='') - { - // General Housekeeping - global $wpdb; - $count = 0; - - // Deal with the links - if(is_array($links)) - { - echo '

    '.__('Importing Links...').'

    '; - foreach($links as $link) - { - $count++; - extract($link); - - // Make nice vars - $category = $wpdb->escape($category); - $linkname = $wpdb->escape($linkname); - $description = $wpdb->escape($description); - - if($linfo = link_exists($linkname)) - { - $ret_id = wp_insert_link(array( - 'link_id' => $linfo, - 'link_url' => $url, - 'link_name' => $linkname, - 'link_category' => $category, - 'link_description' => $description, - 'link_updated' => $date) - ); - } - else - { - $ret_id = wp_insert_link(array( - 'link_url' => $url, - 'link_name' => $linkname, - 'link_category' => $category, - 'link_description' => $description, - 'link_updated' => $date) - ); - } - $txplinks2wplinks[$link_id] = $ret_id; - } - add_option('txplinks2wplinks',$txplinks2wplinks); - echo '

    '; - printf(__ngettext('Done! %s link imported', 'Done! %s links imported', $count), $count); - echo '

    '; - return true; - } - echo __('No Links to Import!'); - return false; - } - - function import_categories() - { - // Category Import - $cats = $this->get_txp_cats(); - $this->cat2wp($cats); - add_option('txp_cats', $cats); - - - - echo '
    '; - wp_nonce_field('import-textpattern'); - printf('

    ', attribute_escape(__('Import Users'))); - echo '
    '; - - } - - function import_users() - { - // User Import - $users = $this->get_txp_users(); - $this->users2wp($users); - - echo '
    '; - wp_nonce_field('import-textpattern'); - printf('

    ', attribute_escape(__('Import Posts'))); - echo '
    '; - } - - function import_posts() - { - // Post Import - $posts = $this->get_txp_posts(); - $result = $this->posts2wp($posts); - if ( is_wp_error( $result ) ) - return $result; - - echo '
    '; - wp_nonce_field('import-textpattern'); - printf('

    ', attribute_escape(__('Import Comments'))); - echo '
    '; - } - - function import_comments() - { - // Comment Import - $comments = $this->get_txp_comments(); - $this->comments2wp($comments); - - echo '
    '; - wp_nonce_field('import-textpattern'); - printf('

    ', attribute_escape(__('Import Links'))); - echo '
    '; - } - - function import_links() - { - //Link Import - $links = $this->get_txp_links(); - $this->links2wp($links); - add_option('txp_links', $links); - - echo '
    '; - wp_nonce_field('import-textpattern'); - printf('

    ', attribute_escape(__('Finish'))); - echo '
    '; - } - - function cleanup_txpimport() - { - delete_option('tpre'); - delete_option('txp_cats'); - delete_option('txpid2wpid'); - delete_option('txpcat2wpcat'); - delete_option('txpposts2wpposts'); - delete_option('txpcm2wpcm'); - delete_option('txplinks2wplinks'); - delete_option('txpuser'); - delete_option('txppass'); - delete_option('txpname'); - delete_option('txphost'); - do_action('import_done', 'textpattern'); - $this->tips(); - } - - function tips() - { - echo '

    '.__('Welcome to WordPress. We hope (and expect!) that you will find this platform incredibly rewarding! As a new WordPress user coming from Textpattern, there are some things that we would like to point out. Hopefully, they will help your transition go as smoothly as possible.').'

    '; - echo '

    '.__('Users').'

    '; - echo '

    '.sprintf(__('You have already setup WordPress and have been assigned an administrative login and password. Forget it. You didn’t have that login in Textpattern, why should you have it here? Instead we have taken care to import all of your users into our system. Unfortunately there is one downside. Because both WordPress and Textpattern uses a strong encryption hash with passwords, it is impossible to decrypt it and we are forced to assign temporary passwords to all your users. Every user has the same username, but their passwords are reset to password123. So Login and change it.'), get_bloginfo( 'wpurl' ) . '/wp-login.php').'

    '; - echo '

    '.__('Preserving Authors').'

    '; - echo '

    '.__('Secondly, we have attempted to preserve post authors. If you are the only author or contributor to your blog, then you are safe. In most cases, we are successful in this preservation endeavor. However, if we cannot ascertain the name of the writer due to discrepancies between database tables, we assign it to you, the administrative user.').'

    '; - echo '

    '.__('Textile').'

    '; - echo '

    '.__('Also, since you’re coming from Textpattern, you probably have been using Textile to format your comments and posts. If this is the case, we recommend downloading and installing Textile for WordPress. Trust me... You’ll want it.').'

    '; - echo '

    '.__('WordPress Resources').'

    '; - echo '

    '.__('Finally, there are numerous WordPress resources around the internet. Some of them are:').'

    '; - echo ''; - echo '

    '.sprintf(__('That’s it! What are you waiting for? Go login!'), get_bloginfo( 'wpurl' ) . '/wp-login.php').'

    '; - } - - function db_form() - { - echo ''; - printf('', __('Textpattern Database User:')); - printf('', __('Textpattern Database Password:')); - printf('', __('Textpattern Database Name:')); - printf('', __('Textpattern Database Host:')); - printf('', __('Textpattern Table prefix (if any):')); - echo '
    '; - } - - function dispatch() - { - - if (empty ($_GET['step'])) - $step = 0; - else - $step = (int) $_GET['step']; - $this->header(); - - if ( $step > 0 ) - { - check_admin_referer('import-textpattern'); - - if($_POST['dbuser']) - { - if(get_option('txpuser')) - delete_option('txpuser'); - add_option('txpuser', sanitize_user($_POST['dbuser'], true)); - } - if($_POST['dbpass']) - { - if(get_option('txppass')) - delete_option('txppass'); - add_option('txppass', sanitize_user($_POST['dbpass'], true)); - } - - if($_POST['dbname']) - { - if(get_option('txpname')) - delete_option('txpname'); - add_option('txpname', sanitize_user($_POST['dbname'], true)); - } - if($_POST['dbhost']) - { - if(get_option('txphost')) - delete_option('txphost'); - add_option('txphost', sanitize_user($_POST['dbhost'], true)); - } - if($_POST['dbprefix']) - { - if(get_option('tpre')) - delete_option('tpre'); - add_option('tpre', sanitize_user($_POST['dbprefix'])); - } - - - } - - switch ($step) - { - default: - case 0 : - $this->greet(); - break; - case 1 : - $this->import_categories(); - break; - case 2 : - $this->import_users(); - break; - case 3 : - $result = $this->import_posts(); - if ( is_wp_error( $result ) ) - echo $result->get_error_message(); - break; - case 4 : - $this->import_comments(); - break; - case 5 : - $this->import_links(); - break; - case 6 : - $this->cleanup_txpimport(); - break; - } - - $this->footer(); - } - - function Textpattern_Import() - { - // Nothing. - } -} - -$txp_import = new Textpattern_Import(); - -register_importer('textpattern', __('Textpattern'), __('Import categories, users, posts, comments, and links from a Textpattern blog.'), array ($txp_import, 'dispatch')); - -?> diff -uNr a/mp-wp/wp-admin/import/utw.php b/mp-wp/wp-admin/import/utw.php --- a/mp-wp/wp-admin/import/utw.php 2f7da06f4950ffd6e9f4d9c52a85e13a98d408c69caf3545ca1ced021aa9249d717e86aada55ebfc09c0ab5ec21451886f8462e85536093ab515b22e2c602018 +++ b/mp-wp/wp-admin/import/utw.php false @@ -1,290 +0,0 @@ -'; - screen_icon(); - echo '

    '.__('Import Ultimate Tag Warrior').'

    '; - echo '

    '.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'

    '; - } - - function footer() { - echo ''; - } - - function greet() { - echo '
    '; - echo '

    '.__('Howdy! This imports tags from Ultimate Tag Warrior 3 into WordPress tags.').'

    '; - echo '

    '.__('This has not been tested on any other versions of Ultimate Tag Warrior. Mileage may vary.').'

    '; - echo '

    '.__('To accommodate larger databases for those tag-crazy authors out there, we have made this into an easy 5-step program to help you kick that nasty UTW habit. Just keep clicking along and we will let you know when you are in the clear!').'

    '; - echo '

    '.__('Don’t be stupid - backup your database before proceeding!').'

    '; - echo '
    '; - echo '

    '; - echo '
    '; - echo '
    '; - } - - - function dispatch () { - if ( empty( $_GET['step'] ) ) { - $step = 0; - } else { - $step = (int) $_GET['step']; - } - - if ( $step > 1 ) - check_admin_referer('import-utw'); - - // load the header - $this->header(); - - switch ( $step ) { - case 0 : - $this->greet(); - break; - case 1 : - $this->import_tags(); - break; - case 2 : - $this->import_posts(); - break; - case 3: - $this->import_t2p(); - break; - case 4: - $this->cleanup_import(); - break; - } - - // load the footer - $this->footer(); - } - - - function import_tags ( ) { - echo '
    '; - echo '

    '.__('Reading UTW Tags…').'

    '; - - $tags = $this->get_utw_tags(); - - // if we didn't get any tags back, that's all there is folks! - if ( !is_array($tags) ) { - echo '

    ' . __('No Tags Found!') . '

    '; - return false; - } - else { - - // if there's an existing entry, delete it - if ( get_option('utwimp_tags') ) { - delete_option('utwimp_tags'); - } - - add_option('utwimp_tags', $tags); - - - $count = count($tags); - - echo '

    ' . sprintf( __ngettext('Done! %s tag were read.', 'Done! %s tags were read.', $count), $count ) . '

    '; - echo '

    ' . __('The following tags were found:') . '

    '; - - echo '
      '; - - foreach ( $tags as $tag_id => $tag_name ) { - - echo '
    • ' . $tag_name . '
    • '; - - } - - echo '
    '; - - echo '
    '; - - echo '

    ' . __('If you don’t want to import any of these tags, you should delete them from the UTW tag management page and then re-run this import.') . '

    '; - - - } - - echo '
    '; - wp_nonce_field('import-utw'); - echo '

    '; - echo '
    '; - echo '
    '; - } - - - function import_posts ( ) { - echo '
    '; - echo '

    '.__('Reading UTW Post Tags…').'

    '; - - // read in all the UTW tag -> post settings - $posts = $this->get_utw_posts(); - - // if we didn't get any tags back, that's all there is folks! - if ( !is_array($posts) ) { - echo '

    ' . __('No posts were found to have tags!') . '

    '; - return false; - } - else { - - // if there's an existing entry, delete it - if ( get_option('utwimp_posts') ) { - delete_option('utwimp_posts'); - } - - add_option('utwimp_posts', $posts); - - - $count = count($posts); - - echo '

    ' . sprintf( __ngettext('Done! %s tag to post relationships were read.', 'Done! %s tags to post relationships were read.', $count), $count ) . '

    '; - - } - - echo '
    '; - wp_nonce_field('import-utw'); - echo '

    '; - echo '
    '; - echo '
    '; - - } - - - function import_t2p ( ) { - - echo '
    '; - echo '

    '.__('Adding Tags to Posts…').'

    '; - - // run that funky magic! - $tags_added = $this->tag2post(); - - echo '

    ' . sprintf( __ngettext( 'Done! %s tag were added!', 'Done! %s tags were added!', $tags_added ), $tags_added ) . '

    '; - - echo '
    '; - wp_nonce_field('import-utw'); - echo '

    '; - echo '
    '; - echo '
    '; - - } - - - function get_utw_tags ( ) { - - global $wpdb; - - // read in all the tags from the UTW tags table: should be wp_tags - $tags_query = "SELECT tag_id, tag FROM " . $wpdb->prefix . "tags"; - - $tags = $wpdb->get_results($tags_query); - - // rearrange these tags into something we can actually use - foreach ( $tags as $tag ) { - - $new_tags[$tag->tag_id] = $tag->tag; - - } - - return $new_tags; - - } - - function get_utw_posts ( ) { - - global $wpdb; - - // read in all the posts from the UTW post->tag table: should be wp_post2tag - $posts_query = "SELECT tag_id, post_id FROM " . $wpdb->prefix . "post2tag"; - - $posts = $wpdb->get_results($posts_query); - - return $posts; - - } - - - function tag2post ( ) { - - // get the tags and posts we imported in the last 2 steps - $tags = get_option('utwimp_tags'); - $posts = get_option('utwimp_posts'); - - // null out our results - $tags_added = 0; - - // loop through each post and add its tags to the db - foreach ( $posts as $this_post ) { - - $the_post = (int) $this_post->post_id; - $the_tag = (int) $this_post->tag_id; - - // what's the tag name for that id? - $the_tag = $tags[$the_tag]; - - // screw it, just try to add the tag - wp_add_post_tags($the_post, $the_tag); - - $tags_added++; - - } - - // that's it, all posts should be linked to their tags properly, pending any errors we just spit out! - return $tags_added; - - - } - - - function cleanup_import ( ) { - - delete_option('utwimp_tags'); - delete_option('utwimp_posts'); - - $this->done(); - - } - - - function done ( ) { - - echo '
    '; - echo '

    '.__('Import Complete!').'

    '; - - echo '

    ' . __('OK, so we lied about this being a 5-step program! You’re done!') . '

    '; - - echo '

    ' . __('Now wasn’t that easy?') . '

    '; - - echo '
    '; - - } - - - function UTW_Import ( ) { - - // Nothing. - - } - -} - - -// create the import object -$utw_import = new UTW_Import(); - -// add it to the import page! -register_importer('utw', 'Ultimate Tag Warrior', __('Import Ultimate Tag Warrior tags into WordPress tags.'), array($utw_import, 'dispatch')); - -?> diff -uNr a/mp-wp/wp-admin/includes/admin.php b/mp-wp/wp-admin/includes/admin.php --- a/mp-wp/wp-admin/includes/admin.php 7ff0db86177aa1b9b9311145b1f22df996294b9149316b0eb15eddaaea4d1b72f1ac6c54ad430988dd10d6df7ba176b85129a39a1b66e6826e2f1f801e667129 +++ b/mp-wp/wp-admin/includes/admin.php 3783dc945fcbbde918ac8e97208d5b79d0d216b44ba60b930f4fa851fc7780d98ee4652590284a8fab1a065e57cb16bc3375b2d330dee55af935c1747d682c0b @@ -45,9 +45,6 @@ /** WordPress User Administration API */ require_once(ABSPATH . 'wp-admin/includes/user.php'); -/** WordPress Update Administration API */ -require_once(ABSPATH . 'wp-admin/includes/update.php'); - /** WordPress Registration API */ require_once(ABSPATH . WPINC . '/registration.php'); diff -uNr a/mp-wp/wp-admin/includes/dashboard.php b/mp-wp/wp-admin/includes/dashboard.php --- a/mp-wp/wp-admin/includes/dashboard.php 7fbe4bd45e02aae52e18d66cfeaa22fcf6067adf7cad647bb7652457f07cb635fe7cb999109c25eb8d1212f73b0b27398ca5ee72e24aaa2a54aa204bee61f113 +++ b/mp-wp/wp-admin/includes/dashboard.php 237b6b3c050348cbbd984c97b5030637a17a3c98c6252e4be8d68fbb82ae327b2dc90de81f4bd99c081361e65359f9adf00c1d6f2fa330d94bef05e3959e9f91 @@ -279,7 +279,7 @@ echo '

    '; - update_right_now_message(); + echo sprintf('You are using WordPress %s', $GLOBALS['wp_version']); echo "\n\t".''; do_action( 'rightnow_end' ); @@ -332,7 +332,7 @@

    - +
    diff -uNr a/mp-wp/wp-admin/includes/plugin-install.php b/mp-wp/wp-admin/includes/plugin-install.php --- a/mp-wp/wp-admin/includes/plugin-install.php 3eab678a6f05b8d04ccdd07eaf1619cf67e92a6262b8b865fefee61e388774aebb8af2d28dd1b982fbef829b0726fec88809938d484e5f502e7d7013a9a88f60 +++ b/mp-wp/wp-admin/includes/plugin-install.php b7bb881a25fd047b984ebf4df073b5b1662f8287f33a756484f0afae46bbd3f03008996c7ec4c93a4ce90f5db2e79d9a6d3d9b7dc955c6927df9951043e05b57 @@ -453,11 +453,6 @@ ?> 'url'. - It adds the plugin's name to TinyMCE's plugins init and the call to PluginManager to load the plugin. - The url should be absolute and should include the js file name to be loaded. Example: - array( 'myplugin' => 'http://my-site.com/wp-content/plugins/myfolder/mce_plugin.js' ) - If the plugin uses a button, it should be added with one of the "$mce_buttons" filters. - */ - $mce_external_plugins = apply_filters('mce_external_plugins', array()); - - $ext_plugins = "\n"; - if ( ! empty($mce_external_plugins) ) { - - /* - The following filter loads external language files for TinyMCE plugins. - It takes an associative array 'plugin_name' => 'path', where path is the - include path to the file. The language file should follow the same format as - /tinymce/langs/wp-langs.php and should define a variable $strings that - holds all translated strings. - When this filter is not used, the function will try to load {mce_locale}.js. - If that is not found, en.js will be tried next. - */ - $mce_external_languages = apply_filters('mce_external_languages', array()); - - $loaded_langs = array(); - $strings = ''; - - if ( ! empty($mce_external_languages) ) { - foreach ( $mce_external_languages as $name => $path ) { - if ( is_file($path) && is_readable($path) ) { - include_once($path); - $ext_plugins .= $strings; - $loaded_langs[] = $name; - } - } - } - - foreach ( $mce_external_plugins as $name => $url ) { - - if ( is_ssl() ) $url = str_replace('http://', 'https://', $url); - - $plugins[] = '-' . $name; - - $plugurl = dirname($url); - $strings = $str1 = $str2 = ''; - if ( ! in_array($name, $loaded_langs) ) { - $path = str_replace( WP_PLUGIN_URL, '', $plugurl ); - $path = WP_PLUGIN_DIR . $path . '/langs/'; - - if ( function_exists('realpath') ) - $path = trailingslashit( realpath($path) ); - - if ( is_file($path . $mce_locale . '.js') ) - $strings .= @file_get_contents($path . $mce_locale . '.js'); - - if ( is_file($path . $mce_locale . '_dlg.js') ) - $strings .= @file_get_contents($path . $mce_locale . '_dlg.js'); - - if ( 'en' != $mce_locale && empty($strings) ) { - if ( is_file($path . 'en.js') ) { - $str1 = @file_get_contents($path . 'en.js'); - $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str1, 1 ); - } - - if ( is_file($path . 'en_dlg.js') ) { - $str2 = @file_get_contents($path . 'en_dlg.js'); - $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str2, 1 ); - } - } - - if ( ! empty($strings) ) - $ext_plugins .= "\n" . $strings . "\n"; - } - - $ext_plugins .= 'tinyMCEPreInit.load_ext("' . $plugurl . '", "' . $mce_locale . '");' . "\n"; - $ext_plugins .= 'tinymce.PluginManager.load("' . $name . '", "' . $url . '");' . "\n"; - } - } - } - - $plugins = implode($plugins, ','); - - if ( $teeny ) { - $mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold, italic, underline, blockquote, separator, strikethrough, bullist, numlist,justifyleft, justifycenter, justifyright, undo, redo, link, unlink, fullscreen') ); - $mce_buttons = implode($mce_buttons, ','); - $mce_buttons_2 = $mce_buttons_3 = $mce_buttons_4 = ''; - } else { - $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' )); - $mce_buttons = implode($mce_buttons, ','); - - $mce_buttons_2 = apply_filters('mce_buttons_2', array('formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'media', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' )); - $mce_buttons_2 = implode($mce_buttons_2, ','); - - $mce_buttons_3 = apply_filters('mce_buttons_3', array()); - $mce_buttons_3 = implode($mce_buttons_3, ','); - - $mce_buttons_4 = apply_filters('mce_buttons_4', array()); - $mce_buttons_4 = implode($mce_buttons_4, ','); - } - $no_captions = ( apply_filters( 'disable_captions', '' ) ) ? true : false; - - // TinyMCE init settings - $initArray = array ( - 'mode' => 'none', - 'onpageload' => 'switchEditors.edInit', - 'width' => '100%', - 'theme' => 'advanced', - 'skin' => 'wp_theme', - 'theme_advanced_buttons1' => "$mce_buttons", - 'theme_advanced_buttons2' => "$mce_buttons_2", - 'theme_advanced_buttons3' => "$mce_buttons_3", - 'theme_advanced_buttons4' => "$mce_buttons_4", - 'language' => "$mce_locale", - 'spellchecker_languages' => "$mce_spellchecker_languages", - 'theme_advanced_toolbar_location' => 'top', - 'theme_advanced_toolbar_align' => 'left', - 'theme_advanced_statusbar_location' => 'bottom', - 'theme_advanced_resizing' => true, - 'theme_advanced_resize_horizontal' => false, - 'dialog_type' => 'modal', - 'relative_urls' => false, - 'remove_script_host' => false, - 'convert_urls' => false, - 'apply_source_formatting' => false, - 'remove_linebreaks' => true, - 'paste_convert_middot_lists' => true, - 'paste_remove_spans' => true, - 'paste_remove_styles' => true, - 'gecko_spellcheck' => true, - 'entities' => '38,amp,60,lt,62,gt', - 'accessibility_focus' => true, - 'tab_focus' => ':prev,:next', - 'content_css' => "$mce_css", - 'save_callback' => 'switchEditors.saveCallback', - 'wpeditimage_disable_captions' => $no_captions, - 'plugins' => "$plugins" - ); - - // For people who really REALLY know what they're doing with TinyMCE - // You can modify initArray to add, remove, change elements of the config before tinyMCE.init - // Setting "valid_elements", "invalid_elements" and "extended_valid_elements" can be done through "tiny_mce_before_init". - // Best is to use the default cleanup by not specifying valid_elements, as TinyMCE contains full set of XHTML 1.0. - if ( $teeny ) { - $initArray = apply_filters('teeny_mce_before_init', $initArray); - } else { - $initArray = apply_filters('tiny_mce_before_init', $initArray); - } - - $language = $initArray['language']; - - $ver = apply_filters('tiny_mce_version', '3101'); - - if ( 'en' != $language ) - include_once(ABSPATH . WPINC . '/js/tinymce/langs/wp-langs.php'); - - $mce_options = ''; - foreach ( $initArray as $k => $v ) - $mce_options .= $k . ':"' . $v . '", '; - - $mce_options = rtrim( trim($mce_options), '\n\r,' ); ?> - - - - - - - - - - - \ No newline at end of file diff -uNr a/mp-wp/wp-admin/includes/update-core-fuckit.php b/mp-wp/wp-admin/includes/update-core-fuckit.php --- a/mp-wp/wp-admin/includes/update-core-fuckit.php d36dea82f348ea4d90e412e40b2cc4c34a16f5ac553318d931efc7dea62720941e8cb60e428cfebb1ce6d0db41feb1d8de7b705331c0c61440aed4b37bbe8080 +++ b/mp-wp/wp-admin/includes/update-core-fuckit.php false @@ -1,263 +0,0 @@ -exists($from . '/wordpress/wp-settings.php') || !$wp_filesystem->exists($from . '/wordpress/wp-admin/admin.php') || - !$wp_filesystem->exists($from . '/wordpress/wp-includes/functions.php') ) { - $wp_filesystem->delete($from, true); - return new WP_Error('insane_distro', __('The update could not be unpacked') ); - } - - apply_filters('update_feedback', __('Installing the latest version')); - - // Create maintenance file to signal that we are upgrading - $maintenance_string = ''; - $maintenance_file = $to . '.maintenance'; - $wp_filesystem->delete($maintenance_file); - $wp_filesystem->put_contents($maintenance_file, $maintenance_string, FS_CHMOD_FILE); - - // Copy new versions of WP files into place. - $result = copy_dir($from . '/wordpress', $to); - if ( is_wp_error($result) ) { - $wp_filesystem->delete($maintenance_file); - //$wp_filesystem->delete($working_dir, true); //TODO: Uncomment? This DOES mean that the new files are available in the upgrade folder if it fails. - return $result; - } - - // Remove old files - foreach ( $_old_files as $old_file ) { - $old_file = $to . $old_file; - if ( !$wp_filesystem->exists($old_file) ) - continue; - $wp_filesystem->delete($old_file, true); - } - - // Upgrade DB with separate request - apply_filters('update_feedback', __('Upgrading database')); - $db_upgrade_url = admin_url('upgrade.php?step=upgrade_db'); - wp_remote_post($db_upgrade_url, array('timeout' => 60)); - - // Remove working directory - $wp_filesystem->delete($from, true); - - // Force refresh of update information - delete_option('update_core'); - - // Remove maintenance file, we're done. - $wp_filesystem->delete($maintenance_file); -} - -?> diff -uNr a/mp-wp/wp-admin/includes/update.php b/mp-wp/wp-admin/includes/update.php --- a/mp-wp/wp-admin/includes/update.php 313d01a0d12b7e73c3039c791758e0d14267d19c9aa8b397d668c7cff6b27159045fbf6c212410da52b453c38fc46731a5fd43f71080ab9ef4e42a80cb13462d +++ b/mp-wp/wp-admin/includes/update.php false @@ -1,492 +0,0 @@ - 'latest'); - return $updates[0]; -} - -/** - * Get available core updates - * - * @param array $options Set $options['dismissed'] to true to show dismissed upgrades too, - * set $options['available'] to false to skip not-dimissed updates. - * @return array Array of the update objects - */ -function get_core_updates( $options = array() ) { - $options = array_merge( array('available' => true, 'dismissed' => false ), $options ); - $dismissed = get_option( 'dismissed_update_core' ); - if ( !is_array( $dismissed ) ) $dismissed = array(); - $from_api = get_option( 'update_core' ); - if ( empty($from_api) ) - return false; - if ( !is_array( $from_api->updates ) ) return false; - $updates = $from_api->updates; - if ( !is_array( $updates ) ) return false; - $result = array(); - foreach($updates as $update) { - if ( array_key_exists( $update->current.'|'.$update->locale, $dismissed ) ) { - if ( $options['dismissed'] ) { - $update->dismissed = true; - $result[]= $update; - } - } else { - if ( $options['available'] ) { - $update->dismissed = false; - $result[]= $update; - } - } - } - return $result; -} - -function dismiss_core_update( $update ) { - $dismissed = get_option( 'dismissed_update_core' ); - $dismissed[ $update->current.'|'.$update->locale ] = true; - return update_option( 'dismissed_update_core', $dismissed ); -} - -function undismiss_core_update( $version, $locale ) { - $dismissed = get_option( 'dismissed_update_core' ); - $key = $version.'|'.$locale; - if ( !isset( $dismissed[$key] ) ) return false; - unset( $dismissed[$key] ); - return update_option( 'dismissed_update_core', $dismissed ); -} - -function find_core_update( $version, $locale ) { - $from_api = get_option( 'update_core' ); - if ( !is_array( $from_api->updates ) ) return false; - $updates = $from_api->updates; - foreach($updates as $update) { - if ( $update->current == $version && $update->locale == $locale ) - return $update; - } - return false; -} - -function core_update_footer( $msg = '' ) { - if ( !current_user_can('manage_options') ) - return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'] ); - - $cur = get_preferred_from_update_core(); - if ( ! isset( $cur->current ) ) - $cur->current = ''; - - if ( ! isset( $cur->url ) ) - $cur->url = ''; - - if ( ! isset( $cur->response ) ) - $cur->response = ''; - - switch ( $cur->response ) { - case 'development' : - return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), $GLOBALS['wp_version'], 'update-core.php'); - break; - - case 'upgrade' : - if ( current_user_can('manage_options') ) { - return sprintf( ''.__( 'Get Version %2$s' ).'', 'update-core.php', $cur->current); - break; - } - - case 'latest' : - default : - return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] ); - break; - } -} -add_filter( 'update_footer', 'core_update_footer' ); - -function update_nag() { - global $pagenow; - - if ( 'update-core.php' == $pagenow ) - return; - - $cur = get_preferred_from_update_core(); - - if ( ! isset( $cur->response ) || $cur->response != 'upgrade' ) - return false; - - if ( current_user_can('manage_options') ) - $msg = sprintf( __('WordPress %1$s is available! Please update now.'), $cur->current, 'update-core.php' ); - else - $msg = sprintf( __('WordPress %1$s is available! Please notify the site administrator.'), $cur->current ); - - echo "
    $msg
    "; -} -add_action( 'admin_notices', 'update_nag', 3 ); - -// Called directly from dashboard -function update_right_now_message() { - $cur = get_preferred_from_update_core(); - - $msg = sprintf( __('You are using WordPress %s.'), $GLOBALS['wp_version'] ); - if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('manage_options') ) - $msg .= " " . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . ''; - - echo "$msg"; -} - -function wp_plugin_update_row( $file, $plugin_data ) { - $current = get_option( 'update_plugins' ); - if ( !isset( $current->response[ $file ] ) ) - return false; - - $r = $current->response[ $file ]; - - $details_url = admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&TB_iframe=true&width=600&height=800'); - - echo ''; - if ( ! current_user_can('update_plugins') ) - printf( __('There is a new version of %1$s available. View version %3$s Details.'), $plugin_data['Name'], $details_url, $r->new_version); - else if ( empty($r->package) ) - printf( __('There is a new version of %1$s available. View version %3$s Details automatic upgrade unavailable for this plugin.'), $plugin_data['Name'], $details_url, $r->new_version); - else - printf( __('There is a new version of %1$s available. View version %3$s Details or upgrade automatically.'), $plugin_data['Name'], $details_url, $r->new_version, wp_nonce_url('update.php?action=upgrade-plugin&plugin=' . $file, 'upgrade-plugin_' . $file) ); - - echo ''; -} -add_action( 'after_plugin_row', 'wp_plugin_update_row', 10, 2 ); - -function wp_update_plugin($plugin, $feedback = '') { - global $wp_filesystem; - - if ( !empty($feedback) ) - add_filter('update_feedback', $feedback); - - // Is an update available? - $current = get_option( 'update_plugins' ); - if ( !isset( $current->response[ $plugin ] ) ) - return new WP_Error('up_to_date', __('The plugin is at the latest version.')); - - // Is a filesystem accessor setup? - if ( ! $wp_filesystem || ! is_object($wp_filesystem) ) - WP_Filesystem(); - - if ( ! is_object($wp_filesystem) ) - return new WP_Error('fs_unavailable', __('Could not access filesystem.')); - - if ( $wp_filesystem->errors->get_error_code() ) - return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors); - - //Get the base plugin folder - $plugins_dir = $wp_filesystem->wp_plugins_dir(); - if ( empty($plugins_dir) ) - return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.')); - - //And the same for the Content directory. - $content_dir = $wp_filesystem->wp_content_dir(); - if( empty($content_dir) ) - return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).')); - - $plugins_dir = trailingslashit( $plugins_dir ); - $content_dir = trailingslashit( $content_dir ); - - // Get the URL to the zip file - $r = $current->response[ $plugin ]; - - if ( empty($r->package) ) - return new WP_Error('no_package', __('Upgrade package not available.')); - - // Download the package - $package = $r->package; - apply_filters('update_feedback', sprintf(__('Downloading update from %s'), $package)); - $download_file = download_url($package); - - if ( is_wp_error($download_file) ) - return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message()); - - $working_dir = $content_dir . 'upgrade/' . basename($plugin, '.php'); - - // Clean up working directory - if ( $wp_filesystem->is_dir($working_dir) ) - $wp_filesystem->delete($working_dir, true); - - apply_filters('update_feedback', __('Unpacking the update')); - // Unzip package to working directory - $result = unzip_file($download_file, $working_dir); - - // Once extracted, delete the package - unlink($download_file); - - if ( is_wp_error($result) ) { - $wp_filesystem->delete($working_dir, true); - return $result; - } - - if ( is_plugin_active($plugin) ) { - //Deactivate the plugin silently, Prevent deactivation hooks from running. - apply_filters('update_feedback', __('Deactivating the plugin')); - deactivate_plugins($plugin, true); - } - - // Remove the existing plugin. - apply_filters('update_feedback', __('Removing the old version of the plugin')); - $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) ); - - // If plugin is in its own directory, recursively delete the directory. - if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder - $deleted = $wp_filesystem->delete($this_plugin_dir, true); - else - $deleted = $wp_filesystem->delete($plugins_dir . $plugin); - - if ( ! $deleted ) { - $wp_filesystem->delete($working_dir, true); - return new WP_Error('delete_failed', __('Could not remove the old plugin')); - } - - apply_filters('update_feedback', __('Installing the latest version')); - // Copy new version of plugin into place. - $result = copy_dir($working_dir, $plugins_dir); - if ( is_wp_error($result) ) { - $wp_filesystem->delete($working_dir, true); - return $result; - } - - //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin - $filelist = array_keys( $wp_filesystem->dirlist($working_dir) ); - - // Remove working directory - $wp_filesystem->delete($working_dir, true); - - // Force refresh of plugin update information - delete_option('update_plugins'); - - if( empty($filelist) ) - return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup. - - $folder = $filelist[0]; - $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash - $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list - - return $folder . '/' . $pluginfiles[0]; -} - -function wp_update_theme($theme, $feedback = '') { - global $wp_filesystem; - - if ( !empty($feedback) ) - add_filter('update_feedback', $feedback); - - // Is an update available? - $current = get_option( 'update_themes' ); - if ( !isset( $current->response[ $theme ] ) ) - return new WP_Error('up_to_date', __('The theme is at the latest version.')); - - $r = $current->response[ $theme ]; - - $themes = get_themes(); - foreach ( (array) $themes as $this_theme ) { - if ( $this_theme['Stylesheet'] == $theme ) { - $theme_directory = preg_replace('!^/themes/!i', '', $this_theme['Stylesheet Dir']); - break; - } - } - unset($themes); - - if ( empty($theme_directory) ) - return new WP_Error('theme_non_existant', __('Theme does not exist.')); - - // Is a filesystem accessor setup? - if ( ! $wp_filesystem || ! is_object($wp_filesystem) ) - WP_Filesystem(); - - if ( ! is_object($wp_filesystem) ) - return new WP_Error('fs_unavailable', __('Could not access filesystem.')); - - if ( $wp_filesystem->errors->get_error_code() ) - return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors); - - //Get the base plugin folder - $themes_dir = $wp_filesystem->wp_themes_dir(); - if ( empty($themes_dir) ) - return new WP_Error('fs_no_themes_dir', __('Unable to locate WordPress Theme directory.')); - - //And the same for the Content directory. - $content_dir = $wp_filesystem->wp_content_dir(); - if( empty($content_dir) ) - return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).')); - - $themes_dir = trailingslashit( $themes_dir ); - $content_dir = trailingslashit( $content_dir ); - - if ( empty($r->package) ) - return new WP_Error('no_package', __('Upgrade package not available.')); - - // Download the package - apply_filters('update_feedback', sprintf(__('Downloading update from %s'), $r['package'])); - $download_file = download_url($r['package']); - - if ( is_wp_error($download_file) ) - return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message()); - - $working_dir = $content_dir . 'upgrade/' . basename($theme_directory); - - // Clean up working directory - if ( $wp_filesystem->is_dir($working_dir) ) - $wp_filesystem->delete($working_dir, true); - - apply_filters('update_feedback', __('Unpacking the update')); - // Unzip package to working directory - $result = unzip_file($download_file, $working_dir); - - // Once extracted, delete the package - unlink($download_file); - - if ( is_wp_error($result) ) { - $wp_filesystem->delete($working_dir, true); - return $result; - } - - //TODO: Is theme currently active? If so, set default theme - /* - if ( is_plugin_active($plugin) ) { - //Deactivate the plugin silently, Prevent deactivation hooks from running. - apply_filters('update_feedback', __('Deactivating the plugin')); - deactivate_plugins($plugin, true); - }*/ - - // Remove the existing plugin. - apply_filters('update_feedback', __('Removing the old version of the theme')); - $deleted = $wp_filesystem->delete($themes_dir . $theme_directory, true); - - if ( ! $deleted ) { - $wp_filesystem->delete($working_dir, true); - return new WP_Error('delete_failed', __('Could not remove the old plugin')); - } - - apply_filters('update_feedback', __('Installing the latest version')); - // Copy new version of plugin into place. - $result = copy_dir($working_dir, $themes_dir); - if ( is_wp_error($result) ) { - $wp_filesystem->delete($working_dir, true); - return $result; - } - - //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin - //$filelist = array_keys( $wp_filesystem->dirlist($working_dir) ); - - // Remove working directory - $wp_filesystem->delete($working_dir, true); - - // Force refresh of plugin update information - delete_option('update_themes'); - - /*if( empty($filelist) ) - return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup. - - $folder = $filelist[0]; - $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash - $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list - - return $folder . '/' . $pluginfiles[0];*/ -} - - -function wp_update_core($current, $feedback = '') { - global $wp_filesystem; - - @set_time_limit( 300 ); - - if ( !empty($feedback) ) - add_filter('update_feedback', $feedback); - - // Is an update available? - if ( !isset( $current->response ) || $current->response == 'latest' ) - return new WP_Error('up_to_date', __('WordPress is at the latest version.')); - - // Is a filesystem accessor setup? - if ( ! $wp_filesystem || ! is_object($wp_filesystem) ) - WP_Filesystem(); - - if ( ! is_object($wp_filesystem) ) - return new WP_Error('fs_unavailable', __('Could not access filesystem.')); - - if ( $wp_filesystem->errors->get_error_code() ) - return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors); - - // Get the base WP folder - $wp_dir = $wp_filesystem->abspath(); - if ( empty($wp_dir) ) - return new WP_Error('fs_no_wp_dir', __('Unable to locate WordPress directory.')); - - // And the same for the Content directory. - $content_dir = $wp_filesystem->wp_content_dir(); - if( empty($content_dir) ) - return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).')); - - $wp_dir = trailingslashit( $wp_dir ); - $content_dir = trailingslashit( $content_dir ); - - // Get the URL to the zip file - $package = $current->package; - - // Download the package - apply_filters('update_feedback', sprintf(__('Downloading update from %s'), $package)); - $download_file = download_url($package); - - if ( is_wp_error($download_file) ) - return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message()); - - $working_dir = $content_dir . 'upgrade/core'; - // Clean up working directory - if ( $wp_filesystem->is_dir($working_dir) ) { - $wp_filesystem->delete($working_dir, true); - } - - apply_filters('update_feedback', __('Unpacking the core update')); - // Unzip package to working directory - $result = unzip_file($download_file, $working_dir); - // Once extracted, delete the package - unlink($download_file); - - if ( is_wp_error($result) ) { - $wp_filesystem->delete($working_dir, true); - return $result; - } - - // Copy update-core.php from the new version into place. - if ( !$wp_filesystem->copy($working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true) ) { - $wp_filesystem->delete($working_dir, true); - return new WP_Error('copy_failed', __('Could not copy files')); - } - $wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE); - - require(ABSPATH . 'wp-admin/includes/update-core.php'); - - return update_core($working_dir, $wp_dir); -} - -function maintenance_nag() { - global $upgrading; - if ( ! isset( $upgrading ) ) - return false; - - if ( current_user_can('manage_options') ) - $msg = sprintf( __('An automated WordPress update has failed to complete - please attempt the update again now.'), 'update-core.php' ); - else - $msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.'); - - echo "
    $msg
    "; -} -add_action( 'admin_notices', 'maintenance_nag' ); - -?> diff -uNr a/mp-wp/wp-admin/includes/user.php b/mp-wp/wp-admin/includes/user.php --- a/mp-wp/wp-admin/includes/user.php bfcc62dcf123697333d4706045f926642e46868a8b2b49349c19e3eef4c461dc54eb304ed70a300c728ddf07aff409aa88586db6fcd74ec3ac020d24f80a91bd +++ b/mp-wp/wp-admin/includes/user.php b1a67fb94b54614d5382954578fd8ceb71a9317e3be71381b318ea538001d3d7044d8bf959adf296dd5b52880e4af48fbe6caa642ad8304929c89ae87cd1f74b @@ -91,12 +91,6 @@ $user->aim = wp_specialchars( trim( $_POST['aim'] )); if ( isset( $_POST['yim'] )) $user->yim = wp_specialchars( trim( $_POST['yim'] )); - if ( !$update ) - $user->rich_editing = 'true'; // Default to true for new users. - else if ( isset( $_POST['rich_editing'] ) ) - $user->rich_editing = $_POST['rich_editing']; - else - $user->rich_editing = 'true'; $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] )? $_POST['comment_shortcuts'] : ''; diff -uNr a/mp-wp/wp-admin/js/common.js b/mp-wp/wp-admin/js/common.js --- a/mp-wp/wp-admin/js/common.js 02cc5e2d1b6c577857523f3eaaa1637cfeb34133e5b129c221df09c535285721ad8ab72a72e3be80daeb683c3cf66f4206f1ccf9755ac780f30240b2fafb6209 +++ b/mp-wp/wp-admin/js/common.js e47932af030e1a7055a8e3a8d649999819fbfb685a92349e5ee9a83f6225741cb39f92102fc23241c892d679d7f2e8b2af87d28b12fc9474d773a8f81cae007d @@ -364,32 +364,3 @@ } })(jQuery); - - -jQuery(document).ready(function($){ - if ( 'undefined' != typeof google && google.gears ) return; - - var gf = false; - if ( 'undefined' != typeof GearsFactory ) { - gf = new GearsFactory(); - } else { - try { - gf = new ActiveXObject('Gears.Factory'); - if ( factory.getBuildInfo().indexOf('ie_mobile') != -1 ) - gf.privateSetGlobalObject(this); - } catch (e) { - if ( ( 'undefined' != typeof navigator.mimeTypes ) && navigator.mimeTypes['application/x-googlegears'] ) { - gf = document.createElement("object"); - gf.style.display = "none"; - gf.width = 0; - gf.height = 0; - gf.type = "application/x-googlegears"; - document.documentElement.appendChild(gf); - } - } - } - if ( gf && gf.hasPermission ) - return; - - $('.turbo-nag').show(); -}); diff -uNr a/mp-wp/wp-admin/js/editor.js b/mp-wp/wp-admin/js/editor.js --- a/mp-wp/wp-admin/js/editor.js 24cc6e70bbca8677c39551e12424e8a47cf686a81c70fcc3eedba3633f9c5d0ad06f4c946b244110156cf15fd413c513c725eac936d570396be7256a73146e3c +++ b/mp-wp/wp-admin/js/editor.js false @@ -1,172 +0,0 @@ - -switchEditors = { - - mode : '', - - I : function(e) { - return document.getElementById(e); - }, - - edInit : function() { - var h = tinymce.util.Cookie.getHash("TinyMCE_content_size"), H = this.I('edButtonHTML'), P = this.I('edButtonPreview'); - - // Activate TinyMCE if it's the user's default editor - if ( getUserSetting( 'editor' ) == 'html' ) { - if ( h ) - try { this.I('content').style.height = h.ch - 30 + 'px'; } catch(e){}; - } else { - try { - this.I("quicktags").style.display = "none"; - } catch(e){}; - tinyMCE.execCommand("mceAddControl", false, "content"); - } - }, - - saveCallback : function(el, content, body) { - - if ( tinyMCE.activeEditor.isHidden() ) - content = this.I(el).value; - else - content = this.pre_wpautop(content); - - return content; - }, - - pre_wpautop : function(content) { - // We have a TON of cleanup to do. Line breaks are already stripped. - - // Protect pre|script tags - content = content.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) { - a = a.replace(/
    [\r\n]*/g, ''); - return a.replace(/<\/?p( [^>]*)?>[\r\n]*/g, ''); - }); - - // Pretty it up for the source editor - var blocklist1 = 'blockquote|ul|ol|li|table|thead|tbody|tr|th|td|div|h[1-6]|p'; - content = content.replace(new RegExp('\\s*\\s*', 'mg'), '\n'); - content = content.replace(new RegExp('\\s*<(('+blocklist1+')[^>]*)>', 'mg'), '\n<$1>'); - - // Mark

    if it has any attributes. - content = content.replace(new RegExp('(

    ]+>.*?)

    ', 'mg'), '$1'); - - // Sepatate
    containing

    - content = content.replace(new RegExp(']*)>\\s*

    ', 'mgi'), '\n\n'); - - // Remove

    and
    - content = content.replace(new RegExp('\\s*

    ', 'mgi'), ''); - content = content.replace(new RegExp('\\s*

    \\s*', 'mgi'), '\n\n'); - content = content.replace(new RegExp('\\n\\s*\\n', 'mgi'), '\n\n'); - content = content.replace(new RegExp('\\s*
    \\s*', 'gi'), '\n'); - - // Fix some block element newline issues - content = content.replace(new RegExp('\\s*\\s*', 'mg'), '
    \n'); - content = content.replace(new RegExp('\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*', 'gi'), '\n\n[caption$1[/caption]\n\n'); - content = content.replace(new RegExp('caption\\]\\n\\n+\\[caption', 'g'), 'caption]\n\n[caption'); - - var blocklist2 = 'blockquote|ul|ol|li|table|thead|tr|th|td|h[1-6]|pre'; - content = content.replace(new RegExp('\\s*<(('+blocklist2+') ?[^>]*)\\s*>', 'mg'), '\n<$1>'); - content = content.replace(new RegExp('\\s*\\s*', 'mg'), '\n'); - content = content.replace(new RegExp(']*)>', 'g'), '\t'); - - if ( content.indexOf(']*)>\\s*', 'mg'), ""); - content = content.replace(new RegExp('\\s*\\s*', 'mg'), ''); - } - - // Unmark special paragraph closing tags - content = content.replace(new RegExp('', 'g'), '

    \n'); - content = content.replace(new RegExp('\\s*(

    ]+>.*

    )', 'mg'), '\n$1'); - - // Trim whitespace - content = content.replace(new RegExp('^\\s*', ''), ''); - content = content.replace(new RegExp('[\\s\\u00a0]*$', ''), ''); - - // put back the line breaks in pre|script - content = content.replace(//g, '\n'); - - // Hope. - return content; - }, - - go : function(id, mode) { - id = id || 'content'; - mode = mode || this.mode || ''; - - var ed = tinyMCE.get(id) || false; - var qt = this.I('quicktags'); - var H = this.I('edButtonHTML'); - var P = this.I('edButtonPreview'); - var ta = this.I(id); - - if ( 'tinymce' == mode ) { - - if ( ed && ! ed.isHidden() ) - return false; - - this.mode = 'html'; - ta.style.color = '#fff'; - - P.className = 'active'; - H.className = ''; - edCloseAllTags(); // :-( - - qt.style.display = 'none'; - - ta.value = this.wpautop(ta.value); - - if ( ed ) ed.show(); - else tinyMCE.execCommand("mceAddControl", false, id); - - setUserSetting( 'editor', 'tinymce' ); - } else { - if ( ! ed || ed.isHidden() ) - return false; - - this.mode = 'tinymce'; - H.className = 'active'; - P.className = ''; - - ta.style.height = ed.getContentAreaContainer().offsetHeight + 6 + 'px'; - - ed.hide(); - qt.style.display = 'block'; - - ta.style.color = ''; - setUserSetting( 'editor', 'html' ); - } - return false; - }, - - wpautop : function(pee) { - var blocklist = 'table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|address|math|p|h[1-6]'; - - pee = pee + "\n\n"; - pee = pee.replace(new RegExp('
    \\s*
    ', 'gi'), "\n\n"); - pee = pee.replace(new RegExp('(<(?:'+blocklist+')[^>]*>)', 'gi'), "\n$1"); - pee = pee.replace(new RegExp('()', 'gi'), "$1\n\n"); - pee = pee.replace(new RegExp("\\r\\n|\\r", 'g'), "\n"); - pee = pee.replace(new RegExp("\\n\\s*\\n+", 'g'), "\n\n"); - pee = pee.replace(new RegExp('([\\s\\S]+?)\\n\\n', 'mg'), "

    $1

    \n"); - pee = pee.replace(new RegExp('

    \\s*?

    ', 'gi'), ''); - pee = pee.replace(new RegExp('

    \\s*(]*>)\\s*

    ', 'gi'), "$1"); - pee = pee.replace(new RegExp("

    (", 'gi'), "$1"); - pee = pee.replace(new RegExp('

    \\s*]*)>', 'gi'), "

    "); - pee = pee.replace(new RegExp('\\s*

    ', 'gi'), '

    '); - pee = pee.replace(new RegExp('

    \\s*(]*>)', 'gi'), "$1"); - pee = pee.replace(new RegExp('(]*>)\\s*

    ', 'gi'), "$1"); - pee = pee.replace(new RegExp('\\s*\\n', 'gi'), "
    \n"); - pee = pee.replace(new RegExp('(]*>)\\s*
    ', 'gi'), "$1"); - pee = pee.replace(new RegExp('
    (\\s*)', 'gi'), '$1'); - pee = pee.replace(new RegExp('(?:

    |
    )*\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*(?:

    |
    )*', 'gi'), '[caption$1[/caption]'); - // pee = pee.replace(new RegExp('^((?: )*)\\s', 'mg'), '$1 '); - - // Fix the pre|script tags - pee = pee.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) { - a = a.replace(/
    [\r\n]*/g, '\n'); - return a.replace(/<\/?p( [^>]*)?>[\r\n]*/g, '\n'); - }); - - return pee; - } -} diff -uNr a/mp-wp/wp-admin/js/gallery.js b/mp-wp/wp-admin/js/gallery.js --- a/mp-wp/wp-admin/js/gallery.js ea8f81f08cb7f4d05f0ac7e3ede78493621ea774e52954ef001b501e22f11d9f8a1dafeaa5f2291c7b175d5514750c68772c703ccc51261848f85a06c1c740e6 +++ b/mp-wp/wp-admin/js/gallery.js 238aa7e252e5c106b396b8eaa65d155d70c48c09e84ba23ab408364962b7fa67f345cbc7c303d6dc47b6d4e64edd71b2522b34793bd9954ee1ba72f64f140dd8 @@ -30,22 +30,11 @@ var w = wpgallery.getWin(); $('#save-all, #gallery-settings').show(); - if ( typeof w.tinyMCE != 'undefined' && w.tinyMCE.activeEditor && ! w.tinyMCE.activeEditor.isHidden() ) { - wpgallery.mcemode = true; - wpgallery.init(); - } else { - $('#insert-gallery').show(); - } + $('#insert-gallery').show(); } }); -jQuery(window).unload( function () { tinymce = tinyMCE = wpgallery = null; } ); // Cleanup - -/* gallery settings */ -var tinymce = null, tinyMCE; - var wpgallery = { - mcemode : false, editor : {}, dom : {}, is_update : false, @@ -55,98 +44,10 @@ return document.getElementById(e); }, - init: function() { - var t = this, li, q, i, it, w = t.getWin(); - - if ( ! t.mcemode ) return; - - li = ('' + document.location.search).replace(/^\?/, '').split('&'); - q = {}; - for (i=0; i|;,]+/g, '_'); // gears beta doesn't allow certain chars in the store name - name = 'wp_' + name.substring(0, 60); // max length of name is 64 chars - - return name; - }, - - message : function(show) { - var t = this, msg1 = t.I('gears-msg1'), msg2 = t.I('gears-msg2'), msg3 = t.I('gears-msg3'), msg4 = t.I('gears-msg4'), num = t.I('gears-upd-number'), wait = t.I('gears-wait'); - - if ( ! msg1 ) return; - - if ( 'undefined' != typeof google && google.gears ) { - if ( show && show == 4 ) { - msg1.style.display = msg2.style.display = msg3.style.display = 'none'; - msg4.style.display = 'block'; - } else if ( google.gears.factory.hasPermission ) { - msg1.style.display = msg2.style.display = msg4.style.display = 'none'; - msg3.style.display = 'block'; - - if ( 'undefined' == typeof store ) - t.createStore(); - - store.oncomplete = function(){wait.innerHTML = (' ' + wpGearsL10n.updateCompleted);}; - store.onerror = function(){wait.innerHTML = (' ' + wpGearsL10n.error + ' ' + store.lastErrorMessage);}; - store.onprogress = function(e){if(num) num.innerHTML = (' ' + e.filesComplete + ' / ' + e.filesTotal);}; - } else { - msg1.style.display = msg3.style.display = msg4.style.display = 'none'; - msg2.style.display = 'block'; - } - } - }, - - I : function(id) { - return document.getElementById(id); - } -}; - -(function() { - if ( 'undefined' != typeof google && google.gears ) return; - - var gf = false; - if ( 'undefined' != typeof GearsFactory ) { - gf = new GearsFactory(); - } else { - try { - gf = new ActiveXObject('Gears.Factory'); - if ( factory.getBuildInfo().indexOf('ie_mobile') != -1 ) - gf.privateSetGlobalObject(this); - } catch (e) { - if ( ( 'undefined' != typeof navigator.mimeTypes ) && navigator.mimeTypes['application/x-googlegears'] ) { - gf = document.createElement("object"); - gf.style.display = "none"; - gf.width = 0; - gf.height = 0; - gf.type = "application/x-googlegears"; - document.documentElement.appendChild(gf); - } - } - } - - if ( ! gf ) return; - if ( 'undefined' == typeof google ) google = {}; - if ( ! google.gears ) google.gears = { factory : gf }; -})(); diff -uNr a/mp-wp/wp-admin/menu.php b/mp-wp/wp-admin/menu.php --- a/mp-wp/wp-admin/menu.php baf069ea7741c8752db52f31bb8b7dfa4f509cacc56a42e39c52c70411f270d289eb7d67156ad07e2502ccd496d3c7e7fcd0fa182de59cca6a47ba287510e1b3 +++ b/mp-wp/wp-admin/menu.php 38e5575a69fdf003a721791a120bd47e1568e85409f9450f9cad69bb6cc18f96b99eabcbb4342c25c051d5268903442449b4dfc232ee9f2139dc77be9788f6a1 @@ -84,10 +84,8 @@ } $menu[55] = array( __('Tools'), 'manage_options', 'tools.php', '', 'menu-top', 'menu-tools', 'div' ); - $submenu['tools.php'][5] = array( __('Tools'), 'read', 'tools.php' ); $submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' ); $submenu['tools.php'][15] = array( __('Export'), 'import', 'export.php' ); - $submenu['tools.php'][20] = array( __('Upgrade'), 'install_plugins', 'update-core.php'); $menu[60] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top', 'menu-settings', 'div' ); $submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php'); diff -uNr a/mp-wp/wp-admin/page-new.php b/mp-wp/wp-admin/page-new.php --- a/mp-wp/wp-admin/page-new.php 1c4b42cd7b11d6411ba3723f0a341c8919bdfbd940fbb26a58357d58106c2d60110bf692b246387d4df3fa12e90ae80425f1dce5cb72104219882ad249ce5095 +++ b/mp-wp/wp-admin/page-new.php 03e2d59cf4e78dbcf4645dc9c610d571eb929d621c537bae791426924ccb0fb68804ad63a0a08fc28c12058217d0db5c0e63a18670831f43277672d966741b40 @@ -13,8 +13,6 @@ $editing = true; wp_enqueue_script('autosave'); wp_enqueue_script('page'); -if ( user_can_richedit() ) - wp_enqueue_script('editor'); add_thickbox(); wp_enqueue_script('media-upload'); wp_enqueue_script('word-count'); diff -uNr a/mp-wp/wp-admin/page.php b/mp-wp/wp-admin/page.php --- a/mp-wp/wp-admin/page.php 042ea279bad11e69d38bb0587087e58500aa3f626ac8fe19c0c34f11e4243fe2cda0028483523947177d7359e563f6946abe4501c1658c33140ca7eb24e81cec +++ b/mp-wp/wp-admin/page.php 39f36e5f74970dd9f50e5c6ef0ac4e4c861a7051d932ee934b512f1511ead45bc1154b77a804f2f4411b6dc9a7281df3b7a7d332e185fdd9d57e005bbae8b147 @@ -106,8 +106,6 @@ } wp_enqueue_script('page'); - if ( user_can_richedit() ) - wp_enqueue_script('editor'); add_thickbox(); wp_enqueue_script('media-upload'); wp_enqueue_script('word-count'); diff -uNr a/mp-wp/wp-admin/plugins.php b/mp-wp/wp-admin/plugins.php --- a/mp-wp/wp-admin/plugins.php 0e9668b51dc2967d2956459b4f098e9cb06b507f03a6b61b15bdad80ad3e368f032edcd4e80b819a03bc6b1e46350fed3fe845e6247f547689b878a67d146c57 +++ b/mp-wp/wp-admin/plugins.php 954ab7dc135abba9b25af8dabaeadaaf7408ddce076578572097832e83aee55ff27350822d39a773141b2f1487555cb54ae6a28ed16f0b74a03e78c772205bcb @@ -87,7 +87,6 @@ check_admin_referer('bulk-manage-plugins'); $plugins = $_REQUEST['checked']; //$_POST = from the plugin form; $_GET = from the FTP details screen. - include(ABSPATH . 'wp-admin/update.php'); $title = __('Delete Plugin'); $parent_file = 'plugins.php'; diff -uNr a/mp-wp/wp-admin/post-new.php b/mp-wp/wp-admin/post-new.php --- a/mp-wp/wp-admin/post-new.php f1d1f2b97df3b495496b715ecaaaa495510402068254edf23c7c29c5c0775865e6240b01a4512b12208809b34c3eb77077ad8676f1b673e2ab47b2fcabcff638 +++ b/mp-wp/wp-admin/post-new.php 570352a7a904f4bb9efe9f23f8331c9233168ee572dcddb4a804802905a302c1a3988a0c3270078321275ca5617225278fe0c3ae8c2695816b94c6f54bf6622e @@ -13,8 +13,6 @@ $editing = true; wp_enqueue_script('autosave'); wp_enqueue_script('post'); -if ( user_can_richedit() ) - wp_enqueue_script('editor'); add_thickbox(); wp_enqueue_script('media-upload'); wp_enqueue_script('word-count'); diff -uNr a/mp-wp/wp-admin/post.php b/mp-wp/wp-admin/post.php --- a/mp-wp/wp-admin/post.php 4180eb3561d61862094aa83349ac50114c38c5e13b406d6c37b4458365ed1a533c8ca04e941249f22428dbb44177e5e01a1a0b5b792c2ece08e36608a157ab1e +++ b/mp-wp/wp-admin/post.php 70ceffb697d263832d4007de3de8d8aed4eaddf8092e2a6ddbe53ba0685f54051d50f8a1ac97281dc7d42317483731c86f2f9093aff529f14e2eba3ffa8ea25c @@ -139,8 +139,6 @@ } wp_enqueue_script('post'); - if ( user_can_richedit() ) - wp_enqueue_script('editor'); add_thickbox(); wp_enqueue_script('media-upload'); wp_enqueue_script('word-count'); diff -uNr a/mp-wp/wp-admin/press-this.php b/mp-wp/wp-admin/press-this.php --- a/mp-wp/wp-admin/press-this.php 2643ce0130a729f633725922235c3c21b1dbcd31dbec8f8954c69e32efe72186af54f8f5c3a2c936ffa9eafae40a2cd126cb88b7e229734198877310e0cf0a60 +++ b/mp-wp/wp-admin/press-this.php false @@ -1,563 +0,0 @@ - $image) - // see if files exist in content - we don't want to upload non-used selected files. - if( strpos($_REQUEST['content'], $image) !== false ) { - $upload = media_sideload_image($image, $post_ID, $_REQUEST['photo_description'][$key]); - - // Replace the POSTED content with correct uploaded ones. - // escape quote for matching - $quoted = preg_quote2($image); - if( !is_wp_error($upload) ) $content = preg_replace('/]*)src=(\"|\')'.$quoted.'(\2)([^>\/]*)\/*>/is', $upload, $content); - } - - // set the post_content and status - $quick['post_status'] = isset($_REQUEST['publish']) ? 'publish' : 'draft'; - $quick['post_content'] = $content; - // error handling for $post - if ( is_wp_error($post_ID)) { - wp_die($id); - wp_delete_post($post_ID); - // error handling for media_sideload - } elseif ( is_wp_error($upload)) { - wp_die($upload); - wp_delete_post($post_ID); - } else { - $quick['ID'] = $post_ID; - wp_update_post($quick); - } - return $post_ID; -} - -// For submitted posts. -if ( 'post' == $_REQUEST['action'] ) { - check_admin_referer('press-this'); - $post_ID = press_it(); - $posted = $post_ID; -} - -// Set Variables -$title = wp_specialchars(aposfix(stripslashes($_GET['t']))); -$selection = trim( aposfix( stripslashes($_GET['s']) ) ); -if ( ! empty($selection) ) { - $selection = preg_replace('/(\r?\n|\r)/', '

    ', $selection); - $selection = '

    '.str_replace('

    ', '', $selection).'

    '; -} -$url = clean_url($_GET['u']); -$image = $_GET['i']; - -if($_REQUEST['ajax']) { -switch ($_REQUEST['ajax']) { - case 'video': ?> - -
    -

    -
    - -

    -
    -
    - - -

    -
    -
    - -
    -
    - -

    - <?php echo attribute_escape(__('Click to insert.')); ?>

    - -

    - - - - -

    -
    -
    - -
    -
    - - -

    -
    -
    - -
    -
    - -

    |

    - ]*)src=(\"|\')([^<>]+?\.(png|jpeg|jpg|jpe|gif))[^<>\'\"]*(\2)([^>\/]*)\/*>/is'; - preg_match_all($pattern, $content, $matches); - if ( empty($matches[0]) ) - return ''; - $sources = array(); - foreach ($matches[3] as $src) { - // if no http in url - if(strpos($src, 'http') === false) - // if it doesn't have a relative uri - if( strpos($src, '../') === false && strpos($src, './') === false && strpos($src, '/') === 0) - $src = 'http://'.str_replace('//','/', $host['host'].'/'.$src); - else - $src = 'http://'.str_replace('//','/', $host['host'].'/'.dirname($host['path']).'/'.$src); - $sources[] = clean_url($src); - } - return "'" . implode("','", $sources) . "'"; - } - $url = urldecode($url); - $url = str_replace(' ', '%20', $url); - echo 'new Array('.get_images_from_uri($url).')'; - - break; - - case 'photo_js': ?> - // gather images and load some default JS - var last = null - var img, img_tag, aspect, w, h, skip, i, strtoappend = ""; - var my_src = eval( - jQuery.ajax({ - type: "GET", - url: "", - cache : false, - async : false, - data: "ajax=photo_images&u=", - dataType : "script" - }).responseText - ); - if(my_src.length == 0) { - var my_src = eval( - jQuery.ajax({ - type: "GET", - url: "", - cache : false, - async : false, - data: "ajax=photo_images&u=", - dataType : "script" - }).responseText - ); - if(my_src.length == 0) { - strtoappend = ''; - } - } - - for (i = 0; i < my_src.length; i++) { - img = new Image(); - img.src = my_src[i]; - img_attr = 'id="img' + i + '"'; - skip = false; - - maybeappend = ''; - - if (img.width && img.height) { - if (img.width >= 30 && img.height >= 30) { - aspect = img.width / img.height; - scale = (aspect > 1) ? (71 / img.width) : (71 / img.height); - - w = img.width; - h = img.height; - - if (scale < 1) { - w = parseInt(img.width * scale); - h = parseInt(img.height * scale); - } - img_attr += ' style="width: ' + w + 'px; height: ' + h + 'px;"'; - strtoappend += maybeappend; - } - } else { - strtoappend += maybeappend; - } - } - - function pick(img, desc) { - if (img) { - if('object' == typeof jQuery('.photolist input') && jQuery('.photolist input').length != 0) length = jQuery('.photolist input').length; - if(length == 0) length = 1; - jQuery('.photolist').append(''); - jQuery('.photolist').append(''); - insert_editor( "\n\n" + encodeURI('

    ' + desc + '

    ')); - } - return false; - } - - function image_selector() { - tb_remove(); - desc = jQuery('#this_photo_description').val(); - src = jQuery('#this_photo').val(); - pick(src, desc); - jQuery('#extra_fields').hide(); - jQuery('#extra_fields').html(''); - return false; - } - - jQuery(document).ready(function() { - jQuery('#extra_fields').html('

    Photo ()

    '); - jQuery('.close').click(function() { - jQuery('#extra_fields').hide(); - jQuery('#extra_fields').html(''); - }); - jQuery('.refresh').click(function() { - show('photo'); - }); - jQuery('#img_container').html(strtoappend); - jQuery('#photo_add_url').attr('href', '?ajax=photo_thickbox_url&height=200&width=500'); - tb_init('#extra_fields .thickbox'); - - - }); - - - > - - - <?php _e('Press This') ?> - - - - - - -
    -
    -
    -
    -

    - - - - - - - - -
    - -
    -

    -
    - -
    -
      - ID, false, false, $popular_ids) ?> -
    -
    - -
    - -

    - - 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?> - - - -

    -
    -
    -
    - -
    -

    -
    - -
    - - -
    -
    -
    -
    -
    -

    -
    -

    - - - -

    -
    -
    -
    -
    - -
    - -

    | |

    - - -
    -
    - -
    -
    - - - -
    -
      -
    • - Add: -<?php _e('Insert an Image'); ?> -
    • -
    • - <?php _e('Embed a Video'); ?> -
    • - -
    • - - - - -
      -
    • - -
    -
    -
    - -
    -
    -
    -
    -
    - - diff -uNr a/mp-wp/wp-admin/rtl.css b/mp-wp/wp-admin/rtl.css --- a/mp-wp/wp-admin/rtl.css ab9776f9cb4c99b3d729b0fb471304bda9d27e3aa53058d7c7ee801a3ee4c9f55b4d8675c364cf372f2f35a55b0f19cdee876dae483f6a1e204696bb07922990 +++ b/mp-wp/wp-admin/rtl.css 52a0de9489cbfd0a34141cd595c031436cd52828943bdccfd02bdf6be0506a2ba2473667a73bea012a0801a872d66a7ff4924c7f5290575f03e7a968410c9179 @@ -201,10 +201,6 @@ .form-table table.color-palette { float: right; } -#profile-page .form-table #rich_editing { - margin-right: 0; - margin-left: 5px; -} /* Post Screen */ /* 1300 - 1500 =================================== */ @@ -261,9 +257,6 @@ right: auto; left: 10px; } -.wp_themeSkin tr.mceFirst td.mceToolbar { - background-position: right top; -} #poststuff #edButtonPreview, #poststuff #edButtonHTML { margin: 5px 0 0 5px; @@ -529,11 +522,6 @@ padding-left: 0; padding-right: 25px; } -/* TinyMCE -=================================== */ -.clearlooks2 .mceTop .mceLeft { - width:100% !important; -} /* ltr =================================== */ #author-email, #author-url, #rss-url-1, #edit-slug-box, #post_name, #trackback_url, #metakeyinput, #post_password, #slug, #category_nicename, #link_url, #link_image, #rss_uri, #menu_order, #email, #newcomment_author_url, #pages-exclude, #template textarea, #user_login, #url, #pass1, #pass2, #aim, #yim, #jabber, #siteurl, #home, #admin_email, #gmt_offset, #default_post_edit_rows, #mailserver_url, #mailserver_login, #mailserver_pass, #mailserver_port, #ping_sites, #posts_per_page, #posts_per_rss, #blog_charset, #close_comments_days_old, #comments_per_page, #comment_max_links, #moderation_keys, #blacklist_keys, #thumbnail_size_w, #thumbnail_size_h, #medium_size_w, #medium_size_h, #large_size_w, #large_size_h, #permalink_structure, #category_base, #tag_base, #upload_path, #upload_url_path, #rules { diff -uNr a/mp-wp/wp-admin/themes.php b/mp-wp/wp-admin/themes.php --- a/mp-wp/wp-admin/themes.php 16023917f295e698f79c150ee79d54ac67115f2974bb25427927914748ff5873c5072dc3f7c7f30f7e78228d10a9751b0c2a600fb40f8a701aceb1a1b88396a8 +++ b/mp-wp/wp-admin/themes.php 70e37396b6d1248880f83859c3639df7ea4e8c863bb1760466d73f86c8230c079edfce08c8a4d2de557af801965a5e0e1afca46b2ee28992d201201f84c94925 @@ -61,42 +61,6 @@ $themes = array_slice( $themes, $start, $per_page ); -/** - * Check if there is an update for a theme available. - * - * Will display link, if there is an update available. - * - * @since 2.7.0 - * - * @param object $theme Theme data object. - * @return bool False if no valid info was passed. - */ -function theme_update_available( $theme ) { - static $themes_update; - if ( !isset($themes_update) ) - $themes_update = get_option('update_themes'); - - if ( is_object($theme) && isset($theme->stylesheet) ) - $stylesheet = $theme->stylesheet; - elseif ( is_array($theme) && isset($theme['Stylesheet']) ) - $stylesheet = $theme['Stylesheet']; - else - return false; //No valid info passed. - - if ( isset($themes_update->response[ $stylesheet ]) ) { - $update = $themes_update->response[ $stylesheet ]; - $details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list. - $update_url = wp_nonce_url('update.php?action=upgrade-theme&theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet); - - if ( ! current_user_can('update_themes') ) - printf( __('

    There is a new version of %1$s available. View version %3$s Details.

    '), $ct->name, $details_url, $update['new_version']); - else if ( empty($update->package) ) - printf( __('

    There is a new version of %1$s available. View version %3$s Details automatic upgrade unavailable for this theme.

    '), $ct->name, $details_url, $update['new_version']); - else - printf( __('

    There is a new version of %1$s available. View version %3$s Details or upgrade automatically.

    '), $ct->name, $details_url, $update['new_version'], $update_url ); - } -} - ?>
    @@ -118,7 +82,6 @@ tags ) : ?>

    tags); ?>

    -
    @@ -188,7 +151,6 @@

    -
    diff -uNr a/mp-wp/wp-admin/tools.php b/mp-wp/wp-admin/tools.php --- a/mp-wp/wp-admin/tools.php 8c5d968fee3a814b231faaa3a93d6585d01ea66b4db949bdf6831b51db5fb2b7c1e6749cbf2d4a9fa926384b5d125c8a739f8b9617014506bf56fbfc2f169d11 +++ b/mp-wp/wp-admin/tools.php 6662f4e73224d9c0bff37b298d074b232aed9cecb2f3798af25cbe158ef9c4dde079df09fcad771676fd6c6cfec56cdd4bf014788912d97caedc09661c3d888b @@ -10,7 +10,6 @@ require_once('admin.php'); $title = __('Tools'); -wp_enqueue_script( 'wp-gears' ); require_once('admin-header.php'); @@ -19,74 +18,6 @@

    -
    - -
    -

    -


    -

    -

    -

    -
    -
    - - - - - - - - -
    - - -
    -

    -

    - -

    -

    -

    -
    -
    locale ? - $update->current : sprintf("%s–%s", $update->current, $update->locale); - $current = false; - if ( !isset($update->response) || 'latest' == $update->response ) - $current = true; - $submit = __('Upgrade Automatically'); - $form_action = 'update-core.php?action=do-core-upgrade'; - if ( 'development' == $update->response ) { - $message = __('You are using a development version of WordPress. You can upgrade to the latest nightly build automatically or download the nightly build and install it manually:'); - $download = __('Download nightly build'); - } else { - if ( $current ) { - $message = sprintf(__('You have the latest version of WordPress. You do not need to upgrade. However, if you want to re-install version %s, you can do so automatically or download the package and re-install manually:'), $version_string); - $submit = __('Re-install Automatically'); - $form_action = 'update-core.php?action=do-core-reinstall'; - } else { - $message = sprintf(__('You can upgrade to version %s automatically or download the package and install it manually:'), $version_string); - } - $download = sprintf(__('Download %s'), $version_string); - } - - echo '

    '; - echo $message; - echo '

    '; - echo '
    '; - wp_nonce_field('upgrade-core'); - echo '

    '; - echo ' '; - echo ''; - echo ''; - echo '' . $download . ' '; - if ( 'en_US' != $update->locale ) - if ( !isset( $update->dismissed ) || !$update->dismissed ) - echo ''; - else - echo ''; - echo '

    '; - echo '
    '; - -} - -function dismissed_updates() { - $dismissed = get_core_updates( array( 'dismissed' => true, 'available' => false ) ); - if ( $dismissed ) { - - $show_text = js_escape(__('Show hidden updates')); - $hide_text = js_escape(__('Hide hidden updates')); - ?> - - '.__('Show hidden updates').'

    '; - echo '
      '; - foreach( (array) $dismissed as $update) { - echo '
    • '; - list_core_update( $update ); - echo '
    • '; - } - echo '
    '; - } -} - -/** - * Display upgrade WordPress for downloading latest or upgrading automatically form. - * - * @since 2.7 - * - * @return null - */ -function core_upgrade_preamble() { - $updates = get_core_updates(); -?> -
    - -

    -response) || 'latest' == $updates[0]->response ) { - echo '

    '; - _e('You have the latest version of WordPress. You do not need to upgrade'); - echo '

    '; - } else { - echo '

    '; - _e('Important: before upgrading, please backup your database and files.'); - echo '

    '; - - echo '

    '; - _e( 'There is a new version of WordPress available for upgrade' ); - echo '

    '; - } - - echo '
      '; - $alternate = true; - foreach( (array) $updates as $update ) { - $class = $alternate? ' class="alternate"' : ''; - $alternate = !$alternate; - echo "
    • "; - list_core_update( $update ); - echo '
    • '; - } - echo '
    '; - dismissed_updates(); - echo '
    '; -} - - -/** - * Upgrade WordPress core display. - * - * @since 2.7 - * - * @return null - */ -function do_core_upgrade( $reinstall = false ) { - global $wp_filesystem; - - $url = wp_nonce_url('update-core.php?action=do-core-upgrade', 'upgrade-core'); - if ( false === ($credentials = request_filesystem_credentials($url)) ) - return; - - $version = isset( $_POST['version'] )? $_POST['version'] : false; - $locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US'; - $update = find_core_update( $version, $locale ); - if ( !$update ) - return; - - - if ( ! WP_Filesystem($credentials) ) { - request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again - return; - } -?> -
    - -

    -errors->get_error_code() ) { - foreach ( $wp_filesystem->errors->get_error_messages() as $message ) - show_message($message); - echo '
    '; - return; - } - - if ( $reinstall ) - $update->response = 'reinstall'; - - $result = wp_update_core($update, 'show_message'); - - if ( is_wp_error($result) ) { - show_message($result); - if ('up_to_date' != $result->get_error_code() ) - show_message( __('Installation Failed') ); - } else { - show_message( __('WordPress upgraded successfully') ); - } - echo '
    '; -} - -function do_dismiss_core_update() { - $version = isset( $_POST['version'] )? $_POST['version'] : false; - $locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US'; - $update = find_core_update( $version, $locale ); - if ( !$update ) - return; - dismiss_core_update( $update ); - wp_redirect( wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core') ); -} - -function do_undismiss_core_update() { - $version = isset( $_POST['version'] )? $_POST['version'] : false; - $locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US'; - $update = find_core_update( $version, $locale ); - if ( !$update ) - return; - undismiss_core_update( $version, $locale ); - wp_redirect( wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core') ); -} - -$action = isset($_GET['action']) ? $_GET['action'] : 'upgrade-core'; - -if ( 'upgrade-core' == $action ) { - $title = __('Upgrade WordPress'); - $parent_file = 'tools.php'; - require_once('admin-header.php'); - core_upgrade_preamble(); - include('admin-footer.php'); -} elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) { - check_admin_referer('upgrade-core'); - $title = __('Upgrade WordPress'); - $parent_file = 'tools.php'; - // do the (un)dismiss actions before headers, - // so that they can redirect - if ( isset( $_POST['dismiss'] ) ) - do_dismiss_core_update(); - elseif ( isset( $_POST['undismiss'] ) ) - do_undismiss_core_update(); - require_once('admin-header.php'); - if ( 'do-core-reinstall' == $action ) - $reinstall = true; - else - $reinstall = false; - if ( isset( $_POST['upgrade'] ) ) - do_core_upgrade($reinstall); - include('admin-footer.php'); - -}?> diff -uNr a/mp-wp/wp-admin/update.php b/mp-wp/wp-admin/update.php --- a/mp-wp/wp-admin/update.php 7e582a66f9a4c19cb30a1b1c62c2d3e546a4022bb66712d13dd21a4c54103e6868f07d538b4688868db221db18fd654f7f7773c0b2ead0cb5fa8e19f2f0df9c3 +++ b/mp-wp/wp-admin/update.php false @@ -1,166 +0,0 @@ -errors->get_error_code() ) - $error = $wp_filesystem->errors; - request_filesystem_credentials($url, '', $error); //Failed to connect, Error and request again - return; - } - - echo '
    '; - echo '

    ' . __('Upgrade Plugin') . '

    '; - if ( $wp_filesystem->errors->get_error_code() ) { - foreach ( $wp_filesystem->errors->get_error_messages() as $message ) - show_message($message); - echo '
    '; - return; - } - - $was_activated = is_plugin_active($plugin); //Check now, It'll be deactivated by the next line if it is - - $result = wp_update_plugin($plugin, 'show_message'); - - if ( is_wp_error($result) ) { - show_message($result); - show_message( __('Plugin upgrade Failed') ); - } else { - $plugin_file = $result; - show_message( __('Plugin upgraded successfully') ); - if( $result && $was_activated ){ - show_message(__('Attempting reactivation of the plugin')); - echo ''; - } - $update_actions = array( - 'activate_plugin' => '' . __('Activate Plugin') . '', - 'plugins_page' => '' . __('Return to Plugins page') . '' - ); - if ( $was_activated ) - unset( $update_actions['activate_plugin'] ); - - $update_actions = apply_filters('update_plugin_complete_actions', $update_actions, $plugin_file); - if ( ! empty($update_actions) ) - show_message('' . __('Actions:') . ' ' . implode(' | ', (array)$update_actions)); - } - echo ''; -} - -/** - * Theme upgrade display. - * - * @since 2.5 - * - * @param string $plugin Plugin - */ -function do_theme_upgrade($theme) { - global $wp_filesystem; - - $url = wp_nonce_url('update.php?action=upgrade-theme&theme=' . urlencode($theme), 'upgrade-plugin_' . urlencode($theme)); - if ( false === ($credentials = request_filesystem_credentials($url)) ) - return; - - if ( ! WP_Filesystem($credentials) ) { - $error = true; - if ( is_object($wp_filesystem) && $wp_filesystem->errors->get_error_code() ) - $error = $wp_filesystem->errors; - request_filesystem_credentials($url, '', $error); //Failed to connect, Error and request again - return; - } - - echo '
    '; - echo '

    ' . __('Upgrade Theme') . '

    '; - if ( $wp_filesystem->errors->get_error_code() ) { - foreach ( $wp_filesystem->errors->get_error_messages() as $message ) - show_message($message); - echo '
    '; - return; - } - - //TODO: Is theme currently active? - $was_current = false; //is_plugin_active($plugin); //Check now, It'll be deactivated by the next line if it is - - $result = wp_update_theme($theme, 'show_message'); - - if ( is_wp_error($result) ) { - show_message($result); - show_message( __('Installation Failed') ); - } else { - //Result is the new plugin file relative to WP_PLUGIN_DIR - show_message( __('Theme upgraded successfully') ); - if( $result && $was_current ){ - show_message(__('Setting theme as Current')); - //TODO: Actually set it as active again. - //echo ''; - } - } - echo ''; -} - -if ( isset($_GET['action']) ) { - $plugin = isset($_GET['plugin']) ? trim($_GET['plugin']) : ''; - $theme = isset($_REQUEST['theme']) ? urldecode($_REQUEST['theme']) : ''; - $action = isset($_GET['action']) ? $_GET['action'] : ''; - - if ( 'upgrade-plugin' == $action ) { - check_admin_referer('upgrade-plugin_' . $plugin); - $title = __('Upgrade Plugin'); - $parent_file = 'plugins.php'; - require_once('admin-header.php'); - do_plugin_upgrade($plugin); - include('admin-footer.php'); - } elseif ('activate-plugin' == $action ) { - check_admin_referer('activate-plugin_' . $plugin); - if( ! isset($_GET['failure']) && ! isset($_GET['success']) ) { - wp_redirect( 'update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] ); - activate_plugin($plugin); - wp_redirect( 'update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] ); - die(); - } - iframe_header( __('Plugin Reactivation'), true ); - if( isset($_GET['success']) ) - echo '

    ' . __('Plugin reactivated successfully.') . '

    '; - - if( isset($_GET['failure']) ){ - echo '

    ' . __('Plugin failed to reactivate due to a fatal error.') . '

    '; - error_reporting( E_ALL ^ E_NOTICE ); - @ini_set('display_errors', true); //Ensure that Fatal errors are displayed. - include(WP_PLUGIN_DIR . '/' . $plugin); - } - iframe_footer(); - } elseif ( 'upgrade-theme' == $action ) { - check_admin_referer('upgrade-theme_' . $theme); - $title = __('Upgrade Theme'); - $parent_file = 'themes.php'; - require_once('admin-header.php'); - do_theme_upgrade($theme); - include('admin-footer.php'); - } -} - -?> diff -uNr a/mp-wp/wp-admin/upgrade-functions.php b/mp-wp/wp-admin/upgrade-functions.php --- a/mp-wp/wp-admin/upgrade-functions.php 730310d9d952df9e6944f5d2695133378e26a1e9022d95a64dc7178eff7df3aa145a00257d29bd7f514827e6a97522500ad49e6a6d4cba550862cc0b4dc89e55 +++ b/mp-wp/wp-admin/upgrade-functions.php false @@ -1,13 +0,0 @@ - diff -uNr a/mp-wp/wp-admin/upgrade.php b/mp-wp/wp-admin/upgrade.php --- a/mp-wp/wp-admin/upgrade.php f6e6a392e2f2c519c7593233026ff624c7309eb468c101ba2d98fad3ddfeb29044f2198d6fa7b286d539a4d61f599b99db4c5953010e267e21ab8f8658c11fe6 +++ b/mp-wp/wp-admin/upgrade.php false @@ -1,95 +0,0 @@ - - -> - - - <?php _e('WordPress › Upgrade'); ?> - - - -

    WordPress

    - - - -

    -

    -

    - - -

    -

    -

    -

    - -

    -

    -

    - - - - - - diff -uNr a/mp-wp/wp-admin/user-edit.php b/mp-wp/wp-admin/user-edit.php --- a/mp-wp/wp-admin/user-edit.php bd680733b9a2364a0cf4391c935f575cdf48c2f5a4dbde611521b1928df6a81f9575b0fb45828558540230db415a24d5363e0902188b82b4aff5d23a12b0c144 +++ b/mp-wp/wp-admin/user-edit.php a324350a555e58f3b0ad3f90eb42221f7c16672925a02c1714573e2141ca4fa7fb36105906c98b1c60eba1a3a9eac655f5d841e361a81cfe17a29d4330cc0825 @@ -192,12 +192,6 @@

    - - - - - - 1 ) : ?> diff -uNr a/mp-wp/wp-admin/wp-admin.css b/mp-wp/wp-admin/wp-admin.css --- a/mp-wp/wp-admin/wp-admin.css 1ab49847eeba691f62e24fc1081784a4241c271c49f7dcad7608a75b73069bfd2d311208a44128d92c0b40b2c2224c1a3272d52c76eca75ba0dc51b7567a04ff +++ b/mp-wp/wp-admin/wp-admin.css 310db6ed07d6f444552841e3bcaca5c4b8841e1488d1cb17074d3fc09e98af2a369013d7ed258ad787a7f9a519b15caea536271f06c126dad14019a170b80240 @@ -591,10 +591,6 @@ font-size: 22px; } -#your-profile #rich_editing { - border: none; -} - #howto { font-size: 11px; margin: 0 5px; @@ -1227,10 +1223,6 @@ width: 300px; } -#profile-page .form-table #rich_editing { - margin-right: 5px -} - .form-table .pre { padding: 8px; margin: 0; @@ -1387,20 +1379,6 @@ border: none; } -#post-body-content .wp_themeSkin .mceStatusbar a.mceResize { - display: block; - float: right; - background: transparent url(images/resize.svg) no-repeat scroll right bottom; - width: 12px; - height: 12px; - cursor: se-resize; - margin: 0 2px; - position: relative; - right: 0; - top: 31px; -} - - #pagesubmitdiv div.inside, #linksubmitdiv div.inside, div.inside { @@ -1670,14 +1648,6 @@ height: 30px; } -.wp_themeSkin tr.mceFirst td.mceToolbar { - background-image: url("images/ed-bg.svg"); - background-position: left top; - background-repeat: repeat-x; - border-width: 0 0 1px; - border-style: none none solid; -} - #poststuff #edButtonPreview, #poststuff #edButtonHTML { display: block; diff -uNr a/mp-wp/wp-content/themes/default/footer.php b/mp-wp/wp-content/themes/default/footer.php --- a/mp-wp/wp-content/themes/default/footer.php f73f685a504e7d9267eae21fe6186e83a7a640e732e3c765d65c63fd8704d485b4ae1487cec8889a5394eb36a505f5e2a278ed8a708a92d0499998470b3b167f +++ b/mp-wp/wp-content/themes/default/footer.php acdc1e30a585923e1b0879e650e51185df6faaf999e79ba34c37cf360181ed4a5d67e2d53e4a510c3f4958f776284b865b302130451c548a067dc5efca8fd575 @@ -10,7 +10,7 @@

    is proudly powered by - WordPress + mp-wp
    Entries (RSS) and Comments (RSS). diff -uNr a/mp-wp/wp-includes/default-filters.php b/mp-wp/wp-includes/default-filters.php --- a/mp-wp/wp-includes/default-filters.php 1c4df56d9e66f982be8931e6348b4df29ec552b250dc985c6e35639137c2aad09ddf71c031ec2b7fcdc62cf05853de091c666ac8b4c4adf7cfd37798e3c96c6d +++ b/mp-wp/wp-includes/default-filters.php 5daadbb5362bff123f3858e455008789291800b0066f27ee232320298278f4acab93b2b03ccf39704c5b953e8e7dd8e5d382dc7866c6007825af3bdd5db5c6af @@ -146,7 +146,6 @@ add_filter('option_blog_charset', 'wp_specialchars'); add_filter('option_home', '_config_wp_home'); add_filter('option_siteurl', '_config_wp_siteurl'); -add_filter('tiny_mce_before_init', '_mce_set_direction'); add_filter('pre_kses', 'wp_pre_kses_less_than'); add_filter('sanitize_title', 'sanitize_title_with_dashes'); add_action('check_comment_flood', 'check_comment_flood_db', 10, 3); diff -uNr a/mp-wp/wp-includes/deprecated.php b/mp-wp/wp-includes/deprecated.php --- a/mp-wp/wp-includes/deprecated.php b37f522ed5f64513ec5541c578d7b238b219118f616b98964236c1cd8267c5633000a27a2602e90dc68337d6c3b823901dcd8dbdacbc2a0417c166b9832e3654 +++ b/mp-wp/wp-includes/deprecated.php 70f855dacd4c0cb42bf3987c348d079b8959698f44d25235d47610d5eefc8e46959451715e67e608982be91c9452002a349a3c7c235e8491e8da04997d51452c @@ -747,18 +747,6 @@ } /** - * @since 2.1 - * @deprecated Use wp_print_scripts() or WP_Scripts. - * @see wp_print_scripts() - * @see WP_Scripts - */ -function tinymce_include() { - _deprecated_function(__FUNCTION__, '0.0', 'wp_print_scripts()/WP_Scripts'); - - wp_print_script('wp_tiny_mce'); -} - -/** * @since 1.2 * @deprecated Use wp_list_authors() * @see wp_list_authors() diff -uNr a/mp-wp/wp-includes/formatting.php b/mp-wp/wp-includes/formatting.php --- a/mp-wp/wp-includes/formatting.php 10526d3d84bbe766511af25287f01bbe1125a06d18babb93e1b7c33488c1f1df15ea3e706848a67d36c30edac25d3a4dd360bc563ac21093f6bfe0183f9c4388 +++ b/mp-wp/wp-includes/formatting.php 96c9b9b0b8da6f255e10fd47fd4053958417127524a5b8be961e126cce7fde0476bd5c2b20c4580517a75b01e9751636c8dc0c6f250ab8f94dbbe8097057cf67 @@ -775,20 +775,16 @@ /** * Acts on text which is about to be edited. * - * Unless $richedit is set, it is simply a holder for the 'format_to_edit' - * filter. If $richedit is set true htmlspecialchars() will be run on the - * content, converting special characters to HTMl entities. + * Holder for the 'format_to_edit' + * filter. * * @since 0.71 * * @param string $content The text about to be edited. - * @param bool $richedit Whether or not the $content should pass through htmlspecialchars(). Default false. * @return string The text after the filter (and possibly htmlspecialchars()) has been run. */ -function format_to_edit($content, $richedit = false) { +function format_to_edit($content) { $content = apply_filters('format_to_edit', $content); - if (! $richedit ) - $content = htmlspecialchars($content); return $content; } @@ -1616,28 +1612,6 @@ } /** - * Formats text for the rich text editor. - * - * The filter 'richedit_pre' is applied here. If $text is empty the filter will - * be applied to an empty string. - * - * @since 2.0.0 - * - * @param string $text The text to be formatted. - * @return string The formatted text after filter is applied. - */ -function wp_richedit_pre($text) { - // Filtering a blank results in an annoying
    \n - if ( empty($text) ) return apply_filters('richedit_pre', ''); - - $output = convert_chars($text); - $output = wpautop($output); - $output = htmlspecialchars($output, ENT_NOQUOTES); - - return apply_filters('richedit_pre', $output); -} - -/** * Formats text for the HTML editor. * * Unless $output is empty it will pass through htmlspecialchars before the diff -uNr a/mp-wp/wp-includes/functions.php b/mp-wp/wp-includes/functions.php --- a/mp-wp/wp-includes/functions.php f633c2f813adaa7b680ec6f12b1d8bbf1c15e5f942852e67c53924efe9fc5cf74beaa65e1131e3bd7cf11eacce30cd2d8398354fd301eb7084121d62489b205a +++ b/mp-wp/wp-includes/functions.php 421caf82eab0fab79a4e5e0d0d74c06b6e0c590610090cf750ce570e766f322a204d116719e31854b000c9049788512e5eef6c981027bc1fc198f7e7aa6c8951 @@ -2338,35 +2338,6 @@ } /** - * Set the localized direction for MCE plugin. - * - * Will only set the direction to 'rtl', if the WordPress locale has the text - * direction set to 'rtl'. - * - * Fills in the 'directionality', 'plugins', and 'theme_advanced_button1' array - * keys. These keys are then returned in the $input array. - * - * @access private - * @package WordPress - * @subpackage MCE - * @since 2.1.0 - * - * @param array $input MCE plugin array. - * @return array Direction set for 'rtl', if needed by locale. - */ -function _mce_set_direction( $input ) { - global $wp_locale; - - if ( 'rtl' == $wp_locale->text_direction ) { - $input['directionality'] = 'rtl'; - $input['plugins'] .= ',directionality'; - $input['theme_advanced_buttons1'] .= ',ltr'; - } - - return $input; -} - -/** * Convert smiley code to the icon graphic file equivalent. * * You can turn off smilies, by going to the write setting screen and unchecking diff -uNr a/mp-wp/wp-includes/general-template.php b/mp-wp/wp-includes/general-template.php --- a/mp-wp/wp-includes/general-template.php 16c5908a112243d1cd25306b9225b53419e6aebc3d9f235037b77386fed111dcecf69d58699d7cebfaec27e366b4fee8000c46b293030d9c6bbfdcd88498cb77 +++ b/mp-wp/wp-includes/general-template.php b61758ce3944dcc4e0d26b170cac7d65e024b14414aee50de039c9bc0eaa7b909dad56cec1ae40faee7f0cd478cf13b3d92ecd128606e0143f921b717217f88d @@ -1399,77 +1399,12 @@ } /** - * Determine if TinyMCE is available. - * - * Checks to see if the user has deleted the tinymce files to slim down there WordPress install. - * - * @since 2.1.0 - * - * @return bool Whether of not TinyMCE exists. - */ -function rich_edit_exists() { - global $wp_rich_edit_exists; - if ( !isset($wp_rich_edit_exists) ) - $wp_rich_edit_exists = file_exists(ABSPATH . WPINC . '/js/tinymce/tiny_mce.js'); - return $wp_rich_edit_exists; -} - -/** - * Whether or not the user should have a WYSIWIG editor. - * - * Checks that the user requires a WYSIWIG editor and that the editor is - * supported in the users browser. - * - * @since 2.0.0 - * - * @return bool - */ -function user_can_richedit() { - global $wp_rich_edit, $pagenow; - - if ( !isset( $wp_rich_edit) ) { - if ( get_user_option( 'rich_editing' ) == 'true' && - ( ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval($match[1]) >= 420 ) || - !preg_match( '!opera[ /][2-8]|konqueror|safari!i', $_SERVER['HTTP_USER_AGENT'] ) ) - && 'comment.php' != $pagenow ) { - $wp_rich_edit = true; - } else { - $wp_rich_edit = false; - } - } - - return apply_filters('user_can_richedit', $wp_rich_edit); -} - -/** - * Find out which editor should be displayed by default. - * - * Works out which of the two editors to display as the current editor for a - * user. - * - * @since 2.5.0 - * - * @return string Either 'tinymce', or 'html', or 'test' - */ -function wp_default_editor() { - $r = user_can_richedit() ? 'tinymce' : 'html'; // defaults - if ( $user = wp_get_current_user() ) { // look for cookie - $ed = get_user_setting('editor', 'tinymce'); - $r = ( in_array($ed, array('tinymce', 'html', 'test') ) ) ? $ed : $r; - } - return apply_filters( 'wp_default_editor', $r ); // filter -} - -/** - * Display visual editor forms: TinyMCE, or HTML, or both. + * Display HTML editor form. * * The amount of rows the text area will have for the content has to be between * 3 and 100 or will default at 12. There is only one option used for all users, * named 'default_post_edit_rows'. * - * If the user can not use the rich editor (TinyMCE), then the switch button - * will not be displayed. - * * @since 2.1.0 * * @param string $content Textarea content. @@ -1486,26 +1421,11 @@ if ( !current_user_can( 'upload_files' ) ) $media_buttons = false; - $richedit = user_can_richedit(); $rows = "rows='$rows'"; - if ( $richedit || $media_buttons ) { ?> + if ( $media_buttons ) { ?>

    - -
    - - - - - - - +
    @@ -1527,24 +1447,6 @@ - - - blank_page - - - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/langs/wp-langs-en.js b/mp-wp/wp-includes/js/tinymce/langs/wp-langs-en.js --- a/mp-wp/wp-includes/js/tinymce/langs/wp-langs-en.js ca3946ff77e779ead75ef53d27a40dd74ccf7d8ae24823f55c3e9e88404b52e9be0b3b434eb53713ea8da7ccfbceb39792b20cbb1061b35de772124914d60ef2 +++ b/mp-wp/wp-includes/js/tinymce/langs/wp-langs-en.js false @@ -1,431 +0,0 @@ -tinyMCE.addI18n({en:{ -common:{ -edit_confirm:"Do you want to use the WYSIWYG mode for this textarea?", -apply:"Apply", -insert:"Insert", -update:"Update", -cancel:"Cancel", -close:"Close", -browse:"Browse", -class_name:"Class", -not_set:"-- Not set --", -clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.", -clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.", -popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.", -invalid_data:"Error: Invalid values entered, these are marked in red.", -more_colors:"More colors" -}, -contextmenu:{ -align:"Alignment", -left:"Left", -center:"Center", -right:"Right", -full:"Full" -}, -insertdatetime:{ -date_fmt:"%Y-%m-%d", -time_fmt:"%H:%M:%S", -insertdate_desc:"Insert date", -inserttime_desc:"Insert time", -months_long:"January,February,March,April,May,June,July,August,September,October,November,December", -months_short:"Jan_January_abbreviation,Feb_February_abbreviation,Mar_March_abbreviation,Apr_April_abbreviation,May_May_abbreviation,Jun_June_abbreviation,Jul_July_abbreviation,Aug_August_abbreviation,Sep_September_abbreviation,Oct_October_abbreviation,Nov_November_abbreviation,Dec_December_abbreviation", -day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday", -day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat" -}, -print:{ -print_desc:"Print" -}, -preview:{ -preview_desc:"Preview" -}, -directionality:{ -ltr_desc:"Direction left to right", -rtl_desc:"Direction right to left" -}, -layer:{ -insertlayer_desc:"Insert new layer", -forward_desc:"Move forward", -backward_desc:"Move backward", -absolute_desc:"Toggle absolute positioning", -content:"New layer..." -}, -save:{ -save_desc:"Save", -cancel_desc:"Cancel all changes" -}, -nonbreaking:{ -nonbreaking_desc:"Insert non-breaking space character" -}, -iespell:{ -iespell_desc:"Run spell checking", -download:"ieSpell not detected. Do you want to install it now?" -}, -advhr:{ -advhr_desc:"Horizontale rule" -}, -emotions:{ -emotions_desc:"Emotions" -}, -searchreplace:{ -search_desc:"Find", -replace_desc:"Find/Replace" -}, -advimage:{ -image_desc:"Insert/edit image" -}, -advlink:{ -link_desc:"Insert/edit link" -}, -xhtmlxtras:{ -cite_desc:"Citation", -abbr_desc:"Abbreviation", -acronym_desc:"Acronym", -del_desc:"Deletion", -ins_desc:"Insertion", -attribs_desc:"Insert/Edit Attributes" -}, -style:{ -desc:"Edit CSS Style" -}, -paste:{ -paste_text_desc:"Paste as Plain Text", -paste_word_desc:"Paste from Word", -selectall_desc:"Select All" -}, -paste_dlg:{ -text_title:"Use CTRL+V on your keyboard to paste the text into the window.", -text_linebreaks:"Keep linebreaks", -word_title:"Use CTRL+V on your keyboard to paste the text into the window." -}, -table:{ -desc:"Inserts a new table", -row_before_desc:"Insert row before", -row_after_desc:"Insert row after", -delete_row_desc:"Delete row", -col_before_desc:"Insert column before", -col_after_desc:"Insert column after", -delete_col_desc:"Remove column", -split_cells_desc:"Split merged table cells", -merge_cells_desc:"Merge table cells", -row_desc:"Table row properties", -cell_desc:"Table cell properties", -props_desc:"Table properties", -paste_row_before_desc:"Paste table row before", -paste_row_after_desc:"Paste table row after", -cut_row_desc:"Cut table row", -copy_row_desc:"Copy table row", -del:"Delete table", -row:"Row", -col:"Column", -cell:"Cell" -}, -autosave:{ -unload_msg:"The changes you made will be lost if you navigate away from this page." -}, -fullscreen:{ -desc:"Toggle fullscreen mode (Alt+Shift+G)" -}, -media:{ -desc:"Insert / edit embedded media", -delta_width:"0", -delta_height:"0", -edit:"Edit embedded media" -}, -fullpage:{ -desc:"Document properties" -}, -template:{ -desc:"Insert predefined template content" -}, -visualchars:{ -desc:"Visual control characters on/off." -}, -spellchecker:{ -desc:"Toggle spellchecker (Alt+Shift+N)", -menu:"Spellchecker settings", -ignore_word:"Ignore word", -ignore_words:"Ignore all", -langs:"Languages", -wait:"Please wait...", -sug:"Suggestions", -no_sug:"No suggestions", -no_mpell:"No misspellings found." -}, -pagebreak:{ -desc:"Insert page break." -}}}); - -tinyMCE.addI18n("en.advanced",{ -style_select:"Styles", -font_size:"Font size", -fontdefault:"Font family", -block:"Format", -paragraph:"Paragraph", -div:"Div", -address:"Address", -pre:"Preformatted", -h1:"Heading 1", -h2:"Heading 2", -h3:"Heading 3", -h4:"Heading 4", -h5:"Heading 5", -h6:"Heading 6", -blockquote:"Blockquote", -code:"Code", -samp:"Code sample", -dt:"Definition term ", -dd:"Definition description", -bold_desc:"Bold (Ctrl / Alt+Shift + B)", -italic_desc:"Italic (Ctrl / Alt+Shift + I)", -underline_desc:"Underline", -striketrough_desc:"Strikethrough (Alt+Shift+D)", -justifyleft_desc:"Align left (Alt+Shift+L)", -justifycenter_desc:"Align center (Alt+Shift+C)", -justifyright_desc:"Align right (Alt+Shift+R)", -justifyfull_desc:"Align full (Alt+Shift+J)", -bullist_desc:"Unordered list (Alt+Shift+U)", -numlist_desc:"Ordered list (Alt+Shift+O)", -outdent_desc:"Outdent", -indent_desc:"Indent", -undo_desc:"Undo (Ctrl+Z)", -redo_desc:"Redo (Ctrl+Y)", -link_desc:"Insert/edit link (Alt+Shift+A)", -link_delta_width:"0", -link_delta_height:"0", -unlink_desc:"Unlink (Alt+Shift+S)", -image_desc:"Insert/edit image (Alt+Shift+M)", -image_delta_width:"0", -image_delta_height:"0", -cleanup_desc:"Cleanup messy code", -code_desc:"Edit HTML Source", -sub_desc:"Subscript", -sup_desc:"Superscript", -hr_desc:"Insert horizontal ruler", -removeformat_desc:"Remove formatting", -forecolor_desc:"Select text color", -backcolor_desc:"Select background color", -charmap_desc:"Insert custom character", -visualaid_desc:"Toggle guidelines/invisible elements", -anchor_desc:"Insert/edit anchor", -cut_desc:"Cut", -copy_desc:"Copy", -paste_desc:"Paste", -image_props_desc:"Image properties", -newdocument_desc:"New document", -help_desc:"Help", -blockquote_desc:"Blockquote (Alt+Shift+Q)", -clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.", -path:"Path", -newdocument:"Are you sure you want to clear all contents?", -toolbar_focus:"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X", -more_colors:"More colors", -colorpicker_delta_width:"0", -colorpicker_delta_height:"0" -}); - -tinyMCE.addI18n("en.advanced_dlg",{ -about_title:"About TinyMCE", -about_general:"About", -about_help:"Help", -about_license:"License", -about_plugins:"Plugins", -about_plugin:"Plugin", -about_author:"Author", -about_version:"Version", -about_loaded:"Loaded plugins", -anchor_title:"Insert/edit anchor", -anchor_name:"Anchor name", -code_title:"HTML Source Editor", -code_wordwrap:"Word wrap", -colorpicker_title:"Select a color", -colorpicker_picker_tab:"Picker", -colorpicker_picker_title:"Color picker", -colorpicker_palette_tab:"Palette", -colorpicker_palette_title:"Palette colors", -colorpicker_named_tab:"Named", -colorpicker_named_title:"Named colors", -colorpicker_color:"Color:", -colorpicker_name:"Name:", -charmap_title:"Select custom character", -image_title:"Insert/edit image", -image_src:"Image URL", -image_alt:"Image description", -image_list:"Image list", -image_border:"Border", -image_dimensions:"Dimensions", -image_vspace:"Vertical space", -image_hspace:"Horizontal space", -image_align:"Alignment", -image_align_baseline:"Baseline", -image_align_top:"Top", -image_align_middle:"Middle", -image_align_bottom:"Bottom", -image_align_texttop:"Text top", -image_align_textbottom:"Text bottom", -image_align_left:"Left", -image_align_right:"Right", -link_title:"Insert/edit link", -link_url:"Link URL", -link_target:"Target", -link_target_same:"Open link in the same window", -link_target_blank:"Open link in a new window", -link_titlefield:"Title", -link_is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?", -link_is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?", -link_list:"Link list" -}); - -tinyMCE.addI18n("en.media_dlg",{ -title:"Insert / edit embedded media", -general:"General", -advanced:"Advanced", -file:"File/URL", -list:"List", -size:"Dimensions", -preview:"Preview", -constrain_proportions:"Constrain proportions", -type:"Type", -id:"Id", -name:"Name", -class_name:"Class", -vspace:"V-Space", -hspace:"H-Space", -play:"Auto play", -loop:"Loop", -menu:"Show menu", -quality:"Quality", -scale:"Scale", -align:"Align", -salign:"SAlign", -wmode:"WMode", -bgcolor:"Background", -base:"Base", -flashvars:"Flashvars", -liveconnect:"SWLiveConnect", -autohref:"AutoHREF", -cache:"Cache", -hidden:"Hidden", -controller:"Controller", -kioskmode:"Kiosk mode", -playeveryframe:"Play every frame", -targetcache:"Target cache", -correction:"No correction", -enablejavascript:"Enable JavaScript", -starttime:"Start time", -endtime:"End time", -href:"Href", -qtsrcchokespeed:"Choke speed", -target:"Target", -volume:"Volume", -autostart:"Auto start", -enabled:"Enabled", -fullscreen:"Fullscreen", -invokeurls:"Invoke URLs", -mute:"Mute", -stretchtofit:"Stretch to fit", -windowlessvideo:"Windowless video", -balance:"Balance", -baseurl:"Base URL", -captioningid:"Captioning id", -currentmarker:"Current marker", -currentposition:"Current position", -defaultframe:"Default frame", -playcount:"Play count", -rate:"Rate", -uimode:"UI Mode", -flash_options:"Flash options", -qt_options:"Quicktime options", -wmp_options:"Windows media player options", -rmp_options:"Real media player options", -shockwave_options:"Shockwave options", -autogotourl:"Auto goto URL", -center:"Center", -imagestatus:"Image status", -maintainaspect:"Maintain aspect", -nojava:"No java", -prefetch:"Prefetch", -shuffle:"Shuffle", -console:"Console", -numloop:"Num loops", -controls:"Controls", -scriptcallbacks:"Script callbacks", -swstretchstyle:"Stretch style", -swstretchhalign:"Stretch H-Align", -swstretchvalign:"Stretch V-Align", -sound:"Sound", -progress:"Progress", -qtsrc:"QT Src", -qt_stream_warn:"Streamed rtsp resources should be added to the QT Src field under the advanced tab.", -align_top:"Top", -align_right:"Right", -align_bottom:"Bottom", -align_left:"Left", -align_center:"Center", -align_top_left:"Top left", -align_top_right:"Top right", -align_bottom_left:"Bottom left", -align_bottom_right:"Bottom right", -flv_options:"Flash video options", -flv_scalemode:"Scale mode", -flv_buffer:"Buffer", -flv_startimage:"Start image", -flv_starttime:"Start time", -flv_defaultvolume:"Default volume", -flv_hiddengui:"Hidden GUI", -flv_autostart:"Auto start", -flv_loop:"Loop", -flv_showscalemodes:"Show scale modes", -flv_smoothvideo:"Smooth video", -flv_jscallback:"JS Callback" -}); - -tinyMCE.addI18n("en.wordpress",{ -wp_adv_desc:"Show/Hide Kitchen Sink (Alt+Shift+Z)", -wp_more_desc:"Insert More tag (Alt+Shift+T)", -wp_page_desc:"Insert Page break (Alt+Shift+P)", -wp_help_desc:"Help (Alt+Shift+H)", -wp_more_alt:"More...", -wp_page_alt:"Next page...", -add_media:"Add Media", -add_image:"Add an Image", -add_video:"Add Video", -add_audio:"Add Audio", -editgallery:"Edit Gallery", -delgallery:"Delete Gallery" -}); - -tinyMCE.addI18n("en.wpeditimage",{ -edit_img:"Edit Image", -del_img:"Delete Image", -adv_settings:"Advanced Settings", -none:"None", -size:"Size", -thumbnail:"Thumbnail", -medium:"Medium", -full_size:"Full Size", -current_link:"Current Link", -link_to_img:"Link to Image", -link_help:"Enter a link URL or click above for presets.", -adv_img_settings:"Advanced Image Settings", -source:"Source", -width:"Width", -height:"Height", -orig_size:"Original Size", -css:"CSS Class", -adv_link_settings:"Advanced Link Settings", -link_rel:"Link Rel", -height:"Height", -orig_size:"Original Size", -css:"CSS Class", -s60:"60%", -s70:"70%", -s80:"80%", -s90:"90%", -s100:"100%", -s110:"110%", -s120:"120%", -s130:"130%", -img_title:"Edit Image Title", -caption:"Edit Image Caption", -alt:"Edit Alternate Text" -}); diff -uNr a/mp-wp/wp-includes/js/tinymce/langs/wp-langs.php b/mp-wp/wp-includes/js/tinymce/langs/wp-langs.php --- a/mp-wp/wp-includes/js/tinymce/langs/wp-langs.php ab179a7467ba0742d64e0475070c8341b4c076c5747608012392c361af061eb63eddae164a59c3cd556d1f5ce16a62038a8e791b780b6eb48c44cd4a886fd17e +++ b/mp-wp/wp-includes/js/tinymce/langs/wp-langs.php false @@ -1,455 +0,0 @@ - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/autosave/editor_plugin.js b/mp-wp/wp-includes/js/tinymce/plugins/autosave/editor_plugin.js --- a/mp-wp/wp-includes/js/tinymce/plugins/autosave/editor_plugin.js 88c600b21ccb213b3fb1296410d5be6ff0e105acd7f460e05ce83cccb211693e3df7d22eeec850e7786b66e203e9e1115b17b741b6ae0d89bbf0f96d63debef4 +++ b/mp-wp/wp-includes/js/tinymce/plugins/autosave/editor_plugin.js false @@ -1 +0,0 @@ -(function(){tinymce.create('tinymce.plugins.AutoSavePlugin',{init:function(ed,url){var t=this;t.editor=ed;window.onbeforeunload=tinymce.plugins.AutoSavePlugin._beforeUnloadHandler;},getInfo:function(){return{longname:'Auto save',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave',version:tinymce.majorVersion+"."+tinymce.minorVersion};},'static':{_beforeUnloadHandler:function(){var msg;tinymce.each(tinyMCE.editors,function(ed){if(ed.getParam("fullscreen_is_enabled"))return;if(ed.isDirty()){msg=ed.getLang("autosave.unload_msg");return false;}});return msg;}}});tinymce.PluginManager.add('autosave',tinymce.plugins.AutoSavePlugin);})(); \ No newline at end of file diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js b/mp-wp/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js --- a/mp-wp/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js ab981687a8a1983695d9939ff917049c9769b6b237b45f5dbf9a11a9f232598bc14553f09e6612f6bd143425d8810cff8632333cd55f093ba42d55c06f38b69d +++ b/mp-wp/wp-includes/js/tinymce/plugins/directionality/editor_plugin.js false @@ -1 +0,0 @@ -(function(){tinymce.create('tinymce.plugins.Directionality',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mceDirectionLTR',function(){var e=ed.dom.getParent(ed.selection.getNode(),ed.dom.isBlock);if(e){if(ed.dom.getAttrib(e,"dir")!="ltr")ed.dom.setAttrib(e,"dir","ltr");else ed.dom.setAttrib(e,"dir","");}ed.nodeChanged();});ed.addCommand('mceDirectionRTL',function(){var e=ed.dom.getParent(ed.selection.getNode(),ed.dom.isBlock);if(e){if(ed.dom.getAttrib(e,"dir")!="rtl")ed.dom.setAttrib(e,"dir","rtl");else ed.dom.setAttrib(e,"dir","");}ed.nodeChanged();});ed.addButton('ltr',{title:'directionality.ltr_desc',cmd:'mceDirectionLTR'});ed.addButton('rtl',{title:'directionality.rtl_desc',cmd:'mceDirectionRTL'});ed.onNodeChange.add(t._nodeChange,t);},getInfo:function(){return{longname:'Directionality',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_nodeChange:function(ed,cm,n){var dom=ed.dom,dir;n=dom.getParent(n,dom.isBlock);if(!n){cm.setDisabled('ltr',1);cm.setDisabled('rtl',1);return;}dir=dom.getAttrib(n,'dir');cm.setActive('ltr',dir=="ltr");cm.setDisabled('ltr',0);cm.setActive('rtl',dir=="rtl");cm.setDisabled('rtl',0);}});tinymce.PluginManager.add('directionality',tinymce.plugins.Directionality);})(); \ No newline at end of file diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js b/mp-wp/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js --- a/mp-wp/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js 250330798ca54e141d6fe95081957a2ffaf4f64f71c2bf0901c6b221202d3239bf5309818972b10d9657cfd6d9eaed5f09929bceacce66d9ff89cbe78126201e +++ b/mp-wp/wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js false @@ -1 +0,0 @@ -(function(){var DOM=tinymce.DOM;tinymce.create('tinymce.plugins.FullScreenPlugin',{init:function(ed,url){var t=this,s={},vp;t.editor=ed;ed.addCommand('mceFullScreen',function(){var win,de=DOM.doc.documentElement;if(ed.getParam('fullscreen_is_enabled')){if(ed.getParam('fullscreen_new_window'))closeFullscreen();else{DOM.win.setTimeout(function(){tinymce.dom.Event.remove(DOM.win,'resize',t.resizeFunc);tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent({format:'raw'}),{format:'raw'});tinyMCE.remove(ed);DOM.remove('mce_fullscreen_container');de.style.overflow=ed.getParam('fullscreen_html_overflow');DOM.setStyle(DOM.doc.body,'overflow',ed.getParam('fullscreen_overflow'));DOM.win.scrollTo(ed.getParam('fullscreen_scrollx'),ed.getParam('fullscreen_scrolly'));tinyMCE.settings=tinyMCE.oldSettings;},10);}return;}if(ed.getParam('fullscreen_new_window')){win=DOM.win.open(url+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{win.resizeTo(screen.availWidth,screen.availHeight);}catch(e){}}else{tinyMCE.oldSettings=tinyMCE.settings;s.fullscreen_overflow=DOM.getStyle(DOM.doc.body,'overflow',1)||'auto';s.fullscreen_html_overflow=DOM.getStyle(de,'overflow',1);vp=DOM.getViewPort();s.fullscreen_scrollx=vp.x;s.fullscreen_scrolly=vp.y;if(tinymce.isOpera&&s.fullscreen_overflow=='visible')s.fullscreen_overflow='auto';if(tinymce.isIE&&s.fullscreen_overflow=='scroll')s.fullscreen_overflow='auto';if(tinymce.isIE&&(s.fullscreen_html_overflow=='visible'||s.fullscreen_html_overflow=='scroll'))s.fullscreen_html_overflow='auto';if(s.fullscreen_overflow=='0px')s.fullscreen_overflow='';DOM.setStyle(DOM.doc.body,'overflow','hidden');de.style.overflow='hidden';vp=DOM.getViewPort();DOM.win.scrollTo(0,0);if(tinymce.isIE)vp.h-=1;n=DOM.add(DOM.doc.body,'div',{id:'mce_fullscreen_container',style:'position:'+(tinymce.isIE6||(tinymce.isIE&&!DOM.boxModel)?'absolute':'fixed')+';top:0;left:0;width:'+vp.w+'px;height:'+vp.h+'px;z-index:200000;'});DOM.add(n,'div',{id:'mce_fullscreen'});tinymce.each(ed.settings,function(v,n){s[n]=v;});s.id='mce_fullscreen';s.width=n.clientWidth;s.height=n.clientHeight-15;s.fullscreen_is_enabled=true;s.fullscreen_editor_id=ed.id;s.theme_advanced_resizing=false;s.save_onsavecallback=function(){ed.setContent(tinyMCE.get(s.id).getContent({format:'raw'}),{format:'raw'});ed.execCommand('mceSave');};tinymce.each(ed.getParam('fullscreen_settings'),function(v,k){s[k]=v;});if(s.theme_advanced_toolbar_location==='external')s.theme_advanced_toolbar_location='top';t.fullscreenEditor=new tinymce.Editor('mce_fullscreen',s);t.fullscreenEditor.onInit.add(function(){t.fullscreenEditor.setContent(ed.getContent());t.fullscreenEditor.focus();});t.fullscreenEditor.render();tinyMCE.add(t.fullscreenEditor);t.fullscreenElement=new tinymce.dom.Element('mce_fullscreen_container');t.fullscreenElement.update();t.resizeFunc=tinymce.dom.Event.add(DOM.win,'resize',function(){var vp=tinymce.DOM.getViewPort();t.fullscreenEditor.theme.resizeTo(vp.w,vp.h);});}});ed.addButton('fullscreen',{title:'fullscreen.desc',cmd:'mceFullScreen'});ed.onNodeChange.add(function(ed,cm){cm.setActive('fullscreen',ed.getParam('fullscreen_is_enabled'));});},getInfo:function(){return{longname:'Fullscreen',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.PluginManager.add('fullscreen',tinymce.plugins.FullScreenPlugin);})(); \ No newline at end of file diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm b/mp-wp/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm --- a/mp-wp/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm be564e5ff5b2f8e4998f5bbb271bd6de4c28a1562cdfa582d4444d57256ac61d101eb54d1ab7f3b1397bba4aa73af10f0dd37b6dcf375908b8a43b70b9863b8a +++ b/mp-wp/wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm false @@ -1,111 +0,0 @@ - - - - - - - - - - -
    - - - - - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js --- a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js 9e8846e4c6d267bd474b772d90dcdad77059a56e682bd31a7add56f515aa24aeca5d39a88139d1c709c13f99b47ba1ec63b3170e86dcf4f73366ea04f7867194 +++ b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js false @@ -1 +0,0 @@ -(function(){var DOM=tinymce.DOM,Element=tinymce.dom.Element,Event=tinymce.dom.Event,each=tinymce.each,is=tinymce.is;tinymce.create('tinymce.plugins.InlinePopups',{init:function(ed,url){ed.onBeforeRenderUI.add(function(){ed.windowManager=new tinymce.InlineWindowManager(ed);DOM.loadCSS(url+'/skins/'+(ed.settings.inlinepopups_skin||'clearlooks2')+"/window.css");});},getInfo:function(){return{longname:'InlinePopups',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups',version:tinymce.majorVersion+"."+tinymce.minorVersion};}});tinymce.create('tinymce.InlineWindowManager:tinymce.WindowManager',{InlineWindowManager:function(ed){var t=this;t.parent(ed);t.zIndex=300000;t.count=0;t.windows={};},open:function(f,p){var t=this,id,opt='',ed=t.editor,dw=0,dh=0,vp,po,mdf,clf,we,w,u;f=f||{};p=p||{};if(!f.inline)return t.parent(f,p);if(!f.type)t.bookmark=ed.selection.getBookmark('simple');id=DOM.uniqueId();vp=DOM.getViewPort();f.width=parseInt(f.width||320);f.height=parseInt(f.height||240)+(tinymce.isIE?8:0);f.min_width=parseInt(f.min_width||150);f.min_height=parseInt(f.min_height||100);f.max_width=parseInt(f.max_width||2000);f.max_height=parseInt(f.max_height||2000);f.left=f.left||Math.round(Math.max(vp.x,vp.x+(vp.w/ 2.0) - (f.width /2.0)));f.top=f.top||Math.round(Math.max(vp.y,vp.y+(vp.h/ 2.0) - (f.height /2.0)));f.movable=f.resizable=true;p.mce_width=f.width;p.mce_height=f.height;p.mce_inline=true;p.mce_window_id=id;p.mce_auto_focus=f.auto_focus;t.features=f;t.params=p;t.onOpen.dispatch(t,f,p);if(f.type){opt+=' mceModal';if(f.type)opt+=' mce'+f.type.substring(0,1).toUpperCase()+f.type.substring(1);f.resizable=false;}if(f.statusbar)opt+=' mceStatusbar';if(f.resizable)opt+=' mceResizable';if(f.minimizable)opt+=' mceMinimizable';if(f.maximizable)opt+=' mceMaximizable';if(f.movable)opt+=' mceMovable';t._addAll(DOM.doc.body,['div',{id:id,'class':ed.settings.inlinepopups_skin||'clearlooks2',style:'width:100px;height:100px'},['div',{id:id+'_wrapper','class':'mceWrapper'+opt},['div',{id:id+'_top','class':'mceTop'},['div',{'class':'mceLeft'}],['div',{'class':'mceCenter'}],['div',{'class':'mceRight'}],['span',{id:id+'_title'},f.title||'']],['div',{id:id+'_middle','class':'mceMiddle'},['div',{id:id+'_left','class':'mceLeft'}],['span',{id:id+'_content'}],['div',{id:id+'_right','class':'mceRight'}]],['div',{id:id+'_bottom','class':'mceBottom'},['div',{'class':'mceLeft'}],['div',{'class':'mceCenter'}],['div',{'class':'mceRight'}],['span',{id:id+'_status'},'Content']],['a',{'class':'mceMove',tabindex:'-1',href:'javascript:;'}],['a',{'class':'mceMin',tabindex:'-1',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'mceMax',tabindex:'-1',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'mceMed',tabindex:'-1',href:'javascript:;',onmousedown:'return false;'}],['a',{'class':'mceClose',tabindex:'-1',href:'javascript:;',onmousedown:'return false;'}],['a',{id:id+'_resize_n','class':'mceResize mceResizeN',tabindex:'-1',href:'javascript:;'}],['a',{id:id+'_resize_s','class':'mceResize mceResizeS',tabindex:'-1',href:'javascript:;'}],['a',{id:id+'_resize_w','class':'mceResize mceResizeW',tabindex:'-1',href:'javascript:;'}],['a',{id:id+'_resize_e','class':'mceResize mceResizeE',tabindex:'-1',href:'javascript:;'}],['a',{id:id+'_resize_nw','class':'mceResize mceResizeNW',tabindex:'-1',href:'javascript:;'}],['a',{id:id+'_resize_ne','class':'mceResize mceResizeNE',tabindex:'-1',href:'javascript:;'}],['a',{id:id+'_resize_sw','class':'mceResize mceResizeSW',tabindex:'-1',href:'javascript:;'}],['a',{id:id+'_resize_se','class':'mceResize mceResizeSE',tabindex:'-1',href:'javascript:;'}]]]);DOM.setStyles(id,{top:-10000,left:-10000});if(tinymce.isGecko)DOM.setStyle(id,'overflow','auto');if(!f.type){dw+=DOM.get(id+'_left').clientWidth;dw+=DOM.get(id+'_right').clientWidth;dh+=DOM.get(id+'_top').clientHeight;dh+=DOM.get(id+'_bottom').clientHeight;}DOM.setStyles(id,{top:f.top,left:f.left,width:f.width+dw,height:f.height+dh});u=f.url||f.file;if(u){if(tinymce.relaxedDomain)u+=(u.indexOf('?')==-1?'?':'&')+'mce_rdomain='+tinymce.relaxedDomain;u=tinymce._addVer(u);}if(!f.type){DOM.add(id+'_content','iframe',{id:id+'_ifr',src:'javascript:""',frameBorder:0,style:'border:0;width:10px;height:10px'});DOM.setStyles(id+'_ifr',{width:f.width,height:f.height});DOM.setAttrib(id+'_ifr','src',u);}else{DOM.add(id+'_wrapper','a',{id:id+'_ok','class':'mceButton mceOk',href:'javascript:;',onmousedown:'return false;'},'Ok');if(f.type=='confirm')DOM.add(id+'_wrapper','a',{'class':'mceButton mceCancel',href:'javascript:;',onmousedown:'return false;'},'Cancel');DOM.add(id+'_middle','div',{'class':'mceIcon'});DOM.setHTML(id+'_content',f.content.replace('\n','
    '));}mdf=Event.add(id,'mousedown',function(e){var n=e.target,w,vp;w=t.windows[id];t.focus(id);if(n.nodeName=='A'||n.nodeName=='a'){if(n.className=='mceMax'){w.oldPos=w.element.getXY();w.oldSize=w.element.getSize();vp=DOM.getViewPort();vp.w-=2;vp.h-=2;w.element.moveTo(vp.x,vp.y);w.element.resizeTo(vp.w,vp.h);DOM.setStyles(id+'_ifr',{width:vp.w-w.deltaWidth,height:vp.h-w.deltaHeight});DOM.addClass(id+'_wrapper','mceMaximized');}else if(n.className=='mceMed'){w.element.moveTo(w.oldPos.x,w.oldPos.y);w.element.resizeTo(w.oldSize.w,w.oldSize.h);w.iframeElement.resizeTo(w.oldSize.w-w.deltaWidth,w.oldSize.h-w.deltaHeight);DOM.removeClass(id+'_wrapper','mceMaximized');}else if(n.className=='mceMove')return t._startDrag(id,e,n.className);else if(DOM.hasClass(n,'mceResize'))return t._startDrag(id,e,n.className.substring(13));}});clf=Event.add(id,'click',function(e){var n=e.target;t.focus(id);if(n.nodeName=='A'||n.nodeName=='a'){switch(n.className){case'mceClose':t.close(null,id);return Event.cancel(e);case'mceButton mceOk':case'mceButton mceCancel':f.button_func(n.className=='mceButton mceOk');return Event.cancel(e);}}});w=t.windows[id]={id:id,mousedown_func:mdf,click_func:clf,element:new Element(id,{blocker:1,container:ed.getContainer()}),iframeElement:new Element(id+'_ifr'),features:f,deltaWidth:dw,deltaHeight:dh};w.iframeElement.on('focus',function(){t.focus(id);});if(t.count==0&&t.editor.getParam('dialog_type','modal')=='modal'){DOM.add(DOM.doc.body,'div',{id:'mceModalBlocker','class':(t.editor.settings.inlinepopups_skin||'clearlooks2')+'_modalBlocker',style:{zIndex:t.zIndex-1}});DOM.show('mceModalBlocker');}else DOM.setStyle('mceModalBlocker','z-index',t.zIndex-1);if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!DOM.boxModel))DOM.setStyles('mceModalBlocker',{position:'absolute',width:vp.w-2,height:vp.h-2});t.focus(id);t._fixIELayout(id,1);if(DOM.get(id+'_ok'))DOM.get(id+'_ok').focus();t.count++;return w;},focus:function(id){var t=this,w;if(w=t.windows[id]){w.zIndex=this.zIndex++;w.element.setStyle('zIndex',w.zIndex);w.element.update();id=id+'_wrapper';DOM.removeClass(t.lastId,'mceFocus');DOM.addClass(id,'mceFocus');t.lastId=id;}},_addAll:function(te,ne){var i,n,t=this,dom=tinymce.DOM;if(is(ne,'string'))te.appendChild(dom.doc.createTextNode(ne));else if(ne.length){te=te.appendChild(dom.create(ne[0],ne[1]));for(i=2;iix){fw=w;ix=w.zIndex;}});if(fw)t.focus(fw.id);}},setTitle:function(w,ti){var e;w=this._findId(w);if(e=DOM.get(w+'_title'))e.innerHTML=DOM.encode(ti);},alert:function(txt,cb,s){var t=this,w;w=t.open({title:t,type:'alert',button_func:function(s){if(cb)cb.call(s||t,s);t.close(null,w.id);},content:DOM.encode(t.editor.getLang(txt,txt)),inline:1,width:400,height:130});},confirm:function(txt,cb,s){var t=this,w;w=t.open({title:t,type:'confirm',button_func:function(s){if(cb)cb.call(s||t,s);t.close(null,w.id);},content:DOM.encode(t.editor.getLang(txt,txt)),inline:1,width:400,height:130});},_findId:function(w){var t=this;if(typeof(w)=='string')return w;each(t.windows,function(wo){var ifr=DOM.get(wo.id+'_ifr');if(ifr&&w==ifr.contentWindow){w=wo.id;return false;}});return w;},_fixIELayout:function(id,s){var w,img;if(!tinymce.isIE6)return;each(['n','s','w','e','nw','ne','sw','se'],function(v){var e=DOM.get(id+'_resize_'+v);DOM.setStyles(e,{width:s?e.clientWidth:'',height:s?e.clientHeight:'',cursor:DOM.getStyle(e,'cursor',1)});DOM.setStyle(id+"_bottom",'bottom','-1px');e=0;});if(w=this.windows[id]){w.element.hide();w.element.show();each(DOM.select('div,a',id),function(e,i){if(e.currentStyle.backgroundImage!='none'){img=new Image();img.src=e.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,'$1');}});DOM.get(id).style.filter='';}}});tinymce.PluginManager.add('inlinepopups',tinymce.plugins.InlinePopups);})(); \ No newline at end of file diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.svg b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.svg ef01e61df5c0f7bbed46d6150cc32d00e99cc53585406432eed1f5c5f193dccd688d6753e84ff0ac04af829d76496da944522813d6489ca260f5c3e5ded0c428 +++ b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/alert.svg false @@ -1,20 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.svg b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.svg 31eed09c90604b9f2b5ef1847143ccf46f16251e176b52f784d6fe73888f0b40ff8d876f2b1c8909eb777c33aaa6c7b091732617d281ee5392a670daa2f77dea +++ b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/button.svg false @@ -1,10 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.svg b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.svg f9e16907ee6082fc62b8f3ee9ef63d320a3320fa95289ec35745d1e5c22cedb8844d6ab3a7b5defe028de221f7bc627824cd6f7508d09b529930aa3aedcc5f49 +++ b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.svg false @@ -1,23 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.svg b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.svg b1045e2a772e1e3781a420691c9ccff9f2763155105b5b27a61a3963890789724ff567f4bb690b0eafad314fe24b907e4865fafc70cfb2a9d7bfe08b5a1aedbc +++ b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/confirm.svg false @@ -1,22 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.svg b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.svg 8a2e59af0b45ce71c48237b20257f80e1fe8849be8383f35a1c68698cfdf70e151c398f86bab2063c43cddb8d24c99e5748c83334d91127cc33960068988d100 +++ b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/corners.svg false @@ -1,21 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.svg b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.svg 6ea5b808ccfb527b9a9664c4a85afe486c24c547189d00392ad6107cb16856cd7bbbc909f8cd3a218e2ede68800151e984d8dfd7f2e42a674a8e9616900b33c8 +++ b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/drag.svg false @@ -1,6 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.svg b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.svg 1c15ad62e5076a76259de5d60bc3ea61a1985a6aefcdcaded56624dfa2e7f48ff1e86fe587990e054e734cad7ac8cea90cb185778a192f6462b893dec854df58 +++ b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.svg false @@ -1,19 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.svg b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.svg a502ff8fc8be848ccfa69abc1e729c66e27a6d1096c935577c8c5e4dfff5d7906686c7058ab84b478f6bf28aa0c828a8dec4b448d3564fba72c38b55f8594594 +++ b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/vertical.svg false @@ -1,7 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css --- a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css 58810d80effa2446e7ac1202de9af2f9aab280f855c2b4f23fd4e57fddc79b4b6df9cc7b20ead0928f6794e578171436a2c6a1674857537c528470402d1788a2 +++ b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css false @@ -1,126 +0,0 @@ -/* Clearlooks 2 */ -/* Reset */ -.clearlooks2, .clearlooks2 div, .clearlooks2 span, .clearlooks2 a {vertical-align:baseline; text-align:left; position:absolute; border:0; padding:0; margin:0; background:transparent; font-family:Arial,Verdana; font-size:11px; color:#000; text-decoration:none; font-weight:normal; width:auto; height:auto; overflow:hidden; display:block;} - -/* General */ -.clearlooks2 div, .clearlooks2 span, .clearlooks2 a {position:absolute; border:0; padding:0; margin:0; background:transparent; font-family:Arial,Verdana; font-size:11px; color:#000; text-decoration:none; font-weight:normal; width:auto; height:auto; overflow:hidden; display:block;} -.clearlooks2 {position:absolute;} -.clearlooks2 .mceWrapper {position:static} -.mceEventBlocker {position:absolute; left:0; top:0; background:url(img/horizontal.svg) no-repeat 0 -75px; width:100%; height:100%;} -.clearlooks2 .mcePlaceHolder {border:1px solid #000; background:#888; top:0; left:0; opacity:0.5; filter:alpha(opacity=50);} -.clearlooks2_modalBlocker {position:absolute; left:0; top:0; width:100%; height:100%; background:#FFF; opacity:0.6; filter:alpha(opacity=60); display:none} - -/* Top */ -.clearlooks2 .mceTop, -.clearlooks2 .mceTop div { - top:0; - width:100%; - height:23px -} -.clearlooks2 .mceTop .mceLeft { - width:55%; - background-image: none; - border-style: solid none none solid; - border-width: 1px; -} -.clearlooks2 .mceTop .mceCenter { -} -.clearlooks2 .mceTop .mceRight { - right:0; - width:55%; - height:23px; - background-image: none; - border-style: solid solid none none; - border-width: 1px; -} -.clearlooks2 .mceTop span { - width:100%; - font: 12px/20px bold "Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif; - text-align:center; - vertical-align:middle; - line-height:23px; - font-weight:bold; -} -.clearlooks2 .mceFocus .mceTop .mceLeft { - background-image: none; - border-style: solid none none solid; - border-width: 1px; -} -.clearlooks2 .mceFocus .mceTop .mceCenter { -} -.clearlooks2 .mceFocus .mceTop .mceRight { - background-image: none; - border-style: solid solid none none; - border-width: 1px; -} -.clearlooks2 .mceFocus .mceTop span { -color:#FFF -} - -/* Middle */ -.clearlooks2 .mceMiddle, .clearlooks2 .mceMiddle div {top:0} -.clearlooks2 .mceMiddle {width:100%; height:100%; clip:rect(23px auto auto auto)} -.clearlooks2 .mceMiddle .mceLeft {left:0; width:5px; height:100%; background:#E4F2FD;border-left:1px solid #c6d9e9} -.clearlooks2 .mceMiddle span {top:23px; left:5px; width:100%; height:100%; background:#FFF} -.clearlooks2 .mceMiddle .mceRight {right:0; width:5px; height:100%; background:#E4F2FD;border-right:1px solid #c6d9e9} - -/* Bottom */ -.clearlooks2 .mceBottom, .clearlooks2 .mceBottom div {height:6px} -.clearlooks2 .mceBottom {left:0; bottom:0; width:100%;background:#E4F2FD;border-bottom:1px solid #c6d9e9} -.clearlooks2 .mceBottom div {top:0} -.clearlooks2 .mceBottom .mceLeft {left:0; width:5px; background:#E4F2FD ;border-left:1px solid #c6d9e9} -.clearlooks2 .mceBottom .mceCenter {left:5px; width:100%} -.clearlooks2 .mceBottom .mceRight {right:0; width:6px; background:#E4F2FD url(img/drag.svg) no-repeat;border-right:1px solid #c6d9e9} -.clearlooks2 .mceBottom span {display:none} -.clearlooks2 .mceStatusbar .mceBottom, .clearlooks2 .mceStatusbar .mceBottom div {height:23px} -.clearlooks2 .mceStatusbar .mceBottom .mceLeft {background:url(img/corners.svg) -29px 0} -.clearlooks2 .mceStatusbar .mceBottom .mceCenter {background:url(img/horizontal.svg) 0 -52px} -.clearlooks2 .mceStatusbar .mceBottom .mceRight {background:url(img/corners.svg) -24px 0} -.clearlooks2 .mceStatusbar .mceBottom span {display:block; left:7px; font-family:Arial, Verdana; font-size:11px; line-height:23px} - -/* Actions */ -.clearlooks2 a {width:29px; height:16px; top:3px} -.clearlooks2 .mceClose {right:6px; background:url(img/buttons.svg) -87px 0} -.clearlooks2 .mceMin {display:none; right:68px; background:url(img/buttons.svg) 0 0} -.clearlooks2 .mceMed {display:none; right:37px; background:url(img/buttons.svg) -29px 0} -.clearlooks2 .mceMax {display:none; right:37px; background:url(img/buttons.svg) -58px 0} -.clearlooks2 .mceMove {display:none;width:100%;cursor:move;background:url(img/corners.svg) no-repeat -100px -100px} -.clearlooks2 .mceMovable .mceMove {display:block} -.clearlooks2 .mceFocus .mceClose {right:6px; background:url(img/buttons.svg) -87px -16px} -.clearlooks2 .mceFocus .mceMin {right:68px; background:url(img/buttons.svg) 0 -16px} -.clearlooks2 .mceFocus .mceMed {right:37px; background:url(img/buttons.svg) -29px -16px} -.clearlooks2 .mceFocus .mceMax {right:37px; background:url(img/buttons.svg) -58px -16px} -.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.svg) -87px -32px} -.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.svg) -87px -32px} -.clearlooks2 .mceFocus .mceMin:hover {right:68px; background:url(img/buttons.svg) 0 -32px} -.clearlooks2 .mceFocus .mceMed:hover {right:37px; background:url(img/buttons.svg) -29px -32px} -.clearlooks2 .mceFocus .mceMax:hover {right:37px; background:url(img/buttons.svg) -58px -32px} - -/* Resize */ -.clearlooks2 .mceResize {top:auto; left:auto; display:none; width:5px; height:5px; background:url(img/horizontal.svg) no-repeat 0 -75px} -.clearlooks2 .mceResizable .mceResize {display:block} -.clearlooks2 .mceResizable .mceMin, .clearlooks2 .mceMax {display:none} -.clearlooks2 .mceMinimizable .mceMin {display:block} -.clearlooks2 .mceMaximizable .mceMax {display:block} -.clearlooks2 .mceMaximized .mceMed {display:block} -.clearlooks2 .mceMaximized .mceMax {display:none} -.clearlooks2 a.mceResizeN {top:0; left:0; width:100%; cursor:n-resize} -.clearlooks2 a.mceResizeNW {top:0; left:0; cursor:nw-resize} -.clearlooks2 a.mceResizeNE {top:0; right:0; cursor:ne-resize} -.clearlooks2 a.mceResizeW {top:0; left:0; height:100%; cursor:w-resize} -.clearlooks2 a.mceResizeE {top:0; right:0; height:100%; cursor:e-resize} -.clearlooks2 a.mceResizeS {bottom:0; left:0; width:100%; cursor:s-resize} -.clearlooks2 a.mceResizeSW {bottom:0; left:0; cursor:sw-resize} -.clearlooks2 a.mceResizeSE {bottom:0; right:0; cursor:se-resize} - -/* Alert/Confirm */ -.clearlooks2 .mceButton {font-weight:bold; bottom:10px; width:80px; height:30px; background:url(img/button.svg); line-height:30px; vertical-align:middle; text-align:center; outline:0} -.clearlooks2 .mceMiddle .mceIcon {left:15px; top:35px; width:32px; height:32px} -.clearlooks2 .mceAlert .mceMiddle span, .clearlooks2 .mceConfirm .mceMiddle span {background:transparent;left:60px; top:35px; width:320px; height:50px; font-weight:bold; overflow:auto; white-space:normal} -.clearlooks2 a:hover {font-weight:bold} -.clearlooks2 .mceAlert .mceMiddle, .clearlooks2 .mceConfirm .mceMiddle {background:#E4F2FD} -.clearlooks2 .mceAlert .mceOk {left:50%; top:auto; margin-left: -40px} -.clearlooks2 .mceAlert .mceIcon {background:url(img/alert.svg)} -.clearlooks2 .mceConfirm .mceOk {left:50%; top:auto; margin-left: -90px} -.clearlooks2 .mceConfirm .mceCancel {left:50%; top:auto} -.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.svg)} diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/template.htm b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/template.htm --- a/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/template.htm f26b34aba189f1fb0fac2c89e3c884d4ed77775c6852570f8a9c3da459a96c6251faf9beb186ef5144298445ccf96083f8b6cc8ef4a2824ce9768550a3360f14 +++ b/mp-wp/wp-includes/js/tinymce/plugins/inlinepopups/template.htm false @@ -1,387 +0,0 @@ - - - -Template for dialogs - - - - -
    -
    -
    -
    -
    -
    -
    - Blured -
    - -
    -
    - Content -
    -
    - -
    -
    -
    -
    - Statusbar text. -
    - - - - - - - - - - - - - - -
    -
    - -
    -
    -
    -
    -
    -
    - Focused -
    - -
    -
    - Content -
    -
    - -
    -
    -
    -
    - Statusbar text. -
    - - - - - - - - - - - - - - -
    -
    - -
    -
    -
    -
    -
    -
    - Statusbar -
    - -
    -
    - Content -
    -
    - -
    -
    -
    -
    - Statusbar text. -
    - - - - - - - - - - - - - - -
    -
    - -
    -
    -
    -
    -
    -
    - Statusbar, Resizable -
    - -
    -
    - Content -
    -
    - -
    -
    -
    -
    - Statusbar text. -
    - - - - - - - - - - - - - - -
    -
    - -
    -
    -
    -
    -
    -
    - Resizable, Maximizable -
    - -
    -
    - Content -
    -
    - -
    -
    -
    -
    - Statusbar text. -
    - - - - - - - - - - - - - - -
    -
    - -
    -
    -
    -
    -
    -
    - Blurred, Maximizable, Statusbar, Resizable -
    - -
    -
    - Content -
    -
    - -
    -
    -
    -
    - Statusbar text. -
    - - - - - - - - - - - - - - -
    -
    - -
    -
    -
    -
    -
    -
    - Maximized, Maximizable, Minimizable -
    - -
    -
    - Content -
    -
    - -
    -
    -
    -
    - Statusbar text. -
    - - - - - - - - - - - - - - -
    -
    - -
    -
    -
    -
    -
    -
    - Blured -
    - -
    -
    - Content -
    -
    - -
    -
    -
    -
    - Statusbar text. -
    - - - - - - - - - - - - - - -
    -
    - -
    -
    -
    -
    -
    -
    - Alert -
    - -
    -
    - - This is a very long error message. This is a very long error message. - This is a very long error message. This is a very long error message. - This is a very long error message. This is a very long error message. - This is a very long error message. This is a very long error message. - This is a very long error message. This is a very long error message. - This is a very long error message. This is a very long error message. - -
    -
    -
    - -
    -
    -
    -
    -
    - - - Ok - -
    -
    - -
    -
    -
    -
    -
    -
    - Confirm -
    - -
    -
    - - This is a very long error message. This is a very long error message. - This is a very long error message. This is a very long error message. - This is a very long error message. This is a very long error message. - This is a very long error message. This is a very long error message. - This is a very long error message. This is a very long error message. - This is a very long error message. This is a very long error message. - -
    -
    -
    - -
    -
    -
    -
    -
    - - - Ok - Cancel - -
    -
    -
    - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/media/css/content.css b/mp-wp/wp-includes/js/tinymce/plugins/media/css/content.css --- a/mp-wp/wp-includes/js/tinymce/plugins/media/css/content.css a22343e4c9a243e5c9a0fb200077ac29a2d1818232cbce6a8026eccf8f4e97cd7e8a288970e2e12e2c7d52cde01856f3a898bf9cdb51ceb62452967503e71403 +++ b/mp-wp/wp-includes/js/tinymce/plugins/media/css/content.css false @@ -1,6 +0,0 @@ -.mceItemFlash, .mceItemShockWave, .mceItemQuickTime, .mceItemWindowsMedia, .mceItemRealMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc;} -.mceItemShockWave {background-image: url(../img/shockwave.svg);} -.mceItemFlash {background-image:url(../img/flash.svg);} -.mceItemQuickTime {background-image:url(../img/quicktime.svg);} -.mceItemWindowsMedia {background-image:url(../img/windowsmedia.svg);} -.mceItemRealMedia {background-image:url(../img/realmedia.svg);} diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/media/css/media.css b/mp-wp/wp-includes/js/tinymce/plugins/media/css/media.css --- a/mp-wp/wp-includes/js/tinymce/plugins/media/css/media.css 4511fa00c5d18ebdf63835d41f30facb96eeee13cabbdc556b877ba92975df7b97563cf7a8e6b1713a3465e269ae419f58cd1339a45ff258b547f63eec0572c5 +++ b/mp-wp/wp-includes/js/tinymce/plugins/media/css/media.css false @@ -1,16 +0,0 @@ -#id, #name, #hspace, #vspace, #class_name, #align { width: 100px } -#hspace, #vspace { width: 50px } -#flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px } -#flash_base, #flash_flashvars { width: 240px } -#width, #height { width: 40px } -#src, #media_type { width: 250px } -#class { width: 120px } -#prev { margin: 0; border: 1px solid black; width: 380px; height: 230px; overflow: auto } -.panel_wrapper div.current { height: 390px; overflow: auto } -#flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none } -.mceAddSelectValue { background-color: #DDDDDD } -#qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px } -#wmp_balance, #wmp_baseurl, #wmp_captioningid, #wmp_currentmarker, #wmp_currentposition, #wmp_defaultframe, #wmp_playcount, #wmp_rate, #wmp_uimode, #wmp_volume { width: 70px } -#rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px } -#shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px } -#qt_qtsrc { width: 200px } diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/media/editor_plugin.js b/mp-wp/wp-includes/js/tinymce/plugins/media/editor_plugin.js --- a/mp-wp/wp-includes/js/tinymce/plugins/media/editor_plugin.js ccbf4139d820bdc489e8950a0dc4b20fd613cfcd56062083750cc69fd61a48bc0b37d7d7be8e89136626db74ef7b1744e243df65f01e1f847b48e927b9aea737 +++ b/mp-wp/wp-includes/js/tinymce/plugins/media/editor_plugin.js false @@ -1 +0,0 @@ -(function(){var each=tinymce.each;tinymce.create('tinymce.plugins.MediaPlugin',{init:function(ed,url){var t=this;t.editor=ed;t.url=url;function isMediaElm(n){return/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className);};ed.onPreInit.add(function(){ed.serializer.addRules('param[name|value|_mce_value]');});ed.addCommand('mceMedia',function(){ed.windowManager.open({file:url+'/media.htm',width:430+parseInt(ed.getLang('media.delta_width',0)),height:470+parseInt(ed.getLang('media.delta_height',0)),inline:1},{plugin_url:url});});ed.addButton('media',{title:'media.desc',cmd:'mceMedia'});ed.onNodeChange.add(function(ed,cm,n){cm.setActive('media',n.nodeName=='IMG'&&isMediaElm(n));});ed.onInit.add(function(){var lo={mceItemFlash:'flash',mceItemShockWave:'shockwave',mceItemWindowsMedia:'windowsmedia',mceItemQuickTime:'quicktime',mceItemRealMedia:'realmedia'};ed.selection.onSetContent.add(function(){t._spansToImgs(ed.getBody());});ed.selection.onBeforeSetContent.add(t._objectsToSpans,t);if(ed.settings.content_css!==false)ed.dom.loadCSS(url+"/css/content.css");if(ed.theme.onResolveName){ed.theme.onResolveName.add(function(th,o){if(o.name=='img'){each(lo,function(v,k){if(ed.dom.hasClass(o.node,k)){o.name=v;o.title=ed.dom.getAttrib(o.node,'title');return false;}});}});}if(ed&&ed.plugins.contextmenu){ed.plugins.contextmenu.onContextMenu.add(function(th,m,e){if(e.nodeName=='IMG'&&/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(e.className)){m.add({title:'media.edit',icon:'media',cmd:'mceMedia'});}});}});ed.onBeforeSetContent.add(t._objectsToSpans,t);ed.onSetContent.add(function(){t._spansToImgs(ed.getBody());});ed.onPreProcess.add(function(ed,o){var dom=ed.dom;if(o.set){t._spansToImgs(o.node);each(dom.select('IMG',o.node),function(n){var p;if(isMediaElm(n)){p=t._parse(n.title);dom.setAttrib(n,'width',dom.getAttrib(n,'width',p.width||100));dom.setAttrib(n,'height',dom.getAttrib(n,'height',p.height||100));}});}if(o.get){each(dom.select('IMG',o.node),function(n){var ci,cb,mt;if(ed.getParam('media_use_script')){if(isMediaElm(n))n.className=n.className.replace(/mceItem/g,'mceTemp');return;}switch(n.className){case'mceItemFlash':ci='d27cdb6e-ae6d-11cf-96b8-444553540000';cb='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';mt='application/x-shockwave-flash';break;case'mceItemShockWave':ci='166b1bca-3f9c-11cf-8075-444553540000';cb='http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';mt='application/x-director';break;case'mceItemWindowsMedia':ci=ed.getParam('media_wmp6_compatible')?'05589fa1-c356-11ce-bf01-00aa0055595a':'6bf52a52-394a-11d3-b153-00c04f79faa6';cb='http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';mt='application/x-mplayer2';break;case'mceItemQuickTime':ci='02bf25d5-8c17-4b23-bc80-d3488abddc6b';cb='http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';mt='video/quicktime';break;case'mceItemRealMedia':ci='cfcdaa03-8be4-11cf-b84b-0020afbbccfa';cb='http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';mt='audio/x-pn-realaudio-plugin';break;}if(ci){dom.replace(t._buildObj({classid:ci,codebase:cb,type:mt},n),n);}});}});ed.onPostProcess.add(function(ed,o){o.content=o.content.replace(/_mce_value=/g,'value=');});if(ed.getParam('media_use_script')){function getAttr(s,n){n=new RegExp(n+'=\"([^\"]+)\"','g').exec(s);return n?ed.dom.decode(n[1]):'';};ed.onPostProcess.add(function(ed,o){o.content=o.content.replace(/]+>/g,function(im){var cl=getAttr(im,'class');if(/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(cl)){at=t._parse(getAttr(im,'title'));at.width=getAttr(im,'width');at.height=getAttr(im,'height');im='';}return im;});});}},getInfo:function(){return{longname:'Media',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_objectsToSpans:function(ed,o){var t=this,h=o.content;h=h.replace(/]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi,function(a,b,c){var o=t._parse(c);return''});h=h.replace(/]*)>/gi,'');h=h.replace(/]*)\/?>/gi,'');h=h.replace(/]*)>/gi,'');h=h.replace(/<\/(object)([^>]*)>/gi,'');h=h.replace(/<\/embed>/gi,'');h=h.replace(/]*)>/gi,function(a,b){return''});h=h.replace(/\/ class=\"mceItemParam\"><\/span>/gi,'class="mceItemParam">');o.content=h;},_buildObj:function(o,n){var ob,ed=this.editor,dom=ed.dom,p=this._parse(n.title),stc;stc=ed.getParam('media_strict',true)&&o.type=='application/x-shockwave-flash';p.width=o.width=dom.getAttrib(n,'width')||100;p.height=o.height=dom.getAttrib(n,'height')||100;if(p.src)p.src=ed.convertURL(p.src,'src',n);if(stc){ob=dom.create('span',{mce_name:'object',type:'application/x-shockwave-flash',data:p.src,width:o.width,height:o.height});}else{ob=dom.create('span',{mce_name:'object',classid:"clsid:"+o.classid,codebase:o.codebase,width:o.width,height:o.height});}each(p,function(v,k){if(!/^(width|height|codebase|classid|_cx|_cy)$/.test(k)){if(o.type=='application/x-mplayer2'&&k=='src')k='url';if(v)dom.add(ob,'span',{mce_name:'param',name:k,'_mce_value':v});}});if(!stc)dom.add(ob,'span',tinymce.extend({mce_name:'embed',type:o.type},p));return ob;},_spansToImgs:function(p){var t=this,dom=t.editor.dom,im,ci;each(dom.select('span',p),function(n){if(dom.getAttrib(n,'class')=='mceItemObject'){ci=dom.getAttrib(n,"classid").toLowerCase().replace(/\s+/g,'');switch(ci){case'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':dom.replace(t._createImg('mceItemFlash',n),n);break;case'clsid:166b1bca-3f9c-11cf-8075-444553540000':dom.replace(t._createImg('mceItemShockWave',n),n);break;case'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6':case'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95':case'clsid:05589fa1-c356-11ce-bf01-00aa0055595a':dom.replace(t._createImg('mceItemWindowsMedia',n),n);break;case'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':dom.replace(t._createImg('mceItemQuickTime',n),n);break;case'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':dom.replace(t._createImg('mceItemRealMedia',n),n);break;default:dom.replace(t._createImg('mceItemFlash',n),n);}return;}if(dom.getAttrib(n,'class')=='mceItemEmbed'){switch(dom.getAttrib(n,'type')){case'application/x-shockwave-flash':dom.replace(t._createImg('mceItemFlash',n),n);break;case'application/x-director':dom.replace(t._createImg('mceItemShockWave',n),n);break;case'application/x-mplayer2':dom.replace(t._createImg('mceItemWindowsMedia',n),n);break;case'video/quicktime':dom.replace(t._createImg('mceItemQuickTime',n),n);break;case'audio/x-pn-realaudio-plugin':dom.replace(t._createImg('mceItemRealMedia',n),n);break;default:dom.replace(t._createImg('mceItemFlash',n),n);}}});},_createImg:function(cl,n){var im,dom=this.editor.dom,pa={},ti='',args;args=['id','name','width','height','bgcolor','align','flashvars','src','wmode','allowfullscreen','quality'];im=dom.create('img',{src:this.url+'/img/trans.svg',width:dom.getAttrib(n,'width')||100,height:dom.getAttrib(n,'height')||100,'class':cl});each(args,function(na){var v=dom.getAttrib(n,na);if(v)pa[na]=v;});each(dom.select('span',n),function(n){if(dom.hasClass(n,'mceItemParam'))pa[dom.getAttrib(n,'name')]=dom.getAttrib(n,'_mce_value');});if(pa.movie){pa.src=pa.movie;delete pa.movie;}n=dom.select('.mceItemEmbed',n)[0];if(n){each(args,function(na){var v=dom.getAttrib(n,na);if(v&&!pa[na])pa[na]=v;});}delete pa.width;delete pa.height;im.title=this._serialize(pa);return im;},_parse:function(s){return tinymce.util.JSON.parse('{'+s+'}');},_serialize:function(o){return tinymce.util.JSON.serialize(o).replace(/[{}]/g,'');}});tinymce.PluginManager.add('media',tinymce.plugins.MediaPlugin);})(); diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/media/img/flash.svg b/mp-wp/wp-includes/js/tinymce/plugins/media/img/flash.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/media/img/flash.svg 4ff1f23cd097cd02aee518f438f42e42c1078a42649f8b39b2b1b37100600a7b251e56f51e114b9e7a041274003fdf08e70185ade5f82d297d8492b3d2e9e34a +++ b/mp-wp/wp-includes/js/tinymce/plugins/media/img/flash.svg false @@ -1,10 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/media/img/quicktime.svg b/mp-wp/wp-includes/js/tinymce/plugins/media/img/quicktime.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/media/img/quicktime.svg fe3143b9adf4e310aa61bdae5b79195b88f0278bef213e89d04af66a529f96a353cb8cb9d597da9ff4b9143d6ffdcf6a5478bb9a2bcf1707ddeaf4528c49a56d +++ b/mp-wp/wp-includes/js/tinymce/plugins/media/img/quicktime.svg false @@ -1,11 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/media/img/realmedia.svg b/mp-wp/wp-includes/js/tinymce/plugins/media/img/realmedia.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/media/img/realmedia.svg d1d7ccd26392e7cf7cb83dee42b4c62f62a36bd12e1b25f01ba5a65ce710d90399e39b7d8317c116e84f47624ede6ea7d13282f695a648f270ddabafeb3bee04 +++ b/mp-wp/wp-includes/js/tinymce/plugins/media/img/realmedia.svg false @@ -1,13 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/media/img/shockwave.svg b/mp-wp/wp-includes/js/tinymce/plugins/media/img/shockwave.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/media/img/shockwave.svg e2be8d0b70c5e8fa1b2a044e50e246afb7873258db5493224954ba27356dfe0435a9cb442f371dbfcc48aaca3d9bf3052f53e12bcb30516e928294d82e8d040d +++ b/mp-wp/wp-includes/js/tinymce/plugins/media/img/shockwave.svg false @@ -1,12 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/media/img/trans.svg b/mp-wp/wp-includes/js/tinymce/plugins/media/img/trans.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/media/img/trans.svg 3e90a5cf5d7eaaa8d42315526cab2f0953963dd261fc77894199072632283d9c33921ac95ee84564af909161bf23712b97a412b08372a8e9f5d05e249e892c87 +++ b/mp-wp/wp-includes/js/tinymce/plugins/media/img/trans.svg false @@ -1,6 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/media/img/windowsmedia.svg b/mp-wp/wp-includes/js/tinymce/plugins/media/img/windowsmedia.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/media/img/windowsmedia.svg 44b353942a78464bd4d1bd376c955f631eeb03d27927206e2ab0d88a38ae8f056a29e207cde115d2a6efbb64c814bfbf50983c74a150e64141c3d2c83ad2e0c1 +++ b/mp-wp/wp-includes/js/tinymce/plugins/media/img/windowsmedia.svg false @@ -1,13 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/media/js/embed.js b/mp-wp/wp-includes/js/tinymce/plugins/media/js/embed.js --- a/mp-wp/wp-includes/js/tinymce/plugins/media/js/embed.js 2f8ad0e31e8637ea7db328020f912fd7706bb777638a80f8587f775d45c1ec6cbfae26877ccbf1d1f417acf2e26a02919864b6d87ba9a30c5b22b27bd81d4cc4 +++ b/mp-wp/wp-includes/js/tinymce/plugins/media/js/embed.js false @@ -1,73 +0,0 @@ -/** - * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose. - */ - -function writeFlash(p) { - writeEmbed( - 'D27CDB6E-AE6D-11cf-96B8-444553540000', - 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0', - 'application/x-shockwave-flash', - p - ); -} - -function writeShockWave(p) { - writeEmbed( - '166B1BCA-3F9C-11CF-8075-444553540000', - 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0', - 'application/x-director', - p - ); -} - -function writeQuickTime(p) { - writeEmbed( - '02BF25D5-8C17-4B23-BC80-D3488ABDDC6B', - 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0', - 'video/quicktime', - p - ); -} - -function writeRealMedia(p) { - writeEmbed( - 'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA', - 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0', - 'audio/x-pn-realaudio-plugin', - p - ); -} - -function writeWindowsMedia(p) { - p.url = p.src; - writeEmbed( - '6BF52A52-394A-11D3-B153-00C04F79FAA6', - 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701', - 'application/x-mplayer2', - p - ); -} - -function writeEmbed(cls, cb, mt, p) { - var h = '', n; - - h += ''; - - h += ''); - -function init() { - var pl = "", f, val; - var type = "flash", fe, i; - - ed = tinyMCEPopup.editor; - - tinyMCEPopup.resizeToInnerSize(); - f = document.forms[0] - - fe = ed.selection.getNode(); - if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) { - pl = fe.title; - - switch (ed.dom.getAttrib(fe, 'class')) { - case 'mceItemFlash': - type = 'flash'; - break; - - case 'mceItemFlashVideo': - type = 'flv'; - break; - - case 'mceItemShockWave': - type = 'shockwave'; - break; - - case 'mceItemWindowsMedia': - type = 'wmp'; - break; - - case 'mceItemQuickTime': - type = 'qt'; - break; - - case 'mceItemRealMedia': - type = 'rmp'; - break; - } - - document.forms[0].insert.value = ed.getLang('update', 'Insert', true); - } - - document.getElementById('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media'); - document.getElementById('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','qt_qtsrc','media','media'); - document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor'); - - var html = getMediaListHTML('medialist','src','media','media'); - if (html == "") - document.getElementById("linklistrow").style.display = 'none'; - else - document.getElementById("linklistcontainer").innerHTML = html; - - // Resize some elements - if (isVisible('filebrowser')) - document.getElementById('src').style.width = '230px'; - - // Setup form - if (pl != "") { - pl = tinyMCEPopup.editor.plugins.media._parse(pl); - - switch (type) { - case "flash": - setBool(pl, 'flash', 'play'); - setBool(pl, 'flash', 'loop'); - setBool(pl, 'flash', 'menu'); - setBool(pl, 'flash', 'swliveconnect'); - setStr(pl, 'flash', 'quality'); - setStr(pl, 'flash', 'scale'); - setStr(pl, 'flash', 'salign'); - setStr(pl, 'flash', 'wmode'); - setStr(pl, 'flash', 'base'); - setStr(pl, 'flash', 'flashvars'); - break; - - case "qt": - setBool(pl, 'qt', 'loop'); - setBool(pl, 'qt', 'autoplay'); - setBool(pl, 'qt', 'cache'); - setBool(pl, 'qt', 'controller'); - setBool(pl, 'qt', 'correction'); - setBool(pl, 'qt', 'enablejavascript'); - setBool(pl, 'qt', 'kioskmode'); - setBool(pl, 'qt', 'autohref'); - setBool(pl, 'qt', 'playeveryframe'); - setBool(pl, 'qt', 'tarsetcache'); - setStr(pl, 'qt', 'scale'); - setStr(pl, 'qt', 'starttime'); - setStr(pl, 'qt', 'endtime'); - setStr(pl, 'qt', 'tarset'); - setStr(pl, 'qt', 'qtsrcchokespeed'); - setStr(pl, 'qt', 'volume'); - setStr(pl, 'qt', 'qtsrc'); - break; - - case "shockwave": - setBool(pl, 'shockwave', 'sound'); - setBool(pl, 'shockwave', 'progress'); - setBool(pl, 'shockwave', 'autostart'); - setBool(pl, 'shockwave', 'swliveconnect'); - setStr(pl, 'shockwave', 'swvolume'); - setStr(pl, 'shockwave', 'swstretchstyle'); - setStr(pl, 'shockwave', 'swstretchhalign'); - setStr(pl, 'shockwave', 'swstretchvalign'); - break; - - case "wmp": - setBool(pl, 'wmp', 'autostart'); - setBool(pl, 'wmp', 'enabled'); - setBool(pl, 'wmp', 'enablecontextmenu'); - setBool(pl, 'wmp', 'fullscreen'); - setBool(pl, 'wmp', 'invokeurls'); - setBool(pl, 'wmp', 'mute'); - setBool(pl, 'wmp', 'stretchtofit'); - setBool(pl, 'wmp', 'windowlessvideo'); - setStr(pl, 'wmp', 'balance'); - setStr(pl, 'wmp', 'baseurl'); - setStr(pl, 'wmp', 'captioningid'); - setStr(pl, 'wmp', 'currentmarker'); - setStr(pl, 'wmp', 'currentposition'); - setStr(pl, 'wmp', 'defaultframe'); - setStr(pl, 'wmp', 'playcount'); - setStr(pl, 'wmp', 'rate'); - setStr(pl, 'wmp', 'uimode'); - setStr(pl, 'wmp', 'volume'); - break; - - case "rmp": - setBool(pl, 'rmp', 'autostart'); - setBool(pl, 'rmp', 'loop'); - setBool(pl, 'rmp', 'autogotourl'); - setBool(pl, 'rmp', 'center'); - setBool(pl, 'rmp', 'imagestatus'); - setBool(pl, 'rmp', 'maintainaspect'); - setBool(pl, 'rmp', 'nojava'); - setBool(pl, 'rmp', 'prefetch'); - setBool(pl, 'rmp', 'shuffle'); - setStr(pl, 'rmp', 'console'); - setStr(pl, 'rmp', 'controls'); - setStr(pl, 'rmp', 'numloop'); - setStr(pl, 'rmp', 'scriptcallbacks'); - break; - } - - setStr(pl, null, 'src'); - setStr(pl, null, 'id'); - setStr(pl, null, 'name'); - setStr(pl, null, 'vspace'); - setStr(pl, null, 'hspace'); - setStr(pl, null, 'bgcolor'); - setStr(pl, null, 'align'); - setStr(pl, null, 'width'); - setStr(pl, null, 'height'); - - if ((val = ed.dom.getAttrib(fe, "width")) != "") - pl.width = f.width.value = val; - - if ((val = ed.dom.getAttrib(fe, "height")) != "") - pl.height = f.height.value = val; - - oldWidth = pl.width ? parseInt(pl.width) : 0; - oldHeight = pl.height ? parseInt(pl.height) : 0; - } else - oldWidth = oldHeight = 0; - - selectByValue(f, 'media_type', type); - changedType(type); - updateColor('bgcolor_pick', 'bgcolor'); - - TinyMCE_EditableSelects.init(); - generatePreview(); -} - -function insertMedia() { - var fe, f = document.forms[0], h; - - tinyMCEPopup.restoreSelection(); - - if (!AutoValidator.validate(f)) { - tinyMCEPopup.alert(ed.getLang('invalid_data')); - return false; - } - - f.width.value = f.width.value == "" ? 100 : f.width.value; - f.height.value = f.height.value == "" ? 100 : f.height.value; - - fe = ed.selection.getNode(); - if (fe != null && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) { - switch (f.media_type.options[f.media_type.selectedIndex].value) { - case "flash": - fe.className = "mceItemFlash"; - break; - - case "flv": - fe.className = "mceItemFlashVideo"; - break; - - case "shockwave": - fe.className = "mceItemShockWave"; - break; - - case "qt": - fe.className = "mceItemQuickTime"; - break; - - case "wmp": - fe.className = "mceItemWindowsMedia"; - break; - - case "rmp": - fe.className = "mceItemRealMedia"; - break; - } - - if (fe.width != f.width.value || fe.height != f.height.height) - ed.execCommand('mceRepaint'); - - fe.title = serializeParameters(); - fe.width = f.width.value; - fe.height = f.height.value; - fe.style.width = f.width.value + (f.width.value.indexOf('%') == -1 ? 'px' : ''); - fe.style.height = f.height.value + (f.height.value.indexOf('%') == -1 ? 'px' : ''); - fe.align = f.align.options[f.align.selectedIndex].value; - } else { - h = ' 0) { - var html = ""; - - html += ''; - - return html; - } - - return ""; -} - -function getType(v) { - var fo, i, c, el, x, f = document.forms[0]; - - fo = ed.getParam("media_types", "flash=swf;flv=flv;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';'); - - // YouTube - if (v.match(/watch\?v=(.+)(.*)/)) { - f.width.value = '425'; - f.height.value = '350'; - f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1]; - return 'flash'; - } - - // Google video - if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) { - f.width.value = '425'; - f.height.value = '326'; - f.src.value = 'http://video.google.com/googleplayer.swf?docId=' + v.substring('http://video.google.com/videoplay?docid='.length) + '&hl=en'; - return 'flash'; - } - - for (i=0; i 0 ? s.substring(0, s.length - 1) : s; - - return s; -} - -function setBool(pl, p, n) { - if (typeof(pl[n]) == "undefined") - return; - - document.forms[0].elements[p + "_" + n].checked = pl[n]; -} - -function setStr(pl, p, n) { - var f = document.forms[0], e = f.elements[(p != null ? p + "_" : '') + n]; - - if (typeof(pl[n]) == "undefined") - return; - - if (e.type == "text") - e.value = pl[n]; - else - selectByValue(f, (p != null ? p + "_" : '') + n, pl[n]); -} - -function getBool(p, n, d, tv, fv) { - var v = document.forms[0].elements[p + "_" + n].checked; - - tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'"; - fv = typeof(fv) == 'undefined' ? 'false' : "'" + jsEncode(fv) + "'"; - - return (v == d) ? '' : n + (v ? ':' + tv + ',' : ':' + fv + ','); -} - -function getStr(p, n, d) { - var e = document.forms[0].elements[(p != null ? p + "_" : "") + n]; - var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value; - - if (n == 'src') - v = tinyMCEPopup.editor.convertURL(v, 'src', null); - - return ((n == d || v == '') ? '' : n + ":'" + jsEncode(v) + "',"); -} - -function getInt(p, n, d) { - var e = document.forms[0].elements[(p != null ? p + "_" : "") + n]; - var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value; - - return ((n == d || v == '') ? '' : n + ":" + v.replace(/[^0-9]+/g, '') + ","); -} - -function jsEncode(s) { - s = s.replace(new RegExp('\\\\', 'g'), '\\\\'); - s = s.replace(new RegExp('"', 'g'), '\\"'); - s = s.replace(new RegExp("'", 'g'), "\\'"); - - return s; -} - -function generatePreview(c) { - var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh; - - p.innerHTML = ''; - - nw = parseInt(f.width.value); - nh = parseInt(f.height.value); - - if (f.width.value != "" && f.height.value != "") { - if (f.constrain.checked) { - if (c == 'width' && oldWidth != 0) { - wp = nw / oldWidth; - nh = Math.round(wp * nh); - f.height.value = nh; - } else if (c == 'height' && oldHeight != 0) { - hp = nh / oldHeight; - nw = Math.round(hp * nw); - f.width.value = nw; - } - } - } - - if (f.width.value != "") - oldWidth = nw; - - if (f.height.value != "") - oldHeight = nh; - - // After constrain - pl = serializeParameters(); - - switch (f.media_type.options[f.media_type.selectedIndex].value) { - case "flash": - cls = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000'; - codebase = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0'; - type = 'application/x-shockwave-flash'; - break; - - case "shockwave": - cls = 'clsid:166B1BCA-3F9C-11CF-8075-444553540000'; - codebase = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0'; - type = 'application/x-director'; - break; - - case "qt": - cls = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B'; - codebase = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0'; - type = 'video/quicktime'; - break; - - case "wmp": - cls = ed.getParam('media_wmp6_compatible') ? 'clsid:05589FA1-C356-11CE-BF01-00AA0055595A' : 'clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6'; - codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701'; - type = 'application/x-mplayer2'; - break; - - case "rmp": - cls = 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA'; - codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701'; - type = 'audio/x-pn-realaudio-plugin'; - break; - } - - if (pl == '') { - p.innerHTML = ''; - return; - } - - pl = tinyMCEPopup.editor.plugins.media._parse(pl); - - if (!pl.src) { - p.innerHTML = ''; - return; - } - - pl.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(pl.src); - pl.width = !pl.width ? 100 : pl.width; - pl.height = !pl.height ? 100 : pl.height; - pl.id = !pl.id ? 'obj' : pl.id; - pl.name = !pl.name ? 'eobj' : pl.name; - pl.align = !pl.align ? '' : pl.align; - - // Avoid annoying warning about insecure items - if (!tinymce.isIE || document.location.protocol != 'https:') { - h += ''; - - for (n in pl) { - h += ''; - - // Add extra url parameter if it's an absolute URL - if (n == 'src' && pl[n].indexOf('://') != -1) - h += ''; - } - } - - h += ' - - - {#media_dlg.title} - - - - - - - - - - -
    - - -
    -
    -
    - {#media_dlg.general} - -
    - - - - - - - - - - - - - - - - -
    - -
    - - - - - -
     
    -
     
    - - - - - - -
    x   
    -
    - - -
    - {#media_dlg.preview} - -
    - - -
    -
    - {#media_dlg.advanced} - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - -
     
    -
    -
    - -
    - {#media_dlg.flash_options} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - -
    - - - -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - - - - - - - -
    -
    - -
    - {#media_dlg.flv_options} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    -
    - -
    - {#media_dlg.qt_options} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    -  
    - - - - - -
     
    -
    -
    - -
    - {#media_dlg.wmp_options} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    -
    - -
    - {#media_dlg.rmp_options} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    -   -
    -
    - -
    - {#media_dlg.shockwave_options} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
    - - - -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    - - - - - -
    -
    -
    -
    - - -
    -
    - -
    - -
    - -
    -
    - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/paste/blank.htm b/mp-wp/wp-includes/js/tinymce/plugins/paste/blank.htm --- a/mp-wp/wp-includes/js/tinymce/plugins/paste/blank.htm 064ae4dd948cf727fda06d9a5722b46df9da08e17735b28c9c6fe4fe5bdbb82237edbba3864060148aacc57b2ec500fb92d6eef036df78b504058d7d04012ddf +++ b/mp-wp/wp-includes/js/tinymce/plugins/paste/blank.htm false @@ -1,22 +0,0 @@ - - -blank_page - - - - - - - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/paste/css/blank.css b/mp-wp/wp-includes/js/tinymce/plugins/paste/css/blank.css --- a/mp-wp/wp-includes/js/tinymce/plugins/paste/css/blank.css a95901d9cb6dfd76bfcf0b4fab941370e0e16126f564ae942b305552faf352fbf9351f60eccc45c6c2e3bf91ad992fce2f85854da4a05d84279214c846fbf58e +++ b/mp-wp/wp-includes/js/tinymce/plugins/paste/css/blank.css false @@ -1,14 +0,0 @@ -html, body {height:98%} -body { -background-color: #FFFFFF; -font-family: Verdana, Arial, Helvetica, sans-serif; -font-size: 10px; -scrollbar-3dlight-color: #F0F0EE; -scrollbar-arrow-color: #676662; -scrollbar-base-color: #F0F0EE; -scrollbar-darkshadow-color: #DDDDDD; -scrollbar-face-color: #E0E0DD; -scrollbar-highlight-color: #F0F0EE; -scrollbar-shadow-color: #F0F0EE; -scrollbar-track-color: #F5F5F5; -} diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/paste/css/pasteword.css b/mp-wp/wp-includes/js/tinymce/plugins/paste/css/pasteword.css --- a/mp-wp/wp-includes/js/tinymce/plugins/paste/css/pasteword.css 0e863783f54c7f3e980816d35638fdf2cf6a1e2ada12bc997b0cac38f5e527053a4ba189ab518477d4f267ec28ea0344106123d45296daa66f3978072efb8951 +++ b/mp-wp/wp-includes/js/tinymce/plugins/paste/css/pasteword.css false @@ -1,3 +0,0 @@ -.sourceIframe { - border: 1px solid #808080; -} diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/paste/editor_plugin.js b/mp-wp/wp-includes/js/tinymce/plugins/paste/editor_plugin.js --- a/mp-wp/wp-includes/js/tinymce/plugins/paste/editor_plugin.js da836902b5d483d3a6a77d8fd2030bdf39a96d166839678ffbf6e7a6a9c0fb215585f1678ebde084ce53d4a720394f9ac6f410eb21040618090cd04a568dad83 +++ b/mp-wp/wp-includes/js/tinymce/plugins/paste/editor_plugin.js false @@ -1 +0,0 @@ -(function(){var Event=tinymce.dom.Event;tinymce.create('tinymce.plugins.PastePlugin',{init:function(ed,url){var t=this;t.editor=ed;ed.addCommand('mcePasteText',function(ui,v){if(ui){if((ed.getParam('paste_use_dialog',true))||(!tinymce.isIE)){ed.windowManager.open({file:url+'/pastetext.htm',width:450,height:400,inline:1},{plugin_url:url});}else t._insertText(clipboardData.getData("Text"),true);}else t._insertText(v.html,v.linebreaks);});ed.addCommand('mcePasteWord',function(ui,v){if(ui){if((ed.getParam('paste_use_dialog',true))||(!tinymce.isIE)){ed.windowManager.open({file:url+'/pasteword.htm',width:450,height:400,inline:1},{plugin_url:url});}else t._insertText(t._clipboardHTML());}else t._insertWordContent(v);});ed.addCommand('mceSelectAll',function(){ed.execCommand('selectall');});ed.addButton('pastetext',{title:'paste.paste_text_desc',cmd:'mcePasteText',ui:true});ed.addButton('pasteword',{title:'paste.paste_word_desc',cmd:'mcePasteWord',ui:true});ed.addButton('selectall',{title:'paste.selectall_desc',cmd:'mceSelectAll'});if(ed.getParam("paste_auto_cleanup_on_paste",false)){ed.onPaste.add(function(ed,e){return t._handlePasteEvent(e)});}if(!tinymce.isIE&&ed.getParam("paste_auto_cleanup_on_paste",false)){ed.onKeyDown.add(function(ed,e){if(e.ctrlKey&&e.keyCode==86){window.setTimeout(function(){ed.execCommand("mcePasteText",true);},1);Event.cancel(e);}});}},getInfo:function(){return{longname:'Paste text/word',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_handlePasteEvent:function(e){var html=this._clipboardHTML(),ed=this.editor,sel=ed.selection,r;if(ed&&(r=sel.getRng())&&r.text.length>0)ed.execCommand('delete');if(html&&html.length>0)ed.execCommand('mcePasteWord',false,html);return Event.cancel(e);},_insertText:function(content,bLinebreaks){content=this.editor.dom.encode(content);if(content&&content.length>0){if(!this.editor.selection.isCollapsed())this.editor.execCommand("Delete");if(bLinebreaks){if(this.editor.getParam("paste_create_paragraphs",true)){var rl=this.editor.getParam("paste_replace_list",'\u2122,TM,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');for(var i=0;i

    ');content=content.replace(/\r\r/g,'

    ');content=content.replace(/\n\n/g,'

    ');if((pos=content.indexOf('

    '))!=-1){this.editor.execCommand("Delete");var node=this.editor.selection.getNode();var breakElms=[];do{if(node.nodeType==1){if(node.nodeName=="TD"||node.nodeName=="BODY")break;breakElms[breakElms.length]=node;}}while(node=node.parentNode);var before="",after="

    ";before+=content.substring(0,pos);for(var i=0;i";after+="<"+breakElms[(breakElms.length-1)-i].nodeName+">";}before+="

    ";content=before+content.substring(pos+7)+after;}}if(this.editor.getParam("paste_create_linebreaks",true)){content=content.replace(/\r\n/g,'
    ');content=content.replace(/\r/g,'
    ');content=content.replace(/\n/g,'
    ');}}this.editor.execCommand("mceInsertRawHTML",false,content);}},_insertWordContent:function(content){var t=this,ed=t.editor;if(content&&content.length>0){var bull=String.fromCharCode(8226);var middot=String.fromCharCode(183);if(ed.getParam('paste_insert_word_content_callback'))content=ed.execCallback('paste_insert_word_content_callback','before',content);var rl=ed.getParam("paste_replace_list",'\u2122,TM,\u2026,...,\x93|\x94|\u201c|\u201d,",\x60|\x91|\x92|\u2018|\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');for(var i=0;i(.*?)<\/p>','gi'),'

    $1

    ');}content=content.replace(new RegExp('tab-stops: list [0-9]+.0pt">','gi'),'">'+"--list--");content=content.replace(new RegExp(bull+"(.*?)
    ","gi"),"

    "+middot+"$1

    ");content=content.replace(new RegExp('','gi'),""+bull);content=content.replace(/<\/o:p>/gi,"");content=content.replace(new RegExp('
    ]+>/g,"");if(this.editor.getParam("paste_remove_spans",true))content=content.replace(/<\/?span[^>]*>/gi,"");if(this.editor.getParam("paste_remove_styles",true))content=content.replace(new RegExp('<(\\w[^>]*) style="([^"]*)"([^>]*)','gi'),"<$1$3");content=content.replace(/<\/?font[^>]*>/gi,"");switch(this.editor.getParam("paste_strip_class_attributes","all")){case"all":content=content.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi,"<$1$3");break;case"mso":content=content.replace(new RegExp('<(\\w[^>]*) class="?mso([^ |>]*)([^>]*)','gi'),"<$1$3");break;}content=content.replace(new RegExp('href="?'+this._reEscape(""+document.location)+'','gi'),'href="'+this.editor.documentBaseURI.getURI());content=content.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi,"<$1$3");content=content.replace(/<\\?\?xml[^>]*>/gi,"");content=content.replace(/<\/?\w+:[^>]*>/gi,"");content=content.replace(/-- page break --\s*

     <\/p>/gi,"");content=content.replace(/-- page break --/gi,"");if(!this.editor.getParam('force_p_newlines')){content=content.replace('','','gi');content=content.replace('

    ','

    ','gi');}if(!tinymce.isIE&&!this.editor.getParam('force_p_newlines')){content=content.replace(/<\/?p[^>]*>/gi,"");}content=content.replace(/<\/?div[^>]*>/gi,"");if(this.editor.getParam("paste_convert_middot_lists",true)){var div=ed.dom.create("div",null,content);var className=this.editor.getParam("paste_unindented_list_class","unIndentedList");while(this._convertMiddots(div,"--list--"));while(this._convertMiddots(div,middot,className));while(this._convertMiddots(div,bull));content=div.innerHTML;}if(this.editor.getParam("paste_convert_headers_to_strong",false)){content=content.replace(/ <\/h[1-6]>/gi,'

      

    ');content=content.replace(//gi,'

    ');content=content.replace(/<\/h[1-6]>/gi,'

    ');content=content.replace(/ <\/b>/gi,'  ');content=content.replace(/^( )*/gi,'');}content=content.replace(/--list--/gi,"");if(ed.getParam('paste_insert_word_content_callback'))content=ed.execCallback('paste_insert_word_content_callback','after',content);this.editor.execCommand("mceInsertContent",false,content);if(this.editor.getParam('paste_force_cleanup_wordpaste',true)){var ed=this.editor;window.setTimeout(function(){ed.execCommand("mceCleanup");},1);}}},_reEscape:function(s){var l="?.\\*[](){}+^$:";var o="";for(var i=0;i - - {#paste.paste_text_desc} - - - - - - -
    -
    {#paste.paste_text_desc}
    - -
    - -
    - -
    - -
    {#paste_dlg.text_title}
    - - - -
    -
    - -
    - -
    - -
    -
    -
    - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/paste/pasteword.htm b/mp-wp/wp-includes/js/tinymce/plugins/paste/pasteword.htm --- a/mp-wp/wp-includes/js/tinymce/plugins/paste/pasteword.htm 4b3edb37c72732d45dfe6c7fbf6f0e2e9751f2c1733eef21976eb9b1d4277cf01b1685f0d9e0eaf29fe96fb9a8eb9b3ffb8651de175b665185644009ff8ee4f1 +++ b/mp-wp/wp-includes/js/tinymce/plugins/paste/pasteword.htm false @@ -1,29 +0,0 @@ - - - - {#paste.paste_word_desc} - - - - - - -
    -
    {#paste.paste_word_desc}
    - -
    {#paste_dlg.word_title}
    - -
    - -
    -
    - -
    - -
    - -
    -
    -
    - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/safari/blank.htm b/mp-wp/wp-includes/js/tinymce/plugins/safari/blank.htm --- a/mp-wp/wp-includes/js/tinymce/plugins/safari/blank.htm 0a193132f9b50066a611480e36ace0e6d03f0e4de8a8395d1646a2b2b5fb09cacb5a1934fa37d7bf63a909c906bf4b881e88cece3f22ebb0295ed521eac25d85 +++ b/mp-wp/wp-includes/js/tinymce/plugins/safari/blank.htm false @@ -1 +0,0 @@ - \ No newline at end of file diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/safari/editor_plugin.js b/mp-wp/wp-includes/js/tinymce/plugins/safari/editor_plugin.js --- a/mp-wp/wp-includes/js/tinymce/plugins/safari/editor_plugin.js baeadc78a04ff65d45ce1a89fb830c64e09de0c0c949a6c3c63c1d22bf5251ce94a2183dfb34db8cca9f5c56251fdac42452b0430e81a76e3d6291796a12d210 +++ b/mp-wp/wp-includes/js/tinymce/plugins/safari/editor_plugin.js false @@ -1 +0,0 @@ -(function(){var Event=tinymce.dom.Event,grep=tinymce.grep,each=tinymce.each,inArray=tinymce.inArray,isOldWebKit=tinymce.isOldWebKit;function isEmpty(d,e,f){var w,n;w=d.createTreeWalker(e,NodeFilter.SHOW_ALL,null,false);while(n=w.nextNode()){if(f){if(!f(n))return false;}if(n.nodeType==3&&n.nodeValue&&/[^\s\u00a0]+/.test(n.nodeValue))return false;if(n.nodeType==1&&/^(HR|IMG|TABLE)$/.test(n.nodeName))return false;}return true;};tinymce.create('tinymce.plugins.Safari',{init:function(ed){var t=this,dom;if(!tinymce.isWebKit)return;t.editor=ed;t.webKitFontSizes=['x-small','small','medium','large','x-large','xx-large','-webkit-xxx-large'];t.namedFontSizes=['xx-small','x-small','small','medium','large','x-large','xx-large'];ed.addCommand('CreateLink',function(u,v){var n=ed.selection.getNode(),dom=ed.dom,a;if(n&&(/^(left|right)$/i.test(dom.getStyle(n,'float',1))||/^(left|right)$/i.test(dom.getAttrib(n,'align')))){a=dom.create('a',{href:v},n.cloneNode());n.parentNode.replaceChild(a,n);ed.selection.select(a);}else ed.getDoc().execCommand("CreateLink",false,v);});ed.onPaste.add(function(ed,e){function removeStyles(e){e=e.target;if(e.nodeType==1){e.style.cssText='';each(ed.dom.select('*',e),function(e){e.style.cssText='';});}};Event.add(ed.getDoc(),'DOMNodeInserted',removeStyles);window.setTimeout(function(){Event.remove(ed.getDoc(),'DOMNodeInserted',removeStyles);},0);});ed.onKeyUp.add(function(ed,e){var h,b,r,n,s;if(e.keyCode==46||e.keyCode==8){b=ed.getBody();h=b.innerHTML;s=ed.selection;if(b.childNodes.length==1&&!/<(img|hr)/.test(h)&&tinymce.trim(h.replace(/<[^>]+>/g,'')).length==0){ed.setContent('


    ',{format:'raw'});n=b.firstChild;r=s.getRng();r.setStart(n,0);r.setEnd(n,0);s.setRng(r);}}});ed.addCommand('FormatBlock',function(u,v){var dom=ed.dom,e=dom.getParent(ed.selection.getNode(),dom.isBlock);if(e)dom.replace(dom.create(v),e,1);else ed.getDoc().execCommand("FormatBlock",false,v);});ed.addCommand('mceInsertContent',function(u,v){ed.getDoc().execCommand("InsertText",false,'mce_marker');ed.getBody().innerHTML=ed.getBody().innerHTML.replace(/mce_marker/g,ed.dom.processHTML(v)+'XX');ed.selection.select(ed.dom.get('_mce_tmp'));ed.getDoc().execCommand("Delete",false,' ');});ed.onKeyPress.add(function(ed,e){var se,li,lic,r1,r2,n,sel,doc,be,af,pa;if(e.keyCode==13){sel=ed.selection;se=sel.getNode();if(e.shiftKey||ed.settings.force_br_newlines&&se.nodeName!='LI'){t._insertBR(ed);Event.cancel(e);}if(li=dom.getParent(se,'LI')){lic=dom.getParent(li,'OL,UL');doc=ed.getDoc();pa=dom.create('p');dom.add(pa,'br',{mce_bogus:"1"});if(isEmpty(doc,li)){if(n=dom.getParent(lic.parentNode,'LI,OL,UL'))return;n=dom.getParent(lic,'p,h1,h2,h3,h4,h5,h6,div')||lic;r1=doc.createRange();r1.setStartBefore(n);r1.setEndBefore(li);r2=doc.createRange();r2.setStartAfter(li);r2.setEndAfter(n);be=r1.cloneContents();af=r2.cloneContents();if(!isEmpty(doc,af))dom.insertAfter(af,n);dom.insertAfter(pa,n);if(!isEmpty(doc,be))dom.insertAfter(be,n);dom.remove(n);n=pa.firstChild;r1=doc.createRange();r1.setStartBefore(n);r1.setEndBefore(n);sel.setRng(r1);return Event.cancel(e);}}}});ed.onExecCommand.add(function(ed,cmd){var sel,dom,bl,bm;if(cmd=='InsertUnorderedList'||cmd=='InsertOrderedList'){sel=ed.selection;dom=ed.dom;if(bl=dom.getParent(sel.getNode(),function(n){return/^(H[1-6]|P|ADDRESS|PRE)$/.test(n.nodeName);})){bm=sel.getBookmark();dom.remove(bl,1);sel.moveToBookmark(bm);}}});ed.onClick.add(function(ed,e){e=e.target;if(e.nodeName=='IMG'){t.selElm=e;ed.selection.select(e);}else t.selElm=null;});ed.onInit.add(function(){t._fixWebKitSpans();if(isOldWebKit)t._patchSafari2x(ed);});ed.onSetContent.add(function(){dom=ed.dom;each(['strong','b','em','u','strike','sub','sup','a'],function(v){each(grep(dom.select(v)).reverse(),function(n){var nn=n.nodeName.toLowerCase(),st;if(nn=='a'){if(n.name)dom.replace(dom.create('img',{mce_name:'a',name:n.name,'class':'mceItemAnchor'}),n);return;}switch(nn){case'b':case'strong':if(nn=='b')nn='strong';st='font-weight: bold;';break;case'em':st='font-style: italic;';break;case'u':st='text-decoration: underline;';break;case'sub':st='vertical-align: sub;';break;case'sup':st='vertical-align: super;';break;case'strike':st='text-decoration: line-through;';break;}dom.replace(dom.create('span',{mce_name:nn,style:st,'class':'Apple-style-span'}),n,1);});});});ed.onPreProcess.add(function(ed,o){dom=ed.dom;each(grep(o.node.getElementsByTagName('span')).reverse(),function(n){var v,bg;if(o.get){if(dom.hasClass(n,'Apple-style-span')){bg=n.style.backgroundColor;switch(dom.getAttrib(n,'mce_name')){case'font':if(!ed.settings.convert_fonts_to_spans)dom.setAttrib(n,'style','');break;case'strong':case'em':case'sub':case'sup':dom.setAttrib(n,'style','');break;case'strike':case'u':if(!ed.settings.inline_styles)dom.setAttrib(n,'style','');else dom.setAttrib(n,'mce_name','');break;default:if(!ed.settings.inline_styles)dom.setAttrib(n,'style','');}if(bg)n.style.backgroundColor=bg;}}if(dom.hasClass(n,'mceItemRemoved'))dom.remove(n,1);});});ed.onPostProcess.add(function(ed,o){o.content=o.content.replace(/
    <\/(h[1-6]|div|p|address|pre)>/g,'');o.content=o.content.replace(/ id=\"undefined\"/g,'');});},getInfo:function(){return{longname:'Safari compatibility',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',infourl:'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/safari',version:tinymce.majorVersion+"."+tinymce.minorVersion};},_fixWebKitSpans:function(){var t=this,ed=t.editor;if(!isOldWebKit){Event.add(ed.getDoc(),'DOMNodeInserted',function(e){e=e.target;if(e&&e.nodeType==1)t._fixAppleSpan(e);});}else{ed.onExecCommand.add(function(){each(ed.dom.select('span'),function(n){t._fixAppleSpan(n);});ed.nodeChanged();});}},_fixAppleSpan:function(e){var ed=this.editor,dom=ed.dom,fz=this.webKitFontSizes,fzn=this.namedFontSizes,s=ed.settings,st,p;if(dom.getAttrib(e,'mce_fixed'))return;if(e.nodeName=='SPAN'&&e.className=='Apple-style-span'){st=e.style;if(!s.convert_fonts_to_spans){if(st.fontSize){dom.setAttrib(e,'mce_name','font');dom.setAttrib(e,'size',inArray(fz,st.fontSize)+1);}if(st.fontFamily){dom.setAttrib(e,'mce_name','font');dom.setAttrib(e,'face',st.fontFamily);}if(st.color){dom.setAttrib(e,'mce_name','font');dom.setAttrib(e,'color',dom.toHex(st.color));}if(st.backgroundColor){dom.setAttrib(e,'mce_name','font');dom.setStyle(e,'background-color',st.backgroundColor);}}else{if(st.fontSize)dom.setStyle(e,'fontSize',fzn[inArray(fz,st.fontSize)]);}if(st.fontWeight=='bold')dom.setAttrib(e,'mce_name','strong');if(st.fontStyle=='italic')dom.setAttrib(e,'mce_name','em');if(st.textDecoration=='underline')dom.setAttrib(e,'mce_name','u');if(st.textDecoration=='line-through')dom.setAttrib(e,'mce_name','strike');if(st.verticalAlign=='super')dom.setAttrib(e,'mce_name','sup');if(st.verticalAlign=='sub')dom.setAttrib(e,'mce_name','sub');dom.setAttrib(e,'mce_fixed','1');}},_patchSafari2x:function(ed){var t=this,setContent,getNode,dom=ed.dom,lr;if(ed.windowManager.onBeforeOpen){ed.windowManager.onBeforeOpen.add(function(){r=ed.selection.getRng();});}ed.selection.select=function(n){this.getSel().setBaseAndExtent(n,0,n,1);};getNode=ed.selection.getNode;ed.selection.getNode=function(){return t.selElm||getNode.call(this);};ed.selection.getRng=function(){var t=this,s=t.getSel(),d=ed.getDoc(),r,rb,ra,di;if(s.anchorNode){r=d.createRange();try{rb=d.createRange();rb.setStart(s.anchorNode,s.anchorOffset);rb.collapse(1);ra=d.createRange();ra.setStart(s.focusNode,s.focusOffset);ra.collapse(1);di=rb.compareBoundaryPoints(rb.START_TO_END,ra)<0;r.setStart(di?s.anchorNode:s.focusNode,di?s.anchorOffset:s.focusOffset);r.setEnd(di?s.focusNode:s.anchorNode,di?s.focusOffset:s.anchorOffset);lr=r;}catch(ex){}}return r||lr;};setContent=ed.selection.setContent;ed.selection.setContent=function(h,s){var r=this.getRng(),b;try{setContent.call(this,h,s);}catch(ex){b=dom.create('body');b.innerHTML=h;each(b.childNodes,function(n){r.insertNode(n.cloneNode(true));});}};},_insertBR:function(ed){var dom=ed.dom,s=ed.selection,r=s.getRng(),br;r.insertNode(br=dom.create('br'));r.setStartAfter(br);r.setEndAfter(br);s.setRng(r);if(s.getSel().focusNode==br.previousSibling){s.select(dom.insertAfter(dom.doc.createTextNode('\u00a0'),br));s.collapse(1);}ed.getWin().scrollTo(0,dom.getPos(s.getRng().startContainer).y);}});tinymce.PluginManager.add('safari',tinymce.plugins.Safari);})(); \ No newline at end of file diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/EnchantSpell.php b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/EnchantSpell.php --- a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/EnchantSpell.php 94c95ea44c7edba16c996fdc7ab58f3af0b2d8bc9dfc18c2c70d94a42427ec8f26ecce67f73ee90c5d83b5be955ddcbd9e809c6e71f2b1a3f9fa435a084d7f3e +++ b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/EnchantSpell.php false @@ -1,66 +0,0 @@ -= 1.4.1 - * @param Array $words Array of words to check. - * @return Array of misspelled words. - */ - function &checkWords($lang, $words) { - $r = enchant_broker_init(); - - if (enchant_broker_dict_exists($r,$lang)) { - $d = enchant_broker_request_dict($r, $lang); - - $returnData = array(); - foreach($words as $key => $value) { - $correct = enchant_dict_check($d, $value); - if(!$correct) { - $returnData[] = trim($value); - } - } - - return $returnData; - enchant_broker_free_dict($d); - } else { - - } - enchant_broker_free($r); - } - - /** - * Returns suggestions for a specific word. - * - * @param String $lang Selected language code (like en_US or de_DE). Shortcodes like "en" and "de" work with enchant >= 1.4.1 - * @param String $word Specific word to get suggestions for. - * @return Array of suggestions for the specified word. - */ - function &getSuggestions($lang, $word) { - $r = enchant_broker_init(); - $suggs = array(); - - if (enchant_broker_dict_exists($r,$lang)) { - $d = enchant_broker_request_dict($r, $lang); - $suggs = enchant_dict_suggest($d, $word); - - enchant_broker_free_dict($d); - } else { - - } - enchant_broker_free($r); - - return $suggs; - } -} - -?> diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/GoogleSpell.php b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/GoogleSpell.php --- a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/GoogleSpell.php 24380c644e90518106b47367b3c3ddf490d6702ce47474ffa8e2faa4e9ff63fff6ed2f1ff52ffbf1137d000fc2dcc84bfe62d624af6bddf5f39deb22c223bb60 +++ b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/GoogleSpell.php false @@ -1,158 +0,0 @@ -_getMatches($lang, $wordstr); - $words = array(); - - for ($i=0; $i_unhtmlentities(mb_substr($wordstr, $matches[$i][1], $matches[$i][2], "UTF-8")); - - return $words; - } - - /** - * Returns suggestions of for a specific word. - * - * @param {String} $lang Language code like sv or en. - * @param {String} $word Specific word to get suggestions for. - * @return {Array} Array of suggestions for the specified word. - */ - function &getSuggestions($lang, $word) { - $sug = array(); - $osug = array(); - $matches = $this->_getMatches($lang, $word); - - if (count($matches) > 0) - $sug = explode("\t", utf8_encode($this->_unhtmlentities($matches[0][4]))); - - // Remove empty - foreach ($sug as $item) { - if ($item) - $osug[] = $item; - } - - return $osug; - } - - function &_getMatches($lang, $str) { - $server = "www.google.com"; - $port = 443; - $path = "/tbproxy/spell?lang=" . $lang . "&hl=en"; - $host = "www.google.com"; - $url = "https://" . $server; - - // Setup XML request - $xml = '' . $str . ''; - - $header = "POST ".$path." HTTP/1.0 \r\n"; - $header .= "MIME-Version: 1.0 \r\n"; - $header .= "Content-type: application/PTI26 \r\n"; - $header .= "Content-length: ".strlen($xml)." \r\n"; - $header .= "Content-transfer-encoding: text \r\n"; - $header .= "Request-number: 1 \r\n"; - $header .= "Document-type: Request \r\n"; - $header .= "Interface-Version: Test 1.4 \r\n"; - $header .= "Connection: close \r\n\r\n"; - $header .= $xml; - - // Use curl if it exists - if (function_exists('curl_init')) { - // Use curl - $ch = curl_init(); - curl_setopt($ch, CURLOPT_URL,$url); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $header); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE); - $xml = curl_exec($ch); - curl_close($ch); - } else { - // Use raw sockets - $fp = fsockopen("ssl://" . $server, $port, $errno, $errstr, 30); - if ($fp) { - // Send request - fwrite($fp, $header); - - // Read response - $xml = ""; - while (!feof($fp)) - $xml .= fgets($fp, 128); - - fclose($fp); - } else - echo "Could not open SSL connection to google."; - } - - // Grab and parse content - $matches = array(); - preg_match_all('/([^<]*)<\/c>/', $xml, $matches, PREG_SET_ORDER); - - return $matches; - } - - function _unhtmlentities($string) { - $string = preg_replace('~&#x([0-9a-f]+);~ei', 'chr(hexdec("\\1"))', $string); - $string = preg_replace('~&#([0-9]+);~e', 'chr(\\1)', $string); - - $trans_tbl = get_html_translation_table(HTML_ENTITIES); - $trans_tbl = array_flip($trans_tbl); - - return strtr($string, $trans_tbl); - } -} - -// Patch in multibyte support -if (!function_exists('mb_substr')) { - function mb_substr($str, $start, $len = '', $encoding="UTF-8"){ - $limit = strlen($str); - - for ($s = 0; $start > 0;--$start) {// found the real start - if ($s >= $limit) - break; - - if ($str[$s] <= "\x7F") - ++$s; - else { - ++$s; // skip length - - while ($str[$s] >= "\x80" && $str[$s] <= "\xBF") - ++$s; - } - } - - if ($len == '') - return substr($str, $s); - else - for ($e = $s; $len > 0; --$len) {//found the real end - if ($e >= $limit) - break; - - if ($str[$e] <= "\x7F") - ++$e; - else { - ++$e;//skip length - - while ($str[$e] >= "\x80" && $str[$e] <= "\xBF" && $e < $limit) - ++$e; - } - } - - return substr($str, $s, $e - $s); - } -} - -?> diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/PSpell.php b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/PSpell.php --- a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/PSpell.php 5ec71cf0214b6b1c64091c78cb6b868ffc410ec4a8d4057d74aa517ac3d1b5aebe6c929277c2329b1d9934e4930d71951ec344089808f7dbd228540c1bd05c7e +++ b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/PSpell.php false @@ -1,81 +0,0 @@ -_getPLink($lang); - - $outWords = array(); - foreach ($words as $word) { - if (!pspell_check($plink, trim($word))) - $outWords[] = utf8_encode($word); - } - - return $outWords; - } - - /** - * Returns suggestions of for a specific word. - * - * @param {String} $lang Language code like sv or en. - * @param {String} $word Specific word to get suggestions for. - * @return {Array} Array of suggestions for the specified word. - */ - function &getSuggestions($lang, $word) { - $words = pspell_suggest($this->_getPLink($lang), $word); - - for ($i=0; $ithrowError("PSpell support not found in PHP installation."); - - // Setup PSpell link - $plink = pspell_new( - $lang, - $this->_config['PSpell.spelling'], - $this->_config['PSpell.jargon'], - $this->_config['PSpell.encoding'], - $this->_config['PSpell.mode'] - ); - - // Setup PSpell link -/* if (!$plink) { - $pspellConfig = pspell_config_create( - $lang, - $this->_config['PSpell.spelling'], - $this->_config['PSpell.jargon'], - $this->_config['PSpell.encoding'] - ); - - $plink = pspell_new_config($pspell_config); - }*/ - - if (!$plink) - $this->throwError("No PSpell link found opened."); - - return $plink; - } -} - -?> diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/PSpellShell.php b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/PSpellShell.php --- a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/PSpellShell.php 90248aa6fe389c724ea753e028d686c377731bd29ea69ae49cc983cd66b2997ee7132153c8d1e9e565de879c55ece13e6972eca17fbdc112dade45641ccc611b +++ b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/PSpellShell.php false @@ -1,112 +0,0 @@ -_getCMD($lang); - - if ($fh = fopen($this->_tmpfile, "w")) { - fwrite($fh, "!\n"); - - foreach($words as $key => $value) - fwrite($fh, "^" . $value . "\n"); - - fclose($fh); - } else - $this->throwError("PSpell support was not found."); - - $data = shell_exec($cmd); - @unlink($this->_tmpfile); - - $returnData = array(); - $dataArr = preg_split("/[\r\n]/", $data, -1, PREG_SPLIT_NO_EMPTY); - - foreach ($dataArr as $dstr) { - $matches = array(); - - // Skip this line. - if (strpos($dstr, "@") === 0) - continue; - - preg_match("/\& ([^ ]+) .*/i", $dstr, $matches); - - if (!empty($matches[1])) - $returnData[] = utf8_encode(trim($matches[1])); - } - - return $returnData; - } - - /** - * Returns suggestions of for a specific word. - * - * @param {String} $lang Language code like sv or en. - * @param {String} $word Specific word to get suggestions for. - * @return {Array} Array of suggestions for the specified word. - */ - function &getSuggestions($lang, $word) { - $cmd = $this->_getCMD($lang); - - if (function_exists("mb_convert_encoding")) - $word = mb_convert_encoding($word, "ISO-8859-1", mb_detect_encoding($word, "UTF-8")); - else - $word = utf8_encode($word); - - if ($fh = fopen($this->_tmpfile, "w")) { - fwrite($fh, "!\n"); - fwrite($fh, "^$word\n"); - fclose($fh); - } else - $this->throwError("Error opening tmp file."); - - $data = shell_exec($cmd); - @unlink($this->_tmpfile); - - $returnData = array(); - $dataArr = preg_split("/\n/", $data, -1, PREG_SPLIT_NO_EMPTY); - - foreach($dataArr as $dstr) { - $matches = array(); - - // Skip this line. - if (strpos($dstr, "@") === 0) - continue; - - preg_match("/\&[^:]+:(.*)/i", $dstr, $matches); - - if (!empty($matches[1])) { - $words = array_slice(explode(',', $matches[1]), 0, 10); - - for ($i=0; $i_tmpfile = tempnam($this->_config['PSpellShell.tmp'], "tinyspell"); - - if(preg_match("#win#i", php_uname())) - return $this->_config['PSpellShell.aspell'] . " -a --lang=". escapeshellarg($lang) . " --encoding=utf-8 -H < " . $this->_tmpfile . " 2>&1"; - - return "cat ". $this->_tmpfile ." | " . $this->_config['PSpellShell.aspell'] . " -a --encoding=utf-8 -H --lang=". escapeshellarg($lang); - } -} - -?> diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/SpellChecker.php b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/SpellChecker.php --- a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/SpellChecker.php d0e0b140904461fe0249557cabad6ebdf674b6d2b4149a0a778d7321c0d697dd52b0996aebe75c6c7da2f67ec6d2b0b5ab5b38dfa134e967b5447179422d7ff1 +++ b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/SpellChecker.php false @@ -1,61 +0,0 @@ -_config = $config; - } - - /** - * Simple loopback function everything that gets in will be send back. - * - * @param $args.. Arguments. - * @return {Array} Array of all input arguments. - */ - function &loopback(/* args.. */) { - return func_get_args(); - } - - /** - * Spellchecks an array of words. - * - * @param {String} $lang Language code like sv or en. - * @param {Array} $words Array of words to spellcheck. - * @return {Array} Array of misspelled words. - */ - function &checkWords($lang, $words) { - return $words; - } - - /** - * Returns suggestions of for a specific word. - * - * @param {String} $lang Language code like sv or en. - * @param {String} $word Specific word to get suggestions for. - * @return {Array} Array of suggestions for the specified word. - */ - function &getSuggestions($lang, $word) { - return array(); - } - - /** - * Throws an error message back to the user. This will stop all execution. - * - * @param {String} $str Message to send back to user. - */ - function throwError($str) { - die('{"result":null,"id":null,"error":{"errstr":"' . addslashes($str) . '","errfile":"","errline":null,"errcontext":"","level":"FATAL"}}'); - } -} - -?> diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/utils/JSON.php b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/utils/JSON.php --- a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/utils/JSON.php fe081b86e03f39f2413bb72fa5a013abd7065af40b619d91fe16486f2bdbb8a9b69d803d9d6017a5d97a7a78967acc8b7026cd28f50e7d3b2371836cbd7c359d +++ b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/utils/JSON.php false @@ -1,594 +0,0 @@ -_data = $data; - $this->_len = strlen($data); - $this->_pos = -1; - $this->_location = JSON_IN_BETWEEN; - $this->_lastLocations = array(); - $this->_needProp = false; - } - - function getToken() { - return $this->_token; - } - - function getLocation() { - return $this->_location; - } - - function getTokenName() { - switch ($this->_token) { - case JSON_BOOL: - return 'JSON_BOOL'; - - case JSON_INT: - return 'JSON_INT'; - - case JSON_STR: - return 'JSON_STR'; - - case JSON_FLOAT: - return 'JSON_FLOAT'; - - case JSON_NULL: - return 'JSON_NULL'; - - case JSON_START_OBJ: - return 'JSON_START_OBJ'; - - case JSON_END_OBJ: - return 'JSON_END_OBJ'; - - case JSON_START_ARRAY: - return 'JSON_START_ARRAY'; - - case JSON_END_ARRAY: - return 'JSON_END_ARRAY'; - - case JSON_KEY: - return 'JSON_KEY'; - } - - return 'UNKNOWN'; - } - - function getValue() { - return $this->_value; - } - - function readToken() { - $chr = $this->read(); - - if ($chr != null) { - switch ($chr) { - case '[': - $this->_lastLocation[] = $this->_location; - $this->_location = JSON_IN_ARRAY; - $this->_token = JSON_START_ARRAY; - $this->_value = null; - $this->readAway(); - return true; - - case ']': - $this->_location = array_pop($this->_lastLocation); - $this->_token = JSON_END_ARRAY; - $this->_value = null; - $this->readAway(); - - if ($this->_location == JSON_IN_OBJECT) - $this->_needProp = true; - - return true; - - case '{': - $this->_lastLocation[] = $this->_location; - $this->_location = JSON_IN_OBJECT; - $this->_needProp = true; - $this->_token = JSON_START_OBJ; - $this->_value = null; - $this->readAway(); - return true; - - case '}': - $this->_location = array_pop($this->_lastLocation); - $this->_token = JSON_END_OBJ; - $this->_value = null; - $this->readAway(); - - if ($this->_location == JSON_IN_OBJECT) - $this->_needProp = true; - - return true; - - // String - case '"': - case '\'': - return $this->_readString($chr); - - // Null - case 'n': - return $this->_readNull(); - - // Bool - case 't': - case 'f': - return $this->_readBool($chr); - - default: - // Is number - if (is_numeric($chr) || $chr == '-' || $chr == '.') - return $this->_readNumber($chr); - - return true; - } - } - - return false; - } - - function _readBool($chr) { - $this->_token = JSON_BOOL; - $this->_value = $chr == 't'; - - if ($chr == 't') - $this->skip(3); // rue - else - $this->skip(4); // alse - - $this->readAway(); - - if ($this->_location == JSON_IN_OBJECT && !$this->_needProp) - $this->_needProp = true; - - return true; - } - - function _readNull() { - $this->_token = JSON_NULL; - $this->_value = null; - - $this->skip(3); // ull - $this->readAway(); - - if ($this->_location == JSON_IN_OBJECT && !$this->_needProp) - $this->_needProp = true; - - return true; - } - - function _readString($quote) { - $output = ""; - $this->_token = JSON_STR; - $endString = false; - - while (($chr = $this->peek()) != -1) { - switch ($chr) { - case '\\': - // Read away slash - $this->read(); - - // Read escape code - $chr = $this->read(); - switch ($chr) { - case 't': - $output .= "\t"; - break; - - case 'b': - $output .= "\b"; - break; - - case 'f': - $output .= "\f"; - break; - - case 'r': - $output .= "\r"; - break; - - case 'n': - $output .= "\n"; - break; - - case 'u': - $output .= $this->_int2utf8(hexdec($this->read(4))); - break; - - default: - $output .= $chr; - break; - } - - break; - - case '\'': - case '"': - if ($chr == $quote) - $endString = true; - - $chr = $this->read(); - if ($chr != -1 && $chr != $quote) - $output .= $chr; - - break; - - default: - $output .= $this->read(); - } - - // String terminated - if ($endString) - break; - } - - $this->readAway(); - $this->_value = $output; - - // Needed a property - if ($this->_needProp) { - $this->_token = JSON_KEY; - $this->_needProp = false; - return true; - } - - if ($this->_location == JSON_IN_OBJECT && !$this->_needProp) - $this->_needProp = true; - - return true; - } - - function _int2utf8($int) { - $int = intval($int); - - switch ($int) { - case 0: - return chr(0); - - case ($int & 0x7F): - return chr($int); - - case ($int & 0x7FF): - return chr(0xC0 | (($int >> 6) & 0x1F)) . chr(0x80 | ($int & 0x3F)); - - case ($int & 0xFFFF): - return chr(0xE0 | (($int >> 12) & 0x0F)) . chr(0x80 | (($int >> 6) & 0x3F)) . chr (0x80 | ($int & 0x3F)); - - case ($int & 0x1FFFFF): - return chr(0xF0 | ($int >> 18)) . chr(0x80 | (($int >> 12) & 0x3F)) . chr(0x80 | (($int >> 6) & 0x3F)) . chr(0x80 | ($int & 0x3F)); - } - } - - function _readNumber($start) { - $value = ""; - $isFloat = false; - - $this->_token = JSON_INT; - $value .= $start; - - while (($chr = $this->peek()) != -1) { - if (is_numeric($chr) || $chr == '-' || $chr == '.') { - if ($chr == '.') - $isFloat = true; - - $value .= $this->read(); - } else - break; - } - - $this->readAway(); - - if ($isFloat) { - $this->_token = JSON_FLOAT; - $this->_value = floatval($value); - } else - $this->_value = intval($value); - - if ($this->_location == JSON_IN_OBJECT && !$this->_needProp) - $this->_needProp = true; - - return true; - } - - function readAway() { - while (($chr = $this->peek()) != null) { - if ($chr != ':' && $chr != ',' && $chr != ' ') - return; - - $this->read(); - } - } - - function read($len = 1) { - if ($this->_pos < $this->_len) { - if ($len > 1) { - $str = substr($this->_data, $this->_pos + 1, $len); - $this->_pos += $len; - - return $str; - } else - return $this->_data[++$this->_pos]; - } - - return null; - } - - function skip($len) { - $this->_pos += $len; - } - - function peek() { - if ($this->_pos < $this->_len) - return $this->_data[$this->_pos + 1]; - - return null; - } -} - -/** - * This class handles JSON stuff. - * - * @package MCManager.utils - */ -class Moxiecode_JSON { - function Moxiecode_JSON() { - } - - function decode($input) { - $reader = new Moxiecode_JSONReader($input); - - return $this->readValue($reader); - } - - function readValue(&$reader) { - $this->data = array(); - $this->parents = array(); - $this->cur =& $this->data; - $key = null; - $loc = JSON_IN_ARRAY; - - while ($reader->readToken()) { - switch ($reader->getToken()) { - case JSON_STR: - case JSON_INT: - case JSON_BOOL: - case JSON_FLOAT: - case JSON_NULL: - switch ($reader->getLocation()) { - case JSON_IN_OBJECT: - $this->cur[$key] = $reader->getValue(); - break; - - case JSON_IN_ARRAY: - $this->cur[] = $reader->getValue(); - break; - - default: - return $reader->getValue(); - } - break; - - case JSON_KEY: - $key = $reader->getValue(); - break; - - case JSON_START_OBJ: - case JSON_START_ARRAY: - if ($loc == JSON_IN_OBJECT) - $this->addArray($key); - else - $this->addArray(null); - - $cur =& $obj; - - $loc = $reader->getLocation(); - break; - - case JSON_END_OBJ: - case JSON_END_ARRAY: - $loc = $reader->getLocation(); - - if (count($this->parents) > 0) { - $this->cur =& $this->parents[count($this->parents) - 1]; - array_pop($this->parents); - } - break; - } - } - - return $this->data[0]; - } - - // This method was needed since PHP is crapy and doesn't have pointers/references - function addArray($key) { - $this->parents[] =& $this->cur; - $ar = array(); - - if ($key) - $this->cur[$key] =& $ar; - else - $this->cur[] =& $ar; - - $this->cur =& $ar; - } - - function getDelim($index, &$reader) { - switch ($reader->getLocation()) { - case JSON_IN_ARRAY: - case JSON_IN_OBJECT: - if ($index > 0) - return ","; - break; - } - - return ""; - } - - function encode($input) { - switch (gettype($input)) { - case 'boolean': - return $input ? 'true' : 'false'; - - case 'integer': - return (int) $input; - - case 'float': - case 'double': - return (float) $input; - - case 'NULL': - return 'null'; - - case 'string': - return $this->encodeString($input); - - case 'array': - return $this->_encodeArray($input); - - case 'object': - return $this->_encodeArray(get_object_vars($input)); - } - - return ''; - } - - function encodeString($input) { - // Needs to be escaped - if (preg_match('/[^a-zA-Z0-9]/', $input)) { - $output = ''; - - for ($i=0; $i_utf82utf16($char))); - } if (($byte & 0xF0) == 0xE0) { - $char = pack('C*', $byte, ord($input[$i + 1]), ord($input[$i + 2])); - $i += 2; - $output .= sprintf('\u%04s', bin2hex($this->_utf82utf16($char))); - } if (($byte & 0xF8) == 0xF0) { - $char = pack('C*', $byte, ord($input[$i + 1]), ord($input[$i + 2], ord($input[$i + 3]))); - $i += 3; - $output .= sprintf('\u%04s', bin2hex($this->_utf82utf16($char))); - } if (($byte & 0xFC) == 0xF8) { - $char = pack('C*', $byte, ord($input[$i + 1]), ord($input[$i + 2], ord($input[$i + 3]), ord($input[$i + 4]))); - $i += 4; - $output .= sprintf('\u%04s', bin2hex($this->_utf82utf16($char))); - } if (($byte & 0xFE) == 0xFC) { - $char = pack('C*', $byte, ord($input[$i + 1]), ord($input[$i + 2], ord($input[$i + 3]), ord($input[$i + 4]), ord($input[$i + 5]))); - $i += 5; - $output .= sprintf('\u%04s', bin2hex($this->_utf82utf16($char))); - } else if ($byte < 128) - $output .= $input[$i]; - } - } - - return '"' . $output . '"'; - } - - return '"' . $input . '"'; - } - - function _utf82utf16($utf8) { - if (function_exists('mb_convert_encoding')) - return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8'); - - switch (strlen($utf8)) { - case 1: - return $utf8; - - case 2: - return chr(0x07 & (ord($utf8[0]) >> 2)) . chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1]))); - - case 3: - return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))) . chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2]))); - } - - return ''; - } - - function _encodeArray($input) { - $output = ''; - $isIndexed = true; - - $keys = array_keys($input); - for ($i=0; $iencodeString($keys[$i]) . ':' . $this->encode($input[$keys[$i]]); - $isIndexed = false; - } else - $output .= $this->encode($input[$keys[$i]]); - - if ($i != count($keys) - 1) - $output .= ','; - } - - return $isIndexed ? '[' . $output . ']' : '{' . $output . '}'; - } -} - -?> diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/utils/Logger.php b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/utils/Logger.php --- a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/utils/Logger.php 9ce033526d4b872fa20141a90df8cb571059e4196a0698bab5f9ce11725b2d8fc03192eff3b979f9b11faf660a3929a5a7573a929393974022634131b0ee2ba5 +++ b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/classes/utils/Logger.php false @@ -1,267 +0,0 @@ -_path = ""; - $this->_filename = "{level}.log"; - $this->setMaxSize("100k"); - $this->_maxFiles = 10; - $this->_level = MC_LOGGER_DEBUG; - $this->_format = "[{time}] [{level}] {message}"; - } - - /** - * Sets the current log level, use the MC_LOGGER constants. - * - * @param int $level Log level instance for example MC_LOGGER_DEBUG. - */ - function setLevel($level) { - if (is_string($level)) { - switch (strtolower($level)) { - case "debug": - $level = MC_LOGGER_DEBUG; - break; - - case "info": - $level = MC_LOGGER_INFO; - break; - - case "warn": - case "warning": - $level = MC_LOGGER_WARN; - break; - - case "error": - $level = MC_LOGGER_ERROR; - break; - - case "fatal": - $level = MC_LOGGER_FATAL; - break; - - default: - $level = MC_LOGGER_FATAL; - } - } - - $this->_level = $level; - } - - /** - * Returns the current log level for example MC_LOGGER_DEBUG. - * - * @return int Current log level for example MC_LOGGER_DEBUG. - */ - function getLevel() { - return $this->_level; - } - - function setPath($path) { - $this->_path = $path; - } - - function getPath() { - return $this->_path; - } - - function setFileName($file_name) { - $this->_filename = $file_name; - } - - function getFileName() { - return $this->_filename; - } - - function setFormat($format) { - $this->_format = $format; - } - - function getFormat() { - return $this->_format; - } - - function setMaxSize($size) { - // Fix log max size - $logMaxSizeBytes = intval(preg_replace("/[^0-9]/", "", $size)); - - // Is KB - if (strpos((strtolower($size)), "k") > 0) - $logMaxSizeBytes *= 1024; - - // Is MB - if (strpos((strtolower($size)), "m") > 0) - $logMaxSizeBytes *= (1024 * 1024); - - $this->_maxSizeBytes = $logMaxSizeBytes; - $this->_maxSize = $size; - } - - function getMaxSize() { - return $this->_maxSize; - } - - function setMaxFiles($max_files) { - $this->_maxFiles = $max_files; - } - - function getMaxFiles() { - return $this->_maxFiles; - } - - function debug($msg) { - $args = func_get_args(); - $this->_logMsg(MC_LOGGER_DEBUG, implode(', ', $args)); - } - - function info($msg) { - $args = func_get_args(); - $this->_logMsg(MC_LOGGER_INFO, implode(', ', $args)); - } - - function warn($msg) { - $args = func_get_args(); - $this->_logMsg(MC_LOGGER_WARN, implode(', ', $args)); - } - - function error($msg) { - $args = func_get_args(); - $this->_logMsg(MC_LOGGER_ERROR, implode(', ', $args)); - } - - function fatal($msg) { - $args = func_get_args(); - $this->_logMsg(MC_LOGGER_FATAL, implode(', ', $args)); - } - - function isDebugEnabled() { - return $this->_level >= MC_LOGGER_DEBUG; - } - - function isInfoEnabled() { - return $this->_level >= MC_LOGGER_INFO; - } - - function isWarnEnabled() { - return $this->_level >= MC_LOGGER_WARN; - } - - function isErrorEnabled() { - return $this->_level >= MC_LOGGER_ERROR; - } - - function isFatalEnabled() { - return $this->_level >= MC_LOGGER_FATAL; - } - - function _logMsg($level, $message) { - $roll = false; - - if ($level < $this->_level) - return; - - $logFile = $this->toOSPath($this->_path . "/" . $this->_filename); - - switch ($level) { - case MC_LOGGER_DEBUG: - $levelName = "DEBUG"; - break; - - case MC_LOGGER_INFO: - $levelName = "INFO"; - break; - - case MC_LOGGER_WARN: - $levelName = "WARN"; - break; - - case MC_LOGGER_ERROR: - $levelName = "ERROR"; - break; - - case MC_LOGGER_FATAL: - $levelName = "FATAL"; - break; - } - - $logFile = str_replace('{level}', strtolower($levelName), $logFile); - - $text = $this->_format; - $text = str_replace('{time}', date("Y-m-d H:i:s"), $text); - $text = str_replace('{level}', strtolower($levelName), $text); - $text = str_replace('{message}', $message, $text); - $message = $text . "\r\n"; - - // Check filesize - if (file_exists($logFile)) { - $size = @filesize($logFile); - - if ($size + strlen($message) > $this->_maxSizeBytes) - $roll = true; - } - - // Roll if the size is right - if ($roll) { - for ($i=$this->_maxFiles-1; $i>=1; $i--) { - $rfile = $this->toOSPath($logFile . "." . $i); - $nfile = $this->toOSPath($logFile . "." . ($i+1)); - - if (@file_exists($rfile)) - @rename($rfile, $nfile); - } - - @rename($logFile, $this->toOSPath($logFile . ".1")); - - // Delete last logfile - $delfile = $this->toOSPath($logFile . "." . ($this->_maxFiles + 1)); - if (@file_exists($delfile)) - @unlink($delfile); - } - - // Append log line - if (($fp = @fopen($logFile, "a")) != null) { - @fputs($fp, $message); - @fflush($fp); - @fclose($fp); - } - } - - /** - * Converts a Unix path to OS specific path. - * - * @param String $path Unix path to convert. - */ - function toOSPath($path) { - return str_replace("/", DIRECTORY_SEPARATOR, $path); - } -} - -?> diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/config.php b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/config.php --- a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/config.php 5d27ac31b4c3c6fce0342b07ec2c24ca111e562d19548746b0e9524cd103879f8135c0899a05b0b3729a5d646c4071441719a7863db812a8639dbe11882c1051 +++ b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/config.php false @@ -1,27 +0,0 @@ - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/css/content.css b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/css/content.css --- a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/css/content.css 9f770f8cef9c7c6909797bc14cfd6a094ea5a3ca06248b01eab2b2c5eb3bce6165c29e99cf34234637f4cc71a54446a338e665e586e350ce795a17e7fc8940a4 +++ b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/css/content.css false @@ -1 +0,0 @@ -.mceItemHiddenSpellWord {background:url(../img/wline.svg) repeat-x bottom left; cursor:default;} diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js --- a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js adde3e71e46f75e1348159acf2e6a8d17134be5e2f0fc9cb93b83276bc207a8e2f68ad5643cb84039a8938510085803afde0aa988e75d41e256b2bf415c4ceb4 +++ b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js false @@ -1,337 +0,0 @@ -/** - * $Id: editor_plugin_src.js 425 2007-11-21 15:17:39Z spocke $ - * - * @author Moxiecode - */ - -(function() { - var JSONRequest = tinymce.util.JSONRequest, each = tinymce.each, DOM = tinymce.DOM; - - tinymce.create('tinymce.plugins.SpellcheckerPlugin', { - getInfo : function() { - return { - longname : 'Spellchecker', - author : 'Moxiecode Systems AB', - authorurl : 'http://tinymce.moxiecode.com', - infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker', - version : "2.0.2" - }; - }, - - init : function(ed, url) { - var t = this, cm; - - t.url = url; - t.editor = ed; - - // Register commands - ed.addCommand('mceSpellCheck', function() { - if (!t.active) { - ed.setProgressState(1); - t._sendRPC('checkWords', [t.selectedLang, t._getWords()], function(r) { - if (r.length > 0) { - t.active = 1; - t._markWords(r); - ed.setProgressState(0); - ed.nodeChanged(); - } else { - ed.setProgressState(0); - ed.windowManager.alert('spellchecker.no_mpell'); - } - }); - } else - t._done(); - }); - - ed.onInit.add(function() { - if (ed.settings.content_css !== false) - ed.dom.loadCSS(url + '/css/content.css'); - }); - - ed.onClick.add(t._showMenu, t); - ed.onContextMenu.add(t._showMenu, t); - ed.onBeforeGetContent.add(function() { - if (t.active) - t._removeWords(); - }); - - ed.onNodeChange.add(function(ed, cm) { - cm.setActive('spellchecker', t.active); - }); - - ed.onSetContent.add(function() { - t._done(); - }); - - ed.onBeforeGetContent.add(function() { - t._done(); - }); - - ed.onBeforeExecCommand.add(function(ed, cmd) { - if (cmd == 'mceFullScreen') - t._done(); - }); - - // Find selected language - t.languages = {}; - each(ed.getParam('spellchecker_languages', '+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv', 'hash'), function(v, k) { - if (k.indexOf('+') === 0) { - k = k.substring(1); - t.selectedLang = v; - } - - t.languages[k] = v; - }); - }, - - createControl : function(n, cm) { - var t = this, c, ed = t.editor; - - if (n == 'spellchecker') { - c = cm.createSplitButton(n, {title : 'spellchecker.desc', cmd : 'mceSpellCheck', scope : t}); - - c.onRenderMenu.add(function(c, m) { - m.add({title : 'spellchecker.langs', 'class' : 'mceMenuItemTitle'}).setDisabled(1); - each(t.languages, function(v, k) { - var o = {icon : 1}, mi; - - o.onclick = function() { - mi.setSelected(1); - t.selectedItem.setSelected(0); - t.selectedItem = mi; - t.selectedLang = v; - }; - - o.title = k; - mi = m.add(o); - mi.setSelected(v == t.selectedLang); - - if (v == t.selectedLang) - t.selectedItem = mi; - }) - }); - - return c; - } - }, - - // Internal functions - - _walk : function(n, f) { - var d = this.editor.getDoc(), w; - - if (d.createTreeWalker) { - w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false); - - while ((n = w.nextNode()) != null) - f.call(this, n); - } else - tinymce.walk(n, f, 'childNodes'); - }, - - _getSeparators : function() { - var re = '', i, str = this.editor.getParam('spellchecker_word_separator_chars', '\\s!"#$%&()*+,-./:;<=>?@[\]^_{|}'); - - // Build word separator regexp - for (i=0; i$1
    $2'); - v = v.replace(r3, '$1$2'); - - dom.replace(dom.create('span', {'class' : 'mceItemHidden'}, v), n); - } - } - }); - - se.moveToBookmark(b); - }, - - _showMenu : function(ed, e) { - var t = this, ed = t.editor, m = t._menu, p1, dom = ed.dom, vp = dom.getViewPort(ed.getWin()); - - if (!m) { - p1 = DOM.getPos(ed.getContentAreaContainer()); - //p2 = DOM.getPos(ed.getContainer()); - - m = ed.controlManager.createDropMenu('spellcheckermenu', { - offset_x : p1.x, - offset_y : p1.y, - 'class' : 'mceNoIcons' - }); - - t._menu = m; - } - - if (dom.hasClass(e.target, 'mceItemHiddenSpellWord')) { - m.removeAll(); - m.add({title : 'spellchecker.wait', 'class' : 'mceMenuItemTitle'}).setDisabled(1); - - t._sendRPC('getSuggestions', [t.selectedLang, dom.decode(e.target.innerHTML)], function(r) { - m.removeAll(); - - if (r.length > 0) { - m.add({title : 'spellchecker.sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1); - each(r, function(v) { - m.add({title : v, onclick : function() { - dom.replace(ed.getDoc().createTextNode(v), e.target); - t._checkDone(); - }}); - }); - - m.addSeparator(); - } else - m.add({title : 'spellchecker.no_sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1); - - m.add({ - title : 'spellchecker.ignore_word', - onclick : function() { - dom.remove(e.target, 1); - t._checkDone(); - } - }); - - m.add({ - title : 'spellchecker.ignore_words', - onclick : function() { - t._removeWords(dom.decode(e.target.innerHTML)); - t._checkDone(); - } - }); - - m.update(); - }); - - ed.selection.select(e.target); - p1 = dom.getPos(e.target); - m.showMenu(p1.x, p1.y + e.target.offsetHeight - vp.y); - - return tinymce.dom.Event.cancel(e); - } else - m.hideMenu(); - }, - - _checkDone : function() { - var t = this, ed = t.editor, dom = ed.dom, o; - - each(dom.select('span'), function(n) { - if (n && dom.hasClass(n, 'mceItemHiddenSpellWord')) { - o = true; - return false; - } - }); - - if (!o) - t._done(); - }, - - _done : function() { - var t = this, la = t.active; - - if (t.active) { - t.active = 0; - t._removeWords(); - - if (t._menu) - t._menu.hideMenu(); - - if (la) - t.editor.nodeChanged(); - } - }, - - _sendRPC : function(m, p, cb) { - var t = this, url = t.editor.getParam("spellchecker_rpc_url", this.url+'/rpc.php'); - - if (url == '{backend}') { - t.editor.setProgressState(0); - alert('Please specify: spellchecker_rpc_url'); - return; - } - - JSONRequest.sendRPC({ - url : url, - method : m, - params : p, - success : cb, - error : function(e, x) { - t.editor.setProgressState(0); - t.editor.windowManager.alert(e.errstr || ('Error response: ' + x.responseText)); - } - }); - } - }); - - // Register plugin - tinymce.PluginManager.add('spellchecker', tinymce.plugins.SpellcheckerPlugin); -})(); diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/img/wline.svg b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/img/wline.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/img/wline.svg 2d9abb6962e3daf5736d1562f4c7f719b7e0e53ea35475cc9f548862485b8973d054238fdac0f38f0cbfff52543fe5cfe5ed873561d055167dcf9fa3a74d5944 +++ b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/img/wline.svg false @@ -1,6 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/includes/general.php b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/includes/general.php --- a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/includes/general.php 31704cd391d31f9a3c4071eb8c33d5d6d1071d9290b77d3a7ac93582c7a9ac34e5c4275ae1bdd98c2622d4308ed44f541fb8de2e0bda0de703fae53419f76a43 +++ b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/includes/general.php false @@ -1,97 +0,0 @@ - $value) - $newarray[formatParam($name, $sanitize)] = formatParam($value, $sanitize); - - return $newarray; - } - - return formatParam($_REQUEST[$name], $sanitize); -} - -function &getLogger() { - global $mcLogger, $man; - - if (isset($man)) - $mcLogger = $man->getLogger(); - - if (!$mcLogger) { - $mcLogger = new Moxiecode_Logger(); - - // Set logger options - $mcLogger->setPath(dirname(__FILE__) . "/../logs"); - $mcLogger->setMaxSize("100kb"); - $mcLogger->setMaxFiles("10"); - $mcLogger->setFormat("{time} - {message}"); - } - - return $mcLogger; -} - -function debug($msg) { - $args = func_get_args(); - - $log = getLogger(); - $log->debug(implode(', ', $args)); -} - -function info($msg) { - $args = func_get_args(); - - $log = getLogger(); - $log->info(implode(', ', $args)); -} - -function error($msg) { - $args = func_get_args(); - - $log = getLogger(); - $log->error(implode(', ', $args)); -} - -function warn($msg) { - $args = func_get_args(); - - $log = getLogger(); - $log->warn(implode(', ', $args)); -} - -function fatal($msg) { - $args = func_get_args(); - - $log = getLogger(); - $log->fatal(implode(', ', $args)); -} - -?> diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/rpc.php b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/rpc.php --- a/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/rpc.php dcd30ce1321bb7891826b352582f3cba30a5ab9b4bdf862b591e18fc1d986bdc01b91185270ce8929ca4952b29103cc040b87547fecd97b3ebe0852537fd1d71 +++ b/mp-wp/wp-includes/js/tinymce/plugins/spellchecker/rpc.php false @@ -1,111 +0,0 @@ -decode($raw); - -// Execute RPC -if (isset($config['general.engine'])) { - $spellchecker = new $config['general.engine']($config); - $result = call_user_func_array(array($spellchecker, $input['method']), $input['params']); -} else - die('{"result":null,"id":null,"error":{"errstr":"You must choose an spellchecker engine in the config.php file.","errfile":"","errline":null,"errcontext":"","level":"FATAL"}}'); - -// Request and response id should always be the same -$output = array( - "id" => $input->id, - "result" => $result, - "error" => null -); - -// Return JSON encoded string -echo $json->encode($output); - -?> diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/css/content.css b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/css/content.css --- a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/css/content.css 358289bd3f057bdee1a83f6df15076a89c17112c6672d4cae5689066b82ca2d54c4604de94ee12ad2aa17d450a7adfbe7582c36619aa66b13ea6665755ee3ae0 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/css/content.css false @@ -1,14 +0,0 @@ -.mceWPnextpage, .mceWPmore { - border: 0px; - border-top: 1px dotted #cccccc; - display: block; - width: 100%; - height: 12px; - margin-top: 15px; -} -.mceWPmore { - background: #ffffff url(../img/more_bug.svg) no-repeat right top; -} -.mceWPnextpage { - background: #ffffff url(../img/page_bug.svg) no-repeat right top; -} diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js --- a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js cc017c1d0d9539ebcc711895b1e02425e2a19ff340da4d1635988be7a46764b312c88c969d3240d29e73b3d16017b7f931ce882c60701186549e7cf48e8d63d0 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js false @@ -1,298 +0,0 @@ -/** - * WordPress plugin. - */ - -(function() { - var DOM = tinymce.DOM; - - // Load plugin specific language pack - tinymce.PluginManager.requireLangPack('wordpress'); - - tinymce.create('tinymce.plugins.WordPress', { - init : function(ed, url) { - var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'); - var moreHTML = ''; - var nextpageHTML = ''; - - if ( getUserSetting('hidetb', '0') == '1' ) - ed.settings.wordpress_adv_hidden = 0; - - // Hides the specified toolbar and resizes the iframe - ed.onPostRender.add(function() { - if ( ed.getParam('wordpress_adv_hidden', 1) ) { - DOM.hide(ed.controlManager.get(tbId).id); - t._resizeIframe(ed, tbId, 28); - } - }); - - // Register commands - ed.addCommand('WP_More', function() { - ed.execCommand('mceInsertContent', 0, moreHTML); - }); - - ed.addCommand('WP_Page', function() { - ed.execCommand('mceInsertContent', 0, nextpageHTML); - }); - - ed.addCommand('WP_Help', function() { - ed.windowManager.open({ - url : tinymce.baseURL + '/wp-mce-help.php', - width : 450, - height : 420, - inline : 1 - }); - }); - - ed.addCommand('WP_Adv', function() { - var id = ed.controlManager.get(tbId).id, cm = ed.controlManager; - - if (DOM.isHidden(id)) { - cm.setActive('wp_adv', 1); - DOM.show(id); - t._resizeIframe(ed, tbId, -28); - ed.settings.wordpress_adv_hidden = 0; - setUserSetting('hidetb', '1'); - } else { - cm.setActive('wp_adv', 0); - DOM.hide(id); - t._resizeIframe(ed, tbId, 28); - ed.settings.wordpress_adv_hidden = 1; - setUserSetting('hidetb', '0'); - } - }); - - // Register buttons - ed.addButton('wp_more', { - title : 'wordpress.wp_more_desc', - image : url + '/img/more.svg', - cmd : 'WP_More' - }); - - ed.addButton('wp_page', { - title : 'wordpress.wp_page_desc', - image : url + '/img/page.svg', - cmd : 'WP_Page' - }); - - ed.addButton('wp_help', { - title : 'wordpress.wp_help_desc', - image : url + '/img/help.svg', - cmd : 'WP_Help' - }); - - ed.addButton('wp_adv', { - title : 'wordpress.wp_adv_desc', - image : url + '/img/toolbars.svg', - cmd : 'WP_Adv' - }); - - // Add Media buttons - ed.addButton('add_media', { - title : 'wordpress.add_media', - image : url + '/img/media.svg', - onclick : function() { - tb_show('', tinymce.DOM.get('add_media').href); - tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' ); - } - }); - - ed.addButton('add_image', { - title : 'wordpress.add_image', - image : url + '/img/image.svg', - onclick : function() { - tb_show('', tinymce.DOM.get('add_image').href); - tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' ); - } - }); - - ed.addButton('add_video', { - title : 'wordpress.add_video', - image : url + '/img/video.svg', - onclick : function() { - tb_show('', tinymce.DOM.get('add_video').href); - tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' ); - } - }); - - ed.addButton('add_audio', { - title : 'wordpress.add_audio', - image : url + '/img/audio.svg', - onclick : function() { - tb_show('', tinymce.DOM.get('add_audio').href); - tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' ); - } - }); - - // Add Media buttons to fullscreen - ed.onBeforeExecCommand.add(function(ed, cmd, ui, val) { - if ( 'mceFullScreen' != cmd ) return; - if ( 'mce_fullscreen' != ed.id ) - ed.settings.theme_advanced_buttons1 += ',|,add_image,add_video,add_audio,add_media'; - }); - - // Add class "alignleft", "alignright" and "aligncenter" when selecting align for images. - ed.addCommand('JustifyLeft', function() { - var n = ed.selection.getNode(); - - if ( n.nodeName != 'IMG' ) - ed.editorCommands.mceJustify('JustifyLeft', 'left'); - else ed.plugins.wordpress.do_align(n, 'alignleft'); - }); - - ed.addCommand('JustifyRight', function() { - var n = ed.selection.getNode(); - - if ( n.nodeName != 'IMG' ) - ed.editorCommands.mceJustify('JustifyRight', 'right'); - else ed.plugins.wordpress.do_align(n, 'alignright'); - }); - - ed.addCommand('JustifyCenter', function() { - var n = ed.selection.getNode(), P = ed.dom.getParent(n, 'p'), DL = ed.dom.getParent(n, 'dl'); - - if ( n.nodeName == 'IMG' && ( P || DL ) ) - ed.plugins.wordpress.do_align(n, 'aligncenter'); - else ed.editorCommands.mceJustify('JustifyCenter', 'center'); - }); - - // Word count if script is loaded - if ( 'undefined' != typeof wpWordCount ) { - var last = 0; - ed.onKeyUp.add(function(ed, e) { - if ( e.keyCode == last ) return; - if ( 13 == e.keyCode || 8 == last || 46 == last ) wpWordCount.wc( ed.getContent({format : 'raw'}) ); - last = e.keyCode; - }); - }; - - // Add listeners to handle more break - t._handleMoreBreak(ed, url); - - // Add custom shortcuts - ed.addShortcut('alt+shift+c', ed.getLang('justifycenter_desc'), 'JustifyCenter'); - ed.addShortcut('alt+shift+r', ed.getLang('justifyright_desc'), 'JustifyRight'); - ed.addShortcut('alt+shift+l', ed.getLang('justifyleft_desc'), 'JustifyLeft'); - ed.addShortcut('alt+shift+j', ed.getLang('justifyfull_desc'), 'JustifyFull'); - ed.addShortcut('alt+shift+q', ed.getLang('blockquote_desc'), 'mceBlockQuote'); - ed.addShortcut('alt+shift+u', ed.getLang('bullist_desc'), 'InsertUnorderedList'); - ed.addShortcut('alt+shift+o', ed.getLang('numlist_desc'), 'InsertOrderedList'); - ed.addShortcut('alt+shift+d', ed.getLang('striketrough_desc'), 'Strikethrough'); - ed.addShortcut('alt+shift+n', ed.getLang('spellchecker.desc'), 'mceSpellCheck'); - ed.addShortcut('alt+shift+a', ed.getLang('link_desc'), 'mceLink'); - ed.addShortcut('alt+shift+s', ed.getLang('unlink_desc'), 'unlink'); - ed.addShortcut('alt+shift+m', ed.getLang('image_desc'), 'mceImage'); - ed.addShortcut('alt+shift+g', ed.getLang('fullscreen.desc'), 'mceFullScreen'); - ed.addShortcut('alt+shift+z', ed.getLang('wp_adv_desc'), 'WP_Adv'); - ed.addShortcut('alt+shift+h', ed.getLang('help_desc'), 'WP_Help'); - ed.addShortcut('alt+shift+t', ed.getLang('wp_more_desc'), 'WP_More'); - ed.addShortcut('alt+shift+p', ed.getLang('wp_page_desc'), 'WP_Page'); - - if ( tinymce.isWebKit ) { - ed.addShortcut('alt+shift+b', ed.getLang('bold_desc'), 'Bold'); - ed.addShortcut('alt+shift+i', ed.getLang('italic_desc'), 'Italic'); - } - }, - - getInfo : function() { - return { - longname : 'WordPress Plugin', - author : 'WordPress', // add Moxiecode? - authorurl : 'http://wordpress.org', - infourl : 'http://wordpress.org', - version : '3.0' - }; - }, - - // Internal functions - do_align : function(n, a) { - var P, DL, DIV, cls, c, ed = tinyMCE.activeEditor; - - if ( /^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className) ) - return; - - P = ed.dom.getParent(n, 'p'); - DL = ed.dom.getParent(n, 'dl'); - DIV = ed.dom.getParent(n, 'div'); - - if ( DL && DIV ) { - cls = ed.dom.hasClass(DL, a) ? 'alignnone' : a; - DL.className = DL.className.replace(/align[^ '"]+\s?/g, ''); - ed.dom.addClass(DL, cls); - c = (cls == 'aligncenter') ? ed.dom.addClass(DIV, 'mceIEcenter') : ed.dom.removeClass(DIV, 'mceIEcenter'); - } else if ( P ) { - cls = ed.dom.hasClass(n, a) ? 'alignnone' : a; - n.className = n.className.replace(/align[^ '"]+\s?/g, ''); - ed.dom.addClass(n, cls); - if ( cls == 'aligncenter' ) - ed.dom.setStyle(P, 'textAlign', 'center'); - else if (P.style && P.style.textAlign == 'center') - ed.dom.setStyle(P, 'textAlign', ''); - } - - ed.execCommand('mceRepaint'); - }, - - // Resizes the iframe by a relative height value - _resizeIframe : function(ed, tb_id, dy) { - var ifr = ed.getContentAreaContainer().firstChild; - - DOM.setStyle(ifr, 'height', ifr.clientHeight + dy); // Resize iframe - ed.theme.deltaHeight += dy; // For resize cookie - }, - - _handleMoreBreak : function(ed, url) { - var moreHTML = '$1'; - var nextpageHTML = ''; - - // Load plugin specific CSS into editor - ed.onInit.add(function() { - ed.dom.loadCSS(url + '/css/content.css'); - }); - - // Display morebreak instead if img in element path - ed.onPostRender.add(function() { - if (ed.theme.onResolveName) { - ed.theme.onResolveName.add(function(th, o) { - if (o.node.nodeName == 'IMG') { - if ( ed.dom.hasClass(o.node, 'mceWPmore') ) - o.name = 'wpmore'; - if ( ed.dom.hasClass(o.node, 'mceWPnextpage') ) - o.name = 'wppage'; - } - - }); - } - }); - - // Replace morebreak with images - ed.onBeforeSetContent.add(function(ed, o) { - o.content = o.content.replace(//g, moreHTML); - o.content = o.content.replace(//g, nextpageHTML); - }); - - // Replace images with morebreak - ed.onPostProcess.add(function(ed, o) { - if (o.get) - o.content = o.content.replace(/]+>/g, function(im) { - if (im.indexOf('class="mceWPmore') !== -1) { - var m, moretext = (m = im.match(/alt="(.*?)"/)) ? m[1] : ''; - im = ''; - } - if (im.indexOf('class="mceWPnextpage') !== -1) - im = ''; - - return im; - }); - }); - - // Set active buttons if user selected pagebreak or more break - ed.onNodeChange.add(function(ed, cm, n) { - cm.setActive('wp_page', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mceWPnextpage')); - cm.setActive('wp_more', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mceWPmore')); - }); - } - }); - - // Register plugin - tinymce.PluginManager.add('wordpress', tinymce.plugins.WordPress); -})(); diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/audio.svg b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/audio.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/audio.svg 381491fb91f0e7f7506cdf0e97d53c49d08ae4986d17b192b1cd253b00159c1b8c3b224087551c83a1ba2afdb5af9cd5fc2a94287f0d460e3ab8f45973350566 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/audio.svg false @@ -1,8 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/help.svg b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/help.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/help.svg b2a1c56986bf36839eb567e4fd05f4970cec1a8fad65d3cdb0ba38e12f8375b904f2fe1927cf095cfa3f347d61b4b4228dbc6ccdf00b3fa6fe1ae07765b8c936 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/help.svg false @@ -1,11 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/image.svg b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/image.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/image.svg 8b235a338bf963737339d2a1aa0e441c0502cad3d3fe31ccd454ca8da219ab2ddd8bf1effa6d263f09ddd5610ff5fab203cee6b6c688a2a975ff3de35a8aa176 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/image.svg false @@ -1,7 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/media.svg b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/media.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/media.svg ff393ea68531c3810717bab9de800cb030ccfd8cf4358288f64258ab5a3e3f5948e01e27bf09ddf6d54834d7616f643c6186fd410ad023a3601e93e01195c64f +++ b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/media.svg false @@ -1,8 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/more.svg b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/more.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/more.svg 8fdc5590f3759896171b924ac7d76a6f5cffd15ddb12331bfb7b5253d8022ea9bfd5a5b82833b193fa242ee965b561b0580e91c752502ef1b1ef7b4d189fe85a +++ b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/more.svg false @@ -1,7 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/more_bug.svg b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/more_bug.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/more_bug.svg 4694babc6a7afd9292b3977ae897693fa59a15dadcac04037736a3f26a812c6b308af996a3d57d53dd5933e0532345a4223401da235aab33f1d39bd36f28e550 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/more_bug.svg false @@ -1,8 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/page.svg b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/page.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/page.svg 4733b517592fd1132e74ef7c2b4fac8c717282f94734d56f9a77f1c5cfe5479651f0f4cfc0816c0c9f06f1f211229f92bdabf729133fb4cfe3a28cee02559371 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/page.svg false @@ -1,7 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/page_bug.svg b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/page_bug.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/page_bug.svg 2bfdc56bd3f080c6e78f7692cb797121ee36e7b510b703aeb5ab5400bf4115c0f057811f71744acec5b4dd49cb65eb8fbc81b93482d227293e8aa083d9282dc9 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/page_bug.svg false @@ -1,9 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/toolbars.svg b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/toolbars.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/toolbars.svg 31efb16acacdee1fcc1a746038f6772b19ddd5d55a4c85eccac3bbfeaf8638b97e53baff6820d9e9a70713cf6eee350b362d97c102907dd3b8a3ec6dd5b060b1 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/toolbars.svg false @@ -1,10 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/trans.svg b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/trans.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/trans.svg 3e90a5cf5d7eaaa8d42315526cab2f0953963dd261fc77894199072632283d9c33921ac95ee84564af909161bf23712b97a412b08372a8e9f5d05e249e892c87 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/trans.svg false @@ -1,6 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/video.svg b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/video.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/video.svg bca94519e39b1efb6368dcb0065085dbb826885f820c6d497f6dcddbfe953cc3da56c727981ca87b933cc5f3f4fe28d578ad40afdeea57c6921800cedc511fb4 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wordpress/img/video.svg false @@ -1,7 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css b/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css --- a/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css bc7bfc3bd2053ffe7bb2874bf03da01b2bc66fc6d41ef8d3f9df79b7c5f68ac3231b42340b30428d74c94872b13cd20de5fdbe06be2c9cdb9664dd40b031884a +++ b/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css false @@ -1,68 +0,0 @@ - -body#media-upload ul#sidemenu { - left: auto; - right: 0; -} - -#basic .align .field label { - display: block; - float: right; - padding: 0 24px 0 0; - margin: 5px 3px 5px 5px; -} - -.align .field input { - display: block; - float: right; - margin: 5px 15px 5px 0; -} - -tr.image-size label { - margin: 0; -} - -tr.image-size input { - margin: 3px 15px 0 5px; -} - -.image-align-none-label, -.image-align-left-label, -.image-align-center-label, -.image-align-right-label { - background-position: center right; -} - -#media-upload .describe th.label { - text-align: right; -} - -.show-align, -.alignright, -#img_size { - float: left; -} - -tr.image-size label, -tr.image-size input, -#img_dim label, -#img_dim input, -#img_prop label, -#img_prop input, -#img_size_div, -.alignleft { - float: right; -} - -#img_dim label, -#img_prop label { - margin: 5px 0pt; -} - -#img_dim input, -#img_prop input { - margin: 0 5px 0 10px; -} - -#img_size_title { - text-align: left; -} diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css b/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css --- a/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css 595ce70416d5ad4532b96a4a245b37d3fd6ebd054a59d24743e64498b8c44ca8358727887a04000edb68ad7b659b811f3abb0cb7d5b9ed72ff904d23e5f8b0e0 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css false @@ -1,343 +0,0 @@ - -html, body { - background-color: #fff; - margin: 0; - padding: 0; -} - -.submit input, -.button, -.button-primary, -.button-secondary, -.button-highlighted { - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - text-decoration: none; - font-size: 11px !important; - line-height: 16px; - padding: 2px 8px; - cursor: pointer; - border-width: 1px; - border-style: solid; - -moz-border-radius: 11px; - -khtml-border-radius: 11px; - -webkit-border-radius: 11px; - border-radius: 11px; - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; - -khtml-box-sizing: content-box; - box-sizing: content-box; -} - -a.button { - padding: 4px 8px; -} - -textarea, -input, -select { - font: 13px Verdana, Arial, Helvetica, sans-serif; - margin: 1px; - padding: 3px; -} - -body, td { - font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; -} - -abbr.required { - color: #FF0000; - text-align: left; -} - -img.alignright, -.alignright { - float: right; -} - -img.alignleft, -.alignleft { - float: left; -} - -img.aligncenter { - display: block; - margin-left: auto; - margin-right: auto; -} - -label { - cursor: pointer; -} - -th.label { - width: 107px; -} - -#media-upload #basic th.label { - padding: 5px 5px 5px 0; -} - -.show-align { - height: 200px; - width: 480px; - float: right; - background-color: #f1f1f1; - cursor: default; - -moz-user-select: none; - user-select: none; - overflow: hidden; -} - -#img-edit { - border: 1px solid #dfdfdf; - width: 623px; - margin: 15px auto; -} - -#media-upload .media-upload-form table.describe { - border-top-style: none; - border-top-width: 0; -} - -#img_demo_txt { - font-size: 9px; - line-height: 13px; - font-family: Monaco,"Courier New",Courier,monospace; - color: #888; -} - -#img_demo { - padding: 0; -} - -#saveeditimg { - padding: 10px 0 0 5px; - border-top: 1px solid #ccc; -} - -#sidemenu, -#sidemenu li { - list-style: none; -} - -#sidemenu li { - display: inline; -} - -#sidemenu a { - border-bottom-style: solid; - border-bottom-width: 1px; - border-top-style: solid; - border-top-width: 1px; - display: block; - float: left; - height: 28px; - line-height: 28px; - text-decoration: none; - text-align: center; - white-space: nowrap; - margin: 0; - padding: 0pt 7px; -} - -#sidemenu a.current { - -moz-border-radius-topleft: 4px; - -khtml-border-top-left-radius: 4px; - -webkit-border-top-left-radius: 4px; - border-top-left-radius: 4px; - -moz-border-radius-topright: 4px; - -khtml-border-top-right-radius: 4px; - -webkit-border-top-right-radius: 4px; - border-top-right-radius: 4px; - border-style:solid; - border-width:1px; - font-weight:normal; -} - -#adv_settings .field label { - padding: 0 5px 5px; -} - -#media-upload h3 { - clear: both; - padding: 0pt 0pt 3px; - border-bottom-style: solid; - border-bottom-width: 1px; - font-family: Georgia,"Times New Roman",Times,serif; - font-size: 20px; - font-weight: normal; - line-height: normal; - margin: 0 0 10px -4px; - padding: 15px 0 3px; - border-bottom-color: #DADADA; - color: #5A5A5A; -} - -#img_dim #width, -#img_dim #height, -#img_prop #border, -#img_prop #vspace, -#img_prop #hspace { - width: 36px; -} - -#img_dim abbr { - padding: 0 4px; -} - -#show_align_sp { - width: 115px; -} - -#img_dim input, -#img_prop input { - margin-right: 10px; -} - -#basic .align .field label { - padding: 0 0 0 24px; -} - -#basic { - padding-top: 2px; -} - -td { - padding: 2px 0; -} - -#img_size { - float: right; - text-align: center; - cursor: pointer; - background-color: #f1f1f1; - padding: 5px 0; - width: 45px; -} - -#img_size div { - font-size: 10px; - padding: 2px; - border: 1px solid #f1f1f1; - line-height: 15px; - height: 15px; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - color: #07273E; -} - -#img_size div#s100 { - border-color: #A3A3A3; - background-color: #E5E5E5; -} - -#img_size_div { - width: 100px; - float: left; - cursor: default; -} - -#img_size_title { - margin: 0 7px 5px; - text-align: right; - font-weight: bold; -} - -#img_align_td { - padding: 2px 0 8px; -} - -#media-upload tr.align td.field { - text-align: center; -} - -.describe td { - vertical-align: middle; -} - -#media-upload .describe th.label { - padding-top: .5em; - text-align: left; -} - -#media-upload .describe { - border-top-width: 1px; - border-top-style: solid; - padding: 5px; - width: 100%; - clear: both; - cursor: default; -} - -form { - margin: 1em; -} - -.describe input[type="text"], -.describe textarea { - width: 460px; - border: 1px solid #dfdfdf; -} - - -.media-upload-form label, -.media-upload-form legend { - font-weight: bold; - font-size: 13px; - color: #464646; -} - -.align .field label { - display: inline; - padding: 0 0 0 28px; - margin: 0 1em 0 0; -} -.image-align-none-label { - background: url(../../../../../../wp-admin/images/align-none.svg) no-repeat center left; -} - -.image-align-left-label { - background: url(../../../../../../wp-admin/images/align-left.svg) no-repeat center left; -} - -.image-align-center-label { - background: url(../../../../../../wp-admin/images/align-center.svg) no-repeat center left; -} - -.image-align-right-label { - background: url(../../../../../../wp-admin/images/align-right.svg) no-repeat center left; -} - -div#media-upload-header { - margin: 0; - padding: 0 5px; - font-weight: bold; - position: relative; - border-bottom-width: 1px; - border-bottom-style: solid; - height: 2.5em; -} - -body#media-upload ul#sidemenu { - font-weight: normal; - margin: 0 5px; - position: relative; - left: 0px; - bottom: -4px; -} - -div#media-upload-error { - margin: 1em; - font-weight: bold; -} - -* html #sidemenu li { - zoom: 100%; -} - -* html #sidemenu a { - height: 27px; - line-height: 26px; -} diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html b/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html --- a/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html c1c185e376320bb83ebe1246cdea8f45da82a3db0cd4c22c0437d8ec89e6033e46ab9ff435ccb38e97e9a0ab6d789f48e06fbf420fe646fd2dfe7d27a7f6cbaf +++ b/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html false @@ -1,275 +0,0 @@ - - - - - - - - - - - - - - - - - - -
    -
    -
    -
    {#wpeditimage.size}
    -
    -
    {#wpeditimage.s130}
    -
    {#wpeditimage.s120}
    -
    {#wpeditimage.s110}
    -
    {#wpeditimage.s100}
    -
    {#wpeditimage.s90}
    -
    {#wpeditimage.s80}
    -
    {#wpeditimage.s70}
    -
    {#wpeditimage.s60}
    -
    -
    -
    - - - Lorem ipsum dolor sit amet consectetuer velit pretium euismod ipsum enim. Mi cursus at a mollis senectus id arcu gravida quis urna. Sed et felis id tempus Morbi mauris tincidunt enim In mauris. Pede eu risus velit libero natoque enim lorem adipiscing ipsum consequat. In malesuada et sociis tincidunt tempus pellentesque cursus convallis ipsum Suspendisse. Risus In ac quis ut Nunc convallis laoreet ante Suspendisse Nam. Amet amet urna condimentum Vestibulum sem at Curabitur lorem et cursus. Sodales tortor fermentum leo dui habitant Nunc Sed Vestibulum. - Ut lorem In penatibus libero id ipsum sagittis nec elit Sed. Condimentum eget Vivamus vel consectetuer lorem molestie turpis amet tellus id. Condimentum vel ridiculus Fusce sed pede Nam nunc sodales eros tempor. Sit lacus magna dictumst Curabitur fringilla auctor id vitae wisi facilisi. Fermentum eget turpis felis velit leo Nunc Proin orci molestie Praesent. Curabitur tellus scelerisque suscipit ut sem amet cursus mi Morbi eu. Donec libero Vestibulum augue et mollis accumsan ornare condimentum In enim. Leo eget ac consectetuer quis condimentum malesuada. - Condimentum commodo et Lorem fringilla malesuada libero volutpat sem tellus enim. Tincidunt sed at Aenean nec nonummy porttitor Nam Sed Nulla ut. Auctor leo In aliquet Curabitur eros et velit Quisque justo morbi. Et vel mauris sit nulla semper vitae et quis at dui. Id at elit laoreet justo eu mauris Quisque et interdum pharetra. Nullam accumsan interdum Maecenas condimentum quis quis Fusce a sollicitudin Sed. Non Quisque Vivamus congue porttitor non semper ipsum porttitor quis vel. Donec eros lacus volutpat et tincidunt sem convallis id venenatis sit. Consectetuer odio. - Semper faucibus Morbi nulla convallis orci Aliquam Sed porttitor et Pellentesque. Venenatis laoreet lorem id a a Morbi augue turpis id semper. Arcu volutpat ac mauris Vestibulum fringilla Aenean condimentum nibh sed id. Sagittis eu lacus orci urna tellus tellus pretium Curabitur dui nunc. Et nibh eu eu nibh adipiscing at lorem Vestibulum adipiscing augue. Magna convallis Phasellus dolor malesuada Curabitur ornare adipiscing tellus Aliquam tempus. Id Aliquam Integer augue Nulla consectetuer ac Donec Curabitur tincidunt et. Id vel Nunc amet lacus dui magna ridiculus penatibus laoreet Duis. Enim sagittis nibh quis Nulla nec laoreet vel Maecenas mattis vel. - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - -
    - - - -
    - - - -
    - - -
    - - - -

    {#wpeditimage.link_help}

    -
    - - - -
    - - - - -
    -
    -
    - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js b/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js --- a/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js 1c1bcebf3acc72a164e7ba912664743a57430b11ed8dad521771e1449f1944f8b9c92e0f8510c732713c8e4f2d9211575c01d3a89aef7413adf4b83e4e6fd607 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js false @@ -1,236 +0,0 @@ - -(function() { - tinymce.create('tinymce.plugins.wpEditImage', { - - init : function(ed, url) { - var t = this; - - t.url = url; - t._createButtons(); - - // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...'); - ed.addCommand('WP_EditImage', function() { - var el = ed.selection.getNode(), vp = tinymce.DOM.getViewPort(), H = vp.h, W = ( 720 < vp.w ) ? 720 : vp.w; - var cls = ed.dom.getAttrib(el, 'class'); - - if ( cls.indexOf('mceItem') != -1 || cls.indexOf('wpGallery') != -1 || el.nodeName != 'IMG' ) - return; - - tb_show('', url + '/editimage.html?ver=321&TB_iframe=true'); - tinymce.DOM.setStyles('TB_window', { - 'width':( W - 50 )+'px', - 'height':( H - 45 )+'px', - 'margin-left':'-'+parseInt((( W - 50 ) / 2),10) + 'px' - }); - - if ( ! tinymce.isIE6 ) { - tinymce.DOM.setStyles('TB_window', { - 'top':'20px', - 'marginTop':'0' - }); - } - - tinymce.DOM.setStyles('TB_iframeContent', { - 'width':( W - 50 )+'px', - 'height':( H - 75 )+'px' - }); - tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' ); - }); - - ed.onInit.add(function(ed) { - tinymce.dom.Event.add(ed.getWin(), 'scroll', function(e) { - ed.plugins.wpeditimage.hideButtons(); - }); - }); - - ed.onBeforeExecCommand.add(function(ed, cmd, ui, val) { - ed.plugins.wpeditimage.hideButtons(); - }); - - ed.onSaveContent.add(function(ed, o) { - ed.plugins.wpeditimage.hideButtons(); - }); - - ed.onMouseUp.add(function(ed, e) { - if ( tinymce.isOpera ) { - if ( e.target.nodeName == 'IMG' ) - ed.plugins.wpeditimage.showButtons(e.target); - } else if ( ! tinymce.isWebKit ) { - var n = ed.selection.getNode(), DL; - - if ( n.nodeName == 'IMG' && (DL = ed.dom.getParent(n, 'DL')) ) { - window.setTimeout(function(){ - var ed = tinyMCE.activeEditor, n = ed.selection.getNode(), DL = ed.dom.getParent(n, 'DL'); - - if ( n.width != (parseInt(ed.dom.getStyle(DL, 'width')) - 10) ) { - ed.dom.setStyle(DL, 'width', parseInt(n.width)+10); - ed.execCommand('mceRepaint'); - } - }, 100); - } - } - }); - - ed.onMouseDown.add(function(ed, e) { - if ( tinymce.isOpera || e.target.nodeName != 'IMG' ) { - t.hideButtons(); - return; - } - ed.plugins.wpeditimage.showButtons(e.target); - }); - - ed.onKeyPress.add(function(ed, e) { - var DL, DIV; - - if ( e.keyCode == 13 && (DL = ed.dom.getParent(ed.selection.getNode(), 'DL')) ) { - var P = ed.dom.create('p', {}, ' '); - if ( (DIV = DL.parentNode) && DIV.nodeName == 'DIV' ) - ed.dom.insertAfter( P, DIV ); - else ed.dom.insertAfter( P, DL ); - - tinymce.dom.Event.cancel(e); - ed.selection.select(P); - return false; - } - }); - - ed.onBeforeSetContent.add(function(ed, o) { - o.content = t._do_shcode(o.content); - }); - - ed.onPostProcess.add(function(ed, o) { - if (o.get) - o.content = t._get_shcode(o.content); - }); - }, - - _do_shcode : function(co) { - return co.replace(/\[(?:wp_)?caption([^\]]+)\]([\s\S]+?)\[\/(?:wp_)?caption\][\s\u00a0]*/g, function(a,b,c){ - b = b.replace(/\\'|\\'|\\'/g, ''').replace(/\\"|\\"/g, '"'); - c = c.replace(/\\'|\\'/g, ''').replace(/\\"/g, '"'); - var id = b.match(/id=['"]([^'"]+)/i), cls = b.match(/align=['"]([^'"]+)/i); - var w = b.match(/width=['"]([0-9]+)/), cap = b.match(/caption=['"]([^'"]+)/i); - - id = ( id && id[1] ) ? id[1] : ''; - cls = ( cls && cls[1] ) ? cls[1] : 'alignnone'; - w = ( w && w[1] ) ? w[1] : ''; - cap = ( cap && cap[1] ) ? cap[1] : ''; - if ( ! w || ! cap ) return c; - - var div_cls = (cls == 'aligncenter') ? 'mceTemp mceIEcenter' : 'mceTemp'; - - return '
    '+c+'
    '+cap+'
    '; - }); - }, - - _get_shcode : function(co) { - return co.replace(/
    \s*]+)>\s*]+>([\s\S]+?)<\/dt>\s*]+>(.+?)<\/dd>\s*<\/dl>\s*<\/div>\s*/gi, function(a,b,c,cap){ - var id = b.match(/id=['"]([^'"]+)/i), cls = b.match(/class=['"]([^'"]+)/i); - var w = c.match(/width=['"]([0-9]+)/); - - id = ( id && id[1] ) ? id[1] : ''; - cls = ( cls && cls[1] ) ? cls[1] : 'alignnone'; - w = ( w && w[1] ) ? w[1] : ''; - - if ( ! w || ! cap ) return c; - cls = cls.match(/align[^ '"]+/) || 'alignnone'; - cap = cap.replace(/<\S[^<>]*>/gi, '').replace(/'/g, ''').replace(/"/g, '"'); - - return '[caption id="'+id+'" align="'+cls+'" width="'+w+'" caption="'+cap+'"]'+c+'[/caption]'; - }); - }, - - showButtons : function(n) { - var t = this, ed = tinyMCE.activeEditor, p1, p2, vp, DOM = tinymce.DOM, X, Y; - var cls = ed.dom.getAttrib(n, 'class'); - - if ( cls.indexOf('mceItem') != -1 || cls.indexOf('wpGallery') != -1 ) - return; - - vp = ed.dom.getViewPort(ed.getWin()); - p1 = DOM.getPos(ed.getContentAreaContainer()); - p2 = ed.dom.getPos(n); - - X = Math.max(p2.x - vp.x, 0) + p1.x; - Y = Math.max(p2.y - vp.y, 0) + p1.y; - - DOM.setStyles('wp_editbtns', { - 'top' : Y+5+'px', - 'left' : X+5+'px', - 'display' : 'block' - }); - - t.btnsTout = window.setTimeout( function(){ed.plugins.wpeditimage.hideButtons();}, 5000 ); - }, - - hideButtons : function() { - if ( tinymce.DOM.isHidden('wp_editbtns') ) return; - - tinymce.DOM.hide('wp_editbtns'); - window.clearTimeout(this.btnsTout); - }, - - _createButtons : function() { - var t = this, ed = tinyMCE.activeEditor, DOM = tinymce.DOM; - - DOM.remove('wp_editbtns'); - - var wp_editbtns = DOM.add(document.body, 'div', { - id : 'wp_editbtns', - style : 'display:none;' - }); - - var wp_editimgbtn = DOM.add('wp_editbtns', 'img', { - src : t.url+'/img/image.svg', - id : 'wp_editimgbtn', - width : '24', - height : '24', - title : ed.getLang('wpeditimage.edit_img') - }); - - wp_editimgbtn.onmousedown = function(e) { - var ed = tinyMCE.activeEditor; - ed.windowManager.bookmark = ed.selection.getBookmark('simple'); - ed.execCommand("WP_EditImage"); - this.parentNode.style.display = 'none'; - }; - - var wp_delimgbtn = DOM.add('wp_editbtns', 'img', { - src : t.url+'/img/delete.svg', - id : 'wp_delimgbtn', - width : '24', - height : '24', - title : ed.getLang('wpeditimage.del_img') - }); - - wp_delimgbtn.onmousedown = function(e) { - var ed = tinyMCE.activeEditor, el = ed.selection.getNode(), p; - - if ( el.nodeName == 'IMG' && ed.dom.getAttrib(el, 'class').indexOf('mceItem') == -1 ) { - if ( (p = ed.dom.getParent(el, 'div')) && ed.dom.hasClass(p, 'mceTemp') ) - ed.dom.remove(p); - else if ( (p = ed.dom.getParent(el, 'A')) && p.childNodes.length == 1 ) - ed.dom.remove(p); - else ed.dom.remove(el); - - this.parentNode.style.display = 'none'; - ed.execCommand('mceRepaint'); - return false; - } - }; - }, - - getInfo : function() { - return { - longname : 'Edit Image', - author : 'WordPress', - authorurl : 'http://wordpress.org', - infourl : '', - version : "1.0" - }; - } - }); - - tinymce.PluginManager.add('wpeditimage', tinymce.plugins.wpEditImage); -})(); diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/img/delete.svg b/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/img/delete.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/img/delete.svg f89073edf370e33015cc57dacab78439e47c40e6a7af9f5d35436435a5449cc04251bbb4029c4b19f5f41e1d5f735301afeb2e91f71a5fd20f8da01dd0a6180d +++ b/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/img/delete.svg false @@ -1,34 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/img/image.svg b/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/img/image.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/img/image.svg 8982c9ef3900403dcfee224dc70eb3ce4a7c97965273ecbaf16dcbd66ad738d781085cd1e25862e871520f0296830a605e33f3051d14fabea9a2b17ae13ffd37 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/img/image.svg false @@ -1,70 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js b/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js --- a/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js 9d5af17e5cdfe480cf5632f211f14cc03372457411f5c97cc23c1fea4ecec84dd0519cb01e1e529990b787f78573bade57b343841600e45163a102ca617f2de9 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js false @@ -1,607 +0,0 @@ - -var tinymce = null, tinyMCEPopup, tinyMCE; - -tinyMCEPopup = { - init: function() { - var t = this, w, ti, li, q, i, it; - - li = ('' + document.location.search).replace(/^\?/, '').split('&'); - q = {}; - for (i=0; i' ); - } - }, - - I : function(e) { - return document.getElementById(e); - }, - - current : '', - link : '', - link_rel : '', - target_value : '', - current_size_sel : 's100', - width : '', - height : '', - align : '', - img_alt : '', - - setTabs : function(tab) { - var t = this; - - if ( 'current' == tab.className ) return false; - t.I('div_advanced').style.display = ( 'tab_advanced' == tab.id ) ? 'block' : 'none'; - t.I('div_basic').style.display = ( 'tab_basic' == tab.id ) ? 'block' : 'none'; - t.I('tab_basic').className = t.I('tab_advanced').className = ''; - tab.className = 'current'; - return false; - }, - - img_seturl : function(u) { - var t = this, rel = t.I('link_rel').value; - - if ( 'current' == u ) { - t.I('link_href').value = t.current; - t.I('link_rel').value = t.link_rel; - } else { - t.I('link_href').value = t.link; - if ( rel ) { - rel = rel.replace( /attachment|wp-att-[0-9]+/gi, '' ); - t.I('link_rel').value = tinymce.trim(rel); - } - } - }, - - imgAlignCls : function(v) { - var t = this, cls = t.I('img_classes').value; - - t.I('img_demo').className = t.align = v; - - cls = cls.replace( /align[^ "']+/gi, '' ); - cls += (' ' + v); - cls = cls.replace( /\s+/g, ' ' ).replace( /^\s/, '' ); - - if ( 'aligncenter' == v ) { - t.I('hspace').value = ''; - t.updateStyle('hspace'); - } - - t.I('img_classes').value = cls; - }, - - showSize : function(el) { - var t = this, demo = t.I('img_demo'), w = t.width, h = t.height, id = el.id || 's100', size; - - size = parseInt(id.substring(1)) / 200; - demo.width = Math.round(w * size); - demo.height = Math.round(h * size); - - t.showSizeClear(); - el.style.borderColor = '#A3A3A3'; - el.style.backgroundColor = '#E5E5E5'; - }, - - showSizeSet : function() { - var t = this; - - if ( (t.width * 1.3) > parseInt(t.preloadImg.width) ) { - var s130 = t.I('s130'), s120 = t.I('s120'), s110 = t.I('s110'); - - s130.onclick = s120.onclick = s110.onclick = null; - s130.onmouseover = s120.onmouseover = s110.onmouseover = null; - s130.style.color = s120.style.color = s110.style.color = '#aaa'; - } - }, - - showSizeRem : function() { - var t = this, demo = t.I('img_demo'), f = document.forms[0]; - - demo.width = Math.round(f.width.value * 0.5); - demo.height = Math.round(f.height.value * 0.5); - t.showSizeClear(); - t.I(t.current_size_sel).style.borderColor = '#A3A3A3'; - t.I(t.current_size_sel).style.backgroundColor = '#E5E5E5'; - - return false; - }, - - showSizeClear : function() { - var divs = this.I('img_size').getElementsByTagName('div'); - - for ( i = 0; i < divs.length; i++ ) { - divs[i].style.borderColor = '#f1f1f1'; - divs[i].style.backgroundColor = '#f1f1f1'; - } - }, - - imgEditSize : function(el) { - var t = this, f = document.forms[0]; - - if ( ! t.preloadImg || ! t.preloadImg.width || ! t.preloadImg.height ) return; - var W = parseInt(t.preloadImg.width), H = parseInt(t.preloadImg.height), w = t.width || W, h = t.height || H, id = el.id || 's100'; - - size = parseInt(id.substring(1)) / 100; - - w = Math.round(w * size); - h = Math.round(h * size); - - f.width.value = Math.min(W, w); - f.height.value = Math.min(H, h); - - t.current_size_sel = id; - t.demoSetSize(); - }, - - demoSetSize : function(img) { - var demo = this.I('img_demo'), f = document.forms[0]; - - demo.width = f.width.value ? Math.round(f.width.value * 0.5) : ''; - demo.height = f.height.value ? Math.round(f.height.value * 0.5) : ''; - }, - - demoSetStyle : function() { - var f = document.forms[0], demo = this.I('img_demo'), dom = tinyMCEPopup.editor.dom; - - if (demo) { - dom.setAttrib(demo, 'style', f.img_style.value); - dom.setStyle(demo, 'width', ''); - dom.setStyle(demo, 'height', ''); - } - }, - - origSize : function() { - var t = this, f = document.forms[0], el = t.I('s100'); - - f.width.value = t.width = t.preloadImg.width; - f.height.value = t.height = t.preloadImg.height; - t.showSizeSet(); - t.demoSetSize(); - t.showSize(el); - }, - - init : function() { - var ed = tinyMCEPopup.editor, h; - - h = document.body.innerHTML; - - // Replace a=x with a="x" in IE - if (tinymce.isIE) - h = h.replace(/ (value|title|alt)=([^"][^\s>]+)/gi, ' $1="$2"') - - document.body.innerHTML = ed.translate(h); - window.setTimeout( function(){wpImage.setup();}, 100 ); - }, - - setup : function() { - var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption = ''; - document.dir = tinyMCEPopup.editor.getParam('directionality',''); - - if ( tinyMCEPopup.editor.getParam('wpeditimage_disable_captions', false) ) - t.I('cap_field').style.display = 'none'; - - tinyMCEPopup.restoreSelection(); - el = ed.selection.getNode(); - if (el.nodeName != 'IMG') return; - - f.img_src.value = d.src = link = ed.dom.getAttrib(el, 'src'); - ed.dom.setStyle(el, 'float', ''); - t.getImageData(); - c = ed.dom.getAttrib(el, 'class'); - - if ( DL = dom.getParent(el, 'dl') ) { - var dlc = ed.dom.getAttrib(DL, 'class'); - dlc = dlc.match(/align[^ "']+/i); - if ( dlc && ! dom.hasClass(el, dlc) ) { - c += ' '+dlc; - tinymce.trim(c); - } - - tinymce.each(DL.childNodes, function(e) { - if ( e.nodeName == 'DD' && dom.hasClass(e, 'wp-caption-dd') ) { - caption = e.innerHTML; - return; - } - }); - } - - f.img_cap.value = caption; - f.img_title.value = ed.dom.getAttrib(el, 'title'); - f.img_alt.value = ed.dom.getAttrib(el, 'alt'); - f.border.value = ed.dom.getAttrib(el, 'border'); - f.vspace.value = ed.dom.getAttrib(el, 'vspace'); - f.hspace.value = ed.dom.getAttrib(el, 'hspace'); - f.align.value = ed.dom.getAttrib(el, 'align'); - f.width.value = t.width = ed.dom.getAttrib(el, 'width'); - f.height.value = t.height = ed.dom.getAttrib(el, 'height'); - f.img_classes.value = c; - f.img_style.value = ed.dom.getAttrib(el, 'style'); - - // Move attribs to styles - if (dom.getAttrib(el, 'hspace')) - t.updateStyle('hspace'); - - if (dom.getAttrib(el, 'border')) - t.updateStyle('border'); - - if (dom.getAttrib(el, 'vspace')) - t.updateStyle('vspace'); - - if (pa = ed.dom.getParent(el, 'A')) { - f.link_href.value = t.current = ed.dom.getAttrib(pa, 'href'); - f.link_title.value = ed.dom.getAttrib(pa, 'title'); - f.link_rel.value = t.link_rel = ed.dom.getAttrib(pa, 'rel'); - f.link_style.value = ed.dom.getAttrib(pa, 'style'); - t.target_value = ed.dom.getAttrib(pa, 'target'); - f.link_classes.value = ed.dom.getAttrib(pa, 'class'); - } - - f.link_target.checked = ( t.target_value && t.target_value == '_blank' ) ? 'checked' : ''; - - fname = link.substring( link.lastIndexOf('/') ); - fname = fname.replace(/-[0-9]{2,4}x[0-9]{2,4}/, '' ); - t.link = link.substring( 0, link.lastIndexOf('/') ) + fname; - - if ( c.indexOf('alignleft') != -1 ) { - t.I('alignleft').checked = "checked"; - d.className = t.align = "alignleft"; - } else if ( c.indexOf('aligncenter') != -1 ) { - t.I('aligncenter').checked = "checked"; - d.className = t.align = "aligncenter"; - } else if ( c.indexOf('alignright') != -1 ) { - t.I('alignright').checked = "checked"; - d.className = t.align = "alignright"; - } else if ( c.indexOf('alignnone') != -1 ) { - t.I('alignnone').checked = "checked"; - d.className = t.align = "alignnone"; - } - - if ( t.width && t.preloadImg.width ) t.showSizeSet(); - document.body.style.display = ''; - }, - - remove : function() { - var ed = tinyMCEPopup.editor, p, el; - - tinyMCEPopup.restoreSelection(); - el = ed.selection.getNode(); - if (el.nodeName != 'IMG') return; - - if ( (p = ed.dom.getParent(el, 'div')) && ed.dom.hasClass(p, 'mceTemp') ) - ed.dom.remove(p); - else if ( (p = ed.dom.getParent(el, 'A')) && p.childNodes.length == 1 ) - ed.dom.remove(p); - else ed.dom.remove(el); - - ed.execCommand('mceRepaint'); - tinyMCEPopup.close(); - return; - }, - - update : function() { - var t = this, f = document.forms[0], ed = tinyMCEPopup.editor, el, b, fixSafari = null, DL, P, A, DIV, do_caption = null, img_class = f.img_classes.value, html; - - tinyMCEPopup.restoreSelection(); - el = ed.selection.getNode(); - - if (el.nodeName != 'IMG') return; - if (f.img_src.value === '') { - t.remove(); - return; - } - - if ( f.img_cap.value != '' && f.width.value != '' ) { - do_caption = 1; - img_class = img_class.replace( /align[^ "']+\s?/gi, '' ); - } - - A = ed.dom.getParent(el, 'a'); - P = ed.dom.getParent(el, 'p'); - DL = ed.dom.getParent(el, 'dl'); - DIV = ed.dom.getParent(el, 'div'); - - tinyMCEPopup.execCommand("mceBeginUndoLevel"); - - ed.dom.setAttribs(el, { - src : f.img_src.value, - title : f.img_title.value, - alt : f.img_alt.value, - width : f.width.value, - height : f.height.value, - style : f.img_style.value, - 'class' : img_class - }); - - if ( f.link_href.value ) { - // Create new anchor elements - if ( A == null ) { - if ( ! f.link_href.value.match(/https?:\/\//i) ) - f.link_href.value = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.link_href.value); - - if ( tinymce.isWebKit && ed.dom.hasClass(el, 'aligncenter') ) { - ed.dom.removeClass(el, 'aligncenter'); - fixSafari = 1; - } - - tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1}); - if ( fixSafari ) ed.dom.addClass(el, 'aligncenter'); - - tinymce.each(ed.dom.select("a"), function(n) { - if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') { - - ed.dom.setAttribs(n, { - href : f.link_href.value, - title : f.link_title.value, - rel : f.link_rel.value, - target : (f.link_target.checked == true) ? '_blank' : '', - 'class' : f.link_classes.value, - style : f.link_style.value - }); - } - }); - } else { - ed.dom.setAttribs(A, { - href : f.link_href.value, - title : f.link_title.value, - rel : f.link_rel.value, - target : (f.link_target.checked == true) ? '_blank' : '', - 'class' : f.link_classes.value, - style : f.link_style.value - }); - } - } - - if ( do_caption ) { - var id, cap_id = '', cap, DT, DD, cap_width = 10 + parseInt(f.width.value), align = t.align.substring(5), div_cls = (t.align == 'aligncenter') ? 'mceTemp mceIEcenter' : 'mceTemp'; - - if ( DL ) { - ed.dom.setAttribs(DL, { - 'class' : 'wp-caption '+t.align, - style : 'width: '+cap_width+'px;' - }); - - if ( DIV ) - ed.dom.setAttrib(DIV, 'class', div_cls); - - if ( (DT = ed.dom.getParent(el, 'dt')) && (DD = DT.nextSibling) && ed.dom.hasClass(DD, 'wp-caption-dd') ) - ed.dom.setHTML(DD, f.img_cap.value); - - } else { - var lnk = '', pa; - if ( (id = f.img_classes.value.match( /wp-image-([0-9]{1,6})/ )) && id[1] ) - cap_id = 'attachment_'+id[1]; - - if ( f.link_href.value && (lnk = ed.dom.getParent(el, 'a')) ) { - if ( lnk.childNodes.length == 1 ) - html = ed.dom.getOuterHTML(lnk); - else { - html = ed.dom.getOuterHTML(lnk); - html = html.match(/]+>/i); - html = html+ed.dom.getOuterHTML(el)+''; - } - } else html = ed.dom.getOuterHTML(el); - - html = '
    '+html+'
    '+f.img_cap.value+'
    '; - - cap = ed.dom.create('div', {'class': div_cls}, html); - - if ( P ) { - P.parentNode.insertBefore(cap, P); - if ( P.childNodes.length == 1 ) - ed.dom.remove(P); - else if ( lnk && lnk.childNodes.length == 1 ) - ed.dom.remove(lnk); - else ed.dom.remove(el); - } else if ( pa = ed.dom.getParent(el, 'TD,TH,LI') ) { - pa.appendChild(cap); - if ( lnk && lnk.childNodes.length == 1 ) - ed.dom.remove(lnk); - else ed.dom.remove(el); - } - } - - } else { - if ( DL && DIV ) { - var aa; - if ( f.link_href.value && (aa = ed.dom.getParent(el, 'a')) ) html = ed.dom.getOuterHTML(aa); - else html = ed.dom.getOuterHTML(el); - - P = ed.dom.create('p', {}, html); - DIV.parentNode.insertBefore(P, DIV); - ed.dom.remove(DIV); - } - } - - if ( f.img_classes.value.indexOf('aligncenter') != -1 ) { - if ( P && ( ! P.style || P.style.textAlign != 'center' ) ) - ed.dom.setStyle(P, 'textAlign', 'center'); - } else { - if ( P && P.style && P.style.textAlign == 'center' ) - ed.dom.setStyle(P, 'textAlign', ''); - } - - if ( ! f.link_href.value && A ) { - b = ed.selection.getBookmark(); - ed.dom.remove(A, 1); - ed.selection.moveToBookmark(b); - } - - tinyMCEPopup.execCommand("mceEndUndoLevel"); - ed.execCommand('mceRepaint'); - tinyMCEPopup.close(); - }, - - updateStyle : function(ty) { - var dom = tinyMCEPopup.dom, st, v, f = document.forms[0], img = dom.create('img', {style : f.img_style.value}); - - if (tinyMCEPopup.editor.settings.inline_styles) { - // Handle align - if (ty == 'align') { - dom.setStyle(img, 'float', ''); - dom.setStyle(img, 'vertical-align', ''); - - v = f.align.value; - if (v) { - if (v == 'left' || v == 'right') - dom.setStyle(img, 'float', v); - else - img.style.verticalAlign = v; - } - } - - // Handle border - if (ty == 'border') { - dom.setStyle(img, 'border', ''); - - v = f.border.value; - if (v || v == '0') { - if (v == '0') - img.style.border = '0'; - else - img.style.border = v + 'px solid black'; - } - } - - // Handle hspace - if (ty == 'hspace') { - dom.setStyle(img, 'marginLeft', ''); - dom.setStyle(img, 'marginRight', ''); - - v = f.hspace.value; - if (v) { - img.style.marginLeft = v + 'px'; - img.style.marginRight = v + 'px'; - } - } - - // Handle vspace - if (ty == 'vspace') { - dom.setStyle(img, 'marginTop', ''); - dom.setStyle(img, 'marginBottom', ''); - - v = f.vspace.value; - if (v) { - img.style.marginTop = v + 'px'; - img.style.marginBottom = v + 'px'; - } - } - - // Merge - f.img_style.value = dom.serializeStyle(dom.parseStyle(img.style.cssText)); - this.demoSetStyle(); - } - }, - - checkVal : function(f) { - - if ( f.value == '' ) { - // if ( f.id == 'width' ) f.value = this.width || this.preloadImg.width; - // if ( f.id == 'height' ) f.value = this.height || this.preloadImg.height; - if ( f.id == 'img_src' ) f.value = this.I('img_demo').src || this.preloadImg.src; - } - }, - - resetImageData : function() { - var f = document.forms[0]; - - f.width.value = f.height.value = ''; - }, - - updateImageData : function() { - var f = document.forms[0], t = wpImage; - - if ( f.width.value == '' || f.height.value == '' ) { - f.width.value = t.width = t.preloadImg.width; - f.height.value = t.height = t.preloadImg.height; - } - - t.showSizeSet(); - t.demoSetSize(); - if ( f.img_style.value ) - t.demoSetStyle(); - }, - - getImageData : function() { - var t = wpImage, f = document.forms[0]; - - t.preloadImg = new Image(); - t.preloadImg.onload = t.updateImageData; - t.preloadImg.onerror = t.resetImageData; - t.preloadImg.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.img_src.value); - } -}; - -window.onload = function(){wpImage.init();} -wpImage.preInit(); diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js b/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js --- a/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js ea7bf9f0b335536f56d6d3765daa4933f599befd5610bce202860f4d8c9e2777a20e24dc7df2ce5ad8090f6e43adb595740877800de41e52c85352d4fa758fb1 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js false @@ -1,174 +0,0 @@ - -(function() { - tinymce.create('tinymce.plugins.wpGallery', { - - init : function(ed, url) { - var t = this; - - t.url = url; - t._createButtons(); - - // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...'); - ed.addCommand('WP_Gallery', function() { - var el = ed.selection.getNode(), vp = tinymce.DOM.getViewPort(), W = ( 720 < vp.w ) ? 720 : vp.w; - - if ( el.nodeName != 'IMG' ) return; - if ( ed.dom.getAttrib(el, 'class').indexOf('wpGallery') == -1 ) return; - - var post_id = tinymce.DOM.get('post_ID').value; - tb_show('', tinymce.documentBaseURL + '/media-upload.php?post_id='+post_id+'&tab=gallery&TB_iframe=true'); - - tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' ); - }); - - ed.onInit.add(function(ed) { - tinymce.dom.Event.add(ed.getWin(), 'scroll', function(e) { - ed.plugins.wpgallery.hideButtons(); - }); - }); - - ed.onBeforeExecCommand.add(function(ed, cmd, ui, val) { - ed.plugins.wpgallery.hideButtons(); - }); - - ed.onSaveContent.add(function(ed, o) { - ed.plugins.wpgallery.hideButtons(); - }); - - ed.onMouseUp.add(function(ed, e) { - if ( tinymce.isOpera ) { - if ( e.target.nodeName == 'IMG' ) - ed.plugins.wpgallery.showButtons(e.target); - } - - }); - - ed.onMouseDown.add(function(ed, e) { - if ( tinymce.isOpera || e.target.nodeName != 'IMG' ) { - t.hideButtons(); - return; - } - ed.plugins.wpgallery.showButtons(e.target); - }); - - ed.onBeforeSetContent.add(function(ed, o) { - o.content = t._do_gallery(o.content); - }); - - ed.onPostProcess.add(function(ed, o) { - if (o.get) - o.content = t._get_gallery(o.content); - }); - }, - - _do_gallery : function(co) { - return co.replace(/\[gallery([^\]]*)\]/g, function(a,b){ - return ''; - }); - }, - - _get_gallery : function(co) { - - function getAttr(s, n) { - n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s); - return n ? tinymce.DOM.decode(n[1]) : ''; - }; - - return co.replace(/(?:]*>)*(]+>)(?:<\/p>)*/g, function(a,im) { - var cls = getAttr(im, 'class'); - - if ( cls.indexOf('wpGallery') != -1 ) - return '

    ['+tinymce.trim(getAttr(im, 'title'))+']

    '; - - return a; - }); - }, - - showButtons : function(n) { - var t = this, ed = tinyMCE.activeEditor, p1, p2, vp, DOM = tinymce.DOM, X, Y; - - if (ed.dom.getAttrib(n, 'class').indexOf('wpGallery') == -1) - return; - - vp = ed.dom.getViewPort(ed.getWin()); - p1 = DOM.getPos(ed.getContentAreaContainer()); - p2 = ed.dom.getPos(n); - - X = Math.max(p2.x - vp.x, 0) + p1.x; - Y = Math.max(p2.y - vp.y, 0) + p1.y; - - DOM.setStyles('wp_gallerybtns', { - 'top' : Y+5+'px', - 'left' : X+5+'px', - 'display' : 'block' - }); - - t.btnsTout = window.setTimeout( function(){ed.plugins.wpgallery.hideButtons();}, 5000 ); - }, - - hideButtons : function() { - if ( tinymce.DOM.isHidden('wp_gallerybtns') ) return; - - tinymce.DOM.hide('wp_gallerybtns'); - window.clearTimeout(this.btnsTout); - }, - - _createButtons : function() { - var t = this, ed = tinyMCE.activeEditor, DOM = tinymce.DOM; - - DOM.remove('wp_gallerybtns'); - - var wp_gallerybtns = DOM.add(document.body, 'div', { - id : 'wp_gallerybtns', - style : 'display:none;' - }); - - var wp_editgallery = DOM.add('wp_gallerybtns', 'img', { - src : t.url+'/img/edit.svg', - id : 'wp_editgallery', - width : '24', - height : '24', - title : ed.getLang('wordpress.editgallery') - }); - - wp_editgallery.onmousedown = function(e) { - var ed = tinyMCE.activeEditor; - ed.windowManager.bookmark = ed.selection.getBookmark('simple'); - ed.execCommand("WP_Gallery"); - this.parentNode.style.display = 'none'; - }; - - var wp_delgallery = DOM.add('wp_gallerybtns', 'img', { - src : t.url+'/img/delete.svg', - id : 'wp_delgallery', - width : '24', - height : '24', - title : ed.getLang('wordpress.delgallery') - }); - - wp_delgallery.onmousedown = function(e) { - var ed = tinyMCE.activeEditor, el = ed.selection.getNode(); - - if ( el.nodeName == 'IMG' && ed.dom.getAttrib(el, 'class').indexOf('wpGallery') != -1 ) { - ed.dom.remove(el); - - this.parentNode.style.display = 'none'; - ed.execCommand('mceRepaint'); - return false; - } - }; - }, - - getInfo : function() { - return { - longname : 'Gallery Settings', - author : 'WordPress', - authorurl : 'http://wordpress.org', - infourl : '', - version : "1.0" - }; - } - }); - - tinymce.PluginManager.add('wpgallery', tinymce.plugins.wpGallery); -})(); diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/delete.svg b/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/delete.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/delete.svg f89073edf370e33015cc57dacab78439e47c40e6a7af9f5d35436435a5449cc04251bbb4029c4b19f5f41e1d5f735301afeb2e91f71a5fd20f8da01dd0a6180d +++ b/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/delete.svg false @@ -1,34 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/edit.svg b/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/edit.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/edit.svg b184eb8a5d358cf9bed10a6a1c9299e4535d14f2f108a9add4d1e131771ee52b509710fdde83334ec19cd0b8e06de56b951d7ce556ae117d9569cc88a349b571 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/edit.svg false @@ -1,37 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/gallery.svg b/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/gallery.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/gallery.svg b26d4c0f49cc3c80a3b13512128d926d768f333fa05693d75aba2292bd165652ae7db8916d6e9b917eaa51e9b982a9e2110cfd4b2168bcedbbdcb31eba104989 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/gallery.svg false @@ -1,491 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/t.svg b/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/t.svg --- a/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/t.svg 3e90a5cf5d7eaaa8d42315526cab2f0953963dd261fc77894199072632283d9c33921ac95ee84564af909161bf23712b97a412b08372a8e9f5d05e249e892c87 +++ b/mp-wp/wp-includes/js/tinymce/plugins/wpgallery/img/t.svg false @@ -1,6 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/about.htm b/mp-wp/wp-includes/js/tinymce/themes/advanced/about.htm --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/about.htm 5f8c34afa2b952fe58bd15ec6970a9038980c37ac2ffbdd75cc2981a659b4d690fcb9ff601fba157790eaac4b237039d6bec9c62eca88caf3ed920c0bc523028 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/about.htm false @@ -1,56 +0,0 @@ - - - - {#advanced_dlg.about_title} - - - - - - - -
    -
    -

    {#advanced_dlg.about_title}

    -

    Version: ()

    -

    TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under LGPL - by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.

    -

    Copyright © 2003-2008, Moxiecode Systems AB, All rights reserved.

    -

    For more information about this software visit the TinyMCE website.

    - -
    - Got Moxie? - Hosted By Sourceforge - Also on freshmeat -
    -
    - -
    -
    -

    {#advanced_dlg.about_loaded}

    - -
    -
    - -

     

    -
    -
    - -
    -
    -
    -
    - -
    -
    - -
    -
    - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/anchor.htm b/mp-wp/wp-includes/js/tinymce/themes/advanced/anchor.htm --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/anchor.htm 603c825a71d597fd0d27e0dcbfcc9748df1dc42573a681b74da766f0d1c7a48a94f93c016c29db9cb66ba7209f9ea95d8079d71a98a97975da1da6c58ccf2d5e +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/anchor.htm false @@ -1,32 +0,0 @@ - - - - {#advanced_dlg.anchor_title} - - - - - -
    - - - - - - - - -
    {#advanced_dlg.anchor_title}
    {#advanced_dlg.anchor_name}:
    - -
    -
    - -
    - -
    - -
    -
    -
    - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/charmap.htm b/mp-wp/wp-includes/js/tinymce/themes/advanced/charmap.htm --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/charmap.htm a74c707f15f7ac0331bbcac9c8a31cadf9110f5b9a8109c1521d7e3f19f9dfca09488eb105e2dd90acc5076a2e0872bc1333471ede308896f3207388932bbf50 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/charmap.htm false @@ -1,54 +0,0 @@ - - - - {#advanced_dlg.charmap_title} - - - - - - - - - - - - - - - - - -
    {#advanced_dlg.charmap_title}
    - - - - - - - - - -
     
     
    -
    - - - - - - - - - - - - - - - - -
    HTML-Code
     
     
    NUM-Code
     
    -
    - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/color_picker.htm b/mp-wp/wp-includes/js/tinymce/themes/advanced/color_picker.htm --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/color_picker.htm 8291bde44c10ed34f44f55511d2230f6e937d0b444a16f8b550ae0f4923142e97aaccc2bba1975345648e32008aaf713960ea685f10d1041226dd2a1fef98f7b +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/color_picker.htm false @@ -1,76 +0,0 @@ - - - - {#advanced_dlg.colorpicker_title} - - - - - - -
    - - -
    -
    -
    - {#advanced_dlg.colorpicker_picker_title} -
    - - -
    - -
    - -
    -
    -
    -
    - -
    -
    - {#advanced_dlg.colorpicker_palette_title} -
    - -
    - -
    -
    -
    - -
    -
    - {#advanced_dlg.colorpicker_named_title} -
    - -
    - -
    - -
    - {#advanced_dlg.colorpicker_name} -
    -
    -
    -
    - -
    -
    - -
    - -
    - -
    - -
    -
    -
    - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/editor_template.js b/mp-wp/wp-includes/js/tinymce/themes/advanced/editor_template.js --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/editor_template.js bb65ec255409555e3fc0705764c93965dc05f9c48ee03b0991deac429ac99091323b9b3d516efe8c16f98c811a305e36a5f7f50911e9a92c0f128836e0822284 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/editor_template.js false @@ -1 +0,0 @@ -(function(){var DOM=tinymce.DOM,Event=tinymce.dom.Event,extend=tinymce.extend,each=tinymce.each,Cookie=tinymce.util.Cookie,lastExtID,explode=tinymce.explode;tinymce.ThemeManager.requireLangPack('advanced');tinymce.create('tinymce.themes.AdvancedTheme',{sizes:[8,10,12,14,18,24,36],controls:{bold:['bold_desc','Bold'],italic:['italic_desc','Italic'],underline:['underline_desc','Underline'],strikethrough:['striketrough_desc','Strikethrough'],justifyleft:['justifyleft_desc','JustifyLeft'],justifycenter:['justifycenter_desc','JustifyCenter'],justifyright:['justifyright_desc','JustifyRight'],justifyfull:['justifyfull_desc','JustifyFull'],bullist:['bullist_desc','InsertUnorderedList'],numlist:['numlist_desc','InsertOrderedList'],outdent:['outdent_desc','Outdent'],indent:['indent_desc','Indent'],cut:['cut_desc','Cut'],copy:['copy_desc','Copy'],paste:['paste_desc','Paste'],undo:['undo_desc','Undo'],redo:['redo_desc','Redo'],link:['link_desc','mceLink'],unlink:['unlink_desc','unlink'],image:['image_desc','mceImage'],cleanup:['cleanup_desc','mceCleanup'],help:['help_desc','mceHelp'],code:['code_desc','mceCodeEditor'],hr:['hr_desc','InsertHorizontalRule'],removeformat:['removeformat_desc','RemoveFormat'],sub:['sub_desc','subscript'],sup:['sup_desc','superscript'],forecolor:['forecolor_desc','ForeColor'],forecolorpicker:['forecolor_desc','mceForeColor'],backcolor:['backcolor_desc','HiliteColor'],backcolorpicker:['backcolor_desc','mceBackColor'],charmap:['charmap_desc','mceCharMap'],visualaid:['visualaid_desc','mceToggleVisualAid'],anchor:['anchor_desc','mceInsertAnchor'],newdocument:['newdocument_desc','mceNewDocument'],blockquote:['blockquote_desc','mceBlockQuote']},stateControls:['bold','italic','underline','strikethrough','bullist','numlist','justifyleft','justifycenter','justifyright','justifyfull','sub','sup','blockquote'],init:function(ed,url){var t=this,s,v,o;t.editor=ed;t.url=url;t.onResolveName=new tinymce.util.Dispatcher(this);t.settings=s=extend({theme_advanced_path:true,theme_advanced_toolbar_location:'bottom',theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"center",theme_advanced_fonts:"Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",readonly:ed.settings.readonly},ed.settings);if(!s.font_size_style_values)s.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt";if(tinymce.is(s.theme_advanced_font_sizes,'string')){s.font_size_style_values=tinymce.explode(s.font_size_style_values);s.font_size_classes=tinymce.explode(s.font_size_classes||'');o={};ed.settings.theme_advanced_font_sizes=s.theme_advanced_font_sizes;each(ed.getParam('theme_advanced_font_sizes','','hash'),function(v,k){var cl;if(k==v&&v>=1&&v<=7){k=v+' ('+t.sizes[v-1]+'pt)';if(ed.settings.convert_fonts_to_spans){cl=s.font_size_classes[v-1];v=s.font_size_style_values[v-1]||(t.sizes[v-1]+'pt');}}if(/\s*\./.test(v))cl=v.replace(/\./g,'');o[k]=cl?{'class':cl}:{fontSize:v};});s.theme_advanced_font_sizes=o;}if((v=s.theme_advanced_path_location)&&v!='none')s.theme_advanced_statusbar_location=s.theme_advanced_path_location;if(s.theme_advanced_statusbar_location=='none')s.theme_advanced_statusbar_location=0;ed.onInit.add(function(){ed.onNodeChange.add(t._nodeChanged,t);if(ed.settings.content_css!==false)ed.dom.loadCSS(ed.baseURI.toAbsolute("themes/advanced/skins/"+ed.settings.skin+"/content.css"));});ed.onSetProgressState.add(function(ed,b,ti){var co,id=ed.id,tb;if(b){t.progressTimer=setTimeout(function(){co=ed.getContainer();co=co.insertBefore(DOM.create('DIV',{style:'position:relative'}),co.firstChild);tb=DOM.get(ed.id+'_tbl');DOM.add(co,'div',{id:id+'_blocker','class':'mceBlocker',style:{width:tb.clientWidth+2,height:tb.clientHeight+2}});DOM.add(co,'div',{id:id+'_progress','class':'mceProgress',style:{left:tb.clientWidth/ 2, top : tb.clientHeight /2}});},ti||0);}else{DOM.remove(id+'_blocker');DOM.remove(id+'_progress');clearTimeout(t.progressTimer);}});DOM.loadCSS(s.editor_css?ed.documentBaseURI.toAbsolute(s.editor_css):url+"/skins/"+ed.settings.skin+"/ui.css");if(s.skin_variant)DOM.loadCSS(url+"/skins/"+ed.settings.skin+"/ui_"+s.skin_variant+".css");},createControl:function(n,cf){var cd,c;if(c=cf.createControl(n))return c;switch(n){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu();}if((cd=this.controls[n]))return cf.createButton(n,{title:"advanced."+cd[0],cmd:cd[1],ui:cd[2],value:cd[3]});},execCommand:function(cmd,ui,val){var f=this['_'+cmd];if(f){f.call(this,ui,val);return true;}return false;},_importClasses:function(e){var ed=this.editor,c=ed.controlManager.get('styleselect');if(c.getLength()==0){each(ed.dom.getClasses(),function(o){c.add(o['class'],o['class']);});}},_createStyleSelect:function(n){var t=this,ed=t.editor,cf=ed.controlManager,c=cf.createListBox('styleselect',{title:'advanced.style_select',onselect:function(v){if(c.selectedValue===v){ed.execCommand('mceSetStyleInfo',0,{command:'removeformat'});c.select();return false;}else ed.execCommand('mceSetCSSClass',0,v);}});if(c){each(ed.getParam('theme_advanced_styles','','hash'),function(v,k){if(v)c.add(t.editor.translate(k),v);});c.onPostRender.add(function(ed,n){if(!c.NativeListBox){Event.add(n.id+'_text','focus',t._importClasses,t);Event.add(n.id+'_text','mousedown',t._importClasses,t);Event.add(n.id+'_open','focus',t._importClasses,t);Event.add(n.id+'_open','mousedown',t._importClasses,t);}else Event.add(n.id,'focus',t._importClasses,t);});}return c;},_createFontSelect:function(){var c,t=this,ed=t.editor;c=ed.controlManager.createListBox('fontselect',{title:'advanced.fontdefault',cmd:'FontName'});if(c){each(ed.getParam('theme_advanced_fonts',t.settings.theme_advanced_fonts,'hash'),function(v,k){c.add(ed.translate(k),v,{style:v.indexOf('dings')==-1?'font-family:'+v:''});});}return c;},_createFontSizeSelect:function(){var t=this,ed=t.editor,c,i=0,cl=[];c=ed.controlManager.createListBox('fontsizeselect',{title:'advanced.font_size',onselect:function(v){if(v.fontSize)ed.execCommand('FontSize',false,v.fontSize);else{each(t.settings.theme_advanced_font_sizes,function(v,k){if(v['class'])cl.push(v['class']);});ed.editorCommands._applyInlineStyle('span',{'class':v['class']},{check_classes:cl});}}});if(c){each(t.settings.theme_advanced_font_sizes,function(v,k){var fz=v.fontSize;if(fz>=1&&fz<=7)fz=t.sizes[parseInt(fz)-1]+'pt';c.add(k,v,{'style':'font-size:'+fz,'class':'mceFontSize'+(i++)+(' '+(v['class']||''))});});}return c;},_createBlockFormats:function(){var c,fmts={p:'advanced.paragraph',address:'advanced.address',pre:'advanced.pre',h1:'advanced.h1',h2:'advanced.h2',h3:'advanced.h3',h4:'advanced.h4',h5:'advanced.h5',h6:'advanced.h6',div:'advanced.div',blockquote:'advanced.blockquote',code:'advanced.code',dt:'advanced.dt',dd:'advanced.dd',samp:'advanced.samp'},t=this;c=t.editor.controlManager.createListBox('formatselect',{title:'advanced.block',cmd:'FormatBlock'});if(c){each(t.editor.getParam('theme_advanced_blockformats',t.settings.theme_advanced_blockformats,'hash'),function(v,k){c.add(t.editor.translate(k!=v?k:fmts[v]),v,{'class':'mce_formatPreview mce_'+v});});}return c;},_createForeColorMenu:function(){var c,t=this,s=t.settings,o={},v;if(s.theme_advanced_more_colors){o.more_colors_func=function(){t._mceColorPicker(0,{color:c.value,func:function(co){c.setColor(co);}});};}if(v=s.theme_advanced_text_colors)o.colors=v;if(s.theme_advanced_default_foreground_color)o.default_color=s.theme_advanced_default_foreground_color;o.title='advanced.forecolor_desc';o.cmd='ForeColor';o.scope=this;c=t.editor.controlManager.createColorSplitButton('forecolor',o);return c;},_createBackColorMenu:function(){var c,t=this,s=t.settings,o={},v;if(s.theme_advanced_more_colors){o.more_colors_func=function(){t._mceColorPicker(0,{color:c.value,func:function(co){c.setColor(co);}});};}if(v=s.theme_advanced_background_colors)o.colors=v;if(s.theme_advanced_default_background_color)o.default_color=s.theme_advanced_default_background_color;o.title='advanced.backcolor_desc';o.cmd='HiliteColor';o.scope=this;c=t.editor.controlManager.createColorSplitButton('backcolor',o);return c;},renderUI:function(o){var n,ic,tb,t=this,ed=t.editor,s=t.settings,sc,p,nl;n=p=DOM.create('span',{id:ed.id+'_parent','class':'mceEditor '+ed.settings.skin+'Skin'+(s.skin_variant?' '+ed.settings.skin+'Skin'+t._ufirst(s.skin_variant):'')});if(!DOM.boxModel)n=DOM.add(n,'div',{'class':'mceOldBoxModel'});n=sc=DOM.add(n,'table',{id:ed.id+'_tbl','class':'mceLayout',cellSpacing:0,cellPadding:0});n=tb=DOM.add(n,'tbody');switch((s.theme_advanced_layout_manager||'').toLowerCase()){case"rowlayout":ic=t._rowLayout(s,tb,o);break;case"customlayout":ic=ed.execCallback("theme_advanced_custom_layout",s,tb,o,p);break;default:ic=t._simpleLayout(s,tb,o,p);}n=o.targetNode;nl=DOM.stdMode?sc.getElementsByTagName('tr'):sc.rows;DOM.addClass(nl[0],'mceFirst');DOM.addClass(nl[nl.length-1],'mceLast');each(DOM.select('tr',tb),function(n){DOM.addClass(n.firstChild,'mceFirst');DOM.addClass(n.childNodes[n.childNodes.length-1],'mceLast');});if(DOM.get(s.theme_advanced_toolbar_container))DOM.get(s.theme_advanced_toolbar_container).appendChild(p);else DOM.insertAfter(p,n);Event.add(ed.id+'_path_row','click',function(e){e=e.target;if(e.nodeName=='A'){t._sel(e.className.replace(/^.*mcePath_([0-9]+).*$/,'$1'));return Event.cancel(e);}});if(!ed.getParam('accessibility_focus')||ed.getParam('tab_focus'))Event.add(DOM.add(p,'a',{href:'#'},''),'focus',function(){tinyMCE.get(ed.id).focus();});if(s.theme_advanced_toolbar_location=='external')o.deltaHeight=0;t.deltaHeight=o.deltaHeight;o.targetNode=null;return{iframeContainer:ic,editorContainer:ed.id+'_parent',sizeContainer:sc,deltaHeight:o.deltaHeight};},getInfo:function(){return{longname:'Advanced theme',author:'Moxiecode Systems AB',authorurl:'http://tinymce.moxiecode.com',version:tinymce.majorVersion+"."+tinymce.minorVersion}},resizeBy:function(dw,dh){var e=DOM.get(this.editor.id+'_tbl');this.resizeTo(e.clientWidth+dw,e.clientHeight+dh);},resizeTo:function(w,h){var ed=this.editor,s=ed.settings,e=DOM.get(ed.id+'_tbl'),ifr=DOM.get(ed.id+'_ifr'),dh;w=Math.max(s.theme_advanced_resizing_min_width||100,w);h=Math.max(s.theme_advanced_resizing_min_height||100,h);w=Math.min(s.theme_advanced_resizing_max_width||0xFFFF,w);h=Math.min(s.theme_advanced_resizing_max_height||0xFFFF,h);dh=e.clientHeight-ifr.clientHeight;DOM.setStyle(ifr,'height',h-dh);DOM.setStyles(e,{width:w,height:h});},destroy:function(){var id=this.editor.id;Event.clear(id+'_resize');Event.clear(id+'_path_row');Event.clear(id+'_external_close');},_simpleLayout:function(s,tb,o,p){var t=this,ed=t.editor,lo=s.theme_advanced_toolbar_location,sl=s.theme_advanced_statusbar_location,n,ic,etb,c;if(s.readonly){n=DOM.add(tb,'tr');n=ic=DOM.add(n,'td',{'class':'mceIframeContainer'});return ic;}if(lo=='top')t._addToolbars(tb,o);if(lo=='external'){n=c=DOM.create('div',{style:'position:relative'});n=DOM.add(n,'div',{id:ed.id+'_external','class':'mceExternalToolbar'});DOM.add(n,'a',{id:ed.id+'_external_close',href:'javascript:;','class':'mceExternalClose'});n=DOM.add(n,'table',{id:ed.id+'_tblext',cellSpacing:0,cellPadding:0});etb=DOM.add(n,'tbody');if(p.firstChild.className=='mceOldBoxModel')p.firstChild.appendChild(c);else p.insertBefore(c,p.firstChild);t._addToolbars(etb,o);ed.onMouseUp.add(function(){var e=DOM.get(ed.id+'_external');DOM.show(e);DOM.hide(lastExtID);var f=Event.add(ed.id+'_external_close','click',function(){DOM.hide(ed.id+'_external');Event.remove(ed.id+'_external_close','click',f);});DOM.show(e);DOM.setStyle(e,'top',0-DOM.getRect(ed.id+'_tblext').h-1);DOM.hide(e);DOM.show(e);e.style.filter='';lastExtID=ed.id+'_external';e=null;});}if(sl=='top')t._addStatusBar(tb,o);if(!s.theme_advanced_toolbar_container){n=DOM.add(tb,'tr');n=ic=DOM.add(n,'td',{'class':'mceIframeContainer'});}if(lo=='bottom')t._addToolbars(tb,o);if(sl=='bottom')t._addStatusBar(tb,o);return ic;},_rowLayout:function(s,tb,o){var t=this,ed=t.editor,dc,da,cf=ed.controlManager,n,ic,to,a;dc=s.theme_advanced_containers_default_class||'';da=s.theme_advanced_containers_default_align||'center';each(explode(s.theme_advanced_containers||''),function(c,i){var v=s['theme_advanced_container_'+c]||'';switch(v.toLowerCase()){case'mceeditor':n=DOM.add(tb,'tr');n=ic=DOM.add(n,'td',{'class':'mceIframeContainer'});break;case'mceelementpath':t._addStatusBar(tb,o);break;default:a=(s['theme_advanced_container_'+c+'_align']||da).toLowerCase();a='mce'+t._ufirst(a);n=DOM.add(DOM.add(tb,'tr'),'td',{'class':'mceToolbar '+(s['theme_advanced_container_'+c+'_class']||dc)+' '+a||da});to=cf.createToolbar("toolbar"+i);t._addControls(v,to);DOM.setHTML(n,to.renderHTML());o.deltaHeight-=s.theme_advanced_row_height;}});return ic;},_addControls:function(v,tb){var t=this,s=t.settings,di,cf=t.editor.controlManager;if(s.theme_advanced_disable&&!t._disabled){di={};each(explode(s.theme_advanced_disable),function(v){di[v]=1;});t._disabled=di;}else di=t._disabled;each(explode(v),function(n){var c;if(di&&di[n])return;if(n=='tablecontrols'){each(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(n){n=t.createControl(n,cf);if(n)tb.add(n);});return;}c=t.createControl(n,cf);if(c)tb.add(c);});},_addToolbars:function(c,o){var t=this,i,tb,ed=t.editor,s=t.settings,v,cf=ed.controlManager,di,n,h=[],a;a=s.theme_advanced_toolbar_align.toLowerCase();a='mce'+t._ufirst(a);n=DOM.add(DOM.add(c,'tr'),'td',{'class':'mceToolbar '+a});if(!ed.getParam('accessibility_focus')||ed.getParam('tab_focus'))h.push(DOM.createHTML('a',{href:'#',onfocus:'tinyMCE.get(\''+ed.id+'\').focus();'},''));h.push(DOM.createHTML('a',{href:'#',accesskey:'q',title:ed.getLang("advanced.toolbar_focus")},''));for(i=1;(v=s['theme_advanced_buttons'+i]);i++){tb=cf.createToolbar("toolbar"+i,{'class':'mceToolbarRow'+i});if(s['theme_advanced_buttons'+i+'_add'])v+=','+s['theme_advanced_buttons'+i+'_add'];if(s['theme_advanced_buttons'+i+'_add_before'])v=s['theme_advanced_buttons'+i+'_add_before']+','+v;t._addControls(v,tb);h.push(tb.renderHTML());o.deltaHeight-=s.theme_advanced_row_height;}h.push(DOM.createHTML('a',{href:'#',accesskey:'z',title:ed.getLang("advanced.toolbar_focus"),onfocus:'tinyMCE.getInstanceById(\''+ed.id+'\').focus();'},''));DOM.setHTML(n,h.join(''));},_addStatusBar:function(tb,o){var n,t=this,ed=t.editor,s=t.settings,r,mf,me,td;n=DOM.add(tb,'tr');n=td=DOM.add(n,'td',{'class':'mceStatusbar'});n=DOM.add(n,'div',{id:ed.id+'_path_row'},s.theme_advanced_path?ed.translate('advanced.path')+': ':' ');DOM.add(n,'a',{href:'#',accesskey:'x'});if(s.theme_advanced_resizing&&!tinymce.isOldWebKit){DOM.add(td,'a',{id:ed.id+'_resize',href:'javascript:;',onclick:"return false;",'class':'mceResize'});if(s.theme_advanced_resizing_use_cookie){ed.onPostRender.add(function(){var o=Cookie.getHash("TinyMCE_"+ed.id+"_size"),c=DOM.get(ed.id+'_tbl');if(!o)return;if(s.theme_advanced_resize_horizontal)c.style.width=Math.max(10,o.cw)+'px';c.style.height=Math.max(10,o.ch)+'px';DOM.get(ed.id+'_ifr').style.height=Math.max(10,parseInt(o.ch)+t.deltaHeight)+'px';});}ed.onPostRender.add(function(){Event.add(ed.id+'_resize','mousedown',function(e){var c,p,w,h,n,pa;c=DOM.get(ed.id+'_tbl');w=c.clientWidth;h=c.clientHeight;miw=s.theme_advanced_resizing_min_width||100;mih=s.theme_advanced_resizing_min_height||100;maw=s.theme_advanced_resizing_max_width||0xFFFF;mah=s.theme_advanced_resizing_max_height||0xFFFF;p=DOM.add(DOM.get(ed.id+'_parent'),'div',{'class':'mcePlaceHolder'});DOM.setStyles(p,{width:w,height:h});DOM.hide(c);DOM.show(p);r={x:e.screenX,y:e.screenY,w:w,h:h,dx:null,dy:null};mf=Event.add(DOM.doc,'mousemove',function(e){var w,h;r.dx=e.screenX-r.x;r.dy=e.screenY-r.y;w=Math.max(miw,r.w+r.dx);h=Math.max(mih,r.h+r.dy);w=Math.min(maw,w);h=Math.min(mah,h);if(s.theme_advanced_resize_horizontal)p.style.width=w+'px';p.style.height=h+'px';return Event.cancel(e);});me=Event.add(DOM.doc,'mouseup',function(e){var ifr;Event.remove(DOM.doc,'mousemove',mf);Event.remove(DOM.doc,'mouseup',me);c.style.display='';DOM.remove(p);if(r.dx===null)return;ifr=DOM.get(ed.id+'_ifr');if(s.theme_advanced_resize_horizontal)c.style.width=Math.max(10,r.w+r.dx)+'px';c.style.height=Math.max(10,r.h+r.dy)+'px';ifr.style.height=Math.max(10,ifr.clientHeight+r.dy)+'px';if(s.theme_advanced_resizing_use_cookie){Cookie.setHash("TinyMCE_"+ed.id+"_size",{cw:r.w+r.dx,ch:r.h+r.dy});}});return Event.cancel(e);});});}o.deltaHeight-=21;n=tb=null;},_nodeChanged:function(ed,cm,n,co){var t=this,p,de=0,v,c,s=t.settings,cl,fz,fn;if(s.readonly)return;tinymce.each(t.stateControls,function(c){cm.setActive(c,ed.queryCommandState(t.controls[c][1]));});cm.setActive('visualaid',ed.hasVisual);cm.setDisabled('undo',!ed.undoManager.hasUndo()&&!ed.typing);cm.setDisabled('redo',!ed.undoManager.hasRedo());cm.setDisabled('outdent',!ed.queryCommandState('Outdent'));p=DOM.getParent(n,'A');if(c=cm.get('link')){if(!p||!p.name){c.setDisabled(!p&&co);c.setActive(!!p);}}if(c=cm.get('unlink')){c.setDisabled(!p&&co);c.setActive(!!p&&!p.name);}if(c=cm.get('anchor')){c.setActive(!!p&&p.name);if(tinymce.isWebKit){p=DOM.getParent(n,'IMG');c.setActive(!!p&&DOM.getAttrib(p,'mce_name')=='a');}}p=DOM.getParent(n,'IMG');if(c=cm.get('image'))c.setActive(!!p&&n.className.indexOf('mceItem')==-1);if(c=cm.get('styleselect')){if(n.className){t._importClasses();c.select(n.className);}else c.select();}if(c=cm.get('formatselect')){p=DOM.getParent(n,DOM.isBlock);if(p)c.select(p.nodeName.toLowerCase());}if(ed.settings.convert_fonts_to_spans){ed.dom.getParent(n,function(n){if(n.nodeName==='SPAN'){if(!cl&&n.className)cl=n.className;if(!fz&&n.style.fontSize)fz=n.style.fontSize;if(!fn&&n.style.fontFamily)fn=n.style.fontFamily.replace(/[\"\']+/g,'').replace(/^([^,]+).*/,'$1').toLowerCase();}return false;});if(c=cm.get('fontselect')){c.select(function(v){return v.replace(/^([^,]+).*/,'$1').toLowerCase()==fn;});}if(c=cm.get('fontsizeselect')){c.select(function(v){if(v.fontSize&&v.fontSize===fz)return true;if(v['class']&&v['class']===cl)return true;});}}else{if(c=cm.get('fontselect'))c.select(ed.queryCommandValue('FontName'));if(c=cm.get('fontsizeselect')){v=ed.queryCommandValue('FontSize');c.select(function(iv){return iv.fontSize==v;});}}if(s.theme_advanced_path&&s.theme_advanced_statusbar_location){p=DOM.get(ed.id+'_path')||DOM.add(ed.id+'_path_row','span',{id:ed.id+'_path'});DOM.setHTML(p,'');ed.dom.getParent(n,function(n){var na=n.nodeName.toLowerCase(),u,pi,ti='';if(n.nodeType!=1||n.nodeName==='BR'||(DOM.hasClass(n,'mceItemHidden')||DOM.hasClass(n,'mceItemRemoved')))return;if(v=DOM.getAttrib(n,'mce_name'))na=v;if(tinymce.isIE&&n.scopeName!=='HTML')na=n.scopeName+':'+na;na=na.replace(/mce\:/g,'');switch(na){case'b':na='strong';break;case'i':na='em';break;case'img':if(v=DOM.getAttrib(n,'src'))ti+='src: '+v+' ';break;case'a':if(v=DOM.getAttrib(n,'name')){ti+='name: '+v+' ';na+='#'+v;}if(v=DOM.getAttrib(n,'href'))ti+='href: '+v+' ';break;case'font':if(s.convert_fonts_to_spans)na='span';if(v=DOM.getAttrib(n,'face'))ti+='font: '+v+' ';if(v=DOM.getAttrib(n,'size'))ti+='size: '+v+' ';if(v=DOM.getAttrib(n,'color'))ti+='color: '+v+' ';break;case'span':if(v=DOM.getAttrib(n,'style'))ti+='style: '+v+' ';break;}if(v=DOM.getAttrib(n,'id'))ti+='id: '+v+' ';if(v=n.className){v=v.replace(/(webkit-[\w\-]+|Apple-[\w\-]+|mceItem\w+|mceVisualAid)/g,'');if(v&&v.indexOf('mceItem')==-1){ti+='class: '+v+' ';if(DOM.isBlock(n)||na=='img'||na=='span')na+='.'+v;}}na=na.replace(/(html:)/g,'');na={name:na,node:n,title:ti};t.onResolveName.dispatch(t,na);ti=na.title;na=na.name;pi=DOM.create('a',{'href':"javascript:;",onmousedown:"return false;",title:ti,'class':'mcePath_'+(de++)},na);if(p.hasChildNodes()){p.insertBefore(DOM.doc.createTextNode(' \u00bb '),p.firstChild);p.insertBefore(pi,p.firstChild);}else p.appendChild(pi);},ed.getBody());}},_sel:function(v){this.editor.execCommand('mceSelectNodeDepth',false,v);},_mceInsertAnchor:function(ui,v){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/anchor.htm',width:320+parseInt(ed.getLang('advanced.anchor_delta_width',0)),height:90+parseInt(ed.getLang('advanced.anchor_delta_height',0)),inline:true},{theme_url:this.url});},_mceCharMap:function(){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/charmap.htm',width:550+parseInt(ed.getLang('advanced.charmap_delta_width',0)),height:250+parseInt(ed.getLang('advanced.charmap_delta_height',0)),inline:true},{theme_url:this.url});},_mceHelp:function(){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/about.htm',width:480,height:380,inline:true},{theme_url:this.url});},_mceColorPicker:function(u,v){var ed=this.editor;v=v||{};ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/color_picker.htm',width:375+parseInt(ed.getLang('advanced.colorpicker_delta_width',0)),height:250+parseInt(ed.getLang('advanced.colorpicker_delta_height',0)),close_previous:false,inline:true},{input_color:v.color,func:v.func,theme_url:this.url});},_mceCodeEditor:function(ui,val){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/source_editor.htm',width:parseInt(ed.getParam("theme_advanced_source_editor_width",720)),height:parseInt(ed.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url});},_mceImage:function(ui,val){var ed=this.editor;if(ed.dom.getAttrib(ed.selection.getNode(),'class').indexOf('mceItem')!=-1)return;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/image.htm',width:355+parseInt(ed.getLang('advanced.image_delta_width',0)),height:275+parseInt(ed.getLang('advanced.image_delta_height',0)),inline:true},{theme_url:this.url});},_mceLink:function(ui,val){var ed=this.editor;ed.windowManager.open({url:tinymce.baseURL+'/themes/advanced/link.htm',width:310+parseInt(ed.getLang('advanced.link_delta_width',0)),height:200+parseInt(ed.getLang('advanced.link_delta_height',0)),inline:true},{theme_url:this.url});},_mceNewDocument:function(){var ed=this.editor;ed.windowManager.confirm('advanced.newdocument',function(s){if(s)ed.execCommand('mceSetContent',false,'');});},_mceForeColor:function(){var t=this;this._mceColorPicker(0,{color:t.fgColor,func:function(co){t.fgColor=co;t.editor.execCommand('ForeColor',false,co);}});},_mceBackColor:function(){var t=this;this._mceColorPicker(0,{color:t.bgColor,func:function(co){t.bgColor=co;t.editor.execCommand('HiliteColor',false,co);}});},_ufirst:function(s){return s.substring(0,1).toUpperCase()+s.substring(1);}});tinymce.ThemeManager.add('advanced',tinymce.themes.AdvancedTheme);}()); \ No newline at end of file diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/image.htm b/mp-wp/wp-includes/js/tinymce/themes/advanced/image.htm --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/image.htm 6856cd7e527b03c6e5e3fb575752824f8b4db56a80c8a866fddb20169701b8beae0a94809651c2aab6d76951164250ec64a28adcc906c7a3dd7e806c9b10f7e4 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/image.htm false @@ -1,90 +0,0 @@ - - - - {#advanced_dlg.image_title} - - - - - - - -
    - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - -
     
    - x -
    -
    -
    - -
    -
    - -
    - -
    - -
    -
    -
    - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/img/colorpicker.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/img/colorpicker.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/img/colorpicker.svg d3b61c4f540c119e2d507bc3a4241938f1d54bd2c7fe9b267e79a7df0897b49ddd1063f116b8ea9eb518f3d0d66a02f28a0b2874b4f3a80ab9b039c84c8b942e +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/img/colorpicker.svg false @@ -1,61 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/img/fm.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/img/fm.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/img/fm.svg 108d4b0b083120ddec6231f474ca18e7ffa112b7d835d57d4a2f10c3db65ea4c9f2f4319265316227e0fac9cc0b768b24289503f73111dbd6f00405db3cd25f4 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/img/fm.svg false @@ -1,37 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/img/gotmoxie.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/img/gotmoxie.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/img/gotmoxie.svg 1451f823a635d2089b3648d435009af4ec808345a65d91fc96acf3494b0e768942cee4363cf22a961b54481e58f91b106efbcebdc8058f3af6dc0e1511e2fb27 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/img/gotmoxie.svg false @@ -1,23 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/img/icons.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/img/icons.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/img/icons.svg eb611b7fe42a98ee871e2e44b1586c98c6cacc79d1df62be431e29828bfcff833a36923eb4727d86608cc48a8eb9acd2b11ae5b2b883e01f3596e6b2f414137f +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/img/icons.svg false @@ -1,207 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/img/sflogo.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/img/sflogo.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/img/sflogo.svg 7c56eee2945248d77b1bbee15bde8d6a533bafd86ecafa46ab304516a0f74812931b7b55720d8217b59fffaa417206270dd758872bcc578f4990c815d5295323 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/img/sflogo.svg false @@ -1,14 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/js/about.js b/mp-wp/wp-includes/js/tinymce/themes/advanced/js/about.js --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/js/about.js db3bd1f9f348341e6e8153b058a109f521c7948bb4b066cc6c550c69e6b96f8acfe8958967a98ebbf5db474980681d6968bab9e450520d9dbc0018a3e0aa26bd +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/js/about.js false @@ -1,72 +0,0 @@ -tinyMCEPopup.requireLangPack(); - -function init() { - var ed, tcont; - - tinyMCEPopup.resizeToInnerSize(); - ed = tinyMCEPopup.editor; - - // Give FF some time - window.setTimeout(insertHelpIFrame, 10); - - tcont = document.getElementById('plugintablecontainer'); - document.getElementById('plugins_tab').style.display = 'none'; - - var html = ""; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - html += ''; - - tinymce.each(ed.plugins, function(p, n) { - var info; - - if (!p.getInfo) - return; - - html += ''; - - info = p.getInfo(); - - if (info.infourl != null && info.infourl != '') - html += ''; - else - html += ''; - - if (info.authorurl != null && info.authorurl != '') - html += ''; - else - html += ''; - - html += ''; - html += ''; - - document.getElementById('plugins_tab').style.display = ''; - - }); - - html += ''; - html += '
    ' + ed.getLang('advanced_dlg.about_plugin') + '' + ed.getLang('advanced_dlg.about_author') + '' + ed.getLang('advanced_dlg.about_version') + '
    ' + info.longname + '' + info.longname + '' + info.author + '' + info.author + '' + info.version + '
    '; - - tcont.innerHTML = html; - - tinyMCEPopup.dom.get('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion; - tinyMCEPopup.dom.get('date').innerHTML = tinymce.releaseDate; -} - -function insertHelpIFrame() { - var html; - - if (tinyMCEPopup.getParam('docs_url')) { - html = ''; - document.getElementById('iframecontainer').innerHTML = html; - document.getElementById('help_tab').style.display = 'block'; - } -} - -tinyMCEPopup.onInit.add(init); diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/js/anchor.js b/mp-wp/wp-includes/js/tinymce/themes/advanced/js/anchor.js --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/js/anchor.js 36f589552853c130ed9be4fdad2766f9fc55257c39e80bee4f35828aa6e5d5ce9a87d878e110ebe0fcd89979fa2debe541cb75eef885a2d18bd1e1658f20492c +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/js/anchor.js false @@ -1,37 +0,0 @@ -tinyMCEPopup.requireLangPack(); - -var AnchorDialog = { - init : function(ed) { - var action, elm, f = document.forms[0]; - - this.editor = ed; - elm = ed.dom.getParent(ed.selection.getNode(), 'A,IMG'); - v = ed.dom.getAttrib(elm, 'name'); - - if (v) { - this.action = 'update'; - f.anchorName.value = v; - } - - f.insert.value = ed.getLang(elm ? 'update' : 'insert'); - }, - - update : function() { - var ed = this.editor; - - tinyMCEPopup.restoreSelection(); - - if (this.action != 'update') - ed.selection.collapse(1); - - // Webkit acts weird if empty inline element is inserted so we need to use a image instead - if (tinymce.isWebKit) - ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('img', {mce_name : 'a', name : document.forms[0].anchorName.value, 'class' : 'mceItemAnchor'})); - else - ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', {name : document.forms[0].anchorName.value, 'class' : 'mceItemAnchor'}, '')); - - tinyMCEPopup.close(); - } -}; - -tinyMCEPopup.onInit.add(AnchorDialog.init, AnchorDialog); diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/js/charmap.js b/mp-wp/wp-includes/js/tinymce/themes/advanced/js/charmap.js --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/js/charmap.js 9a5de81758483c6795a0bd7e4c0af6c038b58f3e1e99d430074cf5d34bbd595797e1c1b2d7abcee5629b6e88a0f6866b6bb40c7a22a659c8ec8876739d9e16e1 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/js/charmap.js false @@ -1,325 +0,0 @@ -tinyMCEPopup.requireLangPack(); - -var charmap = [ - [' ', ' ', true, 'no-break space'], - ['&', '&', true, 'ampersand'], - ['"', '"', true, 'quotation mark'], -// finance - ['¢', '¢', true, 'cent sign'], - ['€', '€', true, 'euro sign'], - ['£', '£', true, 'pound sign'], - ['¥', '¥', true, 'yen sign'], -// signs - ['©', '©', true, 'copyright sign'], - ['®', '®', true, 'registered sign'], - ['™', '™', true, 'trade mark sign'], - ['‰', '‰', true, 'per mille sign'], - ['µ', 'µ', true, 'micro sign'], - ['·', '·', true, 'middle dot'], - ['•', '•', true, 'bullet'], - ['…', '…', true, 'three dot leader'], - ['′', '′', true, 'minutes / feet'], - ['″', '″', true, 'seconds / inches'], - ['§', '§', true, 'section sign'], - ['¶', '¶', true, 'paragraph sign'], - ['ß', 'ß', true, 'sharp s / ess-zed'], -// quotations - ['‹', '‹', true, 'single left-pointing angle quotation mark'], - ['›', '›', true, 'single right-pointing angle quotation mark'], - ['«', '«', true, 'left pointing guillemet'], - ['»', '»', true, 'right pointing guillemet'], - ['‘', '‘', true, 'left single quotation mark'], - ['’', '’', true, 'right single quotation mark'], - ['“', '“', true, 'left double quotation mark'], - ['”', '”', true, 'right double quotation mark'], - ['‚', '‚', true, 'single low-9 quotation mark'], - ['„', '„', true, 'double low-9 quotation mark'], - ['<', '<', true, 'less-than sign'], - ['>', '>', true, 'greater-than sign'], - ['≤', '≤', true, 'less-than or equal to'], - ['≥', '≥', true, 'greater-than or equal to'], - ['–', '–', true, 'en dash'], - ['—', '—', true, 'em dash'], - ['¯', '¯', true, 'macron'], - ['‾', '‾', true, 'overline'], - ['¤', '¤', true, 'currency sign'], - ['¦', '¦', true, 'broken bar'], - ['¨', '¨', true, 'diaeresis'], - ['¡', '¡', true, 'inverted exclamation mark'], - ['¿', '¿', true, 'turned question mark'], - ['ˆ', 'ˆ', true, 'circumflex accent'], - ['˜', '˜', true, 'small tilde'], - ['°', '°', true, 'degree sign'], - ['−', '−', true, 'minus sign'], - ['±', '±', true, 'plus-minus sign'], - ['÷', '÷', true, 'division sign'], - ['⁄', '⁄', true, 'fraction slash'], - ['×', '×', true, 'multiplication sign'], - ['¹', '¹', true, 'superscript one'], - ['²', '²', true, 'superscript two'], - ['³', '³', true, 'superscript three'], - ['¼', '¼', true, 'fraction one quarter'], - ['½', '½', true, 'fraction one half'], - ['¾', '¾', true, 'fraction three quarters'], -// math / logical - ['ƒ', 'ƒ', true, 'function / florin'], - ['∫', '∫', true, 'integral'], - ['∑', '∑', true, 'n-ary sumation'], - ['∞', '∞', true, 'infinity'], - ['√', '√', true, 'square root'], - ['∼', '∼', false,'similar to'], - ['≅', '≅', false,'approximately equal to'], - ['≈', '≈', true, 'almost equal to'], - ['≠', '≠', true, 'not equal to'], - ['≡', '≡', true, 'identical to'], - ['∈', '∈', false,'element of'], - ['∉', '∉', false,'not an element of'], - ['∋', '∋', false,'contains as member'], - ['∏', '∏', true, 'n-ary product'], - ['∧', '∧', false,'logical and'], - ['∨', '∨', false,'logical or'], - ['¬', '¬', true, 'not sign'], - ['∩', '∩', true, 'intersection'], - ['∪', '∪', false,'union'], - ['∂', '∂', true, 'partial differential'], - ['∀', '∀', false,'for all'], - ['∃', '∃', false,'there exists'], - ['∅', '∅', false,'diameter'], - ['∇', '∇', false,'backward difference'], - ['∗', '∗', false,'asterisk operator'], - ['∝', '∝', false,'proportional to'], - ['∠', '∠', false,'angle'], -// undefined - ['´', '´', true, 'acute accent'], - ['¸', '¸', true, 'cedilla'], - ['ª', 'ª', true, 'feminine ordinal indicator'], - ['º', 'º', true, 'masculine ordinal indicator'], - ['†', '†', true, 'dagger'], - ['‡', '‡', true, 'double dagger'], -// alphabetical special chars - ['À', 'À', true, 'A - grave'], - ['Á', 'Á', true, 'A - acute'], - ['Â', 'Â', true, 'A - circumflex'], - ['Ã', 'Ã', true, 'A - tilde'], - ['Ä', 'Ä', true, 'A - diaeresis'], - ['Å', 'Å', true, 'A - ring above'], - ['Æ', 'Æ', true, 'ligature AE'], - ['Ç', 'Ç', true, 'C - cedilla'], - ['È', 'È', true, 'E - grave'], - ['É', 'É', true, 'E - acute'], - ['Ê', 'Ê', true, 'E - circumflex'], - ['Ë', 'Ë', true, 'E - diaeresis'], - ['Ì', 'Ì', true, 'I - grave'], - ['Í', 'Í', true, 'I - acute'], - ['Î', 'Î', true, 'I - circumflex'], - ['Ï', 'Ï', true, 'I - diaeresis'], - ['Ð', 'Ð', true, 'ETH'], - ['Ñ', 'Ñ', true, 'N - tilde'], - ['Ò', 'Ò', true, 'O - grave'], - ['Ó', 'Ó', true, 'O - acute'], - ['Ô', 'Ô', true, 'O - circumflex'], - ['Õ', 'Õ', true, 'O - tilde'], - ['Ö', 'Ö', true, 'O - diaeresis'], - ['Ø', 'Ø', true, 'O - slash'], - ['Œ', 'Œ', true, 'ligature OE'], - ['Š', 'Š', true, 'S - caron'], - ['Ù', 'Ù', true, 'U - grave'], - ['Ú', 'Ú', true, 'U - acute'], - ['Û', 'Û', true, 'U - circumflex'], - ['Ü', 'Ü', true, 'U - diaeresis'], - ['Ý', 'Ý', true, 'Y - acute'], - ['Ÿ', 'Ÿ', true, 'Y - diaeresis'], - ['Þ', 'Þ', true, 'THORN'], - ['à', 'à', true, 'a - grave'], - ['á', 'á', true, 'a - acute'], - ['â', 'â', true, 'a - circumflex'], - ['ã', 'ã', true, 'a - tilde'], - ['ä', 'ä', true, 'a - diaeresis'], - ['å', 'å', true, 'a - ring above'], - ['æ', 'æ', true, 'ligature ae'], - ['ç', 'ç', true, 'c - cedilla'], - ['è', 'è', true, 'e - grave'], - ['é', 'é', true, 'e - acute'], - ['ê', 'ê', true, 'e - circumflex'], - ['ë', 'ë', true, 'e - diaeresis'], - ['ì', 'ì', true, 'i - grave'], - ['í', 'í', true, 'i - acute'], - ['î', 'î', true, 'i - circumflex'], - ['ï', 'ï', true, 'i - diaeresis'], - ['ð', 'ð', true, 'eth'], - ['ñ', 'ñ', true, 'n - tilde'], - ['ò', 'ò', true, 'o - grave'], - ['ó', 'ó', true, 'o - acute'], - ['ô', 'ô', true, 'o - circumflex'], - ['õ', 'õ', true, 'o - tilde'], - ['ö', 'ö', true, 'o - diaeresis'], - ['ø', 'ø', true, 'o slash'], - ['œ', 'œ', true, 'ligature oe'], - ['š', 'š', true, 's - caron'], - ['ù', 'ù', true, 'u - grave'], - ['ú', 'ú', true, 'u - acute'], - ['û', 'û', true, 'u - circumflex'], - ['ü', 'ü', true, 'u - diaeresis'], - ['ý', 'ý', true, 'y - acute'], - ['þ', 'þ', true, 'thorn'], - ['ÿ', 'ÿ', true, 'y - diaeresis'], - ['Α', 'Α', true, 'Alpha'], - ['Β', 'Β', true, 'Beta'], - ['Γ', 'Γ', true, 'Gamma'], - ['Δ', 'Δ', true, 'Delta'], - ['Ε', 'Ε', true, 'Epsilon'], - ['Ζ', 'Ζ', true, 'Zeta'], - ['Η', 'Η', true, 'Eta'], - ['Θ', 'Θ', true, 'Theta'], - ['Ι', 'Ι', true, 'Iota'], - ['Κ', 'Κ', true, 'Kappa'], - ['Λ', 'Λ', true, 'Lambda'], - ['Μ', 'Μ', true, 'Mu'], - ['Ν', 'Ν', true, 'Nu'], - ['Ξ', 'Ξ', true, 'Xi'], - ['Ο', 'Ο', true, 'Omicron'], - ['Π', 'Π', true, 'Pi'], - ['Ρ', 'Ρ', true, 'Rho'], - ['Σ', 'Σ', true, 'Sigma'], - ['Τ', 'Τ', true, 'Tau'], - ['Υ', 'Υ', true, 'Upsilon'], - ['Φ', 'Φ', true, 'Phi'], - ['Χ', 'Χ', true, 'Chi'], - ['Ψ', 'Ψ', true, 'Psi'], - ['Ω', 'Ω', true, 'Omega'], - ['α', 'α', true, 'alpha'], - ['β', 'β', true, 'beta'], - ['γ', 'γ', true, 'gamma'], - ['δ', 'δ', true, 'delta'], - ['ε', 'ε', true, 'epsilon'], - ['ζ', 'ζ', true, 'zeta'], - ['η', 'η', true, 'eta'], - ['θ', 'θ', true, 'theta'], - ['ι', 'ι', true, 'iota'], - ['κ', 'κ', true, 'kappa'], - ['λ', 'λ', true, 'lambda'], - ['μ', 'μ', true, 'mu'], - ['ν', 'ν', true, 'nu'], - ['ξ', 'ξ', true, 'xi'], - ['ο', 'ο', true, 'omicron'], - ['π', 'π', true, 'pi'], - ['ρ', 'ρ', true, 'rho'], - ['ς', 'ς', true, 'final sigma'], - ['σ', 'σ', true, 'sigma'], - ['τ', 'τ', true, 'tau'], - ['υ', 'υ', true, 'upsilon'], - ['φ', 'φ', true, 'phi'], - ['χ', 'χ', true, 'chi'], - ['ψ', 'ψ', true, 'psi'], - ['ω', 'ω', true, 'omega'], -// symbols - ['ℵ', 'ℵ', false,'alef symbol'], - ['ϖ', 'ϖ', false,'pi symbol'], - ['ℜ', 'ℜ', false,'real part symbol'], - ['ϑ','ϑ', false,'theta symbol'], - ['ϒ', 'ϒ', false,'upsilon - hook symbol'], - ['℘', '℘', false,'Weierstrass p'], - ['ℑ', 'ℑ', false,'imaginary part'], -// arrows - ['←', '←', true, 'leftwards arrow'], - ['↑', '↑', true, 'upwards arrow'], - ['→', '→', true, 'rightwards arrow'], - ['↓', '↓', true, 'downwards arrow'], - ['↔', '↔', true, 'left right arrow'], - ['↵', '↵', false,'carriage return'], - ['⇐', '⇐', false,'leftwards double arrow'], - ['⇑', '⇑', false,'upwards double arrow'], - ['⇒', '⇒', false,'rightwards double arrow'], - ['⇓', '⇓', false,'downwards double arrow'], - ['⇔', '⇔', false,'left right double arrow'], - ['∴', '∴', false,'therefore'], - ['⊂', '⊂', false,'subset of'], - ['⊃', '⊃', false,'superset of'], - ['⊄', '⊄', false,'not a subset of'], - ['⊆', '⊆', false,'subset of or equal to'], - ['⊇', '⊇', false,'superset of or equal to'], - ['⊕', '⊕', false,'circled plus'], - ['⊗', '⊗', false,'circled times'], - ['⊥', '⊥', false,'perpendicular'], - ['⋅', '⋅', false,'dot operator'], - ['⌈', '⌈', false,'left ceiling'], - ['⌉', '⌉', false,'right ceiling'], - ['⌊', '⌊', false,'left floor'], - ['⌋', '⌋', false,'right floor'], - ['⟨', '〈', false,'left-pointing angle bracket'], - ['⟩', '〉', false,'right-pointing angle bracket'], - ['◊', '◊', true,'lozenge'], - ['♠', '♠', false,'black spade suit'], - ['♣', '♣', true, 'black club suit'], - ['♥', '♥', true, 'black heart suit'], - ['♦', '♦', true, 'black diamond suit'], - [' ', ' ', false,'en space'], - [' ', ' ', false,'em space'], - [' ', ' ', false,'thin space'], - ['‌', '‌', false,'zero width non-joiner'], - ['‍', '‍', false,'zero width joiner'], - ['‎', '‎', false,'left-to-right mark'], - ['‏', '‏', false,'right-to-left mark'], - ['­', '­', false,'soft hyphen'] -]; - -tinyMCEPopup.onInit.add(function() { - tinyMCEPopup.dom.setHTML('charmapView', renderCharMapHTML()); -}); - -function renderCharMapHTML() { - var charsPerRow = 20, tdWidth=20, tdHeight=20, i; - var html = ''; - var cols=-1; - - for (i=0; i' - + '' - + charmap[i][1] - + ''; - if ((cols+1) % charsPerRow == 0) - html += ''; - } - } - - if (cols % charsPerRow > 0) { - var padd = charsPerRow - (cols % charsPerRow); - for (var i=0; i '; - } - - html += '
    '; - - return html; -} - -function insertChar(chr) { - tinyMCEPopup.execCommand('mceInsertContent', false, '&#' + chr + ';'); - - // Refocus in window - if (tinyMCEPopup.isWindow) - window.focus(); - - tinyMCEPopup.editor.focus(); - tinyMCEPopup.close(); -} - -function previewChar(codeA, codeB, codeN) { - var elmA = document.getElementById('codeA'); - var elmB = document.getElementById('codeB'); - var elmV = document.getElementById('codeV'); - var elmN = document.getElementById('codeN'); - - if (codeA=='#160;') { - elmV.innerHTML = '__'; - } else { - elmV.innerHTML = '&' + codeA; - } - - elmB.innerHTML = '&' + codeA; - elmA.innerHTML = '&' + codeB; - elmN.innerHTML = codeN; -} diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/js/color_picker.js b/mp-wp/wp-includes/js/tinymce/themes/advanced/js/color_picker.js --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/js/color_picker.js ebc5b3a5fa877a30888894f5343804d271096ef9fe01b9cfb66ad3acb72780f53ae50ee8a51d281991f67020450401b029d4e03109866eb1c655469422dd436f +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/js/color_picker.js false @@ -1,253 +0,0 @@ -tinyMCEPopup.requireLangPack(); - -var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false; - -var colors = [ - "#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033", - "#330066","#330099","#3300cc","#3300ff","#660000","#660033","#660066","#660099", - "#6600cc","#6600ff","#990000","#990033","#990066","#990099","#9900cc","#9900ff", - "#cc0000","#cc0033","#cc0066","#cc0099","#cc00cc","#cc00ff","#ff0000","#ff0033", - "#ff0066","#ff0099","#ff00cc","#ff00ff","#003300","#003333","#003366","#003399", - "#0033cc","#0033ff","#333300","#333333","#333366","#333399","#3333cc","#3333ff", - "#663300","#663333","#663366","#663399","#6633cc","#6633ff","#993300","#993333", - "#993366","#993399","#9933cc","#9933ff","#cc3300","#cc3333","#cc3366","#cc3399", - "#cc33cc","#cc33ff","#ff3300","#ff3333","#ff3366","#ff3399","#ff33cc","#ff33ff", - "#006600","#006633","#006666","#006699","#0066cc","#0066ff","#336600","#336633", - "#336666","#336699","#3366cc","#3366ff","#666600","#666633","#666666","#666699", - "#6666cc","#6666ff","#996600","#996633","#996666","#996699","#9966cc","#9966ff", - "#cc6600","#cc6633","#cc6666","#cc6699","#cc66cc","#cc66ff","#ff6600","#ff6633", - "#ff6666","#ff6699","#ff66cc","#ff66ff","#009900","#009933","#009966","#009999", - "#0099cc","#0099ff","#339900","#339933","#339966","#339999","#3399cc","#3399ff", - "#669900","#669933","#669966","#669999","#6699cc","#6699ff","#999900","#999933", - "#999966","#999999","#9999cc","#9999ff","#cc9900","#cc9933","#cc9966","#cc9999", - "#cc99cc","#cc99ff","#ff9900","#ff9933","#ff9966","#ff9999","#ff99cc","#ff99ff", - "#00cc00","#00cc33","#00cc66","#00cc99","#00cccc","#00ccff","#33cc00","#33cc33", - "#33cc66","#33cc99","#33cccc","#33ccff","#66cc00","#66cc33","#66cc66","#66cc99", - "#66cccc","#66ccff","#99cc00","#99cc33","#99cc66","#99cc99","#99cccc","#99ccff", - "#cccc00","#cccc33","#cccc66","#cccc99","#cccccc","#ccccff","#ffcc00","#ffcc33", - "#ffcc66","#ffcc99","#ffcccc","#ffccff","#00ff00","#00ff33","#00ff66","#00ff99", - "#00ffcc","#00ffff","#33ff00","#33ff33","#33ff66","#33ff99","#33ffcc","#33ffff", - "#66ff00","#66ff33","#66ff66","#66ff99","#66ffcc","#66ffff","#99ff00","#99ff33", - "#99ff66","#99ff99","#99ffcc","#99ffff","#ccff00","#ccff33","#ccff66","#ccff99", - "#ccffcc","#ccffff","#ffff00","#ffff33","#ffff66","#ffff99","#ffffcc","#ffffff" -]; - -var named = { - '#F0F8FF':'AliceBlue','#FAEBD7':'AntiqueWhite','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige', - '#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'BlanchedAlmond','#0000FF':'Blue','#8A2BE2':'BlueViolet','#A52A2A':'Brown', - '#DEB887':'BurlyWood','#5F9EA0':'CadetBlue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'CornflowerBlue', - '#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'DarkBlue','#008B8B':'DarkCyan','#B8860B':'DarkGoldenRod', - '#A9A9A9':'DarkGray','#A9A9A9':'DarkGrey','#006400':'DarkGreen','#BDB76B':'DarkKhaki','#8B008B':'DarkMagenta','#556B2F':'DarkOliveGreen', - '#FF8C00':'Darkorange','#9932CC':'DarkOrchid','#8B0000':'DarkRed','#E9967A':'DarkSalmon','#8FBC8F':'DarkSeaGreen','#483D8B':'DarkSlateBlue', - '#2F4F4F':'DarkSlateGray','#2F4F4F':'DarkSlateGrey','#00CED1':'DarkTurquoise','#9400D3':'DarkViolet','#FF1493':'DeepPink','#00BFFF':'DeepSkyBlue', - '#696969':'DimGray','#696969':'DimGrey','#1E90FF':'DodgerBlue','#B22222':'FireBrick','#FFFAF0':'FloralWhite','#228B22':'ForestGreen', - '#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'GhostWhite','#FFD700':'Gold','#DAA520':'GoldenRod','#808080':'Gray','#808080':'Grey', - '#008000':'Green','#ADFF2F':'GreenYellow','#F0FFF0':'HoneyDew','#FF69B4':'HotPink','#CD5C5C':'IndianRed','#4B0082':'Indigo','#FFFFF0':'Ivory', - '#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'LavenderBlush','#7CFC00':'LawnGreen','#FFFACD':'LemonChiffon','#ADD8E6':'LightBlue', - '#F08080':'LightCoral','#E0FFFF':'LightCyan','#FAFAD2':'LightGoldenRodYellow','#D3D3D3':'LightGray','#D3D3D3':'LightGrey','#90EE90':'LightGreen', - '#FFB6C1':'LightPink','#FFA07A':'LightSalmon','#20B2AA':'LightSeaGreen','#87CEFA':'LightSkyBlue','#778899':'LightSlateGray','#778899':'LightSlateGrey', - '#B0C4DE':'LightSteelBlue','#FFFFE0':'LightYellow','#00FF00':'Lime','#32CD32':'LimeGreen','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon', - '#66CDAA':'MediumAquaMarine','#0000CD':'MediumBlue','#BA55D3':'MediumOrchid','#9370D8':'MediumPurple','#3CB371':'MediumSeaGreen','#7B68EE':'MediumSlateBlue', - '#00FA9A':'MediumSpringGreen','#48D1CC':'MediumTurquoise','#C71585':'MediumVioletRed','#191970':'MidnightBlue','#F5FFFA':'MintCream','#FFE4E1':'MistyRose','#FFE4B5':'Moccasin', - '#FFDEAD':'NavajoWhite','#000080':'Navy','#FDF5E6':'OldLace','#808000':'Olive','#6B8E23':'OliveDrab','#FFA500':'Orange','#FF4500':'OrangeRed','#DA70D6':'Orchid', - '#EEE8AA':'PaleGoldenRod','#98FB98':'PaleGreen','#AFEEEE':'PaleTurquoise','#D87093':'PaleVioletRed','#FFEFD5':'PapayaWhip','#FFDAB9':'PeachPuff', - '#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'PowderBlue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'RosyBrown','#4169E1':'RoyalBlue', - '#8B4513':'SaddleBrown','#FA8072':'Salmon','#F4A460':'SandyBrown','#2E8B57':'SeaGreen','#FFF5EE':'SeaShell','#A0522D':'Sienna','#C0C0C0':'Silver', - '#87CEEB':'SkyBlue','#6A5ACD':'SlateBlue','#708090':'SlateGray','#708090':'SlateGrey','#FFFAFA':'Snow','#00FF7F':'SpringGreen', - '#4682B4':'SteelBlue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet', - '#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'WhiteSmoke','#FFFF00':'Yellow','#9ACD32':'YellowGreen' -}; - -function init() { - var inputColor = convertRGBToHex(tinyMCEPopup.getWindowArg('input_color')); - - tinyMCEPopup.resizeToInnerSize(); - - generatePicker(); - - if (inputColor) { - changeFinalColor(inputColor); - - col = convertHexToRGB(inputColor); - - if (col) - updateLight(col.r, col.g, col.b); - } -} - -function insertAction() { - var color = document.getElementById("color").value, f = tinyMCEPopup.getWindowArg('func'); - - tinyMCEPopup.restoreSelection(); - - if (f) - f(color); - - tinyMCEPopup.close(); -} - -function showColor(color, name) { - if (name) - document.getElementById("colorname").innerHTML = name; - - document.getElementById("preview").style.backgroundColor = color; - document.getElementById("color").value = color.toLowerCase(); -} - -function convertRGBToHex(col) { - var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi"); - - if (!col) - return col; - - var rgb = col.replace(re, "$1,$2,$3").split(','); - if (rgb.length == 3) { - r = parseInt(rgb[0]).toString(16); - g = parseInt(rgb[1]).toString(16); - b = parseInt(rgb[2]).toString(16); - - r = r.length == 1 ? '0' + r : r; - g = g.length == 1 ? '0' + g : g; - b = b.length == 1 ? '0' + b : b; - - return "#" + r + g + b; - } - - return col; -} - -function convertHexToRGB(col) { - if (col.indexOf('#') != -1) { - col = col.replace(new RegExp('[^0-9A-F]', 'gi'), ''); - - r = parseInt(col.substring(0, 2), 16); - g = parseInt(col.substring(2, 4), 16); - b = parseInt(col.substring(4, 6), 16); - - return {r : r, g : g, b : b}; - } - - return null; -} - -function generatePicker() { - var el = document.getElementById('light'), h = '', i; - - for (i = 0; i < detail; i++){ - h += '
    '; - } - - el.innerHTML = h; -} - -function generateWebColors() { - var el = document.getElementById('webcolors'), h = '', i; - - if (el.className == 'generated') - return; - - h += '' - + ''; - - for (i=0; i' - + '' - + ''; - if ((i+1) % 18 == 0) - h += ''; - } - - h += '
    '; - - el.innerHTML = h; - el.className = 'generated'; -} - -function generateNamedColors() { - var el = document.getElementById('namedcolors'), h = '', n, v, i = 0; - - if (el.className == 'generated') - return; - - for (n in named) { - v = named[n]; - h += '' - } - - el.innerHTML = h; - el.className = 'generated'; -} - -function dechex(n) { - return strhex.charAt(Math.floor(n / 16)) + strhex.charAt(n % 16); -} - -function computeColor(e) { - var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB; - - x = e.offsetX ? e.offsetX : (e.target ? e.clientX - e.target.x : 0); - y = e.offsetY ? e.offsetY : (e.target ? e.clientY - e.target.y : 0); - - partWidth = document.getElementById('colors').width / 6; - partDetail = detail / 2; - imHeight = document.getElementById('colors').height; - - r = (x >= 0)*(x < partWidth)*255 + (x >= partWidth)*(x < 2*partWidth)*(2*255 - x * 255 / partWidth) + (x >= 4*partWidth)*(x < 5*partWidth)*(-4*255 + x * 255 / partWidth) + (x >= 5*partWidth)*(x < 6*partWidth)*255; - g = (x >= 0)*(x < partWidth)*(x * 255 / partWidth) + (x >= partWidth)*(x < 3*partWidth)*255 + (x >= 3*partWidth)*(x < 4*partWidth)*(4*255 - x * 255 / partWidth); - b = (x >= 2*partWidth)*(x < 3*partWidth)*(-2*255 + x * 255 / partWidth) + (x >= 3*partWidth)*(x < 5*partWidth)*255 + (x >= 5*partWidth)*(x < 6*partWidth)*(6*255 - x * 255 / partWidth); - - coef = (imHeight - y) / imHeight; - r = 128 + (r - 128) * coef; - g = 128 + (g - 128) * coef; - b = 128 + (b - 128) * coef; - - changeFinalColor('#' + dechex(r) + dechex(g) + dechex(b)); - updateLight(r, g, b); -} - -function updateLight(r, g, b) { - var i, partDetail = detail / 2, finalCoef, finalR, finalG, finalB, color; - - for (i=0; i=0) && (i'); - }, - - init : function() { - var f = document.forms[0], ed = tinyMCEPopup.editor; - - // Setup browse button - document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image'); - if (isVisible('srcbrowser')) - document.getElementById('src').style.width = '180px'; - - e = ed.selection.getNode(); - - this.fillFileList('image_list', 'tinyMCEImageList'); - - if (e.nodeName == 'IMG') { - f.src.value = ed.dom.getAttrib(e, 'src'); - f.alt.value = ed.dom.getAttrib(e, 'alt'); - f.border.value = this.getAttrib(e, 'border'); - f.vspace.value = this.getAttrib(e, 'vspace'); - f.hspace.value = this.getAttrib(e, 'hspace'); - f.width.value = ed.dom.getAttrib(e, 'width'); - f.height.value = ed.dom.getAttrib(e, 'height'); - f.insert.value = ed.getLang('update'); - f.class_name.value = ed.dom.getAttrib(e, 'class'); - this.styleVal = ed.dom.getAttrib(e, 'style'); - selectByValue(f, 'image_list', f.src.value); - selectByValue(f, 'align', this.getAttrib(e, 'align')); - this.updateStyle(); - } - }, - - fillFileList : function(id, l) { - var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl; - - l = window[l]; - - if (l && l.length > 0) { - lst.options[lst.options.length] = new Option('', ''); - - tinymce.each(l, function(o) { - lst.options[lst.options.length] = new Option(o[0], o[1]); - }); - } else - dom.remove(dom.getParent(id, 'tr')); - }, - - update : function() { - var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, args = {}, el; - - tinyMCEPopup.restoreSelection(); - - if (f.src.value === '') { - if (ed.selection.getNode().nodeName == 'IMG') { - ed.dom.remove(ed.selection.getNode()); - ed.execCommand('mceRepaint'); - } - - tinyMCEPopup.close(); - return; - } - - if (!ed.settings.inline_styles) { - args = tinymce.extend(args, { - vspace : nl.vspace.value, - hspace : nl.hspace.value, - border : nl.border.value, - align : getSelectValue(f, 'align') - }); - } else - args.style = this.styleVal; - - tinymce.extend(args, { - src : f.src.value, - alt : f.alt.value, - width : f.width.value, - height : f.height.value, - 'class' : f.class_name.value - }); - - el = ed.selection.getNode(); - - if (el && el.nodeName == 'IMG') { - ed.dom.setAttribs(el, args); - } else { - ed.execCommand('mceInsertContent', false, '', {skip_undo : 1}); - ed.dom.setAttribs('__mce_tmp', args); - ed.dom.setAttrib('__mce_tmp', 'id', ''); - ed.undoManager.add(); - } - - tinyMCEPopup.close(); - }, - - updateStyle : function() { - var dom = tinyMCEPopup.dom, st, v, cls, oldcls, rep, f = document.forms[0]; - - if (tinyMCEPopup.editor.settings.inline_styles) { - st = tinyMCEPopup.dom.parseStyle(this.styleVal); - - // Handle align - v = getSelectValue(f, 'align'); - cls = f.class_name.value || ''; - cls = cls ? cls.replace(/alignright\s*|alignleft\s*|aligncenter\s*/g, '') : ''; - cls = cls ? cls.replace(/^\s*(.+?)\s*$/, '$1') : ''; - if (v) { - if (v == 'left' || v == 'right') { - st['float'] = v; - delete st['vertical-align']; - oldcls = cls ? ' '+cls : ''; - f.class_name.value = 'align' + v + oldcls; - } else { - st['vertical-align'] = v; - delete st['float']; - f.class_name.value = cls; - } - } else { - delete st['float']; - delete st['vertical-align']; - f.class_name.value = cls; - } - - // Handle border - v = f.border.value; - if (v || v == '0') { - if (v == '0') - st['border'] = '0'; - else - st['border'] = v + 'px solid black'; - } else - delete st['border']; - - // Handle hspace - v = f.hspace.value; - if (v) { - delete st['margin']; - st['margin-left'] = v + 'px'; - st['margin-right'] = v + 'px'; - } else { - delete st['margin-left']; - delete st['margin-right']; - } - - // Handle vspace - v = f.vspace.value; - if (v) { - delete st['margin']; - st['margin-top'] = v + 'px'; - st['margin-bottom'] = v + 'px'; - } else { - delete st['margin-top']; - delete st['margin-bottom']; - } - - // Merge - st = tinyMCEPopup.dom.parseStyle(dom.serializeStyle(st)); - this.styleVal = dom.serializeStyle(st); - } - }, - - getAttrib : function(e, at) { - var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2; - - if (ed.settings.inline_styles) { - switch (at) { - case 'align': - if (v = dom.getStyle(e, 'float')) - return v; - - if (v = dom.getStyle(e, 'vertical-align')) - return v; - - break; - - case 'hspace': - v = dom.getStyle(e, 'margin-left') - v2 = dom.getStyle(e, 'margin-right'); - if (v && v == v2) - return parseInt(v.replace(/[^0-9]/g, '')); - - break; - - case 'vspace': - v = dom.getStyle(e, 'margin-top') - v2 = dom.getStyle(e, 'margin-bottom'); - if (v && v == v2) - return parseInt(v.replace(/[^0-9]/g, '')); - - break; - - case 'border': - v = 0; - - tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) { - sv = dom.getStyle(e, 'border-' + sv + '-width'); - - // False or not the same as prev - if (!sv || (sv != v && v !== 0)) { - v = 0; - return false; - } - - if (sv) - v = sv; - }); - - if (v) - return parseInt(v.replace(/[^0-9]/g, '')); - - break; - } - } - - if (v = dom.getAttrib(e, at)) - return v; - - return ''; - }, - - resetImageData : function() { - var f = document.forms[0]; - - f.width.value = f.height.value = ""; - }, - - updateImageData : function() { - var f = document.forms[0], t = ImageDialog; - - if (f.width.value == "") - f.width.value = t.preloadImg.width; - - if (f.height.value == "") - f.height.value = t.preloadImg.height; - }, - - getImageData : function() { - var f = document.forms[0]; - - this.preloadImg = new Image(); - this.preloadImg.onload = this.updateImageData; - this.preloadImg.onerror = this.resetImageData; - this.preloadImg.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.src.value); - } -}; - -ImageDialog.preInit(); -tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog); diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/js/link.js b/mp-wp/wp-includes/js/tinymce/themes/advanced/js/link.js --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/js/link.js 7dd658dc5c080c8ac353a0d6dfb229f8f681fd731321339169bfda0578dc113bccb7a230469087d6aede5ea8f20c284bef3d0d88dec14ee06a7fd1f4f39a6f52 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/js/link.js false @@ -1,155 +0,0 @@ -tinyMCEPopup.requireLangPack(); - -var LinkDialog = { - preInit : function() { - var url; - - if (url = tinyMCEPopup.getParam("external_link_list_url")) - document.write(''); - }, - - init : function() { - var f = document.forms[0], ed = tinyMCEPopup.editor; - - // Setup browse button - document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser', 'href', 'file', 'theme_advanced_link'); - if (isVisible('hrefbrowser')) - document.getElementById('href').style.width = '180px'; - - this.fillClassList('class_list'); - this.fillFileList('link_list', 'tinyMCELinkList'); - this.fillTargetList('target_list'); - - if (e = ed.dom.getParent(ed.selection.getNode(), 'A')) { - f.href.value = ed.dom.getAttrib(e, 'href'); - f.linktitle.value = ed.dom.getAttrib(e, 'title'); - f.insert.value = ed.getLang('update'); - selectByValue(f, 'link_list', f.href.value); - selectByValue(f, 'target_list', ed.dom.getAttrib(e, 'target')); - selectByValue(f, 'class_list', ed.dom.getAttrib(e, 'class')); - } - }, - - update : function() { - var f = document.forms[0], ed = tinyMCEPopup.editor, e, b; - - tinyMCEPopup.restoreSelection(); - e = ed.dom.getParent(ed.selection.getNode(), 'A'); - - // Remove element if there is no href - if (!f.href.value) { - if (e) { - tinyMCEPopup.execCommand("mceBeginUndoLevel"); - b = ed.selection.getBookmark(); - ed.dom.remove(e, 1); - ed.selection.moveToBookmark(b); - tinyMCEPopup.execCommand("mceEndUndoLevel"); - tinyMCEPopup.close(); - return; - } - } - - tinyMCEPopup.execCommand("mceBeginUndoLevel"); - - // Create new anchor elements - if (e == null) { - tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1}); - - tinymce.each(ed.dom.select("a"), function(n) { - if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') { - e = n; - - ed.dom.setAttribs(e, { - href : f.href.value, - title : f.linktitle.value, - target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null, - 'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null - }); - } - }); - } else { - ed.dom.setAttribs(e, { - href : f.href.value, - title : f.linktitle.value, - target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null, - 'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null - }); - } - - // Don't move caret if selection was image - if (e.childNodes.length != 1 || e.firstChild.nodeName != 'IMG') { - ed.focus(); - ed.selection.select(e); - ed.selection.collapse(0); - tinyMCEPopup.storeSelection(); - } - - tinyMCEPopup.execCommand("mceEndUndoLevel"); - tinyMCEPopup.close(); - }, - - checkPrefix : function(n) { - if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_email'))) - n.value = 'mailto:' + n.value; - - if (/^\s*www./i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_external'))) - n.value = 'http://' + n.value; - }, - - fillFileList : function(id, l) { - var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl; - - l = window[l]; - - if (l && l.length > 0) { - lst.options[lst.options.length] = new Option('', ''); - - tinymce.each(l, function(o) { - lst.options[lst.options.length] = new Option(o[0], o[1]); - }); - } else - dom.remove(dom.getParent(id, 'tr')); - }, - - fillClassList : function(id) { - var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl; - - if (v = tinyMCEPopup.getParam('theme_advanced_styles')) { - cl = []; - - tinymce.each(v.split(';'), function(v) { - var p = v.split('='); - - cl.push({'title' : p[0], 'class' : p[1]}); - }); - } else - cl = tinyMCEPopup.editor.dom.getClasses(); - - if (cl.length > 0) { - lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), ''); - - tinymce.each(cl, function(o) { - lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']); - }); - } else - dom.remove(dom.getParent(id, 'tr')); - }, - - fillTargetList : function(id) { - var dom = tinyMCEPopup.dom, lst = dom.get(id), v; - - lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), ''); - lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_same'), '_self'); - lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_blank'), '_blank'); - - if (v = tinyMCEPopup.getParam('theme_advanced_link_targets')) { - tinymce.each(v.split(','), function(v) { - v = v.split('='); - lst.options[lst.options.length] = new Option(v[0], v[1]); - }); - } - } -}; - -LinkDialog.preInit(); -tinyMCEPopup.onInit.add(LinkDialog.init, LinkDialog); diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/js/source_editor.js b/mp-wp/wp-includes/js/tinymce/themes/advanced/js/source_editor.js --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/js/source_editor.js 41ff9fd557f5d9b614727ea2341aca3b9cbe8d3d3e0b941995a8003abaa5b8bdca581e288bd71a237e3ae09ece202590975e8bb762da02801406a85e4c88700b +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/js/source_editor.js false @@ -1,62 +0,0 @@ -tinyMCEPopup.requireLangPack(); -tinyMCEPopup.onInit.add(onLoadInit); - -function saveContent() { - tinyMCEPopup.editor.setContent(document.getElementById('htmlSource').value); - tinyMCEPopup.close(); -} - -function onLoadInit() { - tinyMCEPopup.resizeToInnerSize(); - - // Remove Gecko spellchecking - if (tinymce.isGecko) - document.body.spellcheck = tinyMCEPopup.editor.getParam("gecko_spellcheck"); - - document.getElementById('htmlSource').value = tinyMCEPopup.editor.getContent(); - - if (tinyMCEPopup.editor.getParam("theme_advanced_source_editor_wrap", true)) { - setWrap('soft'); - document.getElementById('wraped').checked = true; - } - - resizeInputs(); -} - -function setWrap(val) { - var v, n, s = document.getElementById('htmlSource'); - - s.wrap = val; - - if (!tinymce.isIE) { - v = s.value; - n = s.cloneNode(false); - n.setAttribute("wrap", val); - s.parentNode.replaceChild(n, s); - n.value = v; - } -} - -function toggleWordWrap(elm) { - if (elm.checked) - setWrap('soft'); - else - setWrap('off'); -} - -var wHeight=0, wWidth=0, owHeight=0, owWidth=0; - -function resizeInputs() { - var el = document.getElementById('htmlSource'); - - if (!tinymce.isIE) { - wHeight = self.innerHeight - 65; - wWidth = self.innerWidth - 16; - } else { - wHeight = document.body.clientHeight - 70; - wWidth = document.body.clientWidth - 16; - } - - el.style.height = Math.abs(wHeight) + 'px'; - el.style.width = Math.abs(wWidth) + 'px'; -} diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/link.htm b/mp-wp/wp-includes/js/tinymce/themes/advanced/link.htm --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/link.htm d496e1ed001ede8a37e90fdf1c81baf9633f9cac85ae09f83b77cfa9d1d8f582d632c56c0a4e60ba6fe7f6484b883bb8575d53e92706735546b8a3ca3a59be11 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/link.htm false @@ -1,64 +0,0 @@ - - - - {#advanced_dlg.link_title} - - - - - - - - -
    - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - -
    - - - - -
     
    -
    -
    - -
    -
    - -
    - -
    - -
    -
    -
    - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/content.css b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/content.css --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/content.css 2db0bd2e1b43b6e3d7fb5e0fe492b06e8c580cf1063f9f29f4c2c36f496006e4a164decf09e51d4a9713f911a7da983e7ce81c10c456c875ddfa2658a8d3781c +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/content.css false @@ -1,32 +0,0 @@ -body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;} -body {background:#FFF;} -body.mceForceColors {background:#FFF; color:#000;} -h1 {font-size: 2em} -h2 {font-size: 1.5em} -h3 {font-size: 1.17em} -h4 {font-size: 1em} -h5 {font-size: .83em} -h6 {font-size: .75em} -.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;} -a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(img/items.svg) no-repeat bottom left;} -img.mceItemAnchor {width:12px; height:12px; background:url(img/items.svg) no-repeat;} -img {border:0;} -table {cursor:default} -table td, table th {cursor:text} -ins {border-bottom:1px solid green; text-decoration: none; color:green} -del {color:red; text-decoration:line-through} -cite {border-bottom:1px dashed blue} -acronym {border-bottom:1px dotted #CCC; cursor:help} -abbr, html\:abbr {border-bottom:1px dashed #CCC; cursor:help} - -/* IE */ -* html body { -scrollbar-3dlight-color:#F0F0EE; -scrollbar-arrow-color:#676662; -scrollbar-base-color:#F0F0EE; -scrollbar-darkshadow-color:#DDD; -scrollbar-face-color:#E0E0DD; -scrollbar-highlight-color:#F0F0EE; -scrollbar-shadow-color:#F0F0EE; -scrollbar-track-color:#F5F5F5; -} diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/dialog.css b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/dialog.css --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/dialog.css 69f098ff13ed6fe344c6e0a5d22e5c0c41723826d2c33f7568d39ad2e24da681dd557baa7519a3f5f5573d4058fead78055d3ea343e52844abdeff4c977d0d34 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/dialog.css false @@ -1,114 +0,0 @@ -/* Generic */ -body { -font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; -scrollbar-3dlight-color:#F0F0EE; -scrollbar-arrow-color:#676662; -scrollbar-base-color:#F0F0EE; -scrollbar-darkshadow-color:#DDDDDD; -scrollbar-face-color:#E0E0DD; -scrollbar-highlight-color:#F0F0EE; -scrollbar-shadow-color:#F0F0EE; -scrollbar-track-color:#F5F5F5; -background:#F0F0EE; -padding:0; -margin:8px 8px 0 8px; -} - -html {background:#F0F0EE;} -td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} -textarea {resize:none;outline:none;} -a:link, a:visited {color:black;} -a:hover {color:#2B6FB6;} - -/* Forms */ -fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;} -legend {color:#2B6FB6; font-weight:bold;} -label.msg {display:none;} -label.invalid {color:#EE0000; display:inline;} -input.invalid {border:1px solid #EE0000;} -input {background:#FFF; border:1px solid #CCC;} -input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} -input, select, textarea {border:1px solid #808080;} -input.radio {border:1px none #000000; background:transparent; vertical-align:middle;} -input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;} -.input_noborder {border:0;} - -/* Buttons */ -#insert, #cancel, input.button, .updateButton { -border:0; margin:0; padding:0; -font-weight:bold; -width:94px; height:26px; -background:url(img/buttons.svg) 0 -26px; -cursor:pointer; -padding-bottom:2px; -} - -#insert {background:url(img/buttons.svg) 0 -52px;} -#cancel {background:url(img/buttons.svg) 0 0;} - -/* Browse */ -a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.svg) -860px 0; border:1px solid #FFF; margin-left:1px;} -.mceOldBoxModel a.browse span {width:22px; height:20px;} -a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;} -a.browse span.disabled {border:1px solid white; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} -a.browse:hover span.disabled {border:1px solid white; background-color:transparent;} -a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.svg) -840px 0; margin-left:2px;} -.mceOldBoxModel a.pickcolor span {width:21px; height:17px;} -a.pickcolor:hover span {background-color:#B2BBD0;} -a.pickcolor:hover span.disabled {} - -/* Charmap */ -table.charmap {border:1px solid #AAA; text-align:center} -td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;} -#charmap a {display:block; color:#000; text-decoration:none; border:0} -#charmap a:hover {background:#CCC;color:#2B6FB6} -#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center} -#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center} - -/* Source */ -.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;} -.mceActionPanel {margin-top:5px;} - -/* Tabs classes */ -.tabs {width:100%; height:18px; line-height:normal; background:url(img/tabs.svg) repeat-x 0 -72px;} -.tabs ul {margin:0; padding:0; list-style:none;} -.tabs li {float:left; background:url(img/tabs.svg) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;} -.tabs li.current {background:url(img/tabs.svg) no-repeat 0 -18px; margin-right:2px;} -.tabs span {float:left; display:block; background:url(img/tabs.svg) no-repeat right -36px; padding:0px 10px 0 0;} -.tabs .current span {background:url(img/tabs.svg) no-repeat right -54px;} -.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;} -.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;} - -/* Panels */ -.panel_wrapper div.panel {display:none;} -.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;} -.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;} - -/* Columns */ -.column {float:left;} -.properties {width:100%;} -.properties .column1 {} -.properties .column2 {text-align:left;} - -/* Titles */ -h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;} -h3 {font-size:14px;} -.title {font-size:12px; font-weight:bold; color:#2B6FB6;} - -/* Dialog specific */ -#link .panel_wrapper, #link div.current {height:125px;} -#image .panel_wrapper, #image div.current {height:200px;} -#plugintable thead {font-weight:bold; background:#DDD;} -#plugintable, #about #plugintable td {border:1px solid #919B9C;} -#plugintable {width:96%; margin-top:10px;} -#pluginscontainer {height:290px; overflow:auto;} -#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;} -#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;} -#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;} -#colorpicker #light div {overflow:hidden;} -#colorpicker #previewblock {float:right; padding-left:10px; height:20px;} -#colorpicker .panel_wrapper div.current {height:175px;} -#colorpicker #namedcolors {width:150px;} -#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;} -#colorpicker #colornamecontainer {margin-top:5px;} -#colorpicker #picker_panel fieldset {margin:auto;width:325px;} \ No newline at end of file diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/buttons.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/buttons.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/buttons.svg bb0f15dc7f58b3805413e2d6cf0205b48c6e4c3c6ef7599886be5f4e6f153a71b30b966fb18bbb3b256de62a05e201a336c43cca619aa344f909582bf4bda729 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/buttons.svg false @@ -1,63 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/items.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/items.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/items.svg 8325cd5908c6f817be379563f70453298943b1cc35c94c73b51eb4af629631e7cbbcc714113ea7ca8aa5b42bd13fdcff58d45f4a4038aa04409b47a409df6623 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/items.svg false @@ -1,7 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.svg cbb2d57870deab5fdbe91cdda87b6b436964b195d1050c665332c4ba95a6a313604a240e2e5ce2d4230d506d4d8d4540bc9366c4e772aa068b24ed8587b82f0f +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_arrow.svg false @@ -1,7 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.svg 4ce38c8c780d659aa32b68ef405b0b1c7f5c9934a84e983da6ec029e1d63bdfec71c1f4402e1d1904398f8f89cc6403e09fdb28008bbf19738c874bb75cbbfc4 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/menu_check.svg false @@ -1,7 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.svg 8c7904311923a69f7535518222e2c2acb72b4724ca1661a507c9cdcde57197f54a624e26d860b8f0a456aa6999460d22d45f4a876aeb007e925b32d3d9830a2b +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/progress.svg false @@ -1,103 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/tabs.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/tabs.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/tabs.svg 041fd93bb803c193aa3601a1c0ff478fa54ed3ea3faa7b2906f8e023ddfaf6e63e97197fc8bd8018f9aa9e6b733a7b9e0476626d0a050fd719753b8712f488c3 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/img/tabs.svg false @@ -1,29 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/ui.css b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/ui.css --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/ui.css 41909d7de516a7a9aeed6a7821a2d9765c09828d7128731f18992d8c2852cc673532107b3555c17cab1188a0a0631eabe442ccb41f291d3e2f5ea333b20d6f0a +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/default/ui.css false @@ -1,214 +0,0 @@ -/* Reset */ -.defaultSkin table, .defaultSkin tbody, .defaultSkin a, .defaultSkin img, .defaultSkin tr, .defaultSkin div, .defaultSkin td, .defaultSkin iframe, .defaultSkin span, .defaultSkin *, .defaultSkin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left} -.defaultSkin a:hover, .defaultSkin a:link, .defaultSkin a:visited, .defaultSkin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000} -.defaultSkin table td {vertical-align:middle} - -/* Containers */ -.defaultSkin table {background:#F0F0EE} -.defaultSkin iframe {display:block; background:#FFF} -.defaultSkin .mceToolbar {height:26px} -.defaultSkin .mceLeft {text-align:left} -.defaultSkin .mceRight {text-align:right} - -/* External */ -.defaultSkin .mceExternalToolbar {position:absolute; border:1px solid #CCC; border-bottom:0; display:none;} -.defaultSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;} -.defaultSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.svg) -820px 0} - -/* Layout */ -.defaultSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC} -.defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC} -.defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC} -.defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;} -.defaultSkin td.mceToolbar {padding-top:1px; vertical-align:top} -.defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC} -.defaultSkin .mceStatusbar {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px} -.defaultSkin .mceStatusbar div {float:left; margin:2px} -.defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.svg) -800px 0; width:20px; height:20px; cursor:se-resize} -.defaultSkin .mceStatusbar a:hover {text-decoration:underline} -.defaultSkin table.mceToolbar {margin-left:3px} -.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {display:block; width:20px; height:20px} -.defaultSkin .mceIcon {background:url(../../img/icons.svg) no-repeat 20px 20px} -.defaultSkin td.mceCenter {text-align:center;} -.defaultSkin td.mceCenter table {margin:0 auto; text-align:left;} -.defaultSkin td.mceRight table {margin:0 0 0 auto;} - -/* Button */ -.defaultSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px; margin-right:1px} -.defaultSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0} -.defaultSkin a.mceButtonActive, .defaultSkin a.mceButtonSelected {border:1px solid #0A246A; background-color:#C2CBE0} -.defaultSkin .mceButtonDisabled .mceIcon {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} -.defaultSkin .mceButtonLabeled {width:auto} -.defaultSkin .mceButtonLabeled span.mceIcon {float:left} -.defaultSkin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica} -.defaultSkin .mceButtonDisabled .mceButtonLabel {color:#888} - -/* Separator */ -.defaultSkin .mceSeparator {display:block; background:url(../../img/icons.svg) -180px 0; width:2px; height:20px; margin:2px 2px 0 4px} - -/* ListBox */ -.defaultSkin .mceListBox {direction:ltr} -.defaultSkin .mceListBox, .defaultSkin .mceListBox a {display:block} -.defaultSkin .mceListBox .mceText {padding-left:4px; width:70px; text-align:left; border:1px solid #CCC; border-right:0; background:#FFF; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden} -.defaultSkin .mceListBox .mceOpen {width:9px; height:20px; background:url(../../img/icons.svg) -741px 0; margin-right:2px; border:1px solid #CCC;} -.defaultSkin table.mceListBoxEnabled:hover .mceText, .defaultSkin .mceListBoxHover .mceText, .defaultSkin .mceListBoxSelected .mceText {border:1px solid #A2ABC0; border-right:0; background:#FFF} -.defaultSkin table.mceListBoxEnabled:hover .mceOpen, .defaultSkin .mceListBoxHover .mceOpen, .defaultSkin .mceListBoxSelected .mceOpen {background-color:#FFF; border:1px solid #A2ABC0} -.defaultSkin .mceListBoxDisabled a.mceText {color:gray; background-color:transparent;} -.defaultSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden} -.defaultSkin .mceOldBoxModel .mceListBox .mceText {height:22px} -.defaultSkin .mceOldBoxModel .mceListBox .mceOpen {width:11px; height:22px;} -.defaultSkin select.mceNativeListBox {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:7pt; background:#F0F0EE; border:1px solid gray; margin-right:2px;} - -/* SplitButton */ -.defaultSkin .mceSplitButton {width:32px; height:20px; direction:ltr} -.defaultSkin .mceSplitButton a, .defaultSkin .mceSplitButton span {height:20px; display:block} -.defaultSkin .mceSplitButton a.mceAction {width:20px; border:1px solid #F0F0EE; border-right:0;} -.defaultSkin .mceSplitButton span.mceAction {width:20px; background:url(../../img/icons.svg) 20px 20px;} -.defaultSkin .mceSplitButton a.mceOpen {width:9px; background:url(../../img/icons.svg) -741px 0; border:1px solid #F0F0EE;} -.defaultSkin .mceSplitButton span.mceOpen {display:none} -.defaultSkin table.mceSplitButtonEnabled:hover a.mceAction, .defaultSkin .mceSplitButtonHover a.mceAction, .defaultSkin .mceSplitButtonSelected a.mceAction {border:1px solid #0A246A; border-right:0; background-color:#B2BBD0} -.defaultSkin table.mceSplitButtonEnabled:hover a.mceOpen, .defaultSkin .mceSplitButtonHover a.mceOpen, .defaultSkin .mceSplitButtonSelected a.mceOpen {background-color:#B2BBD0; border:1px solid #0A246A;} -.defaultSkin .mceSplitButtonDisabled .mceAction, .defaultSkin .mceSplitButtonDisabled a.mceOpen {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} -.defaultSkin .mceSplitButtonActive a.mceAction {border:1px solid #0A246A; background-color:#C2CBE0} -.defaultSkin .mceSplitButtonActive a.mceOpen {border-left:0;} - -/* ColorSplitButton */ -.defaultSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray} -.defaultSkin .mceColorSplitMenu td {padding:2px} -.defaultSkin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080} -.defaultSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px} -.defaultSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF} -.defaultSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2} -.defaultSkin a.mceMoreColors:hover {border:1px solid #0A246A} -.defaultSkin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a} -.defaultSkin .mce_forecolor span.mceAction, .defaultSkin .mce_backcolor span.mceAction {overflow:hidden; height:16px} - -/* Menu */ -.defaultSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #D4D0C8} -.defaultSkin .mceNoIcons span.mceIcon {width:0;} -.defaultSkin .mceNoIcons a .mceText {padding-left:10px} -.defaultSkin .mceMenu table {background:#FFF} -.defaultSkin .mceMenu a, .defaultSkin .mceMenu span, .defaultSkin .mceMenu {display:block} -.defaultSkin .mceMenu td {height:20px} -.defaultSkin .mceMenu a {position:relative;padding:3px 0 4px 0} -.defaultSkin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block} -.defaultSkin .mceMenu span.mceText, .defaultSkin .mceMenu .mcePreview {font-size:11px} -.defaultSkin .mceMenu pre.mceText {font-family:Monospace} -.defaultSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;} -.defaultSkin .mceMenu .mceMenuItemEnabled a:hover, .defaultSkin .mceMenu .mceMenuItemActive {background-color:#dbecf3} -.defaultSkin td.mceMenuItemSeparator {background:#DDD; height:1px} -.defaultSkin .mceMenuItemTitle a {border:0; background:#EEE; border-bottom:1px solid #DDD} -.defaultSkin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px} -.defaultSkin .mceMenuItemDisabled .mceText {color:#888} -.defaultSkin .mceMenuItemSelected .mceIcon {background:url(img/menu_check.svg)} -.defaultSkin .mceNoIcons .mceMenuItemSelected a {background:url(img/menu_arrow.svg) no-repeat -6px center} -.defaultSkin .mceMenu span.mceMenuLine {display:none} -.defaultSkin .mceMenuItemSub a {background:url(img/menu_arrow.svg) no-repeat top right;} - -/* Progress,Resize */ -.defaultSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=50)'; filter:alpha(opacity=50); background:#FFF} -.defaultSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(img/progress.svg) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px} -.defaultSkin .mcePlaceHolder {border:1px dotted gray} - -/* Formats */ -.defaultSkin .mce_formatPreview a {font-size:10px} -.defaultSkin .mce_p span.mceText {} -.defaultSkin .mce_address span.mceText {font-style:italic} -.defaultSkin .mce_pre span.mceText {font-family:monospace} -.defaultSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em} -.defaultSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em} -.defaultSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em} -.defaultSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em} -.defaultSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em} -.defaultSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em} - -/* Theme */ -.defaultSkin span.mce_bold {background-position:0 0} -.defaultSkin span.mce_italic {background-position:-60px 0} -.defaultSkin span.mce_underline {background-position:-140px 0} -.defaultSkin span.mce_strikethrough {background-position:-120px 0} -.defaultSkin span.mce_undo {background-position:-160px 0} -.defaultSkin span.mce_redo {background-position:-100px 0} -.defaultSkin span.mce_cleanup {background-position:-40px 0} -.defaultSkin span.mce_bullist {background-position:-20px 0} -.defaultSkin span.mce_numlist {background-position:-80px 0} -.defaultSkin span.mce_justifyleft {background-position:-460px 0} -.defaultSkin span.mce_justifyright {background-position:-480px 0} -.defaultSkin span.mce_justifycenter {background-position:-420px 0} -.defaultSkin span.mce_justifyfull {background-position:-440px 0} -.defaultSkin span.mce_anchor {background-position:-200px 0} -.defaultSkin span.mce_indent {background-position:-400px 0} -.defaultSkin span.mce_outdent {background-position:-540px 0} -.defaultSkin span.mce_link {background-position:-500px 0} -.defaultSkin span.mce_unlink {background-position:-640px 0} -.defaultSkin span.mce_sub {background-position:-600px 0} -.defaultSkin span.mce_sup {background-position:-620px 0} -.defaultSkin span.mce_removeformat {background-position:-580px 0} -.defaultSkin span.mce_newdocument {background-position:-520px 0} -.defaultSkin span.mce_image {background-position:-380px 0} -.defaultSkin span.mce_help {background-position:-340px 0} -.defaultSkin span.mce_code {background-position:-260px 0} -.defaultSkin span.mce_hr {background-position:-360px 0} -.defaultSkin span.mce_visualaid {background-position:-660px 0} -.defaultSkin span.mce_charmap {background-position:-240px 0} -.defaultSkin span.mce_paste {background-position:-560px 0} -.defaultSkin span.mce_copy {background-position:-700px 0} -.defaultSkin span.mce_cut {background-position:-680px 0} -.defaultSkin span.mce_blockquote {background-position:-220px 0} -.defaultSkin .mce_forecolor span.mceAction {background-position:-720px 0} -.defaultSkin .mce_backcolor span.mceAction {background-position:-760px 0} -.defaultSkin span.mce_forecolorpicker {background-position:-720px 0} -.defaultSkin span.mce_backcolorpicker {background-position:-760px 0} - -/* Plugins */ -.defaultSkin span.mce_advhr {background-position:-0px -20px} -.defaultSkin span.mce_ltr {background-position:-20px -20px} -.defaultSkin span.mce_rtl {background-position:-40px -20px} -.defaultSkin span.mce_emotions {background-position:-60px -20px} -.defaultSkin span.mce_fullpage {background-position:-80px -20px} -.defaultSkin span.mce_fullscreen {background-position:-100px -20px} -.defaultSkin span.mce_iespell {background-position:-120px -20px} -.defaultSkin span.mce_insertdate {background-position:-140px -20px} -.defaultSkin span.mce_inserttime {background-position:-160px -20px} -.defaultSkin span.mce_absolute {background-position:-180px -20px} -.defaultSkin span.mce_backward {background-position:-200px -20px} -.defaultSkin span.mce_forward {background-position:-220px -20px} -.defaultSkin span.mce_insert_layer {background-position:-240px -20px} -.defaultSkin span.mce_insertlayer {background-position:-260px -20px} -.defaultSkin span.mce_movebackward {background-position:-280px -20px} -.defaultSkin span.mce_moveforward {background-position:-300px -20px} -.defaultSkin span.mce_media {background-position:-320px -20px} -.defaultSkin span.mce_nonbreaking {background-position:-340px -20px} -.defaultSkin span.mce_pastetext {background-position:-360px -20px} -.defaultSkin span.mce_pasteword {background-position:-380px -20px} -.defaultSkin span.mce_selectall {background-position:-400px -20px} -.defaultSkin span.mce_preview {background-position:-420px -20px} -.defaultSkin span.mce_print {background-position:-440px -20px} -.defaultSkin span.mce_cancel {background-position:-460px -20px} -.defaultSkin span.mce_save {background-position:-480px -20px} -.defaultSkin span.mce_replace {background-position:-500px -20px} -.defaultSkin span.mce_search {background-position:-520px -20px} -.defaultSkin span.mce_styleprops {background-position:-560px -20px} -.defaultSkin span.mce_table {background-position:-580px -20px} -.defaultSkin span.mce_cell_props {background-position:-600px -20px} -.defaultSkin span.mce_delete_table {background-position:-620px -20px} -.defaultSkin span.mce_delete_col {background-position:-640px -20px} -.defaultSkin span.mce_delete_row {background-position:-660px -20px} -.defaultSkin span.mce_col_after {background-position:-680px -20px} -.defaultSkin span.mce_col_before {background-position:-700px -20px} -.defaultSkin span.mce_row_after {background-position:-720px -20px} -.defaultSkin span.mce_row_before {background-position:-740px -20px} -.defaultSkin span.mce_merge_cells {background-position:-760px -20px} -.defaultSkin span.mce_table_props {background-position:-980px -20px} -.defaultSkin span.mce_row_props {background-position:-780px -20px} -.defaultSkin span.mce_split_cells {background-position:-800px -20px} -.defaultSkin span.mce_template {background-position:-820px -20px} -.defaultSkin span.mce_visualchars {background-position:-840px -20px} -.defaultSkin span.mce_abbr {background-position:-860px -20px} -.defaultSkin span.mce_acronym {background-position:-880px -20px} -.defaultSkin span.mce_attribs {background-position:-900px -20px} -.defaultSkin span.mce_cite {background-position:-920px -20px} -.defaultSkin span.mce_del {background-position:-940px -20px} -.defaultSkin span.mce_ins {background-position:-960px -20px} -.defaultSkin span.mce_pagebreak {background-position:0 -40px} -.defaultSkin .mce_spellchecker span.mceAction {background-position:-540px -20px} diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/content.css b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/content.css --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/content.css 2b2f57a3316be0358f49b4c35443fe3f3fc8712efba61b86bc0d880aceff1724c183cca351832613d08ccfc03d74d3c48c48d9f84187dd569a3cb69e0234c78b +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/content.css false @@ -1,32 +0,0 @@ -body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;} -body {background:#FFF;} -body.mceForceColors {background:#FFF; color:#000;} -h1 {font-size: 2em} -h2 {font-size: 1.5em} -h3 {font-size: 1.17em} -h4 {font-size: 1em} -h5 {font-size: .83em} -h6 {font-size: .75em} -.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;} -a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(../default/img/items.svg) no-repeat bottom left;} -img.mceItemAnchor {width:12px; height:12px; background:url(../default/img/items.svg) no-repeat;} -img {border:0;} -table {cursor:default} -table td, table th {cursor:text} -ins {border-bottom:1px solid green; text-decoration: none; color:green} -del {color:red; text-decoration:line-through} -cite {border-bottom:1px dashed blue} -acronym {border-bottom:1px dotted #CCC; cursor:help} -abbr, html\:abbr {border-bottom:1px dashed #CCC; cursor:help} - -/* IE */ -* html body { -scrollbar-3dlight-color:#F0F0EE; -scrollbar-arrow-color:#676662; -scrollbar-base-color:#F0F0EE; -scrollbar-darkshadow-color:#DDD; -scrollbar-face-color:#E0E0DD; -scrollbar-highlight-color:#F0F0EE; -scrollbar-shadow-color:#F0F0EE; -scrollbar-track-color:#F5F5F5; -} diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/dialog.css b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/dialog.css --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/dialog.css 275bf534427c64a48e0165d3ca48dfc6efd94ba7124bf95e5f5ffb94195af2bae129943a3582fd652af32be4f2fbb23fdc556d4efb44af2b949ac9b77b1f58f6 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/dialog.css false @@ -1,113 +0,0 @@ -/* Generic */ -body { -font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; -scrollbar-3dlight-color:#F0F0EE; -scrollbar-arrow-color:#676662; -scrollbar-base-color:#F0F0EE; -scrollbar-darkshadow-color:#DDDDDD; -scrollbar-face-color:#E0E0DD; -scrollbar-highlight-color:#F0F0EE; -scrollbar-shadow-color:#F0F0EE; -scrollbar-track-color:#F5F5F5; -background:#F0F0EE; -padding:0; -margin:8px 8px 0 8px; -} - -html {background:#F0F0EE;} -td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} -textarea {resize:none;outline:none;} -a:link, a:visited {color:black;} -a:hover {color:#2B6FB6;} - -/* Forms */ -fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;} -legend {color:#2B6FB6; font-weight:bold;} -label.msg {display:none;} -label.invalid {color:#EE0000; display:inline;} -input.invalid {border:1px solid #EE0000;} -input {background:#FFF; border:1px solid #CCC;} -input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} -input, select, textarea {border:1px solid #808080;} -input.radio {border:1px none #000000; background:transparent; vertical-align:middle;} -input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;} -.input_noborder {border:0;} - -/* Buttons */ -#insert, #cancel, input.button, .updateButton { -border:0; margin:0; padding:0; -font-weight:bold; -width:94px; height:26px; -background:url(../default/img/buttons.svg) 0 -26px; -cursor:pointer; -padding-bottom:2px; -} - -#insert {background:url(../default/img/buttons.svg) 0 -52px;} -#cancel {background:url(../default/img/buttons.svg) 0 0;} - -/* Browse */ -a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.svg) -860px 0; border:1px solid #FFF; margin-left:1px;} -.mceOldBoxModel a.browse span {width:22px; height:20px;} -a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;} -a.browse span.disabled {border:1px solid white; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} -a.browse:hover span.disabled {border:1px solid white; background-color:transparent;} -a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.svg) -840px 0; margin-left:2px;} -.mceOldBoxModel a.pickcolor span {width:21px; height:17px;} -a.pickcolor:hover span {background-color:#B2BBD0;} -a.pickcolor:hover span.disabled {} - -/* Charmap */ -table.charmap {border:1px solid #AAA; text-align:center} -td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;} -#charmap a {display:block; color:#000; text-decoration:none; border:0} -#charmap a:hover {background:#CCC;color:#2B6FB6} -#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center} -#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center} - -/* Source */ -.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;} -.mceActionPanel {margin-top:5px;} - -/* Tabs classes */ -.tabs {width:100%; height:18px; line-height:normal; background:url(../default/img/tabs.svg) repeat-x 0 -72px;} -.tabs ul {margin:0; padding:0; list-style:none;} -.tabs li {float:left; background:url(../default/img/tabs.svg) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;} -.tabs li.current {background:url(../default/img/tabs.svg) no-repeat 0 -18px; margin-right:2px;} -.tabs span {float:left; display:block; background:url(../default/img/tabs.svg) no-repeat right -36px; padding:0px 10px 0 0;} -.tabs .current span {background:url(../default/img/tabs.svg) no-repeat right -54px;} -.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;} -.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;} - -/* Panels */ -.panel_wrapper div.panel {display:none;} -.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;} -.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;} - -/* Columns */ -.column {float:left;} -.properties {width:100%;} -.properties .column1 {} -.properties .column2 {text-align:left;} - -/* Titles */ -h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;} -h3 {font-size:14px;} -.title {font-size:12px; font-weight:bold; color:#2B6FB6;} - -/* Dialog specific */ -#link .panel_wrapper, #link div.current {height:125px;} -#image .panel_wrapper, #image div.current {height:200px;} -#plugintable thead {font-weight:bold; background:#DDD;} -#plugintable, #about #plugintable td {border:1px solid #919B9C;} -#plugintable {width:96%; margin-top:10px;} -#pluginscontainer {height:290px; overflow:auto;} -#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;} -#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;} -#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;} -#colorpicker #light div {overflow:hidden;} -#colorpicker #previewblock {float:right; padding-left:10px; height:20px;} -#colorpicker .panel_wrapper div.current {height:175px;} -#colorpicker #namedcolors {width:150px;} -#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;} -#colorpicker #colornamecontainer {margin-top:5px;} diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg.svg 38d7f92b2613b91d1557c2d5af2bb3361a97fd18d008733f04cb245041bbae1b3a1769910293fb6834fdd6a17b3c6d1053052351bf600229495bc1705a0d4732 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg.svg false @@ -1,108 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg_black.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg_black.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg_black.svg f91280f82ee54a0b0993a6680380471c8ec7e7f6d522ac44aa00ff251bbc4d5616806d9cf0db00e4477cfa793a982110affa6ddcc963b95e0416d3937681c12a +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg_black.svg false @@ -1,71 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg_silver.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg_silver.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg_silver.svg 7efa3db5910ea823c8d2271338d6b658e0d2baefa085c1becd195fd13ddc800d99b55d5bb34937f3d61acf68f027da0173a22fef0457c39ff2d2be323f55a938 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/img/button_bg_silver.svg false @@ -1,99 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui.css b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui.css --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui.css 06f542f50afc410ce67e99cdb7b973dea8803dfb1edb13bf8ed8923ad8acc60af367dfd0aeb6029c4182ec3dbdec319e93a7f2e1ec5bae77a784523a0974d351 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui.css false @@ -1,215 +0,0 @@ -/* Reset */ -.o2k7Skin table, .o2k7Skin tbody, .o2k7Skin a, .o2k7Skin img, .o2k7Skin tr, .o2k7Skin div, .o2k7Skin td, .o2k7Skin iframe, .o2k7Skin span, .o2k7Skin *, .o2k7Skin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left} -.o2k7Skin a:hover, .o2k7Skin a:link, .o2k7Skin a:visited, .o2k7Skin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000} -.o2k7Skin table td {vertical-align:middle} - -/* Containers */ -.o2k7Skin table {background:#E5EFFD} -.o2k7Skin iframe {display:block; background:#FFF} -.o2k7Skin .mceToolbar {height:26px} - -/* External */ -.o2k7Skin .mceExternalToolbar {position:absolute; border:1px solid #ABC6DD; border-bottom:0; display:none} -.o2k7Skin .mceExternalToolbar td.mceToolbar {padding-right:13px;} -.o2k7Skin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.svg) -820px 0} - -/* Layout */ -.o2k7Skin table.mceLayout {border:0; border-left:1px solid #ABC6DD; border-right:1px solid #ABC6DD} -.o2k7Skin table.mceLayout tr.mceFirst td {border-top:1px solid #ABC6DD} -.o2k7Skin table.mceLayout tr.mceLast td {border-bottom:1px solid #ABC6DD} -.o2k7Skin table.mceToolbar, .o2k7Skin tr.mceFirst .mceToolbar tr td, .o2k7Skin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0} -.o2k7Skin .mceIframeContainer {border-top:1px solid #ABC6DD; border-bottom:1px solid #ABC6DD} -.o2k7Skin .mceStatusbar {display:block; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; height:20px} -.o2k7Skin .mceStatusbar div {float:left; padding:2px} -.o2k7Skin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.svg) -800px 0; width:20px; height:20px; cursor:se-resize} -.o2k7Skin .mceStatusbar a:hover {text-decoration:underline} -.o2k7Skin table.mceToolbar {margin-left:3px} -.o2k7Skin .mceToolbar .mceToolbarStart span {display:block; background:url(img/button_bg.svg) -22px 0; width:1px; height:22px; margin-left:3px;} -.o2k7Skin .mceToolbar td.mceFirst span {margin:0} -.o2k7Skin .mceToolbar .mceToolbarEnd span {display:block; background:url(img/button_bg.svg) -22px 0; width:1px; height:22px} -.o2k7Skin .mceToolbar .mceToolbarEndListBox span, .o2k7Skin .mceToolbar .mceToolbarStartListBox span {display:none} -.o2k7Skin span.mceIcon, .o2k7Skin img.mceIcon {display:block; width:20px; height:20px} -.o2k7Skin .mceIcon {background:url(../../img/icons.svg) no-repeat 20px 20px} -.o2k7Skin td.mceCenter {text-align:center;} -.o2k7Skin td.mceCenter table {margin:0 auto; text-align:left;} -.o2k7Skin td.mceRight table {margin:0 0 0 auto;} - -/* Button */ -.o2k7Skin .mceButton {display:block; background:url(img/button_bg.svg); width:22px; height:22px} -.o2k7Skin a.mceButton span, .o2k7Skin a.mceButton img {margin-left:1px} -.o2k7Skin .mceOldBoxModel a.mceButton span, .o2k7Skin .mceOldBoxModel a.mceButton img {margin:0 0 0 1px} -.o2k7Skin a.mceButtonEnabled:hover {background-color:#B2BBD0; background-position:0 -22px} -.o2k7Skin a.mceButtonActive, .o2k7Skin a.mceButtonSelected {background-position:0 -44px} -.o2k7Skin .mceButtonDisabled .mceIcon {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} -.o2k7Skin .mceButtonLabeled {width:auto} -.o2k7Skin .mceButtonLabeled span.mceIcon {float:left} -.o2k7Skin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica} -.o2k7Skin .mceButtonDisabled .mceButtonLabel {color:#888} - -/* Separator */ -.o2k7Skin .mceSeparator {display:block; background:url(img/button_bg.svg) -22px 0; width:5px; height:22px} - -/* ListBox */ -.o2k7Skin .mceListBox {margin-left:3px} -.o2k7Skin .mceListBox, .o2k7Skin .mceListBox a {display:block} -.o2k7Skin .mceListBox .mceText {padding-left:4px; text-align:left; width:70px; border:1px solid #b3c7e1; border-right:0; background:#eaf2fb; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden} -.o2k7Skin .mceListBox .mceOpen {width:14px; height:22px; background:url(img/button_bg.svg) -66px 0} -.o2k7Skin table.mceListBoxEnabled:hover .mceText, .o2k7Skin .mceListBoxHover .mceText, .o2k7Skin .mceListBoxSelected .mceText {background:#FFF} -.o2k7Skin table.mceListBoxEnabled:hover .mceOpen, .o2k7Skin .mceListBoxHover .mceOpen, .o2k7Skin .mceListBoxSelected .mceOpen {background-position:-66px -22px} -.o2k7Skin .mceListBoxDisabled .mceText {color:gray} -.o2k7Skin .mceListBoxMenu {overflow:auto; overflow-x:hidden} -.o2k7Skin .mceOldBoxModel .mceListBox .mceText {height:22px} -.o2k7Skin select.mceListBox {font-family:Tahoma,Verdana,Arial,Helvetica; font-size:12px; border:1px solid #b3c7e1; background:#FFF;} - -/* SplitButton */ -.o2k7Skin .mceSplitButton, .o2k7Skin .mceSplitButton a, .o2k7Skin .mceSplitButton span {display:block; height:22px} -.o2k7Skin .mceSplitButton {background:url(img/button_bg.svg)} -.o2k7Skin .mceSplitButton a.mceAction {width:22px} -.o2k7Skin .mceSplitButton span.mceAction {width:22px; background:url(../../img/icons.svg) 20px 20px} -.o2k7Skin .mceSplitButton a.mceOpen {width:10px; background:url(img/button_bg.svg) -44px 0} -.o2k7Skin .mceSplitButton span.mceOpen {display:none} -.o2k7Skin table.mceSplitButtonEnabled:hover a.mceAction, .o2k7Skin .mceSplitButtonHover a.mceAction, .o2k7Skin .mceSplitButtonSelected {background:url(img/button_bg.svg) 0 -22px} -.o2k7Skin table.mceSplitButtonEnabled:hover a.mceOpen, .o2k7Skin .mceSplitButtonHover a.mceOpen, .o2k7Skin .mceSplitButtonSelected a.mceOpen {background-position:-44px -44px} -.o2k7Skin .mceSplitButtonDisabled .mceAction {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)} -.o2k7Skin .mceSplitButtonActive {background-position:0 -44px} - -/* ColorSplitButton */ -.o2k7Skin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray} -.o2k7Skin .mceColorSplitMenu td {padding:2px} -.o2k7Skin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080} -.o2k7Skin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px} -.o2k7Skin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF} -.o2k7Skin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2} -.o2k7Skin a.mceMoreColors:hover {border:1px solid #0A246A} -.o2k7Skin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a;overflow:hidden} -.o2k7Skin .mce_forecolor span.mceAction, .o2k7Skin .mce_backcolor span.mceAction {height:15px;overflow:hidden} - -/* Menu */ -.o2k7Skin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #ABC6DD} -.o2k7Skin .mceNoIcons span.mceIcon {width:0;} -.o2k7Skin .mceNoIcons a .mceText {padding-left:10px} -.o2k7Skin .mceMenu table {background:#FFF} -.o2k7Skin .mceMenu a, .o2k7Skin .mceMenu span, .o2k7Skin .mceMenu {display:block} -.o2k7Skin .mceMenu td {height:20px} -.o2k7Skin .mceMenu a {position:relative;padding:3px 0 4px 0} -.o2k7Skin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block} -.o2k7Skin .mceMenu span.mceText, .o2k7Skin .mceMenu .mcePreview {font-size:11px} -.o2k7Skin .mceMenu pre.mceText {font-family:Monospace} -.o2k7Skin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;} -.o2k7Skin .mceMenu .mceMenuItemEnabled a:hover, .o2k7Skin .mceMenu .mceMenuItemActive {background-color:#dbecf3} -.o2k7Skin td.mceMenuItemSeparator {background:#DDD; height:1px} -.o2k7Skin .mceMenuItemTitle a {border:0; background:#E5EFFD; border-bottom:1px solid #ABC6DD} -.o2k7Skin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px} -.o2k7Skin .mceMenuItemDisabled .mceText {color:#888} -.o2k7Skin .mceMenuItemSelected .mceIcon {background:url(../default/img/menu_check.svg)} -.o2k7Skin .mceNoIcons .mceMenuItemSelected a {background:url(../default/img/menu_arrow.svg) no-repeat -6px center} -.o2k7Skin .mceMenu span.mceMenuLine {display:none} -.o2k7Skin .mceMenuItemSub a {background:url(../default/img/menu_arrow.svg) no-repeat top right;} - -/* Progress,Resize */ -.o2k7Skin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF} -.o2k7Skin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.svg) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px} -.o2k7Skin .mcePlaceHolder {border:1px dotted gray} - -/* Formats */ -.o2k7Skin .mce_formatPreview a {font-size:10px} -.o2k7Skin .mce_p span.mceText {} -.o2k7Skin .mce_address span.mceText {font-style:italic} -.o2k7Skin .mce_pre span.mceText {font-family:monospace} -.o2k7Skin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em} -.o2k7Skin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em} -.o2k7Skin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em} -.o2k7Skin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em} -.o2k7Skin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em} -.o2k7Skin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em} - -/* Theme */ -.o2k7Skin span.mce_bold {background-position:0 0} -.o2k7Skin span.mce_italic {background-position:-60px 0} -.o2k7Skin span.mce_underline {background-position:-140px 0} -.o2k7Skin span.mce_strikethrough {background-position:-120px 0} -.o2k7Skin span.mce_undo {background-position:-160px 0} -.o2k7Skin span.mce_redo {background-position:-100px 0} -.o2k7Skin span.mce_cleanup {background-position:-40px 0} -.o2k7Skin span.mce_bullist {background-position:-20px 0} -.o2k7Skin span.mce_numlist {background-position:-80px 0} -.o2k7Skin span.mce_justifyleft {background-position:-460px 0} -.o2k7Skin span.mce_justifyright {background-position:-480px 0} -.o2k7Skin span.mce_justifycenter {background-position:-420px 0} -.o2k7Skin span.mce_justifyfull {background-position:-440px 0} -.o2k7Skin span.mce_anchor {background-position:-200px 0} -.o2k7Skin span.mce_indent {background-position:-400px 0} -.o2k7Skin span.mce_outdent {background-position:-540px 0} -.o2k7Skin span.mce_link {background-position:-500px 0} -.o2k7Skin span.mce_unlink {background-position:-640px 0} -.o2k7Skin span.mce_sub {background-position:-600px 0} -.o2k7Skin span.mce_sup {background-position:-620px 0} -.o2k7Skin span.mce_removeformat {background-position:-580px 0} -.o2k7Skin span.mce_newdocument {background-position:-520px 0} -.o2k7Skin span.mce_image {background-position:-380px 0} -.o2k7Skin span.mce_help {background-position:-340px 0} -.o2k7Skin span.mce_code {background-position:-260px 0} -.o2k7Skin span.mce_hr {background-position:-360px 0} -.o2k7Skin span.mce_visualaid {background-position:-660px 0} -.o2k7Skin span.mce_charmap {background-position:-240px 0} -.o2k7Skin span.mce_paste {background-position:-560px 0} -.o2k7Skin span.mce_copy {background-position:-700px 0} -.o2k7Skin span.mce_cut {background-position:-680px 0} -.o2k7Skin span.mce_blockquote {background-position:-220px 0} -.o2k7Skin .mce_forecolor span.mceAction {background-position:-720px 0} -.o2k7Skin .mce_backcolor span.mceAction {background-position:-760px 0} -.o2k7Skin span.mce_forecolorpicker {background-position:-720px 0} -.o2k7Skin span.mce_backcolorpicker {background-position:-760px 0} - -/* Plugins */ -.o2k7Skin span.mce_advhr {background-position:-0px -20px} -.o2k7Skin span.mce_ltr {background-position:-20px -20px} -.o2k7Skin span.mce_rtl {background-position:-40px -20px} -.o2k7Skin span.mce_emotions {background-position:-60px -20px} -.o2k7Skin span.mce_fullpage {background-position:-80px -20px} -.o2k7Skin span.mce_fullscreen {background-position:-100px -20px} -.o2k7Skin span.mce_iespell {background-position:-120px -20px} -.o2k7Skin span.mce_insertdate {background-position:-140px -20px} -.o2k7Skin span.mce_inserttime {background-position:-160px -20px} -.o2k7Skin span.mce_absolute {background-position:-180px -20px} -.o2k7Skin span.mce_backward {background-position:-200px -20px} -.o2k7Skin span.mce_forward {background-position:-220px -20px} -.o2k7Skin span.mce_insert_layer {background-position:-240px -20px} -.o2k7Skin span.mce_insertlayer {background-position:-260px -20px} -.o2k7Skin span.mce_movebackward {background-position:-280px -20px} -.o2k7Skin span.mce_moveforward {background-position:-300px -20px} -.o2k7Skin span.mce_media {background-position:-320px -20px} -.o2k7Skin span.mce_nonbreaking {background-position:-340px -20px} -.o2k7Skin span.mce_pastetext {background-position:-360px -20px} -.o2k7Skin span.mce_pasteword {background-position:-380px -20px} -.o2k7Skin span.mce_selectall {background-position:-400px -20px} -.o2k7Skin span.mce_preview {background-position:-420px -20px} -.o2k7Skin span.mce_print {background-position:-440px -20px} -.o2k7Skin span.mce_cancel {background-position:-460px -20px} -.o2k7Skin span.mce_save {background-position:-480px -20px} -.o2k7Skin span.mce_replace {background-position:-500px -20px} -.o2k7Skin span.mce_search {background-position:-520px -20px} -.o2k7Skin span.mce_styleprops {background-position:-560px -20px} -.o2k7Skin span.mce_table {background-position:-580px -20px} -.o2k7Skin span.mce_cell_props {background-position:-600px -20px} -.o2k7Skin span.mce_delete_table {background-position:-620px -20px} -.o2k7Skin span.mce_delete_col {background-position:-640px -20px} -.o2k7Skin span.mce_delete_row {background-position:-660px -20px} -.o2k7Skin span.mce_col_after {background-position:-680px -20px} -.o2k7Skin span.mce_col_before {background-position:-700px -20px} -.o2k7Skin span.mce_row_after {background-position:-720px -20px} -.o2k7Skin span.mce_row_before {background-position:-740px -20px} -.o2k7Skin span.mce_merge_cells {background-position:-760px -20px} -.o2k7Skin span.mce_table_props {background-position:-980px -20px} -.o2k7Skin span.mce_row_props {background-position:-780px -20px} -.o2k7Skin span.mce_split_cells {background-position:-800px -20px} -.o2k7Skin span.mce_template {background-position:-820px -20px} -.o2k7Skin span.mce_visualchars {background-position:-840px -20px} -.o2k7Skin span.mce_abbr {background-position:-860px -20px} -.o2k7Skin span.mce_acronym {background-position:-880px -20px} -.o2k7Skin span.mce_attribs {background-position:-900px -20px} -.o2k7Skin span.mce_cite {background-position:-920px -20px} -.o2k7Skin span.mce_del {background-position:-940px -20px} -.o2k7Skin span.mce_ins {background-position:-960px -20px} -.o2k7Skin span.mce_pagebreak {background-position:0 -40px} -.o2k7Skin .mce_spellchecker span.mceAction {background-position:-540px -20px} diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui_black.css b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui_black.css --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui_black.css 3413d4c9f668eb6e61dbc439e56f611940ffd0f160405f38b720df7935510c67e38d4f8b008ad21fbc092834be96409399373f781e50c703c5acd0e823a3e974 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui_black.css false @@ -1,8 +0,0 @@ -/* Black */ -.o2k7SkinBlack .mceToolbar .mceToolbarStart span, .o2k7SkinBlack .mceToolbar .mceToolbarEnd span, .o2k7SkinBlack .mceButton, .o2k7SkinBlack .mceSplitButton, .o2k7SkinBlack .mceSeparator, .o2k7SkinBlack .mceSplitButton a.mceOpen, .o2k7SkinBlack .mceListBox a.mceOpen {background-image:url(img/button_bg_black.svg)} -.o2k7SkinBlack table, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack .mceMenuItemTitle span.mceText, .o2k7SkinBlack .mceStatusbar div, .o2k7SkinBlack .mceStatusbar span, .o2k7SkinBlack .mceStatusbar a {background:#535353; color:#FFF} -.o2k7SkinBlack table.mceListBoxEnabled .mceText, o2k7SkinBlack .mceListBox .mceText {background:#FFF; border:1px solid #CBCFD4; border-bottom-color:#989FA9; border-right:0} -.o2k7SkinBlack table.mceListBoxEnabled:hover .mceText, .o2k7SkinBlack .mceListBoxHover .mceText, .o2k7SkinBlack .mceListBoxSelected .mceText {background:#FFF; border:1px solid #FFBD69; border-right:0} -.o2k7SkinBlack .mceExternalToolbar, .o2k7SkinBlack .mceListBox .mceText, .o2k7SkinBlack div.mceMenu, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceFirst td, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceLast td, .o2k7SkinBlack .mceIframeContainer {border-color: #535353;} -.o2k7SkinBlack table.mceSplitButtonEnabled:hover a.mceAction, .o2k7SkinBlack .mceSplitButtonHover a.mceAction, .o2k7SkinBlack .mceSplitButtonSelected {background-image:url(img/button_bg_black.svg)} -.o2k7SkinBlack .mceMenu .mceMenuItemEnabled a:hover, .o2k7SkinBlack .mceMenu .mceMenuItemActive {background-color:#FFE7A1} diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui_silver.css b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui_silver.css --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui_silver.css 98f7417208613a229a773c1148262b739aa4ff2569e190e22a87562c7a94a1672c73d33f247f136b8a595eb17652afa37eef1f963e9f719b1ec7e0a3f70737aa +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui_silver.css false @@ -1,5 +0,0 @@ -/* Silver */ -.o2k7SkinSilver .mceToolbar .mceToolbarStart span, .o2k7SkinSilver .mceButton, .o2k7SkinSilver .mceSplitButton, .o2k7SkinSilver .mceSeparator, .o2k7SkinSilver .mceSplitButton a.mceOpen, .o2k7SkinSilver .mceListBox a.mceOpen {background-image:url(img/button_bg_silver.svg)} -.o2k7SkinSilver table, .o2k7SkinSilver .mceMenuItemTitle a {background:#eee} -.o2k7SkinSilver .mceListBox .mceText {background:#FFF} -.o2k7SkinSilver .mceExternalToolbar, .o2k7SkinSilver .mceListBox .mceText, .o2k7SkinSilver div.mceMenu, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceFirst td, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceLast td, .o2k7SkinSilver .mceIframeContainer {border-color: #bbb} diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css 336d13892feae69a18d112aae1c034ac38c8a26733d6daf1f7bbe11490e6dccb093d016fa89f0aad6485eb4ddfe4ea13bab28ad3e1c8a9e23dfa9bab478ac07d +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css false @@ -1,19 +0,0 @@ -body, td {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;} -body {background:#FFF;} -body.mceForceColors {background:#FFF; color:#000;} -h1 {font-size: 2em} -h2 {font-size: 1.5em} -h3 {font-size: 1.17em} -h4 {font-size: 1em} -h5 {font-size: .83em} -h6 {font-size: .75em} -.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;} -a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(../default/img/items.svg) no-repeat bottom left;} -img.mceItemAnchor {width:12px; height:12px; background:url(../default/img/items.svg) no-repeat;} -img {border:0;} -table {cursor:default} -table td, table th {cursor:text} -ins {border-bottom:1px solid green; text-decoration: none; color:green} -del {color:red; text-decoration:line-through} -cite {border-bottom:1px dashed blue} -acronym {border-bottom:1px dotted #CCC; cursor:help} diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css acd7dc2c9d280b46e4580f6302de5ff21c0e95124c2ee09fbbccfbabd4f3548b99292fd7bf734cd7d07001bff9bcb081a3a3187259e3b2bff0eaee3b080327e6 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css false @@ -1,115 +0,0 @@ -/* Generic */ -body { -font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px; -background:#f1f1f1; -padding:0; -margin:8px 8px 0 8px; -} - -html {background:#f1f1f1;} -td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} -textarea {resize:none;outline:none;} -a:link, a:visited {color:black;} -a:hover {color:#2B6FB6;} - -/* Forms */ -fieldset {margin:0; padding:4px; border:1px solid #dfdfdf; font-family:Verdana, Arial; font-size:10px;} -legend {color:#2B6FB6; font-weight:bold;} -label.msg {display:none;} -label.invalid {color:#EE0000; display:inline;} -input.invalid {border:1px solid #EE0000;} -input {background:#FFF; border:1px solid #dfdfdf;} -input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;} -input, select, textarea {border:1px solid #dfdfdf;} -input.radio {border:1px none #000000; background:transparent; vertical-align:middle;} -input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;} -.input_noborder {border:0;} - -/* Buttons */ -#insert, #cancel, #apply, .mceActionPanel .button, input.mceButton, .updateButton { - border: 1px solid #bbb; - margin:0; - padding:0 0 1px; - font-weight:bold; - font-size: 11px; - width:94px; - height:24px; - background:url(img/fade-butt.svg) 0 0; - cursor:pointer; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; -} -#insert:hover, #cancel:hover, input.mceButton:hover, .updateButton:hover, -#insert:focus, #cancel:focus, input.mceButton:focus, .updateButton:focus { - border: 1px solid #555; -} - -/* Browse */ -a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.svg) -860px 0; border:1px solid #FFF; margin-left:1px;} -.mceOldBoxModel a.browse span {width:22px; height:20px;} -a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;} -a.browse span.disabled {border:1px solid white; -moz-opacity:0.3; opacity:0.3; filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);} -a.browse:hover span.disabled {border:1px solid white; background-color:transparent;} -a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.svg) -840px 0; margin-left:2px;} -.mceOldBoxModel a.pickcolor span {width:21px; height:17px;} -a.pickcolor:hover span {background-color:#B2BBD0;} -a.pickcolor:hover span.disabled {} - -/* Charmap */ -table.charmap {border:1px solid #AAA; text-align:center} -td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;} -#charmap a {display:block; color:#000; text-decoration:none; border:0} -#charmap a:hover {background:#CCC;color:#2B6FB6} -#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center} -#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center} -#charmap #charmapView {background-color:#fff;} - -/* Source */ -.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;} -.mceActionPanel {margin-top:5px;} - -/* Tabs classes */ -.tabs {width:100%; height:18px; line-height:normal; background:url(img/tabs.svg) repeat-x 0 -72px;} -.tabs ul {margin:0; padding:0; list-style:none;} -.tabs li {float:left; background:url(img/tabs.svg) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;} -.tabs li.current {background:url(img/tabs.svg) no-repeat 0 -18px; margin-right:2px;} -.tabs span {float:left; display:block; background:url(img/tabs.svg) no-repeat right -36px; padding:0px 10px 0 0;} -.tabs .current span {background:url(img/tabs.svg) no-repeat right -54px;} -.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;} -.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;} - -/* Panels */ -.panel_wrapper div.panel {display:none;} -.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;} -.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;} - -/* Columns */ -.column {float:left;} -.properties {width:100%;} -.properties .column1 {} -.properties .column2 {text-align:left;} - -/* Titles */ -h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;} -h3 {font-size:14px;} -.title {font-size:12px; font-weight:bold; color:#2B6FB6;} - -/* Dialog specific */ -#link .panel_wrapper, #link div.current {height:125px;} -#image .panel_wrapper, #image div.current {height:200px;} -#plugintable thead {font-weight:bold; background:#DDD;} -#plugintable, #about #plugintable td {border:1px solid #919B9C;} -#plugintable {width:96%; margin-top:10px;} -#pluginscontainer {height:290px; overflow:auto;} -#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;} -#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;} -#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;} -#colorpicker #light div {overflow:hidden;} -#colorpicker #previewblock {float:right; padding-left:10px; height:20px;} -#colorpicker .panel_wrapper div.current {height:175px;} -#colorpicker #namedcolors {width:150px;} -#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;} -#colorpicker #colornamecontainer {margin-top:5px;} -#colorpicker #picker_panel fieldset {margin:auto;width:325px;} \ No newline at end of file diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.svg 9dfa892c097209145b9e24c8de625b55f4c35c790ae2aa3bc3cfd32a1319f232c6bdd0ae4c173a9775016190718a65b67c5cf44bf40a9dd44f122f42e0260fc3 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.svg false @@ -1,9 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/button_bg.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/button_bg.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/button_bg.svg 38d7f92b2613b91d1557c2d5af2bb3361a97fd18d008733f04cb245041bbae1b3a1769910293fb6834fdd6a17b3c6d1053052351bf600229495bc1705a0d4732 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/button_bg.svg false @@ -1,108 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.svg 4956db96cd0f230768b0ec9a5235f5cda505d37fa14fcd19647b35222b5a0a26b7578fa8f1ffd1c94dfd7265f368f253640562b980da1caac5c48ebe08fd54c0 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.svg false @@ -1,7 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.svg 47480c18c0d6f5e496943c4ad0d64daff7caea30eb49fcf203d5710c80212e498a046dafd51f1d342cb18e15b38c56b60122c1a9a8b45f67501959f6afeff926 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.svg false @@ -1,19 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/separator.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/separator.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/separator.svg 9c272f5d764cf9cae344dc053735ea07566972bc389f7507e2a01d80304e3f743c0694c99e004f12274512660b674f7d834a9e8d7d7d820b7a34bd75f6766152 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/separator.svg false @@ -1,6 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.svg b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.svg --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.svg 041fd93bb803c193aa3601a1c0ff478fa54ed3ea3faa7b2906f8e023ddfaf6e63e97197fc8bd8018f9aa9e6b733a7b9e0476626d0a050fd719753b8712f488c3 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/tabs.svg false @@ -1,29 +0,0 @@ - - - diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css 09192490d30a3a97bb30f040028cbb445fe137725ab7cca5e5d59119d9587f041ef2015f418fa66054954751d7d711a0da5fdec8f27d72c289c775b146f07b77 +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css false @@ -1,398 +0,0 @@ -/* Reset */ -.wp_themeSkin table, .wp_themeSkin tbody, .wp_themeSkin a, .wp_themeSkin img, .wp_themeSkin tr, .wp_themeSkin div, .wp_themeSkin td, .wp_themeSkin iframe, .wp_themeSkin span, .wp_themeSkin *, .wp_themeSkin .mceText { -border:0; margin:0; padding:0; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; vertical-align:baseline; width:auto; border-collapse:separate; -} -.wp_themeSkin a:hover, .wp_themeSkin a:link, .wp_themeSkin a:visited, .wp_themeSkin a:active {text-decoration:none; font-weight:normal; cursor:default;} -.wp_themeSkin table td {vertical-align:middle} - -/* Containers */ -.wp_themeSkin table {} -.wp_themeSkin iframe {display:block;} -.wp_themeSkin .mceToolbar {padding: 2px;} - -/* External */ -.wp_themeSkin .mceExternalToolbar {position:absolute; border-bottom:0; display:none} -.wp_themeSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;} -.wp_themeSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.svg) -820px 0} - -/* Layout */ -.wp_themeSkin table.mceToolbar, .wp_themeSkin tr.mceFirst .mceToolbar tr td, .wp_themeSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0} -.wp_themeSkin table.mceLayout {border:0;} -.wp_themeSkin .mceIframeContainer {} -.wp_themeSkin .mceStatusbar { - display: block; - font-family: 'MS Sans Serif',sans-serif,Verdana,Arial; - font-size: 9pt; - line-height: 16px; - overflow: visible; - height: 20px; - border-top-width: 1px; - border-top-style: solid; -} -.wp_themeSkin .mceStatusbar div {float:left; padding:2px;} -.wp_themeSkin .mceStatusbar a.mceResize { - display: block; - float: right; - background: url(../../img/icons.svg) -800px 0; - width: 20px; - height: 20px; - cursor: se-resize -} -.wp_themeSkin .mceStatusbar a:hover {text-decoration:underline} -.wp_themeSkin table.mceToolbar {margin: 0 2px 2px;} -.wp_themeSkin #content_toolbar1 {margin-top: 2px;} -.wp_themeSkin .mceToolbar .mceToolbarEndListBox span {display:none} -.wp_themeSkin span.mceIcon, .wp_themeSkin img.mceIcon {display:block; width:20px; height:20px} -.wp_themeSkin .mceIcon {background:url(../../img/icons.svg) no-repeat 20px 20px} - -/* Button */ -.wp_themeSkin .mceButton { - display:block; - width: 20px; - height: 20px; - cursor: default; - padding: 1px 2px; - margin: 1px; - background-image: url(img/butt2.svg); - background-position: left top; - background-repeat: repeat-x; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - -khtml-border-radius: 3px; - border-radius: 3px; -} -.wp_themeSkin a.mceButton span, .wp_themeSkin a.mceButton img {} -.wp_themeSkin .mceOldBoxModel a.mceButton span, .wp_themeSkin .mceOldBoxModel a.mceButton img {margin:0 0 0 1px} -.wp_themeSkin a.mceButtonEnabled:hover { - background-position:0 -10px; -} -.wp_themeSkin a.mceButtonActive, .wp_themeSkin a.mceButtonSelected { - background-image: inherit; -} -.wp_themeSkin .mceButtonDisabled .mceIcon {opacity:0.3; filter:alpha(opacity=30);} -.wp_themeSkin .mceButtonDisabled {} - -/* Separator */ -.wp_themeSkin .mceSeparator { - height: 24px; - width: 1px; - display: block; - background: transparent; - overflow: hidden; - margin: 0 2px; -} - -/* ListBox */ -.wp_themeSkin .mceListBox, .wp_themeSkin .mceListBox a {display:block} -.wp_themeSkin .mceListBox .mceText { - padding: 1px 2px 1px 5px; - text-align:left; - text-decoration: none !important; - width:70px; - background-image: url(img/butt2.svg); - background-position: left top; - background-repeat: repeat-x; - font-family: Tahoma,Verdana,Arial,Helvetica; - font-size: 11px; - height: 20px; - line-height: 20px; - overflow: hidden; -} -.wp_themeSkin .mceListBox { - margin: 1px; - direction: ltr; -} -.wp_themeSkin .mceListBox .mceOpen { - width: 14px; - height: 20px; - border-collapse: separate; - background-image: url(img/butt2.svg); - background-position: left top; - background-repeat: repeat-x; - padding: 1px; - border-left: 0 none !important; -} -.wp_themeSkin .mceListBox .mceOpen span { - display: block; - width:14px; - height:20px; - background-image: url(img/down_arrow.svg); - background-position: 2px 1px; - background-repeat: no-repeat; -} -.wp_themeSkin table.mceListBoxEnabled:hover .mceText, -.wp_themeSkin .mceListBoxHover .mceText, -.wp_themeSkin .mceListBoxSelected .mceText, -.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, -.wp_themeSkin .mceListBoxHover .mceOpen, -.wp_themeSkin .mceListBoxSelected .mceOpen { - background-image: none; -} -.wp_themeSkin .mceListBoxDisabled .mceText {color:gray} -.wp_themeSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden} -.wp_themeSkin .mceOldBoxModel .mceListBox .mceText {height:22px} -.wp_themeSkin select.mceListBox {font-family:Tahoma,Verdana,Arial,Helvetica; font-size:12px;} - -/* SplitButton */ -.wp_themeSkin .mceSplitButton a, .wp_themeSkin .mceSplitButton span {display:block; height:20px} -.wp_themeSkin .mceSplitButton { - display:block; - margin: 1px; - direction: ltr; -} -.wp_themeSkin table.mceSplitButton td { - padding: 2px; -} -.wp_themeSkin .mceSplitButton a.mceAction { - height:20px; - width:20px; - background-image: url(img/butt2.svg); - background-position: left top; - background-repeat: repeat-x; - padding: 1px 2px; -} -.wp_themeSkin .mceSplitButton span.mceAction { - background: url(../../img/icons.svg) 20px 20px; - width:20px; -} -.wp_themeSkin .mceSplitButton a.mceOpen { - width:10px; - height:20px; - border-collapse:separate; - background-image: url(img/butt2.svg); - background-position: left top; - background-repeat: repeat-x; - padding: 1px; - border-left: 0 none !important; -} -.wp_themeSkin .mceSplitButton span.mceOpen { - width:10px; - background-image: url(img/down_arrow.svg); - background-position: 0px 1px; - background-repeat: no-repeat; - border-collapse:separate; - border-left: 0 none !important; -} -.wp_themeSkin .mceSplitButton a.mceOpen:hover, -.wp_themeSkin .mceSplitButtonSelected a.mceOpen, -.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction, -.wp_themeSkin .mceSplitButton a.mceAction:hover { - background-image: none; -} -.wp_themeSkin table.mceSplitButtonEnabled:hover span.mceOpen, -.wp_themeSkin .mceSplitButtonHover span.mceOpen, -.wp_themeSkin .mceSplitButtonSelected span.mceOpen { -} -.wp_themeSkin .mceSplitButtonDisabled .mceAction { - opacity:0.3; filter:alpha(opacity=30); -} -.wp_themeSkin .mceListBox a.mceText, .wp_themeSkin .mceSplitButton a.mceAction { - -moz-border-radius-bottomleft: 3px; - -webkit-border-bottom-left-radius: 3px; - -khtml-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - -moz-border-radius-topleft: 3px; - -webkit-border-top-left-radius: 3px; - -khtml-border-top-left-radius: 3px; - border-top-left-radius: 3px; -} -.wp_themeSkin .mceSplitButton a.mceOpen, .wp_themeSkin .mceListBox a.mceOpen { - -moz-border-radius-bottomright: 3px; - -webkit-border-bottom-right-radius: 3px; - -khtml-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; - -moz-border-radius-topright: 3px; - -webkit-border-top-right-radius: 3px; - -khtml-border-top-right-radius: 3px; - border-top-right-radius: 3px; -} - -/* ColorSplitButton */ -.wp_themeSkin div.mceColorSplitMenu table {} -.wp_themeSkin .mceColorSplitMenu td {padding:2px} -.wp_themeSkin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden;} -.wp_themeSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px} -.wp_themeSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px;} -.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover {} -.wp_themeSkin a.mceMoreColors:hover {} -.wp_themeSkin .mceColorPreview {margin: -4px 0 0 2px; width:16px; height:4px; overflow:hidden} - -/* Menu */ -.wp_themeSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000;} -.wp_themeSkin .mceNoIcons span.mceIcon {width:0;} -.wp_themeSkin .mceNoIcons a .mceText {padding-left:10px} -.wp_themeSkin .mceMenu table {} -.wp_themeSkin .mceMenu a, .wp_themeSkin .mceMenu span, .wp_themeSkin .mceMenu {display:block} -.wp_themeSkin .mceMenu td {height:20px;overflow:hidden;} -.wp_themeSkin .mceMenu a { - position:relative; - padding:3px 0 4px 0; - text-decoration: none !important; -} -.wp_themeSkin .mceMenu .mceText { - position:relative; - display:block; - font-family:Tahoma,Verdana,Arial,Helvetica; - cursor:default; - margin:0; - padding:0 25px; -} -.wp_themeSkin .mceMenu span.mceText, .wp_themeSkin .mceMenu .mcePreview {font-size:11px} -.wp_themeSkin .mceMenu pre.mceText {font-family:Monospace} -.wp_themeSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;} -.wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover, -.wp_themeSkin .mceMenu .mceMenuItemActive {} -.wp_themeSkin td.mceMenuItemSeparator {height:1px} -.wp_themeSkin .mceMenuItemTitle a { - border-top: 0; - border-right: 0; - border-left: 0; - border-bottom-style: solid; - border-bottom-width: 1px; - text-decoration: none !important; -} -.wp_themeSkin .mceMenuItemTitle span.mceText {font-weight:bold; padding-left:4px} -.wp_themeSkin .mceMenuItemDisabled .mceText {} -.wp_themeSkin .mceMenuItemSelected .mceIcon {background:url(../default/img/menu_check.svg)} -.wp_themeSkin .mceNoIcons .mceMenuItemSelected a {background:url(../default/img/menu_arrow.svg) no-repeat -6px center} -.wp_themeSkin .mceMenu span.mceMenuLine {display:none} -.wp_themeSkin .mceMenuItemSub a {background:url(../default/img/menu_arrow.svg) no-repeat top right;} - -/* Progress,Resize */ -.wp_themeSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; filter:alpha(opacity=50); background:#FFF} -.wp_themeSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.svg) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px} -.wp_themeSkin .mcePlaceHolder {border:1px dotted gray} - -/* Formats */ -.wp_themeSkin .mce_formatPreview a {font-size:10px} -.wp_themeSkin .mce_p span.mceText {} -.wp_themeSkin .mce_address span.mceText {font-style:italic} -.wp_themeSkin .mce_pre span.mceText {font-family:monospace} -.wp_themeSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em} -.wp_themeSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em} -.wp_themeSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em} -.wp_themeSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em} -.wp_themeSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em} -.wp_themeSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em} - -/* Theme */ -.wp_themeSkin span.mce_bold {background-position:0 0} -.wp_themeSkin span.mce_italic {background-position:-60px 0} -.wp_themeSkin span.mce_underline {background-position:-140px 0} -.wp_themeSkin span.mce_strikethrough {background-position:-120px 0} -.wp_themeSkin span.mce_undo {background-position:-160px 0} -.wp_themeSkin span.mce_redo {background-position:-100px 0} -.wp_themeSkin span.mce_cleanup {background-position:-40px 0} -.wp_themeSkin span.mce_bullist {background-position:-20px 0} -.wp_themeSkin span.mce_numlist {background-position:-80px 0} -.wp_themeSkin span.mce_justifyleft {background-position:-460px 0} -.wp_themeSkin span.mce_justifyright {background-position:-480px 0} -.wp_themeSkin span.mce_justifycenter {background-position:-420px 0} -.wp_themeSkin span.mce_justifyfull {background-position:-440px 0} -.wp_themeSkin span.mce_anchor {background-position:-200px 0} -.wp_themeSkin span.mce_indent {background-position:-400px 0} -.wp_themeSkin span.mce_outdent {background-position:-540px 0} -.wp_themeSkin span.mce_link {background-position:-500px 0} -.wp_themeSkin span.mce_unlink {background-position:-640px 0} -.wp_themeSkin span.mce_sub {background-position:-600px 0} -.wp_themeSkin span.mce_sup {background-position:-620px 0} -.wp_themeSkin span.mce_removeformat {background-position:-580px 0} -.wp_themeSkin span.mce_newdocument {background-position:-520px 0} -.wp_themeSkin span.mce_image {background-position:-380px 0} -.wp_themeSkin span.mce_help {background-position:-340px 0} -.wp_themeSkin span.mce_code {background-position:-260px 0} -.wp_themeSkin span.mce_hr {background-position:-360px 0} -.wp_themeSkin span.mce_visualaid {background-position:-660px 0} -.wp_themeSkin span.mce_charmap {background-position:-240px 0} -.wp_themeSkin span.mce_paste {background-position:-560px 0} -.wp_themeSkin span.mce_copy {background-position:-700px 0} -.wp_themeSkin span.mce_cut {background-position:-680px 0} -.wp_themeSkin span.mce_blockquote {background-position:-220px 0} -.wp_themeSkin .mce_forecolor span.mceAction {background-position:-720px 0} -.wp_themeSkin .mce_backcolor span.mceAction {background-position:-760px 0} -.wp_themeSkin .mce_forecolorpicker {background-position:-720px 0} -.wp_themeSkin .mce_backcolorpicker {background-position:-760px 0} - -/* Plugins */ -.wp_themeSkin span.mce_advhr {background-position:-0px -20px} -.wp_themeSkin span.mce_ltr {background-position:-20px -20px} -.wp_themeSkin span.mce_rtl {background-position:-40px -20px} -.wp_themeSkin span.mce_emotions {background-position:-60px -20px} -.wp_themeSkin span.mce_fullpage {background-position:-80px -20px} -.wp_themeSkin span.mce_fullscreen {background-position:-100px -20px} -.wp_themeSkin span.mce_iespell {background-position:-120px -20px} -.wp_themeSkin span.mce_insertdate {background-position:-140px -20px} -.wp_themeSkin span.mce_inserttime {background-position:-160px -20px} -.wp_themeSkin span.mce_absolute {background-position:-180px -20px} -.wp_themeSkin span.mce_backward {background-position:-200px -20px} -.wp_themeSkin span.mce_forward {background-position:-220px -20px} -.wp_themeSkin span.mce_insert_layer {background-position:-240px -20px} -.wp_themeSkin span.mce_insertlayer {background-position:-260px -20px} -.wp_themeSkin span.mce_movebackward {background-position:-280px -20px} -.wp_themeSkin span.mce_moveforward {background-position:-300px -20px} -.wp_themeSkin span.mce_media {background-position:-320px -20px} -.wp_themeSkin span.mce_nonbreaking {background-position:-340px -20px} -.wp_themeSkin span.mce_pastetext {background-position:-360px -20px} -.wp_themeSkin span.mce_pasteword {background-position:-380px -20px} -.wp_themeSkin span.mce_selectall {background-position:-400px -20px} -.wp_themeSkin span.mce_preview {background-position:-420px -20px} -.wp_themeSkin span.mce_print {background-position:-440px -20px} -.wp_themeSkin span.mce_cancel {background-position:-460px -20px} -.wp_themeSkin span.mce_save {background-position:-480px -20px} -.wp_themeSkin span.mce_replace {background-position:-500px -20px} -.wp_themeSkin span.mce_search {background-position:-520px -20px} -.wp_themeSkin span.mce_styleprops {background-position:-560px -20px} -.wp_themeSkin span.mce_table {background-position:-580px -20px} -.wp_themeSkin span.mce_cell_props {background-position:-600px -20px} -.wp_themeSkin span.mce_delete_table {background-position:-620px -20px} -.wp_themeSkin span.mce_delete_col {background-position:-640px -20px} -.wp_themeSkin span.mce_delete_row {background-position:-660px -20px} -.wp_themeSkin span.mce_col_after {background-position:-680px -20px} -.wp_themeSkin span.mce_col_before {background-position:-700px -20px} -.wp_themeSkin span.mce_row_after {background-position:-720px -20px} -.wp_themeSkin span.mce_row_before {background-position:-740px -20px} -.wp_themeSkin span.mce_merge_cells {background-position:-760px -20px} -.wp_themeSkin span.mce_table_props {background-position:-980px -20px} -.wp_themeSkin span.mce_row_props {background-position:-780px -20px} -.wp_themeSkin span.mce_split_cells {background-position:-800px -20px} -.wp_themeSkin span.mce_template {background-position:-820px -20px} -.wp_themeSkin span.mce_visualchars {background-position:-840px -20px} -.wp_themeSkin span.mce_abbr {background-position:-860px -20px} -.wp_themeSkin span.mce_acronym {background-position:-880px -20px} -.wp_themeSkin span.mce_attribs {background-position:-900px -20px} -.wp_themeSkin span.mce_cite {background-position:-920px -20px} -.wp_themeSkin span.mce_del {background-position:-940px -20px} -.wp_themeSkin span.mce_ins {background-position:-960px -20px} -.wp_themeSkin span.mce_pagebreak {background-position:0 -40px} -.wp_themeSkin .mce_spellchecker span.mceAction {background-position:-540px -20px} - -/* border */ -.wp_themeSkin .mceExternalToolbar, -.wp_themeSkin .mceButton, -.wp_themeSkin a.mceButtonEnabled:hover, -.wp_themeSkin a.mceButtonActive, -.wp_themeSkin a.mceButtonSelected, -.wp_themeSkin .mceListBox .mceText, -.wp_themeSkin .mceListBox .mceOpen, -.wp_themeSkin table.mceListBoxEnabled:hover .mceText, -.wp_themeSkin .mceListBoxHover .mceText, -.wp_themeSkin .mceListBoxSelected .mceText, -.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, -.wp_themeSkin .mceListBoxHover .mceOpen, -.wp_themeSkin .mceListBoxSelected .mceOpen, -.wp_themeSkin select.mceListBox, -.wp_themeSkin .mceSplitButton a.mceAction, -.wp_themeSkin .mceSplitButton a.mceOpen, -.wp_themeSkin .mceSplitButton a.mceOpen:hover, -.wp_themeSkin .mceSplitButtonSelected a.mceOpen, -.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction, -.wp_themeSkin .mceSplitButton a.mceAction:hover, -.wp_themeSkin div.mceColorSplitMenu table, -.wp_themeSkin .mceColorSplitMenu a, -.wp_themeSkin .mceColorSplitMenu a.mceMoreColors, -.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover, -.wp_themeSkin a.mceMoreColors:hover, -.wp_themeSkin .mceMenu { - border-style: solid; - border-width: 1px; -} diff -uNr a/mp-wp/wp-includes/js/tinymce/themes/advanced/source_editor.htm b/mp-wp/wp-includes/js/tinymce/themes/advanced/source_editor.htm --- a/mp-wp/wp-includes/js/tinymce/themes/advanced/source_editor.htm d6a86ff30240f6f197aa1b3c4c93e587e0a43a946c32c6fba428792a5698ce343b415c992bc9fbf5cd7b52b4cc7fe380f931ce2bfa7928d39b110bdb6913253d +++ b/mp-wp/wp-includes/js/tinymce/themes/advanced/source_editor.htm false @@ -1,32 +0,0 @@ - - - - {#advanced_dlg.code_title} - - - - - -
    -
    {#advanced_dlg.code_title}
    - -
    - -
    - -
    - - - -
    -
    - -
    - -
    - -
    -
    -
    - - diff -uNr a/mp-wp/wp-includes/js/tinymce/tiny_mce.js b/mp-wp/wp-includes/js/tinymce/tiny_mce.js --- a/mp-wp/wp-includes/js/tinymce/tiny_mce.js 9b3381b4359f3a351ba299bc2583fc493a21e74f139b1354da432cf265df9ecd32aa78828e55c24df7a251a49574a57f3344c1da329eb42036f4a6c1befb1b70 +++ b/mp-wp/wp-includes/js/tinymce/tiny_mce.js false @@ -1 +0,0 @@ -var tinymce={majorVersion:'3',minorVersion:'2.1.1',releaseDate:'2008-11-27',_init:function(){var t=this,d=document,w=window,na=navigator,ua=na.userAgent,i,nl,n,base,p,v;t.isOpera=w.opera&&opera.buildNumber;t.isWebKit=/WebKit/.test(ua);t.isOldWebKit=t.isWebKit&&!w.getSelection().getRangeAt;t.isIE=!t.isWebKit&&!t.isOpera&&(/MSIE/gi).test(ua)&&(/Explorer/gi).test(na.appName);t.isIE6=t.isIE&&/MSIE [56]/.test(ua);t.isGecko=!t.isWebKit&&/Gecko/.test(ua);t.isMac=ua.indexOf('Mac')!=-1;t.isAir=/adobeair/i.test(ua);if(w.tinyMCEPreInit){t.suffix=tinyMCEPreInit.suffix;t.baseURL=tinyMCEPreInit.base;t.query=tinyMCEPreInit.query;return;}t.suffix='';nl=d.getElementsByTagName('base');for(i=0;i=items.length){for(i=0,l=base.length;i=items.length||base[i]!=items[i]){bp=i+1;break;}}}if(base.length=base.length||base[i]!=items[i]){bp=i+1;break;}}}if(bp==1)return path;for(i=0,l=base.length-(bp-1);i=0;i--){if(path[i].length==0||path[i]==".")continue;if(path[i]=='..'){nb++;continue;}if(nb>0){nb--;continue;}o.push(path[i]);}i=base.length-nb;if(i<=0)return'/'+o.reverse().join('/');return'/'+base.slice(0,i).join('/')+'/'+o.reverse().join('/');},getURI:function(nh){var s,t=this;if(!t.source||nh){s='';if(!nh){if(t.protocol)s+=t.protocol+'://';if(t.userInfo)s+=t.userInfo+'@';if(t.host)s+=t.host;if(t.port)s+=':'+t.port;}if(t.path)s+=t.path;if(t.query)s+='?'+t.query;if(t.anchor)s+='#'+t.anchor;t.source=s;}return t.source;}});})();(function(){var each=tinymce.each;tinymce.create('static tinymce.util.Cookie',{getHash:function(n){var v=this.get(n),h;if(v){each(v.split('&'),function(v){v=v.split('=');h=h||{};h[unescape(v[0])]=unescape(v[1]);});}return h;},setHash:function(n,v,e,p,d,s){var o='';each(v,function(v,k){o+=(!o?'':'&')+escape(k)+'='+escape(v);});this.set(n,o,e,p,d,s);},get:function(n){var c=document.cookie,e,p=n+"=",b;if(!c)return;b=c.indexOf("; "+p);if(b==-1){b=c.indexOf(p);if(b!=0)return null;}else b+=2;e=c.indexOf(";",b);if(e==-1)e=c.length;return unescape(c.substring(b+p.length,e));},set:function(n,v,e,p,d,s){document.cookie=n+"="+escape(v)+((e)?"; expires="+e.toGMTString():"")+((p)?"; path="+escape(p):"")+((d)?"; domain="+d:"")+((s)?"; secure":"");},remove:function(n,p){var d=new Date();d.setTime(d.getTime()-1000);this.set(n,'',d,p,d);}});})();tinymce.create('static tinymce.util.JSON',{serialize:function(o){var i,v,s=tinymce.util.JSON.serialize,t;if(o==null)return'null';t=typeof o;if(t=='string'){v='\bb\tt\nn\ff\rr\""\'\'\\\\';return'"'+o.replace(/([\u0080-\uFFFF\x00-\x1f\"])/g,function(a,b){i=v.indexOf(b);if(i+1)return'\\'+v.charAt(i+1);a=b.charCodeAt().toString(16);return'\\u'+'0000'.substring(a.length)+a;})+'"';}if(t=='object'){if(o instanceof Array){for(i=0,v='[';i0?',':'')+s(o[i]);return v+']';}v='{';for(i in o)v+=typeof o[i]!='function'?(v.length>1?',"':'"')+i+'":'+s(o[i]):'';return v+'}';}return''+o;},parse:function(s){try{return eval('('+s+')');}catch(ex){}}});tinymce.create('static tinymce.util.XHR',{send:function(o){var x,t,w=window,c=0;o.scope=o.scope||this;o.success_scope=o.success_scope||o.scope;o.error_scope=o.error_scope||o.scope;o.async=o.async===false?false:true;o.data=o.data||'';function get(s){x=0;try{x=new ActiveXObject(s);}catch(ex){}return x;};x=w.XMLHttpRequest?new XMLHttpRequest():get('Microsoft.XMLHTTP')||get('Msxml2.XMLHTTP');if(x){if(x.overrideMimeType)x.overrideMimeType(o.content_type);x.open(o.type||(o.data?'POST':'GET'),o.url,o.async);if(o.content_type)x.setRequestHeader('Content-Type',o.content_type);x.send(o.data);function ready(){if(!o.async||x.readyState==4||c++>10000){if(o.success&&c<10000&&x.status==200)o.success.call(o.success_scope,''+x.responseText,x,o);else if(o.error)o.error.call(o.error_scope,c>10000?'TIMED_OUT':'GENERAL',x,o);x=null;}else w.setTimeout(ready,10);};if(!o.async)return ready();t=w.setTimeout(ready,10);}}});(function(){var extend=tinymce.extend,JSON=tinymce.util.JSON,XHR=tinymce.util.XHR;tinymce.create('tinymce.util.JSONRequest',{JSONRequest:function(s){this.settings=extend({},s);this.count=0;},send:function(o){var ecb=o.error,scb=o.success;o=extend(this.settings,o);o.success=function(c,x){c=JSON.parse(c);if(typeof(c)=='undefined'){c={error:'JSON Parse error.'};}if(c.error)ecb.call(o.error_scope||o.scope,c.error,x);else scb.call(o.success_scope||o.scope,c.result);};o.error=function(ty,x){ecb.call(o.error_scope||o.scope,ty,x);};o.data=JSON.serialize({id:o.id||'c'+(this.count++),method:o.method,params:o.params});o.content_type='application/json';XHR.send(o);},'static':{sendRPC:function(o){return new tinymce.util.JSONRequest().send(o);}}});}());(function(){var each=tinymce.each,is=tinymce.is;var isWebKit=tinymce.isWebKit,isIE=tinymce.isIE;tinymce.create('tinymce.dom.DOMUtils',{doc:null,root:null,files:null,listeners:{},pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,cache:{},idPattern:/^#[\w]+$/,elmPattern:/^[\w_*]+$/,elmClassPattern:/^([\w_]*)\.([\w_]+)$/,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},DOMUtils:function(d,s){var t=this;t.doc=d;t.win=window;t.files={};t.cssFlicker=false;t.counter=0;t.boxModel=!tinymce.isIE||d.compatMode=="CSS1Compat";t.stdMode=d.documentMode===8;this.settings=s=tinymce.extend({keep_values:false,hex_colors:1,process_html:1},s);if(tinymce.isIE6){try{d.execCommand('BackgroundImageCache',false,true);}catch(e){t.cssFlicker=true;}}tinymce.addUnload(t.destroy,t);},getRoot:function(){var t=this,s=t.settings;return(s&&t.get(s.root_element))||t.doc.body;},getViewPort:function(w){var d,b;w=!w?this.win:w;d=w.document;b=this.boxModel?d.documentElement:d.body;return{x:w.pageXOffset||b.scrollLeft,y:w.pageYOffset||b.scrollTop,w:w.innerWidth||b.clientWidth,h:w.innerHeight||b.clientHeight};},getRect:function(e){var p,t=this,sr;e=t.get(e);p=t.getPos(e);sr=t.getSize(e);return{x:p.x,y:p.y,w:sr.w,h:sr.h};},getSize:function(e){var t=this,w,h;e=t.get(e);w=t.getStyle(e,'width');h=t.getStyle(e,'height');if(w.indexOf('px')===-1)w=0;if(h.indexOf('px')===-1)h=0;return{w:parseInt(w)||e.offsetWidth||e.clientWidth,h:parseInt(h)||e.offsetHeight||e.clientHeight};},getParent:function(n,f,r){var na,se=this.settings;n=this.get(n);if(se.strict_root)r=r||this.getRoot();if(is(f,'string')){na=f.toUpperCase();f=function(n){var s=false;if(n.nodeType==1&&na==='*'){s=true;return false;}each(na.split(','),function(v){if(n.nodeType==1&&((se.strict&&n.nodeName.toUpperCase()==v)||n.nodeName.toUpperCase()==v)){s=true;return false;}});return s;};}while(n){if(n==r)return null;if(f(n))return n;n=n.parentNode;}return null;},get:function(e){var n;if(e&&this.doc&&typeof(e)=='string'){n=e;e=this.doc.getElementById(e);if(e&&e.id!==n)return this.doc.getElementsByName(n)[1];}return e;},select:function(pa,s){var t=this,cs,c,pl,o=[],x,i,l,n,xp;s=t.get(s)||t.doc;if(s.querySelectorAll){if(s!=t.doc){i=s.id;s.id='_mc_tmp';pa='#_mc_tmp '+pa;}l=tinymce.grep(s.querySelectorAll(pa));s.id=i;return l;}if(!t.selectorRe)t.selectorRe=/^([\w\\*]+)?(?:#([\w\\]+))?(?:\.([\w\\\.]+))?(?:\[\@([\w\\]+)([\^\$\*!]?=)([\w\\]+)\])?(?:\:([\w\\]+))?/i;;if(tinymce.isAir){each(tinymce.explode(pa),function(v){if(!(xp=t.cache[v])){xp='';each(v.split(' '),function(v){v=t.selectorRe.exec(v);xp+=v[1]?'//'+v[1]:'//*';if(v[2])xp+="[@id='"+v[2]+"']";if(v[3]){each(v[3].split('.'),function(n){xp+="[@class = '"+n+"' or contains(concat(' ', @class, ' '), ' "+n+" ')]";});}});t.cache[v]=xp;}xp=t.doc.evaluate(xp,s,null,4,null);while(n=xp.iterateNext())o.push(n);});return o;}if(t.settings.strict){function get(s,n){return s.getElementsByTagName(n.toLowerCase());};}else{function get(s,n){return s.getElementsByTagName(n);};}if(t.elmPattern.test(pa)){x=get(s,pa);for(i=0,l=x.length;i=0;i--)cs+='}, '+(i?'n':'s')+');';cs+='})';t.cache[pa]=cs=eval(cs);}cs(isIE?collectIE:collect,s);});each(o,function(n){if(isIE)n.removeAttribute('mce_save');else delete n.mce_save;});return o;},add:function(p,n,a,h,c){var t=this;return this.run(p,function(p){var e,k;e=is(n,'string')?t.doc.createElement(n):n;t.setAttribs(e,a);if(h){if(h.nodeType)e.appendChild(h);else t.setHTML(e,h);}return!c?p.appendChild(e):e;});},create:function(n,a,h){return this.add(this.doc.createElement(n),n,a,h,1);},createHTML:function(n,a,h){var o='',t=this,k;o+='<'+n;for(k in a){if(a.hasOwnProperty(k))o+=' '+k+'="'+t.encode(a[k])+'"';}if(tinymce.is(h))return o+'>'+h+'';return o+' />';},remove:function(n,k){return this.run(n,function(n){var p,g;p=n.parentNode;if(!p)return null;if(k){each(n.childNodes,function(c){p.insertBefore(c.cloneNode(true),n);});}return p.removeChild(n);});},setStyle:function(n,na,v){var t=this;return t.run(n,function(e){var s,i;s=e.style;na=na.replace(/-(\D)/g,function(a,b){return b.toUpperCase();});if(t.pixelStyles.test(na)&&(tinymce.is(v,'number')||/^[\-0-9\.]+$/.test(v)))v+='px';switch(na){case'opacity':if(isIE){s.filter=v===''?'':"alpha(opacity="+(v*100)+")";if(!n.currentStyle||!n.currentStyle.hasLayout)s.display='inline-block';}s[na]=s['-moz-opacity']=s['-khtml-opacity']=v||'';break;case'float':isIE?s.styleFloat=v:s.cssFloat=v;break;default:s[na]=v||'';}if(t.settings.update_styles)t.setAttrib(e,'mce_style');});},getStyle:function(n,na,c){n=this.get(n);if(!n)return false;if(this.doc.defaultView&&c){na=na.replace(/[A-Z]/g,function(a){return'-'+a;});try{return this.doc.defaultView.getComputedStyle(n,null).getPropertyValue(na);}catch(ex){return null;}}na=na.replace(/-(\D)/g,function(a,b){return b.toUpperCase();});if(na=='float')na=isIE?'styleFloat':'cssFloat';if(n.currentStyle&&c)return n.currentStyle[na];return n.style[na];},setStyles:function(e,o){var t=this,s=t.settings,ol;ol=s.update_styles;s.update_styles=0;each(o,function(v,n){t.setStyle(e,n,v);});s.update_styles=ol;if(s.update_styles)t.setAttrib(e,s.cssText);},setAttrib:function(e,n,v){var t=this;if(!e||!n)return;if(t.settings.strict)n=n.toLowerCase();return this.run(e,function(e){var s=t.settings;switch(n){case"style":if(!is(v,'string')){each(v,function(v,n){t.setStyle(e,n,v);});return;}if(s.keep_values){if(v&&!t._isRes(v))e.setAttribute('mce_style',v,2);else e.removeAttribute('mce_style',2);}e.style.cssText=v;break;case"class":e.className=v||'';break;case"src":case"href":if(s.keep_values){if(s.url_converter)v=s.url_converter.call(s.url_converter_scope||t,v,n,e);t.setAttrib(e,'mce_'+n,v,2);}break;case"shape":e.setAttribute('mce_style',v);break;}if(is(v)&&v!==null&&v.length!==0)e.setAttribute(n,''+v,2);else e.removeAttribute(n,2);});},setAttribs:function(e,o){var t=this;return this.run(e,function(e){each(o,function(v,n){t.setAttrib(e,n,v);});});},getAttrib:function(e,n,dv){var v,t=this;e=t.get(e);if(!e||e.nodeType!==1)return false;if(!is(dv))dv='';if(/^(src|href|style|coords|shape)$/.test(n)){v=e.getAttribute("mce_"+n);if(v)return v;}if(isIE&&t.props[n]){v=e[t.props[n]];v=v&&v.nodeValue?v.nodeValue:v;}if(!v)v=e.getAttribute(n,2);if(n==='style'){v=v||e.style.cssText;if(v){v=t.serializeStyle(t.parseStyle(v));if(t.settings.keep_values&&!t._isRes(v))e.setAttribute('mce_style',v);}}if(isWebKit&&n==="class"&&v)v=v.replace(/(apple|webkit)\-[a-z\-]+/gi,'');if(isIE){switch(n){case'rowspan':case'colspan':if(v===1)v='';break;case'size':if(v==='+0'||v===20)v='';break;case'width':case'height':case'vspace':case'checked':case'disabled':case'readonly':if(v===0)v='';break;case'hspace':if(v===-1)v='';break;case'maxlength':case'tabindex':if(v===32768||v===2147483647||v==='32768')v='';break;case'compact':case'noshade':case'nowrap':if(v===65535)return n;return dv;case'shape':v=v.toLowerCase();break;default:if(n.indexOf('on')===0&&v)v=(''+v).replace(/^function\s+anonymous\(\)\s+\{\s+(.*)\s+\}$/,'$1');}}return(v!==undefined&&v!==null&&v!=='')?''+v:dv;},getPos:function(n){var t=this,x=0,y=0,e,d=t.doc,r;n=t.get(n);if(n&&isIE){n=n.getBoundingClientRect();e=t.boxModel?d.documentElement:d.body;x=t.getStyle(t.select('html')[0],'borderWidth');x=(x=='medium'||t.boxModel&&!t.isIE6)&&2||x;n.top+=t.win.self!=t.win.top?2:0;return{x:n.left+e.scrollLeft-x,y:n.top+e.scrollTop-x};}r=n;while(r){x+=r.offsetLeft||0;y+=r.offsetTop||0;r=r.offsetParent;}r=n;while(r){if(!/^table-row|inline.*/i.test(t.getStyle(r,"display",1))){x-=r.scrollLeft||0;y-=r.scrollTop||0;}r=r.parentNode;if(r==d.body)break;}return{x:x,y:y};},parseStyle:function(st){var t=this,s=t.settings,o={};if(!st)return o;function compress(p,s,ot){var t,r,b,l;t=o[p+'-top'+s];if(!t)return;r=o[p+'-right'+s];if(t!=r)return;b=o[p+'-bottom'+s];if(r!=b)return;l=o[p+'-left'+s];if(b!=l)return;o[ot]=l;delete o[p+'-top'+s];delete o[p+'-right'+s];delete o[p+'-bottom'+s];delete o[p+'-left'+s];};function compress2(ta,a,b,c){var t;t=o[a];if(!t)return;t=o[b];if(!t)return;t=o[c];if(!t)return;o[ta]=o[a]+' '+o[b]+' '+o[c];delete o[a];delete o[b];delete o[c];};st=st.replace(/&(#?[a-z0-9]+);/g,'&$1_MCE_SEMI_');each(st.split(';'),function(v){var sv,ur=[];if(v){v=v.replace(/_MCE_SEMI_/g,';');v=v.replace(/url\([^\)]+\)/g,function(v){ur.push(v);return'url('+ur.length+')';});v=v.split(':');sv=tinymce.trim(v[1]);sv=sv.replace(/url\(([^\)]+)\)/g,function(a,b){return ur[parseInt(b)-1];});sv=sv.replace(/rgb\([^\)]+\)/g,function(v){return t.toHex(v);});if(s.url_converter){sv=sv.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g,function(x,c){return'url('+s.url_converter.call(s.url_converter_scope||t,t.decode(c),'style',null)+')';});}o[tinymce.trim(v[0]).toLowerCase()]=sv;}});compress("border","","border");compress("border","-width","border-width");compress("border","-color","border-color");compress("border","-style","border-style");compress("padding","","padding");compress("margin","","margin");compress2('border','border-width','border-style','border-color');if(isIE){if(o.border=='medium none')o.border='';}return o;},serializeStyle:function(o){var s='';each(o,function(v,k){if(k&&v){if(tinymce.isGecko&&k.indexOf('-moz-')===0)return;switch(k){case'color':case'background-color':v=v.toLowerCase();break;}s+=(s?' ':'')+k+': '+v+';';}});return s;},loadCSS:function(u){var t=this,d=t.doc;if(!u)u='';each(u.split(','),function(u){if(t.files[u])return;t.files[u]=true;t.add(t.select('head')[0],'link',{rel:'stylesheet',href:tinymce._addVer(u)});});},addClass:function(e,c){return this.run(e,function(e){var o;if(!c)return 0;if(this.hasClass(e,c))return e.className;o=this.removeClass(e,c);return e.className=(o!=''?(o+' '):'')+c;});},removeClass:function(e,c){var t=this,re;return t.run(e,function(e){var v;if(t.hasClass(e,c)){if(!re)re=new RegExp("(^|\\s+)"+c+"(\\s+|$)","g");v=e.className.replace(re,' ');return e.className=tinymce.trim(v!=' '?v:'');}return e.className;});},hasClass:function(n,c){n=this.get(n);if(!n||!c)return false;return(' '+n.className+' ').indexOf(' '+c+' ')!==-1;},show:function(e){return this.setStyle(e,'display','block');},hide:function(e){return this.setStyle(e,'display','none');},isHidden:function(e){e=this.get(e);return!e||e.style.display=='none'||this.getStyle(e,'display')=='none';},uniqueId:function(p){return(!p?'mce_':p)+(this.counter++);},setHTML:function(e,h){var t=this;return this.run(e,function(e){var x,i,nl,n,p,x;h=t.processHTML(h);if(isIE){function set(){try{e.innerHTML='
    '+h;e.removeChild(e.firstChild);}catch(ex){while(e.firstChild)e.firstChild.removeNode();x=t.create('div');x.innerHTML='
    '+h;each(x.childNodes,function(n,i){if(i)e.appendChild(n);});}};if(t.settings.fix_ie_paragraphs)h=h.replace(/

    <\/p>|]+)><\/p>|/gi,' 

    ');set();if(t.settings.fix_ie_paragraphs){nl=e.getElementsByTagName("p");for(i=nl.length-1,x=0;i>=0;i--){n=nl[i];if(!n.hasChildNodes()){if(!n.mce_keep){x=1;break;}n.removeAttribute('mce_keep');}}}if(x){h=h.replace(/

    ]+)>|

    /g,'

    ');h=h.replace(/<\/p>/g,'
    ');set();if(t.settings.fix_ie_paragraphs){nl=e.getElementsByTagName("DIV");for(i=nl.length-1;i>=0;i--){n=nl[i];if(n.mce_tmp){p=t.doc.createElement('p');n.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi,function(a,b){var v;if(b!=='mce_tmp'){v=n.getAttribute(b);if(!v&&b==='class')v=n.className;p.setAttribute(b,v);}});for(x=0;x|]+)>/gi,'<$1b$2>');h=h.replace(/<(\/?)em>|]+)>/gi,'<$1i$2>');}else if(isIE){h=h.replace(/'/g,''');h=h.replace(/\s+(disabled|checked|readonly|selected)\s*=\s*[\"\']?(false|0)[\"\']?/gi,'');}h=h.replace(/]+)\/>|/gi,'');if(s.keep_values){if(/)/g,'\n');s=s.replace(/^[\r\n]*|[\r\n]*$/g,'');s=s.replace(/^\s*(\/\/\s*|\]\]>|-->|\]\]-->)\s*$/g,'');return s;};h=h.replace(/]+|)>([\s\S]*?)<\/script>/g,function(v,a,b){b=trim(b);if(!a)a=' type="text/javascript"';if(b)b='';return''+b+'';});h=h.replace(/]+|)>([\s\S]*?)<\/style>/g,function(v,a,b){b=trim(b);return''+b+'';});}h=h.replace(//g,'');h=h.replace(/<([\w:]+) [^>]*(src|href|style|shape|coords)[^>]*>/gi,function(a,n){function handle(m,b,c){var u=c;if(a.indexOf('mce_'+b)!=-1)return m;if(b=='style'){if(t._isRes(c))return m;if(s.hex_colors){u=u.replace(/rgb\([^\)]+\)/g,function(v){return t.toHex(v);});}if(s.url_converter){u=u.replace(/url\([\'\"]?([^\)\'\"]+)\)/g,function(x,c){return'url('+t.encode(s.url_converter.call(s.url_converter_scope||t,t.decode(c),b,n))+')';});}}else if(b!='coords'&&b!='shape'){if(s.url_converter)u=t.encode(s.url_converter.call(s.url_converter_scope||t,t.decode(c),b,n));}return' '+b+'="'+c+'" mce_'+b+'="'+u+'"';};a=a.replace(/ (src|href|style|coords|shape)=[\"]([^\"]+)[\"]/gi,handle);a=a.replace(/ (src|href|style|coords|shape)=[\']([^\']+)[\']/gi,handle);return a.replace(/ (src|href|style|coords|shape)=([^\s\"\'>]+)/gi,handle);});}return h;},getOuterHTML:function(e){var d;e=this.get(e);if(!e)return null;if(isIE)return e.outerHTML;d=(e.ownerDocument||this.doc).createElement("body");d.appendChild(e.cloneNode(true));return d.innerHTML;},setOuterHTML:function(e,h,d){var t=this;return this.run(e,function(e){var n,tp;e=t.get(e);d=d||e.ownerDocument||t.doc;if(isIE&&e.nodeType==1)e.outerHTML=h;else{tp=d.createElement("body");tp.innerHTML=h;n=tp.lastChild;while(n){t.insertAfter(n.cloneNode(true),e);n=n.previousSibling;}t.remove(e);}});},decode:function(s){var e,n,v;if(/&[^;]+;/.test(s)){e=this.doc.createElement("div");e.innerHTML=s;n=e.firstChild;v='';if(n){do{v+=n.nodeValue;}while(n.nextSibling);}return v||s;}return s;},encode:function(s){return s?(''+s).replace(/[<>&\"]/g,function(c,b){switch(c){case'&':return'&';case'"':return'"';case'<':return'<';case'>':return'>';}return c;}):s;},insertAfter:function(n,r){var t=this;r=t.get(r);return this.run(n,function(n){var p,ns;p=r.parentNode;ns=r.nextSibling;if(ns)p.insertBefore(n,ns);else p.appendChild(n);return n;});},isBlock:function(n){if(n.nodeType&&n.nodeType!==1)return false;n=n.nodeName||n;return/^(H[1-6]|HR|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP)$/.test(n);},replace:function(n,o,k){if(is(o,'array'))n=n.cloneNode(true);return this.run(o,function(o){if(k){each(o.childNodes,function(c){n.appendChild(c.cloneNode(true));});}return o.parentNode.replaceChild(n,o);});},toHex:function(s){var c=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(s);function hex(s){s=parseInt(s).toString(16);return s.length>1?s:'0'+s;};if(c){s='#'+hex(c[1])+hex(c[2])+hex(c[3]);return s;}return s;},getClasses:function(){var t=this,cl=[],i,lo={},f=t.settings.class_filter,ov;if(t.classes)return t.classes;function addClasses(s){each(s.imports,function(r){addClasses(r);});each(s.cssRules||s.rules,function(r){switch(r.type||1){case 1:if(r.selectorText){each(r.selectorText.split(','),function(v){v=v.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(v)||!/\.[\w\-]+$/.test(v))return;ov=v;v=v.replace(/.*\.([a-z0-9_\-]+).*/i,'$1');if(f&&!(v=f(v,ov)))return;if(!lo[v]){cl.push({'class':v});lo[v]=1;}});}break;case 3:addClasses(r.styleSheet);break;}});};try{each(t.doc.styleSheets,addClasses);}catch(ex){}if(cl.length>0)t.classes=cl;return cl;},run:function(e,f,s){var t=this,o;if(t.doc&&typeof(e)==='string')e=t.get(e);if(!e)return false;s=s||this;if(!e.nodeType&&(e.length||e.length===0)){o=[];each(e,function(e,i){if(e){if(typeof(e)=='string')e=t.doc.getElementById(e);o.push(f.call(s,e,i));}});return o;}return f.call(s,e);},getAttribs:function(n){var o;n=this.get(n);if(!n)return[];if(isIE){o=[];if(n.nodeName=='OBJECT')return n.attributes;n.cloneNode(false).outerHTML.replace(/([a-z0-9\:\-_]+)=/gi,function(a,b){o.push({specified:1,nodeName:b});});return o;}return n.attributes;},destroy:function(s){var t=this;t.win=t.doc=t.root=null;if(!s)tinymce.removeUnload(t.destroy);},_isRes:function(c){return/^(top|left|bottom|right|width|height)/i.test(c)||/;\s*(top|left|bottom|right|width|height)/i.test(c);}});tinymce.DOM=new tinymce.dom.DOMUtils(document,{process_html:0});})();(function(){var each=tinymce.each,DOM=tinymce.DOM,isIE=tinymce.isIE,isWebKit=tinymce.isWebKit,Event;tinymce.create('static tinymce.dom.Event',{inits:[],events:[],add:function(o,n,f,s){var cb,t=this,el=t.events,r;if(o&&o instanceof Array){r=[];each(o,function(o){o=DOM.get(o);r.push(t.add(o,n,f,s));});return r;}o=DOM.get(o);if(!o)return;cb=function(e){e=e||window.event;if(e&&!e.target&&isIE)e.target=e.srcElement;if(!s)return f(e);return f.call(s,e);};if(n=='unload'){tinymce.unloads.unshift({func:cb});return cb;}if(n=='init'){if(t.domLoaded)cb();else t.inits.push(cb);return cb;}el.push({obj:o,name:n,func:f,cfunc:cb,scope:s});t._add(o,n,cb);return f;},remove:function(o,n,f){var t=this,a=t.events,s=false,r;if(o&&o instanceof Array){r=[];each(o,function(o){o=DOM.get(o);r.push(t.remove(o,n,f));});return r;}o=DOM.get(o);each(a,function(e,i){if(e.obj==o&&e.name==n&&(!f||(e.func==f||e.cfunc==f))){a.splice(i,1);t._remove(o,n,e.cfunc);s=true;return false;}});return s;},clear:function(o){var t=this,a=t.events,i,e;if(o){o=DOM.get(o);for(i=a.length-1;i>=0;i--){e=a[i];if(e.obj===o){t._remove(e.obj,e.name,e.cfunc);e.obj=e.cfunc=null;a.splice(i,1);}}}},cancel:function(e){if(!e)return false;this.stop(e);return this.prevent(e);},stop:function(e){if(e.stopPropagation)e.stopPropagation();else e.cancelBubble=true;return false;},prevent:function(e){if(e.preventDefault)e.preventDefault();else e.returnValue=false;return false;},_unload:function(){var t=Event;each(t.events,function(e,i){t._remove(e.obj,e.name,e.cfunc);e.obj=e.cfunc=null;});t.events=[];t=null;},_add:function(o,n,f){if(o.attachEvent)o.attachEvent('on'+n,f);else if(o.addEventListener)o.addEventListener(n,f,false);else o['on'+n]=f;},_remove:function(o,n,f){if(o){try{if(o.detachEvent)o.detachEvent('on'+n,f);else if(o.removeEventListener)o.removeEventListener(n,f,false);else o['on'+n]=null;}catch(ex){}}},_pageInit:function(){var e=Event;if(e.domLoaded)return;e._remove(window,'DOMContentLoaded',e._pageInit);e.domLoaded=true;each(e.inits,function(c){c();});e.inits=[];},_wait:function(){var t;if(window.tinyMCE_GZ&&tinyMCE_GZ.loaded){Event.domLoaded=1;return;}if(isIE&&document.location.protocol!='https:'){document.write('