You can subscribe to this list here.
2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
(73) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2001 |
Jan
(34) |
Feb
(110) |
Mar
(24) |
Apr
(44) |
May
(37) |
Jun
(22) |
Jul
(20) |
Aug
(28) |
Sep
(50) |
Oct
(11) |
Nov
(132) |
Dec
(595) |
2002 |
Jan
(1099) |
Feb
(579) |
Mar
(63) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(125) |
Sep
(101) |
Oct
(25) |
Nov
(34) |
Dec
(47) |
2003 |
Jan
(82) |
Feb
(182) |
Mar
(71) |
Apr
(3) |
May
(1) |
Jun
(3) |
Jul
|
Aug
|
Sep
(14) |
Oct
(6) |
Nov
(124) |
Dec
(68) |
2004 |
Jan
(64) |
Feb
(191) |
Mar
(199) |
Apr
(298) |
May
(252) |
Jun
(426) |
Jul
(134) |
Aug
(13) |
Sep
(96) |
Oct
(75) |
Nov
(232) |
Dec
(171) |
2005 |
Jan
(205) |
Feb
(165) |
Mar
(8) |
Apr
(74) |
May
(21) |
Jun
(19) |
Jul
(37) |
Aug
(69) |
Sep
(141) |
Oct
(118) |
Nov
(31) |
Dec
(7) |
2006 |
Jan
(5) |
Feb
(10) |
Mar
(35) |
Apr
(24) |
May
(34) |
Jun
(29) |
Jul
(5) |
Aug
(38) |
Sep
(30) |
Oct
(37) |
Nov
(30) |
Dec
(86) |
2007 |
Jan
(414) |
Feb
(40) |
Mar
(18) |
Apr
(10) |
May
(66) |
Jun
(60) |
Jul
(105) |
Aug
(55) |
Sep
(64) |
Oct
(7) |
Nov
(11) |
Dec
(5) |
2008 |
Jan
(26) |
Feb
(28) |
Mar
(79) |
Apr
(34) |
May
(61) |
Jun
(24) |
Jul
(29) |
Aug
(160) |
Sep
(62) |
Oct
(70) |
Nov
(32) |
Dec
(14) |
2009 |
Jan
(140) |
Feb
(135) |
Mar
(153) |
Apr
(53) |
May
(24) |
Jun
(138) |
Jul
(90) |
Aug
(46) |
Sep
(72) |
Oct
(84) |
Nov
(32) |
Dec
(4) |
2010 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(55) |
May
(89) |
Jun
(131) |
Jul
(41) |
Aug
(38) |
Sep
(42) |
Oct
(11) |
Nov
(27) |
Dec
(54) |
2011 |
Jan
(127) |
Feb
(16) |
Mar
(71) |
Apr
(52) |
May
(32) |
Jun
(31) |
Jul
(4) |
Aug
|
Sep
(45) |
Oct
(26) |
Nov
(36) |
Dec
(10) |
2012 |
Jan
(23) |
Feb
(6) |
Mar
(13) |
Apr
(18) |
May
(1) |
Jun
(4) |
Jul
(3) |
Aug
(12) |
Sep
(57) |
Oct
(96) |
Nov
(163) |
Dec
(124) |
2013 |
Jan
(11) |
Feb
(17) |
Mar
(7) |
Apr
(48) |
May
(15) |
Jun
(29) |
Jul
(12) |
Aug
|
Sep
(9) |
Oct
|
Nov
|
Dec
(3) |
2014 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(1) |
May
(8) |
Jun
(90) |
Jul
(104) |
Aug
(12) |
Sep
(81) |
Oct
(139) |
Nov
(111) |
Dec
(64) |
2015 |
Jan
(46) |
Feb
(74) |
Mar
(56) |
Apr
(61) |
May
(3) |
Jun
(7) |
Jul
(11) |
Aug
(5) |
Sep
(15) |
Oct
(1) |
Nov
(1) |
Dec
(15) |
2016 |
Jan
(25) |
Feb
(33) |
Mar
(24) |
Apr
(4) |
May
(24) |
Jun
(3) |
Jul
(75) |
Aug
|
Sep
(2) |
Oct
(38) |
Nov
(4) |
Dec
(18) |
2017 |
Jan
(8) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(14) |
Jun
|
Jul
(5) |
Aug
(9) |
Sep
|
Oct
(23) |
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
(9) |
Apr
(60) |
May
(1) |
Jun
|
Jul
(13) |
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
|
Mar
(15) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
2021 |
Jan
(24) |
Feb
(33) |
Mar
(1) |
Apr
|
May
(1) |
Jun
(64) |
Jul
(71) |
Aug
(114) |
Sep
(82) |
Oct
(32) |
Nov
(76) |
Dec
(86) |
2022 |
Jan
(162) |
Feb
(41) |
Mar
(11) |
Apr
(9) |
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
2023 |
Jan
|
Feb
(1) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(25) |
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
2024 |
Jan
(7) |
Feb
(3) |
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2025 |
Jan
|
Feb
(90) |
Mar
(19) |
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <var...@us...> - 2017-10-11 13:45:51
|
Revision: 10048 http://sourceforge.net/p/phpwiki/code/10048 Author: vargenau Date: 2017-10-11 13:45:48 +0000 (Wed, 11 Oct 2017) Log Message: ----------- Remove unused CSS Modified Paths: -------------- trunk/themes/MonoBook/commonPrint.css trunk/themes/MonoBook/monobook.css trunk/themes/MonoBook/rtl.css trunk/themes/MonoBook/wikiprintable.css trunk/themes/Sidebar/sidebar.css Modified: trunk/themes/MonoBook/commonPrint.css =================================================================== --- trunk/themes/MonoBook/commonPrint.css 2017-10-11 12:27:06 UTC (rev 10047) +++ trunk/themes/MonoBook/commonPrint.css 2017-10-11 13:45:48 UTC (rev 10048) @@ -276,36 +276,3 @@ color: inherit ! important; text-decoration: inherit ! important; } - -/* Show some stuff */ -.urlexpansion { - display: inline ! important; -} - -div.townBox { - position: relative; - float: right; - background: white; - margin-left: 1em; - border: 1px solid gray; - padding: 0.3em; - width: 200px; - overflow: hidden; - clear: right; -} - -div.townBox dl { - padding: 0; - margin: 0 0 0.3em 0; - font-size: 96%; -} - -div.townBox dl dt { - background: none; - margin: 0.4em 0 0 0; -} - -div.townBox dl dd { - margin: 0.1em 0 0 1.1em; - background-color: #f3f3f3; -} Modified: trunk/themes/MonoBook/monobook.css =================================================================== --- trunk/themes/MonoBook/monobook.css 2017-10-11 12:27:06 UTC (rev 10047) +++ trunk/themes/MonoBook/monobook.css 2017-10-11 13:45:48 UTC (rev 10048) @@ -508,9 +508,6 @@ background-color: #f9f9f9; padding: 5px; font-size: 95%; -} - -.mw-warning { margin-left: 50px; margin-right: 50px; text-align: center; @@ -592,16 +589,6 @@ border-width: .5em 1.4em .8em 0; } -.hiddenStructure { - display: none; -} - -@media aural { - .hiddenStructure { - speak: none; - } -} - img.tex { vertical-align: middle; } @@ -627,41 +614,6 @@ text-align: center; } -.toccolours { - border: 1px solid #aaa; - background-color: #f9f9f9; - padding: 5px; - font-size: 95%; -} - -div.townBox { - position: relative; - float: right; - background-color: white; - margin-left: 1em; - border: 1px solid gray; - padding: .3em; - width: 200px; - overflow: hidden; - clear: right; -} - -div.townBox dl { - padding: 0; - margin: 0 0 .3em; - font-size: 96%; -} - -div.townBox dl dt { - background-image: none; - margin: .4em 0 0; -} - -div.townBox dl dd { - margin: .1em 0 0 1.1em; - background-color: #f3f3f3; -} - /* ** edit views etc */ @@ -1261,10 +1213,6 @@ font-size: 95%; } -#p-cactions .hiddenStructure { - display: none; -} - #p-cactions ul { list-style: none; } @@ -1467,36 +1415,14 @@ margin: 5px; } -.printfooter { - display: none; -} - -.not-patrolled { - background-color: #ffa; -} - -div.patrollink { - font-size: 75%; - text-align: right; -} - span.newpage, span.minor, span.searchmatch, span.bot { font-weight: bold; } -span.unpatrolled { - font-weight: bold; - color: red; -} - span.searchmatch { color: red; } -.sharedUploadNotice { - font-style: italic; -} - span.updatedmarker { color: black; background-color: #0f0; @@ -1572,21 +1498,6 @@ padding: 0; } -.editExternally { - border: 1px solid gray; - background-color: #ffffff; - padding: 3px; - margin-top: 0.5em; - float: left; - font-size: small; - text-align: center; -} - -.editExternallyHelp { - font-style: italic; - color: gray; -} - li span.deleted, span.history-deleted { text-decoration: line-through; color: #888; @@ -1598,50 +1509,6 @@ text-indent: -2em; } -/* Classes for EXIF data display */ -table.mw_metadata { - font-size: 0.8em; - margin-left: 0.5em; - margin-bottom: 0.5em; - width: 300px; -} - -table.mw_metadata caption { - font-weight: bold; -} - -table.mw_metadata th { - font-weight: normal; -} - -table.mw_metadata td { - padding: 0.1em; -} - -table.mw_metadata { - border: none; - border-collapse: collapse; -} - -table.mw_metadata td, table.mw_metadata th { - text-align: center; - border: 1px solid #aaaaaa; - padding-left: 0.1em; - padding-right: 0.1em; -} - -table.mw_metadata th { - background-color: #f9f9f9; -} - -table.mw_metadata td { - background-color: #fcfcfc; -} - -table.collapsed tr.collapsable { - display: none; -} - /* filetoc */ ul#filetoc { text-align: center; @@ -1705,12 +1572,6 @@ font-weight: bold; } -#mw_trackbacks { - border: solid 1px #bbbbff; - background-color: #eeeeff; - padding: 0.2em; -} - /* Allmessages table */ #allmessagestable th { @@ -1760,76 +1621,6 @@ content: "\00BB \0020"; } -div.multipageimagenavbox { - border: solid 1px silver; - padding: 4px; - margin: 1em; - background-color: #f0f0f0; -} - -div.multipageimagenavbox div.thumb { - border: none; - margin-left: 2em; - margin-right: 2em; -} - -div.multipageimagenavbox hr { - margin: 6px; -} - -table.multipageimage td { - text-align: center; -} - -/* - Table pager (e.g. Special:Imagelist) - - remove underlines from the navigation link - - collapse borders - - set the borders to outsets (similar to Special:Allmessages) - - remove line wrapping for all td and th, set background color - - restore line wrapping for the last two table cells (description and size) -*/ -.TablePager_nav a { - text-decoration: none; -} - -.TablePager { - border-collapse: collapse; -} - -.TablePager, .TablePager td, .TablePager th { - border: 0.15em solid #777777; - padding: 0 0.15em 0 0.15em; -} - -.TablePager th { - background-color: #eeeeff -} - -.TablePager td { - background-color: #ffffff -} - -.TablePager tr:hover td { - background-color: #eeeeff -} - -.imagelist td, .imagelist th { - white-space: nowrap -} - -.imagelist .TablePager_col_links { - background-color: #eeeeff -} - -.imagelist .TablePager_col_img_description { - white-space: normal -} - -.imagelist th.TablePager_sort { - background-color: #ccccff -} - /** * PhpWiki Tables */ Modified: trunk/themes/MonoBook/rtl.css =================================================================== --- trunk/themes/MonoBook/rtl.css 2017-10-11 12:27:06 UTC (rev 10047) +++ trunk/themes/MonoBook/rtl.css 2017-10-11 13:45:48 UTC (rev 10048) @@ -52,7 +52,6 @@ } div.magnify, -#div.townBox, #p-logo { left: auto; right: 0; @@ -123,16 +122,6 @@ margin-right: 2em; } -div.townBox { - margin-left: 0; - margin-right: 1em; -} - -div.townBox dl dd { - margin-left: 0; - margin-right: 1.1em; -} - #p-personal li { margin-left: 0; margin-right: 1em; Modified: trunk/themes/MonoBook/wikiprintable.css =================================================================== --- trunk/themes/MonoBook/wikiprintable.css 2017-10-11 12:27:06 UTC (rev 10047) +++ trunk/themes/MonoBook/wikiprintable.css 2017-10-11 13:45:48 UTC (rev 10048) @@ -31,13 +31,3 @@ position: relative; margin: inherit ! important; } - -/* Show some stuff */ -.urlexpansion { - display: inline ! important; -} - -.printfooter { - border-top: solid 1px black; - display: block ! important; -} Modified: trunk/themes/Sidebar/sidebar.css =================================================================== --- trunk/themes/Sidebar/sidebar.css 2017-10-11 12:27:06 UTC (rev 10047) +++ trunk/themes/Sidebar/sidebar.css 2017-10-11 13:45:48 UTC (rev 10048) @@ -478,8 +478,12 @@ padding: 5px; margin-bottom: 8px; font-size: 95%; + margin-left: 50px; + margin-right: 50px; + text-align: center; } + #toc, .toc { width: 200px; @@ -531,12 +535,6 @@ font-size: 94%; } -.mw-warning { - margin-left: 50px; - margin-right: 50px; - text-align: center; -} - /* images */ div.floatright, table.floatright { clear: right; @@ -613,16 +611,6 @@ border-width: .5em 1.4em .8em 0; } -.hiddenStructure { - display: none; -} - -@media aural { - .hiddenStructure { - speak: none; - } -} - img.tex { vertical-align: middle; } @@ -655,34 +643,6 @@ font-size: 95%; } -div.townBox { - position: relative; - float: right; - background-color: white; - margin-left: 1em; - border: 1px solid gray; - padding: .3em; - width: 200px; - overflow: hidden; - clear: right; -} - -div.townBox dl { - padding: 0; - margin: 0 0 .3em; - font-size: 96%; -} - -div.townBox dl dt { - background-image: none; - margin: .4em 0 0; -} - -div.townBox dl dd { - margin: .1em 0 0 1.1em; - background-color: #f3f3f3; -} - /* ** edit views etc */ @@ -1298,10 +1258,6 @@ font-size: 95%; } -#p-cactions .hiddenStructure { - display: none; -} - #p-cactions ul { list-style: none; } @@ -1495,36 +1451,14 @@ margin: 5px; } -.printfooter { - display: none; -} - -.not-patrolled { - background-color: #ffa; -} - -div.patrollink { - font-size: 75%; - text-align: right; -} - span.newpage, span.minor, span.searchmatch, span.bot { font-weight: bold; } -span.unpatrolled { - font-weight: bold; - color: red; -} - span.searchmatch { color: red; } -.sharedUploadNotice { - font-style: italic; -} - span.updatedmarker { color: black; background-color: #0f0; @@ -1600,21 +1534,6 @@ padding: 0; } -.editExternally { - border: 1px solid gray; - background-color: #ffffff; - padding: 3px; - margin-top: 0.5em; - float: left; - font-size: small; - text-align: center; -} - -.editExternallyHelp { - font-style: italic; - color: gray; -} - li span.deleted, span.history-deleted { text-decoration: line-through; color: #888; @@ -1626,50 +1545,6 @@ text-indent: -2em; } -/* Classes for EXIF data display */ -table.mw_metadata { - font-size: 0.8em; - margin-left: 0.5em; - margin-bottom: 0.5em; - width: 300px; -} - -table.mw_metadata caption { - font-weight: bold; -} - -table.mw_metadata th { - font-weight: normal; -} - -table.mw_metadata td { - padding: 0.1em; -} - -table.mw_metadata { - border: none; - border-collapse: collapse; -} - -table.mw_metadata td, table.mw_metadata th { - text-align: center; - border: 1px solid #aaaaaa; - padding-left: 0.1em; - padding-right: 0.1em; -} - -table.mw_metadata th { - background-color: #f9f9f9; -} - -table.mw_metadata td { - background-color: #fcfcfc; -} - -table.collapsed tr.collapsable { - display: none; -} - /* filetoc */ ul#filetoc { text-align: center; @@ -1729,12 +1604,6 @@ font-weight: bold; } -#mw_trackbacks { - border: solid 1px #bbbbff; - background-color: #eeeeff; - padding: 0.2em; -} - /* Allmessages table */ #allmessagestable th { @@ -1784,77 +1653,6 @@ content: "\00BB \0020"; } -div.multipageimagenavbox { - border: solid 1px silver; - padding: 4px; - margin: 1em; - border-radius: 6px; - background-color: #f0f0f0; -} - -div.multipageimagenavbox div.thumb { - border: none; - margin-left: 2em; - margin-right: 2em; -} - -div.multipageimagenavbox hr { - margin: 6px; -} - -table.multipageimage td { - text-align: center; -} - -/* - Table pager (e.g. Special:Imagelist) - - remove underlines from the navigation link - - collapse borders - - set the borders to outsets (similar to Special:Allmessages) - - remove line wrapping for all td and th, set background color - - restore line wrapping for the last two table cells (description and size) -*/ -.TablePager_nav a { - text-decoration: none; -} - -.TablePager { - border-collapse: collapse; -} - -.TablePager, .TablePager td, .TablePager th { - border: 0.15em solid #777777; - padding: 0 0.15em 0 0.15em; -} - -.TablePager th { - background-color: #eeeeff -} - -.TablePager td { - background-color: #ffffff -} - -.TablePager tr:hover td { - background-color: #eeeeff -} - -.imagelist td, .imagelist th { - white-space: nowrap -} - -.imagelist .TablePager_col_links { - background-color: #eeeeff -} - -.imagelist .TablePager_col_img_description { - white-space: normal -} - -.imagelist th.TablePager_sort { - background-color: #ccccff -} - /** * PhpWiki Tables */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-10-11 12:27:08
|
Revision: 10047 http://sourceforge.net/p/phpwiki/code/10047 Author: vargenau Date: 2017-10-11 12:27:06 +0000 (Wed, 11 Oct 2017) Log Message: ----------- Remove empty CSS Modified Paths: -------------- trunk/themes/Crao/crao.css trunk/themes/Hawaiian/Hawaiian.css trunk/themes/MonoBook/monobook.css trunk/themes/Sidebar/sidebar.css trunk/themes/SpaceWiki/SpaceWiki.css trunk/themes/default/phpwiki.css trunk/themes/fusionforge/fusionforge.css Modified: trunk/themes/Crao/crao.css =================================================================== --- trunk/themes/Crao/crao.css 2017-10-10 15:09:12 UTC (rev 10046) +++ trunk/themes/Crao/crao.css 2017-10-11 12:27:06 UTC (rev 10047) @@ -306,13 +306,6 @@ padding-bottom: 0.5ex; } -/* title */ -div.boxtitrehead { -} - -div.boxtitrehead a.backlinks { -} - div.wikitext { font-size: 1em; line-height: 130%; @@ -391,12 +384,6 @@ color: #333; } -#navbuttons a:visited { -} - -#navbuttons a:hover { -} - /* ****************************** *****SIGNIN @@ -724,12 +711,8 @@ .pagelist { background-color: white; border: 1px #333 dashed; - } -.pagelist thead, .pagelist thead u { -} - .pagelist tr.evenrow { background-color: white; } Modified: trunk/themes/Hawaiian/Hawaiian.css =================================================================== --- trunk/themes/Hawaiian/Hawaiian.css 2017-10-10 15:09:12 UTC (rev 10046) +++ trunk/themes/Hawaiian/Hawaiian.css 2017-10-11 12:27:06 UTC (rev 10047) @@ -246,12 +246,6 @@ font-family: Arial, Helvetica, sans-serif; } -.pagelist { -} - -.pagelist thead, .pagelist thead u { -} - .pagelist tr.evenrow { background-color: #eee; } Modified: trunk/themes/MonoBook/monobook.css =================================================================== --- trunk/themes/MonoBook/monobook.css 2017-10-10 15:09:12 UTC (rev 10046) +++ trunk/themes/MonoBook/monobook.css 2017-10-11 12:27:06 UTC (rev 10047) @@ -1137,7 +1137,6 @@ font-weight: bold; } -/*#searchInput, */ #livesearch, #p-search input.dropdown { text-align: left; width: 9.9em; Modified: trunk/themes/Sidebar/sidebar.css =================================================================== --- trunk/themes/Sidebar/sidebar.css 2017-10-10 15:09:12 UTC (rev 10046) +++ trunk/themes/Sidebar/sidebar.css 2017-10-11 12:27:06 UTC (rev 10047) @@ -894,10 +894,6 @@ border: 1px solid gray; } -/* text */ -table.cal td.cal-today a.cal-hide { -} - /* ** keep the whitespace in front of the ^=, hides rule from konqueror ** this is css3, the validator doesn't like it when validating as css2 Modified: trunk/themes/SpaceWiki/SpaceWiki.css =================================================================== --- trunk/themes/SpaceWiki/SpaceWiki.css 2017-10-10 15:09:12 UTC (rev 10046) +++ trunk/themes/SpaceWiki/SpaceWiki.css 2017-10-11 12:27:06 UTC (rev 10047) @@ -395,12 +395,6 @@ font-family: Arial, Helvetica, sans-serif; } -.pagelist { -} - -.pagelist thead, .pagelist thead u { -} - .pagelist tr.evenrow { background: #111; } @@ -603,10 +597,6 @@ border: 1px solid gray; } -/* text */ -table.cal td.cal-today a.cal-hide { -} - /** * Diff Output */ Modified: trunk/themes/default/phpwiki.css =================================================================== --- trunk/themes/default/phpwiki.css 2017-10-10 15:09:12 UTC (rev 10046) +++ trunk/themes/default/phpwiki.css 2017-10-11 12:27:06 UTC (rev 10047) @@ -505,10 +505,6 @@ border: 1px solid gray; } -/* text */ -table.cal td.cal-today a.cal-hide { -} - /** * Diff Output */ Modified: trunk/themes/fusionforge/fusionforge.css =================================================================== --- trunk/themes/fusionforge/fusionforge.css 2017-10-10 15:09:12 UTC (rev 10046) +++ trunk/themes/fusionforge/fusionforge.css 2017-10-11 12:27:06 UTC (rev 10047) @@ -631,10 +631,6 @@ border: 1px solid gray; } -/* text */ -table.cal td.cal-today a.cal-hide { -} - /* Diff plugin ======================================================== */ .diff .prefix { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-10-10 15:09:14
|
Revision: 10046 http://sourceforge.net/p/phpwiki/code/10046 Author: vargenau Date: 2017-10-10 15:09:12 +0000 (Tue, 10 Oct 2017) Log Message: ----------- Remove unused CSS Modified Paths: -------------- trunk/themes/Crao/crao.css trunk/themes/Hawaiian/Hawaiian.css trunk/themes/MonoBook/monobook.css trunk/themes/Sidebar/sidebar.css trunk/themes/SpaceWiki/SpaceWiki.css trunk/themes/Wordpress/Wordpress.css trunk/themes/blog/Kubrick.css trunk/themes/default/phpwiki-modern.css trunk/themes/default/phpwiki-printer.css trunk/themes/default/phpwiki.css trunk/themes/fusionforge/fusionforge.css Modified: trunk/themes/Crao/crao.css =================================================================== --- trunk/themes/Crao/crao.css 2017-10-10 14:37:20 UTC (rev 10045) +++ trunk/themes/Crao/crao.css 2017-10-10 15:09:12 UTC (rev 10046) @@ -835,21 +835,6 @@ font-family: Verdana, Arial, Helvetica, sans-serif; } -#editarea-size { - margin-top: 1ex; - margin-bottom: -1ex; - text-align: right; - font-size: smaller; - border: 1px none; -} - -#editarea-size legend { - text-align: right; - font-size: smaller; - border: 1px solid #CCC; - background-color: #ccc; -} - .editarea legend { font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 1em; @@ -969,9 +954,6 @@ } /* Day-names header */ -table.cal tbody tr .cal-dayname { -} - .cal-dayname td { text-align: center; font-size: smaller; Modified: trunk/themes/Hawaiian/Hawaiian.css =================================================================== --- trunk/themes/Hawaiian/Hawaiian.css 2017-10-10 14:37:20 UTC (rev 10045) +++ trunk/themes/Hawaiian/Hawaiian.css 2017-10-10 15:09:12 UTC (rev 10046) @@ -328,12 +328,6 @@ font-family: Arial, Helvetica, sans-serif; } -#editarea-size { - margin-top: 1ex; - text-align: right; - font-size: smaller; -} - /* IncludePage plugin ================================================= */ .transclusion-title { Modified: trunk/themes/MonoBook/monobook.css =================================================================== --- trunk/themes/MonoBook/monobook.css 2017-10-10 14:37:20 UTC (rev 10045) +++ trunk/themes/MonoBook/monobook.css 2017-10-10 15:09:12 UTC (rev 10046) @@ -899,9 +899,6 @@ } /* Day-names header */ -table.cal tbody tr .cal-dayname { -} - .cal-dayname td { text-align: center; font-size: smaller; Modified: trunk/themes/Sidebar/sidebar.css =================================================================== --- trunk/themes/Sidebar/sidebar.css 2017-10-10 14:37:20 UTC (rev 10045) +++ trunk/themes/Sidebar/sidebar.css 2017-10-10 15:09:12 UTC (rev 10046) @@ -876,9 +876,6 @@ } /* Day-names header */ -table.cal tbody tr .cal-dayname { -} - .cal-dayname td { text-align: center; font-size: smaller; Modified: trunk/themes/SpaceWiki/SpaceWiki.css =================================================================== --- trunk/themes/SpaceWiki/SpaceWiki.css 2017-10-10 14:37:20 UTC (rev 10045) +++ trunk/themes/SpaceWiki/SpaceWiki.css 2017-10-10 15:09:12 UTC (rev 10046) @@ -503,12 +503,6 @@ padding: 2px; } -#editarea-size { - margin-top: 1ex; - text-align: right; - font-size: smaller; -} - /* IncludePage plugin ================================================= */ .transclusion-title { @@ -591,9 +585,6 @@ } /* Day-names header */ -table.cal tbody tr .cal-dayname { -} - .cal-dayname td { text-align: center; font-size: smaller; Modified: trunk/themes/Wordpress/Wordpress.css =================================================================== --- trunk/themes/Wordpress/Wordpress.css 2017-10-10 14:37:20 UTC (rev 10045) +++ trunk/themes/Wordpress/Wordpress.css 2017-10-10 15:09:12 UTC (rev 10046) @@ -336,12 +336,6 @@ border: 1px solid ButtonFace; } -#editarea-size { - margin-top: 1ex; - text-align: right; - font-size: smaller; -} - #search-replace { margin-top: 1ex; text-align: left; Modified: trunk/themes/blog/Kubrick.css =================================================================== --- trunk/themes/blog/Kubrick.css 2017-10-10 14:37:20 UTC (rev 10045) +++ trunk/themes/blog/Kubrick.css 2017-10-10 15:09:12 UTC (rev 10046) @@ -71,17 +71,6 @@ vertical-align: middle; } -#editarea-size { - font-size: 9px; - margin-top: 0; - margin-left: 20px; - margin-right: 10px; -} - -#editarea-size input { - font-size: 9px; -} - #actionbuttons a { padding-right: 0; font-size: 11px; /* we need pixel units here to match the background */ Modified: trunk/themes/default/phpwiki-modern.css =================================================================== --- trunk/themes/default/phpwiki-modern.css 2017-10-10 14:37:20 UTC (rev 10045) +++ trunk/themes/default/phpwiki-modern.css 2017-10-10 15:09:12 UTC (rev 10046) @@ -278,12 +278,6 @@ padding: 2px; } -#editarea-size { - margin-top: 1ex; - text-align: right; - font-size: smaller; -} - /* IncludePage plugin ================================================= */ .transclusion-title { Modified: trunk/themes/default/phpwiki-printer.css =================================================================== --- trunk/themes/default/phpwiki-printer.css 2017-10-10 14:37:20 UTC (rev 10045) +++ trunk/themes/default/phpwiki-printer.css 2017-10-10 15:09:12 UTC (rev 10046) @@ -174,10 +174,6 @@ padding: 2px; } -#editarea-size { - display: none; -} - /* IncludePage plugin ================================================= */ .transclusion-title { Modified: trunk/themes/default/phpwiki.css =================================================================== --- trunk/themes/default/phpwiki.css 2017-10-10 14:37:20 UTC (rev 10045) +++ trunk/themes/default/phpwiki.css 2017-10-10 15:09:12 UTC (rev 10046) @@ -376,12 +376,6 @@ padding: 2px; } -#editarea-size { - margin-top: 1ex; - text-align: right; - font-size: smaller; -} - #search-replace { margin-top: 1ex; text-align: left; @@ -493,9 +487,6 @@ } /* Day-names header */ -table.cal tbody tr .cal-dayname { -} - .cal-dayname td { text-align: center; font-size: smaller; Modified: trunk/themes/fusionforge/fusionforge.css =================================================================== --- trunk/themes/fusionforge/fusionforge.css 2017-10-10 14:37:20 UTC (rev 10045) +++ trunk/themes/fusionforge/fusionforge.css 2017-10-10 15:09:12 UTC (rev 10046) @@ -201,11 +201,10 @@ border: 1px solid #96a2ae; border-right-color: #d8d8e7; border-bottom-color: #d8d8e7; - margin-top: 0.5ex; margin-bottom: 0.5ex; padding: 0.5ex 0.5em; - /* Emulate the display behaviour of a table, to shrink it's width. */ + /* Emulate the display behaviour of a table, to shrink its width. */ display: table; } @@ -448,10 +447,6 @@ border: 1px solid ButtonFace; } -.tooltitle { - font-weight: bold; -} - nav#actionbuttons, nav#actionbuttons ul { padding: 0; } @@ -525,12 +520,6 @@ padding: 2px; } -#editarea-size { - margin-top: 1ex; - text-align: right; - font-size: smaller; -} - #search-replace { margin-top: 1ex; text-align: left; @@ -624,9 +613,6 @@ } /* Day-names header */ -table.cal tbody tr .cal-dayname { -} - .cal-dayname td { text-align: center; font-size: smaller; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-10-10 14:37:23
|
Revision: 10045 http://sourceforge.net/p/phpwiki/code/10045 Author: vargenau Date: 2017-10-10 14:37:20 +0000 (Tue, 10 Oct 2017) Log Message: ----------- Clean up CSS Modified Paths: -------------- trunk/themes/Crao/crao.css trunk/themes/MacOSX/MacOSX.css trunk/themes/MonoBook/monobook.css trunk/themes/Sidebar/sidebar.css trunk/themes/SpaceWiki/SpaceWiki.css trunk/themes/Wordpress/Wordpress.css trunk/themes/blog/Kubrick.css trunk/themes/default/phpwiki-modern.css trunk/themes/default/phpwiki.css trunk/themes/fusionforge/fusionforge.css trunk/themes/shamino_com/shamino_com.css trunk/themes/smaller/phpwiki.css trunk/themes/wikilens/wikilens.css Modified: trunk/themes/Crao/crao.css =================================================================== --- trunk/themes/Crao/crao.css 2017-10-10 12:10:24 UTC (rev 10044) +++ trunk/themes/Crao/crao.css 2017-10-10 14:37:20 UTC (rev 10045) @@ -7,12 +7,12 @@ /* ****************************** - *****GENERIK + *****GENERIC ****************************** */ body { - background-color: #ccc; /* MODIFY-color */ + background-color: #ccc; font-family: Helvetica, Verdana, Arial, sans-serif; font-size: 12px; line-height: 14px; @@ -34,34 +34,22 @@ empty-cells: show; } -a:link, a { - /* MODIFY-TXT */ +a, a:link, a:visited { color: #33c; text-decoration: underline; background-color: transparent; } -a:visited { - /* MODIFY-TXT */ - color: #33c; - text-decoration: underline; - background-color: transparent; -} - a:hover { - /* MODIFY-TXT */ color: #03f; text-decoration: underline; background-color: transparent; } -a.wiki, a.wikiadmin, a.named-wiki { -} - hr { - background-color: #ccc; /* MODIFY-color */ + background-color: #ccc; height: 1px; - border: 1px solid #ccc; /* MODIFY-color */ + border: 1px solid #ccc; } div.wikitext pre { @@ -128,7 +116,7 @@ /* ****************************** - *****LISTES + *****LISTS ****************************** */ ul { @@ -152,9 +140,9 @@ li.rc-major { list-style: none; display: block; - background-color: #fff; /* MODIFY-color */ + background-color: #fff; margin: 6px 0; - border: 1px #666 dashed; /* MODIFY-color */ + border: 1px #666 dashed; padding: 0.5ex; } @@ -185,8 +173,6 @@ li a.wiki-rc-action { border: 0; - /*border-left: 1.2em solid #FC0;*/ - /*la puce de dernieres modifs*/ } li.rc-major a.wiki { @@ -219,11 +205,10 @@ ****************************** */ #header { - background-color: #333; /* MODIFY-color */ + background-color: #333; } #logo { - /* MODIFY-TXT */ color: #ccc; display: inline; margin-top: 0; @@ -313,8 +298,8 @@ margin-left: 7%; margin-right: 7%; margin-bottom: 7%; - background-color: #f2f2f2; /* MODIFY-color */ - border: 1px #999 solid; /* MODIFY-color */ + background-color: #f2f2f2; + border: 1px #999 solid; padding-left: 2em; padding-right: 15px; padding-top: 15px; @@ -321,7 +306,7 @@ padding-bottom: 0.5ex; } -/* titre */ +/* title */ div.boxtitrehead { } @@ -337,7 +322,7 @@ blockquote.mail-style-quote { margin: 0; margin-bottom: 1em; - border: 1px solid #FF9933; /* MODIFY-color */ + border: 1px solid #FF9933; padding: 0.5em; } @@ -346,7 +331,7 @@ margin-bottom: 0; background-color: transparent; border-style: none; - border-left: 2px solid #FF9933; /* MODIFY-color */ + border-left: 2px solid #FF9933; padding: 0; padding-left: 0.5em; } @@ -367,8 +352,8 @@ div.toolbar { display: block; - background-color: #f2f2f2; /* MODIFY-color */ - border: 1px #666 solid; /* MODIFY-color */ + background-color: #f2f2f2; + border: 1px #666 solid; margin: 2% 7%; } @@ -400,7 +385,6 @@ } #navbuttons a:link, #navbuttons a { - /* MODIFY-TXT */ font-weight: bold; padding-left: 1ex; padding-right: 1ex; @@ -419,7 +403,6 @@ ****************************** */ #signin { - /* MODIFY-TXT */ width: auto; text-align: right; padding-right: 10px; @@ -429,7 +412,6 @@ } #signin form { - /* MODIFY-TXT */ text-align: center; padding: 1px; margin: 0; @@ -437,7 +419,6 @@ } #signin input { - /* MODIFY-TXT */ padding: 0; padding-left: 3px; margin: 0; @@ -453,7 +434,6 @@ } #signin a.wiki { - /* MODIFY-TXT */ color: #FFF; background-color: transparent; } @@ -466,7 +446,6 @@ #search { font-size: 12px; margin: 5px 10px 5px 10px; - /*padding-right: 10px;*/ float: right; } @@ -539,8 +518,6 @@ * The div inside the wikiadmin upload form does not * have a class yet, so it must be referenced indirectly */ -/*div.wikiaction { background-color: #f2f2f2; }*/ -/*div.wikiadmin { background-color: #fee; } */ form.wikiadmin div { color: #000; background-color: #f2f2f2; @@ -586,7 +563,7 @@ .wikiunsafe { color: #000; - background-color: #f2f2f2; /* MODIFY-color */ + background-color: #f2f2f2; } input.wikiadmin { @@ -596,7 +573,7 @@ /* ****************************** - *****DIVERS-LINK + *****LINK ****************************** */ @@ -610,7 +587,7 @@ /* QuestionMark #600 */ .wikiunknown a, .named-wikiunknown a { color: #FFFFFF; - background-color: #000000; /* MODIFY-color */ + background-color: #000000; text-decoration: none; font-weight: normal; font-size: 1em; @@ -656,7 +633,6 @@ } h1 { - /* MODIFY-TXT */ margin-top: 10px; background-color: transparent; color: #555; @@ -663,31 +639,26 @@ } h1 a.backlinks { - /* MODIFY-TXT */ color: #777; text-decoration: none; } h1 a.wiki { - /* MODIFY-TXT */ color: #777; text-decoration: none; } h1 a.pagetitle { - /* MODIFY-TXT */ color: #555; text-decoration: none; } h1 a:hover { - /* MODIFY-TXT */ color: #888; text-decoration: underline; } h4, h5, h6 { - /* MODIFY-TXT */ margin-bottom: 0; background-color: transparent; color: #111; @@ -751,8 +722,8 @@ } .pagelist { - background-color: white; /* MODIFY-color */ - border: 1px #333 dashed; /* MODIFY-color */ + background-color: white; + border: 1px #333 dashed; } @@ -804,7 +775,7 @@ #revision { font-size: 10px; text-align: right; - background-color: #f2f2f2; /* MODIFY-color */ + background-color: #f2f2f2; /* "paper" borders */ padding-left: 2em; padding-right: 1em; @@ -922,7 +893,7 @@ } .transclusion { - border: 1px solid gray; /* MODIFY-color */ + border: 1px solid gray; padding-left: 0.8em; padding-right: 0.8em; padding-top: 0; @@ -934,7 +905,7 @@ .wiki-edithelp { background-color: white; - border: medium solid #fff8dc; /* MODIFY-color */ + border: medium solid #fff8dc; padding-left: 0.5em; padding-right: 0.5em; padding-top: 0.75ex; @@ -945,10 +916,6 @@ margin-bottom: 1ex; } -.wiki-edithelp .wiki { - /* color: #5454ff;*/ -} - .wiki-edithelp p { font-family: Verdana, Helvetica, Arial, sans-serif; padding-left: 0.5em; @@ -968,7 +935,7 @@ float: right; font-size: 10px; border: 1px solid #333; - background-color: #ccc; /* MODIFY-color */ + background-color: #ccc; margin: 10px; padding: 1px; /* For Mozilla */ @@ -982,9 +949,8 @@ /* Month-name header */ table.cal-header { - /* MODIFY-TXT */ font-size: larger; - background-color: #333; /* MODIFY-color */ + background-color: #333; color: #f2f2f2; } @@ -993,7 +959,6 @@ } .cal-arrow { - /* MODIFY-TXT */ font-weight: bold; text-decoration: none; color: #fff; @@ -1000,7 +965,6 @@ } a.cal-arrow { - /* MODIFY-TXT */ color: #fff; } @@ -1012,7 +976,7 @@ text-align: center; font-size: smaller; text-decoration: none; - background-color: #f2f2f2; /* MODIFY-color */ + background-color: #f2f2f2; } /* Individual days */ @@ -1025,9 +989,9 @@ /* cell */ table.cal td.cal-today { margin: 1px; - border: 1px solid #333; /* MODIFY-color */ + border: 1px solid #333; color: #000; - background-color: #f2f2f2; /* MODIFY-color */ + background-color: #f2f2f2; } /* text */ @@ -1146,7 +1110,6 @@ background-color: #eeeeee; font-size: smaller; margin-left: 5em; - /* padding: -0.5em 0 -0.5em; */ border: thin solid #aaaaaa; } @@ -1159,7 +1122,6 @@ #clear { clear: both; margin: 0; - margin-top: -7px; padding: 2px; text-align: center; color: #000; @@ -1167,12 +1129,6 @@ border: solid 0; } -/* reset post NN4 */ -/*/*/ -#clear { - margin-top: 0; -} - /* ****************************** *****IMG-HACK @@ -1207,7 +1163,7 @@ h2.wikiblog-heading { font-size: 2em; padding-bottom: 0.5em; - border-bottom: 2px solid gray; /* MODIFY-color */ + border-bottom: 2px solid gray; } /* Modified: trunk/themes/MacOSX/MacOSX.css =================================================================== --- trunk/themes/MacOSX/MacOSX.css 2017-10-10 12:10:24 UTC (rev 10044) +++ trunk/themes/MacOSX/MacOSX.css 2017-10-10 14:37:20 UTC (rev 10045) @@ -753,7 +753,6 @@ } div.wikiblog { - /* border: thin black solid; */ margin: 1ex 2em; padding: 0 0; } Modified: trunk/themes/MonoBook/monobook.css =================================================================== --- trunk/themes/MonoBook/monobook.css 2017-10-10 12:10:24 UTC (rev 10044) +++ trunk/themes/MonoBook/monobook.css 2017-10-10 14:37:20 UTC (rev 10045) @@ -33,7 +33,6 @@ #column-one { position: absolute; - /*z-index: 3;*/ padding-top: 160px; top: 0; left: 0; @@ -206,7 +205,6 @@ } legend { - /*background: white;*/ padding: 0.5em; font-size: 95%; } @@ -245,11 +243,6 @@ font-style: italic; } -/* disabled for now -blockquote { - font-family: Times, "Times New Roman", serif; - font-style: italic; -}*/ code { background-color: #f9f9f9; } @@ -682,7 +675,7 @@ ** RecentChanges */ .pageinfo-majoredit { - font-weight: normal; /*bold;*/ + font-weight: normal; } .wiki-summary { @@ -927,10 +920,6 @@ border: 1px solid gray; } -/* text */ -table.cal td.cal-today a.cal-hide { -} - /* ** keep the whitespace in front of the ^=, hides rule from konqueror ** this is css3, the validator doesn't like it when validating as css2 @@ -1206,7 +1195,6 @@ padding: 0 2em 0 3em; margin: 0; text-align: right; - /*text-transform: lowercase;*/ list-style: none; background-image: none; cursor: default; @@ -1249,7 +1237,6 @@ li#pt-userpage, li#pt-anonuserpage, li#pt-login { - /*background: url('images/wikiuser.png') top left bottom no-repeat;*/ background: url('images/wikiuser.png') left no-repeat; padding-left: 20px; text-transform: none; @@ -1264,8 +1251,6 @@ */ #p-cactions { position: absolute; - /*z-index: 1;*/ - /* important! */ top: 1.8em; left: 11.5em; margin: 0; @@ -1311,7 +1296,6 @@ border: none; padding: 0 .8em .3em; text-decoration: none; - /*text-transform: lowercase;*/ margin: 0; } @@ -1342,7 +1326,6 @@ z-index: 3; text-decoration: none; background-color: #fff; - /*padding-bottom: 0.3em !important;*/ } #p-cactions h5 { @@ -2041,7 +2024,6 @@ .wiki, .named-wiki { text-decoration: none; font-weight: normal; - /* font-weight: bold; */ } /* Action buttons */ @@ -2051,25 +2033,12 @@ font-family: Arial, Helvetica, sans-serif; /* don't wrap text buttons */ white-space: nowrap; - /*font-size: inherit; */ } -/* -a.wikiaction, a.wikiaction:visited, input.wikiaction, input.button { - background-color: #ddd; -} -*/ - .wikiunsafe { background-color: #fcc; } -/* -a.wikiadmin, a.wikiadmin:visited, input.wikiadmin { - background-color: #fdd; -} -*/ - /* Unknown links */ .wikiunknown, .named-wikiunknown { font-weight: normal; @@ -2096,7 +2065,6 @@ } /* Interwiki links */ -/* .wikipage { font-weight: bold; } */ .wikipage { font-weight: normal; } Modified: trunk/themes/Sidebar/sidebar.css =================================================================== --- trunk/themes/Sidebar/sidebar.css 2017-10-10 12:10:24 UTC (rev 10044) +++ trunk/themes/Sidebar/sidebar.css 2017-10-10 14:37:20 UTC (rev 10045) @@ -244,11 +244,6 @@ font-style: italic; } -/* disabled for now -blockquote { - font-family: Times, "Times New Roman", serif; - font-style: italic; -}*/ code { background-color: #f9f9f9; } @@ -466,7 +461,7 @@ ** RecentChanges */ .pageinfo-majoredit { - font-weight: normal; /*bold;*/ + font-weight: normal; } .wiki-summary { @@ -549,10 +544,6 @@ position: relative; margin: 0 0 .5em .5em; border: 0; - /* - border: .5em solid white; - border-width: .5em 0 .8em 1.4em; - */ } div.floatright p { @@ -1028,7 +1019,6 @@ border: 1px #2f6fab; border-style: solid solid none solid; padding: 0 1em 0 1em; - /*text-transform: lowercase;*/ display: block; font-size: 1em; height: 1.2em; @@ -1165,10 +1155,6 @@ z-index: 3; } -#p-search .pBody { - /*text-align: center;*/ -} - div.pBody > button, #searchButton { margin: 0; padding: 0; @@ -1177,7 +1163,6 @@ #p-search .pBody { margin: 0; padding: .5em 0 .4em .4em; - /*text-align: center;*/ } #searchholder form.searchform { @@ -1214,8 +1199,6 @@ border-width: 1px; border-style: solid; border-color: #aaa #eee #eee #aaa; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; box-sizing: border-box; } @@ -1309,7 +1292,7 @@ #p-cactions { position: absolute; top: 40px; /*1.3em;*/ - left: /*11.5em;*/ 13.2em; + left: 13.2em; margin: 0; white-space: nowrap; width: 76%; @@ -1882,8 +1865,6 @@ /** * PhpWiki Tables */ -.pagelist { -} .pagelist thead td { background-color: #e8e8e8; @@ -1910,7 +1891,6 @@ font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif; font-size: small; font-weight: normal; - /*font-style: menu;*/ white-space: nowrap; margin: 5px 0; max-height: 24px; @@ -2225,10 +2205,6 @@ margin-bottom: 1ex; } -.wiki-edithelp .wiki { - /* color: #5454ff;*/ -} - .wiki-edithelp p { font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif; padding-left: 0.5em; Modified: trunk/themes/SpaceWiki/SpaceWiki.css =================================================================== --- trunk/themes/SpaceWiki/SpaceWiki.css 2017-10-10 12:10:24 UTC (rev 10044) +++ trunk/themes/SpaceWiki/SpaceWiki.css 2017-10-10 14:37:20 UTC (rev 10045) @@ -126,8 +126,6 @@ * Wiki */ body { - /* the background image url is relative to this file's directory */ - /*background-image: url(images/starfield.png) repeat; */ font-family: Helvetica, Arial, sans-serif; color: white; background-color: black; @@ -177,7 +175,6 @@ padding: 0.5ex 0.5em; } -/* div.wikiadmin { background-color: black; } */ form.wikiadmin div { background-color: black; } @@ -893,7 +890,6 @@ li.rc-major, li.rc-minor { display: table; - /*border-bottom: 1px solid #222;*/ margin-bottom: .25ex; padding-left: 0.25em; padding-right: 0.25em; Modified: trunk/themes/Wordpress/Wordpress.css =================================================================== --- trunk/themes/Wordpress/Wordpress.css 2017-10-10 12:10:24 UTC (rev 10044) +++ trunk/themes/Wordpress/Wordpress.css 2017-10-10 14:37:20 UTC (rev 10045) @@ -204,7 +204,6 @@ input { background: #fff; border: 1px solid #999; - /* width: 80%; */ font-size: smaller; } @@ -220,7 +219,7 @@ font: italic normal 100% 'Times New Roman', Times, serif; letter-spacing: 0.1em; margin-top: 10px; - padding-bottom: 2px; /*border-bottom: dotted 1px #ccc;*/ + padding-bottom: 2px; } #actionbar ul ul { @@ -255,13 +254,10 @@ background: #fff; border: 1px solid #ddd; empty-cells: show; - /* font-size: 14px; */ margin: 0 0 0 -5px; - /* width: 90%; */ } .cal a { - /* display: block; */ text-decoration: none; font-style: normal; } @@ -273,9 +269,7 @@ .cal-header, .cal-dayname td { color: #999; - /* font: normal 11px Verdana, Geneva, sans-serif; */ padding: 1px 1px; - /* text-align: right; */ } /* from wp-calendar th (with changes) */ @@ -410,10 +404,6 @@ margin-bottom: 1ex; } -.wiki-edithelp .wiki { - /* color: #5454ff;*/ -} - .wiki-edithelp p { font-family: Arial, Helvetica, sans-serif; padding-left: 0.5em; @@ -455,10 +445,6 @@ text-decoration: none; } -/* Day-names header */ -table.cal tbody tr .cal-dayname { -} - .cal-dayname td { text-align: center; font-size: smaller; @@ -477,10 +463,6 @@ border: 1px solid gray; } -/* text */ -table.cal td.cal-today a.cal-hide { -} - /** * Diff Output */ @@ -728,7 +710,6 @@ } div.wikiblog { - /* border: thin black solid; */ margin: 1ex 2em; padding: 0 0; } @@ -738,12 +719,7 @@ padding: 0.5ex 0.5em; } -div.wikiblog-header { - /* background-color: #ccf; */ -} - div.wikiblog > div.wikiblog-footer { - /* background-color: #eee; */ padding: 0.2ex 0.5em; } @@ -753,10 +729,6 @@ margin: 0 0 1ex 0; } -div.wikiblog.wikiblog-form { - /* background-color: #eee; */ -} - table.wikiblog-form { width: auto; border-collapse: collapse; @@ -764,7 +736,6 @@ } .wikiblog-form caption { - /* background-color: #ccf; */ caption-side: top; font-weight: bold; text-align: left; Modified: trunk/themes/blog/Kubrick.css =================================================================== --- trunk/themes/blog/Kubrick.css 2017-10-10 12:10:24 UTC (rev 10044) +++ trunk/themes/blog/Kubrick.css 2017-10-10 14:37:20 UTC (rev 10045) @@ -34,7 +34,6 @@ background-color: transparent; font: bolder 67px/50px Verdana, Arial, Helvetica, sans-serif; letter-spacing: -0.1em; - /*font-variant: condensed;*/ } #yoursiteheader a:hover, #yoursiteheader a:link, #yoursiteheader a:visited { @@ -45,7 +44,6 @@ #actionbar, #editbar { background: url("images/actionbarbg.png") no-repeat top center; width: 760px; - /*height: 40px;*/ } /* http://universaleditbutton.org */ @@ -128,7 +126,6 @@ } div.wikitext { - /*margin-left: 25px;*/ margin-top: 12px; } @@ -162,7 +159,6 @@ width: 720px; clear: both; margin: 0 20px 0 20px; - /*text-align: center;*/ } #footer { @@ -179,7 +175,6 @@ #footer p, #bottom p { margin: 0; padding: 0; - /* padding: 20px 0; */ } .widecolumn .entry p { @@ -306,7 +301,6 @@ h1, h1 a, h1 a:hover, h1 a:visited, .description { text-decoration: none; - /*color: white;*/ color: black; } @@ -432,13 +426,6 @@ background: url("images/https.png") right top no-repeat; } -/* local links (override above) */ -/* -a.namedurl[href*="the.taoofmac.com"] { - padding-right: 0; - background: none; -} -*/ /* interwiki */ a.named-interwiki { padding-right: 6px; @@ -453,7 +440,6 @@ #searchholder { float: right; - /*height: 30px;*/ vertical-align: middle; margin-top: 10px; margin-right: 30px; @@ -460,7 +446,6 @@ } #livesearch { - /*height: 16px;*/ width: 150px; font-size: 0.8em; } @@ -471,13 +456,11 @@ margin: 0 0 0; width: 550px; overflow: visible; - /* how to define minimal height? */ min-height: 490px; } .narrowcolumn, .wikiblog { width: 550px !important; - /*max-width: 550px;*/ } #editpage, #edit-content, .wiki-edithelp { @@ -519,7 +502,7 @@ margin: 30px 0; } -/* Begin Headers */ +/* Begin Headers */ h1 { margin: 0; } Modified: trunk/themes/default/phpwiki-modern.css =================================================================== --- trunk/themes/default/phpwiki-modern.css 2017-10-10 12:10:24 UTC (rev 10044) +++ trunk/themes/default/phpwiki-modern.css 2017-10-10 14:37:20 UTC (rev 10045) @@ -115,18 +115,6 @@ color: #006; } -/* -.wikiaction, .wikiaction table, span.wikiaction { - background-color: #ddd; -} -.wikiadmin, .wikiadmin table { - background-color: #fdd; -} -.wikiunsafe { - background-color: #ccc; -} -*/ - /* Unknown links */ .wikiunknown a, .named-wikiunknown a, .wikiunknown u { text-decoration: none; Modified: trunk/themes/default/phpwiki.css =================================================================== --- trunk/themes/default/phpwiki.css 2017-10-10 12:10:24 UTC (rev 10044) +++ trunk/themes/default/phpwiki.css 2017-10-10 14:37:20 UTC (rev 10045) @@ -86,7 +86,6 @@ * Wiki */ body { - /* ivory #ffe #fffff0*/ background: #fffff0; font-family: Arial, Helvetica, sans-serif; font-size: 85%; /* The default is too large. But enlarge monospace below */ @@ -171,7 +170,6 @@ background-color: #eee; } -/* div.wikiadmin { background-color: #fee; } */ form.wikiadmin div { background-color: #fee; } @@ -185,7 +183,6 @@ */ .wiki, .named-wiki { text-decoration: none; - /* font-weight: normal; */ font-weight: bold; } @@ -235,7 +232,6 @@ } /* Interwiki links */ -/* .wikipage { font-weight: bold; } */ .wikipage { font-weight: normal; } @@ -455,10 +451,6 @@ margin-bottom: 1ex; } -.wiki-edithelp .wiki { - /* color: #5454ff;*/ -} - .wiki-edithelp p { font-family: Arial, Helvetica, sans-serif; padding-left: 0.5em; @@ -773,7 +765,6 @@ } div.wikiblog { - /* border: thin black solid; */ margin: 1ex 2em; padding: 0 0; } @@ -783,10 +774,6 @@ padding: 0.5ex 0.5em; } -div.wikiblog-header { - /* background-color: #ccf; */ -} - div.wikiblog > div.wikiblog-footer { /* background-color: #eee; */ padding: 0.2ex 0.5em; @@ -798,10 +785,6 @@ margin: 0 0 1ex 0; } -div.wikiblog.wikiblog-form { - /* background-color: #eee; */ -} - table.wikiblog-form { width: auto; border-collapse: collapse; @@ -809,7 +792,6 @@ } .wikiblog-form caption { - /* background-color: #ccf; */ caption-side: top; font-weight: bold; text-align: left; @@ -1119,7 +1101,6 @@ * The div inside the wikiadmin upload form does not * have a class yet, so it must be referenced indirectly */ -/* div.wikiaction, div.wikiadmin { */ div.wikiaction, form.wikiadmin div { border-bottom: 1px solid #d8d8e7; border-right: 1px solid #d8d8e7; @@ -1129,8 +1110,6 @@ margin-top: 0.5ex; margin-bottom: 0.5ex; padding: 0.5ex 0.5em; - /* Emulate the display behaviour of a table, to shrink it's width. - * ie5.1Mac ignores this */ display: table; } Modified: trunk/themes/fusionforge/fusionforge.css =================================================================== --- trunk/themes/fusionforge/fusionforge.css 2017-10-10 12:10:24 UTC (rev 10044) +++ trunk/themes/fusionforge/fusionforge.css 2017-10-10 14:37:20 UTC (rev 10045) @@ -276,7 +276,6 @@ * Link styles */ .wiki, .named-wiki { - /* text-decoration: none; */ font-weight: bold; } Modified: trunk/themes/shamino_com/shamino_com.css =================================================================== --- trunk/themes/shamino_com/shamino_com.css 2017-10-10 12:10:24 UTC (rev 10044) +++ trunk/themes/shamino_com/shamino_com.css 2017-10-10 14:37:20 UTC (rev 10045) @@ -31,7 +31,6 @@ } .wikitext, .wiki, p, form, ul, dd, dl, li, td { - /*font-size: 10pt;*/ line-height: 150%; color: #111111; margin: 0; @@ -290,8 +289,6 @@ font-style: normal; } -/* .header { font-size: x-small; border-top: 1px #999999 solid; padding:10px; padding-top:5px; padding-bottom:5px; } */ - #header { font-size: 8pt; margin-left: 4px; Modified: trunk/themes/smaller/phpwiki.css =================================================================== --- trunk/themes/smaller/phpwiki.css 2017-10-10 12:10:24 UTC (rev 10044) +++ trunk/themes/smaller/phpwiki.css 2017-10-10 14:37:20 UTC (rev 10045) @@ -4,12 +4,9 @@ * Wiki */ body { - /* ivory #ffe #fffff0*/ background: #dddddd; - /* background: #000099; */ font-family: Arial, Helvetica, sans-serif; font-size: 80%; /* The default is too large. But enlarge monospace below */ - /*margin: 1.5ex 1em; */ } /** @@ -20,8 +17,6 @@ border: 0; -moz-appearance: none; -webkit-appearance: none; - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; box-sizing: content-box; border-radius: 0; } Modified: trunk/themes/wikilens/wikilens.css =================================================================== --- trunk/themes/wikilens/wikilens.css 2017-10-10 12:10:24 UTC (rev 10044) +++ trunk/themes/wikilens/wikilens.css 2017-10-10 14:37:20 UTC (rev 10045) @@ -4,7 +4,6 @@ * WikiLens overrides */ body { - /* ivory #ffe #fffff0*/ background: #FEFEFE; font-size: 90%; /* The default is too large. But enlarge monospace below */ margin: 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-10-10 12:10:27
|
Revision: 10044 http://sourceforge.net/p/phpwiki/code/10044 Author: vargenau Date: 2017-10-10 12:10:24 +0000 (Tue, 10 Oct 2017) Log Message: ----------- Remove unused CSS: genmed Modified Paths: -------------- trunk/themes/MacOSX/MacOSX.css trunk/themes/Wordpress/Wordpress.css trunk/themes/blog/Kubrick.css trunk/themes/default/phpwiki.css trunk/themes/fusionforge/fusionforge.css Modified: trunk/themes/MacOSX/MacOSX.css =================================================================== --- trunk/themes/MacOSX/MacOSX.css 2017-10-10 11:41:11 UTC (rev 10043) +++ trunk/themes/MacOSX/MacOSX.css 2017-10-10 12:10:24 UTC (rev 10044) @@ -865,10 +865,6 @@ font-size: 10px } -.genmed { - font-size: 11px -} - td.cat { font-weight: bold; letter-spacing: 1px; Modified: trunk/themes/Wordpress/Wordpress.css =================================================================== --- trunk/themes/Wordpress/Wordpress.css 2017-10-10 11:41:11 UTC (rev 10043) +++ trunk/themes/Wordpress/Wordpress.css 2017-10-10 12:10:24 UTC (rev 10044) @@ -854,10 +854,6 @@ font-size: 10px } -.genmed { - font-size: 11px -} - td.cat { font-weight: bold; letter-spacing: 1px; Modified: trunk/themes/blog/Kubrick.css =================================================================== --- trunk/themes/blog/Kubrick.css 2017-10-10 11:41:11 UTC (rev 10043) +++ trunk/themes/blog/Kubrick.css 2017-10-10 12:10:24 UTC (rev 10044) @@ -907,10 +907,6 @@ font-size: 9px } -.genmed { - font-size: 11px -} - img.toolbar:hover { cursor: pointer; } Modified: trunk/themes/default/phpwiki.css =================================================================== --- trunk/themes/default/phpwiki.css 2017-10-10 11:41:11 UTC (rev 10043) +++ trunk/themes/default/phpwiki.css 2017-10-10 12:10:24 UTC (rev 10044) @@ -899,10 +899,6 @@ font-size: 10px } -.genmed { - font-size: 11px -} - td.cat { font-weight: bold; letter-spacing: 1px; Modified: trunk/themes/fusionforge/fusionforge.css =================================================================== --- trunk/themes/fusionforge/fusionforge.css 2017-10-10 11:41:11 UTC (rev 10043) +++ trunk/themes/fusionforge/fusionforge.css 2017-10-10 12:10:24 UTC (rev 10044) @@ -1075,10 +1075,6 @@ font-size: 10px } -.genmed { - font-size: 11px -} - td.cat { font-weight: bold; letter-spacing: 1px; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-10-10 11:41:13
|
Revision: 10043 http://sourceforge.net/p/phpwiki/code/10043 Author: vargenau Date: 2017-10-10 11:41:11 +0000 (Tue, 10 Oct 2017) Log Message: ----------- Remove unused CSS: #LSResult Modified Paths: -------------- trunk/themes/fusionforge/fusionforge.css Modified: trunk/themes/fusionforge/fusionforge.css =================================================================== --- trunk/themes/fusionforge/fusionforge.css 2017-10-10 11:36:36 UTC (rev 10042) +++ trunk/themes/fusionforge/fusionforge.css 2017-10-10 11:41:11 UTC (rev 10043) @@ -550,21 +550,6 @@ font-weight: normal; } -#LSResult { - position: absolute; - text-align: left; - display: none; - z-index: 100; - background-color: white; - border: 1px solid #d0d0d0; - font-size: 9px; - overflow: hidden; -} - -#LSResult .evenrow { - background-color: #f0f0f0; -} - /* PageTrail plugin =================================================== */ .pagetrail { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-10-10 11:36:39
|
Revision: 10042 http://sourceforge.net/p/phpwiki/code/10042 Author: vargenau Date: 2017-10-10 11:36:36 +0000 (Tue, 10 Oct 2017) Log Message: ----------- Remove unused CSS: #LSResult, #LSHighlight Modified Paths: -------------- trunk/themes/Crao/crao.css trunk/themes/Hawaiian/Hawaiian.css trunk/themes/MacOSX/MacOSX.css trunk/themes/Wordpress/Wordpress.css trunk/themes/blog/Kubrick.css trunk/themes/default/phpwiki.css Modified: trunk/themes/Crao/crao.css =================================================================== --- trunk/themes/Crao/crao.css 2017-10-09 19:57:06 UTC (rev 10041) +++ trunk/themes/Crao/crao.css 2017-10-10 11:36:36 UTC (rev 10042) @@ -507,25 +507,6 @@ width: 100px; } -#LSResult { - position: absolute; - text-align: left; - display: none; - z-index: 100; - background-color: white; - border: 1px solid #d0d0d0; - font-size: 9px; - overflow: hidden; -} - -#LSHighlight { - background-color: #f08000; -} - -#LSResult .evenrow { - background-color: #f0f0f0; -} - /* ****************************** *****MOZ-SIDEBAR Modified: trunk/themes/Hawaiian/Hawaiian.css =================================================================== --- trunk/themes/Hawaiian/Hawaiian.css 2017-10-09 19:57:06 UTC (rev 10041) +++ trunk/themes/Hawaiian/Hawaiian.css 2017-10-10 11:36:36 UTC (rev 10042) @@ -573,25 +573,6 @@ font-weight: normal; } -#LSResult { - position: absolute; - text-align: left; - display: none; - z-index: 100; - background-color: white; - border: 1px solid #d0d0d0; - font-size: 9px; - overflow: hidden; -} - -#LSHighlight { - background-color: #f08000; -} - -#LSResult .evenrow { - background-color: #f0f0f0; -} - /* Link icons */ img.linkicon { vertical-align: middle; Modified: trunk/themes/MacOSX/MacOSX.css =================================================================== --- trunk/themes/MacOSX/MacOSX.css 2017-10-09 19:57:06 UTC (rev 10041) +++ trunk/themes/MacOSX/MacOSX.css 2017-10-10 11:36:36 UTC (rev 10042) @@ -597,25 +597,6 @@ font-weight: normal; } -#LSResult { - position: absolute; - text-align: left; - display: none; - z-index: 100; - background-color: white; - border: 1px solid #d0d0d0; - font-size: 9px; - overflow: hidden; -} - -#LSHighlight { - background-color: #f08000; -} - -#LSResult .evenrow { - background-color: #f0f0f0; -} - .clear-floats { clear: both; } Modified: trunk/themes/Wordpress/Wordpress.css =================================================================== --- trunk/themes/Wordpress/Wordpress.css 2017-10-09 19:57:06 UTC (rev 10041) +++ trunk/themes/Wordpress/Wordpress.css 2017-10-10 11:36:36 UTC (rev 10042) @@ -371,25 +371,6 @@ font-weight: normal; } -#LSResult { - position: absolute; - text-align: left; - display: none; - z-index: 100; - background-color: white; - border: 1px solid #d0d0d0; - font-size: 9px; - overflow: hidden; -} - -#LSHighlight { - background-color: #f08000; -} - -#LSResult .evenrow { - background-color: #f0f0f0; -} - /* IncludePage plugin ================================================= */ .transclusion-title { Modified: trunk/themes/blog/Kubrick.css =================================================================== --- trunk/themes/blog/Kubrick.css 2017-10-09 19:57:06 UTC (rev 10041) +++ trunk/themes/blog/Kubrick.css 2017-10-10 11:36:36 UTC (rev 10042) @@ -54,25 +54,6 @@ padding-left: 13px !important; } -#LSResult { - position: absolute; - text-align: left; - display: none; - z-index: 100; - background-color: white; - border: 1px solid #d0d0d0; - font-size: 9px; - overflow: hidden; -} - -#LSHighlight { - background-color: #f08000; -} - -#LSResult .evenrow { - background-color: #f0f0f0; -} - #sitemeter { float: right; } Modified: trunk/themes/default/phpwiki.css =================================================================== --- trunk/themes/default/phpwiki.css 2017-10-09 19:57:06 UTC (rev 10041) +++ trunk/themes/default/phpwiki.css 2017-10-10 11:36:36 UTC (rev 10042) @@ -416,25 +416,6 @@ font-weight: normal; } -#LSResult { - position: absolute; - text-align: left; - display: none; - z-index: 100; - background-color: white; - border: 1px solid #d0d0d0; - font-size: 9px; - overflow: hidden; -} - -#LSHighlight { - background-color: #f08000; -} - -#LSResult .evenrow { - background-color: #f0f0f0; -} - /* IncludePage plugin ================================================= */ .transclusion-title { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-10-09 19:57:09
|
Revision: 10041 http://sourceforge.net/p/phpwiki/code/10041 Author: vargenau Date: 2017-10-09 19:57:06 +0000 (Mon, 09 Oct 2017) Log Message: ----------- Avoid duplicated role="search" Modified Paths: -------------- trunk/themes/MonoBook/templates/navbar.tmpl Modified: trunk/themes/MonoBook/templates/navbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/navbar.tmpl 2017-10-09 19:40:36 UTC (rev 10040) +++ trunk/themes/MonoBook/templates/navbar.tmpl 2017-10-09 19:57:06 UTC (rev 10041) @@ -22,7 +22,7 @@ </div> </nav> -<div role="search" class="portlet" id="p-search"> +<div class="portlet" id="p-search"> <h2><?php echo _("Search") ?></h2> <div class="pBody"> <?php echo Template("search", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-10-09 19:40:39
|
Revision: 10040 http://sourceforge.net/p/phpwiki/code/10040 Author: vargenau Date: 2017-10-09 19:40:36 +0000 (Mon, 09 Oct 2017) Log Message: ----------- getUploadFilePath() must end with a slash Modified Paths: -------------- trunk/lib/config.php Modified: trunk/lib/config.php =================================================================== --- trunk/lib/config.php 2017-10-03 17:01:36 UTC (rev 10039) +++ trunk/lib/config.php 2017-10-09 19:40:36 UTC (rev 10040) @@ -319,7 +319,7 @@ } return defined('PHPWIKI_DIR') ? PHPWIKI_DIR . "/uploads/" - : realpath(dirname(__FILE__) . "/../uploads/"); + : realpath(dirname(__FILE__) . "/../uploads/")."/"; } function getUploadDataPath() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-10-03 17:01:39
|
Revision: 10039 http://sourceforge.net/p/phpwiki/code/10039 Author: vargenau Date: 2017-10-03 17:01:36 +0000 (Tue, 03 Oct 2017) Log Message: ----------- Update highlight.js to version 9.12.0 Added Paths: ----------- trunk/themes/default/highlight.js/styles/routeros.css trunk/themes/default/highlight.js/styles/vs2015.css Added: trunk/themes/default/highlight.js/styles/routeros.css =================================================================== --- trunk/themes/default/highlight.js/styles/routeros.css (rev 0) +++ trunk/themes/default/highlight.js/styles/routeros.css 2017-10-03 17:01:36 UTC (rev 10039) @@ -0,0 +1,108 @@ +/* + + highlight.js style for Microtik RouterOS script + +*/ + +.hljs { + display: block; + overflow-x: auto; + padding: 0.5em; + background: #F0F0F0; +} + +/* Base color: saturation 0; */ + +.hljs, +.hljs-subst { + color: #444; +} + +.hljs-comment { + color: #888888; +} + +.hljs-keyword, +.hljs-selector-tag, +.hljs-meta-keyword, +.hljs-doctag, +.hljs-name { + font-weight: bold; +} + +.hljs-attribute { + color: #0E9A00; +} + +.hljs-function { + color: #99069A; +} + +.hljs-builtin-name { + color: #99069A; +} + +/* User color: hue: 0 */ + +.hljs-type, +.hljs-string, +.hljs-number, +.hljs-selector-id, +.hljs-selector-class, +.hljs-quote, +.hljs-template-tag, +.hljs-deletion { + color: #880000; +} + +.hljs-title, +.hljs-section { + color: #880000; + font-weight: bold; +} + +.hljs-regexp, +.hljs-symbol, +.hljs-variable, +.hljs-template-variable, +.hljs-link, +.hljs-selector-attr, +.hljs-selector-pseudo { + color: #BC6060; +} + + +/* Language color: hue: 90; */ + +.hljs-literal { + color: #78A960; +} + +.hljs-built_in, +.hljs-bullet, +.hljs-code, +.hljs-addition { + color: #0C9A9A; +} + + +/* Meta color: hue: 200 */ + +.hljs-meta { + color: #1f7199; +} + +.hljs-meta-string { + color: #4d99bf; +} + + +/* Misc effects */ + +.hljs-emphasis { + font-style: italic; +} + +.hljs-strong { + font-weight: bold; +} Added: trunk/themes/default/highlight.js/styles/vs2015.css =================================================================== --- trunk/themes/default/highlight.js/styles/vs2015.css (rev 0) +++ trunk/themes/default/highlight.js/styles/vs2015.css 2017-10-03 17:01:36 UTC (rev 10039) @@ -0,0 +1,115 @@ +/* + * Visual Studio 2015 dark style + * Author: Nicolas LLOBERA <nll...@gm...> + */ + +.hljs { + display: block; + overflow-x: auto; + padding: 0.5em; + background: #1E1E1E; + color: #DCDCDC; +} + +.hljs-keyword, +.hljs-literal, +.hljs-symbol, +.hljs-name { + color: #569CD6; +} +.hljs-link { + color: #569CD6; + text-decoration: underline; +} + +.hljs-built_in, +.hljs-type { + color: #4EC9B0; +} + +.hljs-number, +.hljs-class { + color: #B8D7A3; +} + +.hljs-string, +.hljs-meta-string { + color: #D69D85; +} + +.hljs-regexp, +.hljs-template-tag { + color: #9A5334; +} + +.hljs-subst, +.hljs-function, +.hljs-title, +.hljs-params, +.hljs-formula { + color: #DCDCDC; +} + +.hljs-comment, +.hljs-quote { + color: #57A64A; + font-style: italic; +} + +.hljs-doctag { + color: #608B4E; +} + +.hljs-meta, +.hljs-meta-keyword, +.hljs-tag { + color: #9B9B9B; +} + +.hljs-variable, +.hljs-template-variable { + color: #BD63C5; +} + +.hljs-attr, +.hljs-attribute, +.hljs-builtin-name { + color: #9CDCFE; +} + +.hljs-section { + color: gold; +} + +.hljs-emphasis { + font-style: italic; +} + +.hljs-strong { + font-weight: bold; +} + +/*.hljs-code { + font-family:'Monospace'; +}*/ + +.hljs-bullet, +.hljs-selector-tag, +.hljs-selector-id, +.hljs-selector-class, +.hljs-selector-attr, +.hljs-selector-pseudo { + color: #D7BA7D; +} + +.hljs-addition { + background-color: #144212; + display: inline-block; + width: 100%; +} + +.hljs-deletion { + background-color: #600; + display: inline-block; + width: 100%; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-10-03 17:01:08
|
Revision: 10038 http://sourceforge.net/p/phpwiki/code/10038 Author: vargenau Date: 2017-10-03 17:01:05 +0000 (Tue, 03 Oct 2017) Log Message: ----------- Update highlight.js to version 9.12.0 Modified Paths: -------------- trunk/pgsrc/ReleaseNotes trunk/themes/default/highlight.js/CHANGES.md trunk/themes/default/highlight.js/highlight.pack.js Removed Paths: ------------- trunk/themes/default/highlight.js/styles/atelier-dune.dark.css trunk/themes/default/highlight.js/styles/atelier-dune.light.css trunk/themes/default/highlight.js/styles/atelier-forest.dark.css trunk/themes/default/highlight.js/styles/atelier-forest.light.css trunk/themes/default/highlight.js/styles/atelier-heath.dark.css trunk/themes/default/highlight.js/styles/atelier-heath.light.css trunk/themes/default/highlight.js/styles/atelier-lakeside.dark.css trunk/themes/default/highlight.js/styles/atelier-lakeside.light.css trunk/themes/default/highlight.js/styles/atelier-seaside.dark.css trunk/themes/default/highlight.js/styles/atelier-seaside.light.css trunk/themes/default/highlight.js/styles/brown_paper.css trunk/themes/default/highlight.js/styles/brown_papersq.png trunk/themes/default/highlight.js/styles/ir_black.css trunk/themes/default/highlight.js/styles/monokai_sublime.css trunk/themes/default/highlight.js/styles/paraiso.dark.css trunk/themes/default/highlight.js/styles/paraiso.light.css trunk/themes/default/highlight.js/styles/school_book.css trunk/themes/default/highlight.js/styles/school_book.png trunk/themes/default/highlight.js/styles/solarized_dark.css trunk/themes/default/highlight.js/styles/solarized_light.css Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2017-10-03 16:33:54 UTC (rev 10037) +++ trunk/pgsrc/ReleaseNotes 2017-10-03 17:01:05 UTC (rev 10038) @@ -1,4 +1,4 @@ -Date: Tue, 3 Oct 2017 18:33:25 +0000 +Date: Tue, 3 Oct 2017 19:00:41 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -21,7 +21,7 @@ * Replace ##ereg## functions * Update Adodb to version 5.20.9 * Update ASCIIMathPHP to version 2.1 (from Zefling/ASCIIMathPHP on github.com) -* Update highlight.js to version 9.7.0 +* Update highlight.js to version 9.12.0 * Allow Wikicreole syntax for plugins in theme templates * Valid HTML5 and CSS3 logos (in debug mode) * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth. Modified: trunk/themes/default/highlight.js/CHANGES.md =================================================================== --- trunk/themes/default/highlight.js/CHANGES.md 2017-10-03 16:33:54 UTC (rev 10037) +++ trunk/themes/default/highlight.js/CHANGES.md 2017-10-03 17:01:05 UTC (rev 10038) @@ -1,3 +1,149 @@ +## Version 9.12.0 + +New language: + +- *MikroTik* RouterOS Scripting language by [Ivan Dementev][]. + +New style: + +- *VisualStudio 2015 Dark* by [Nicolas LLOBERA][] + +Improvements: + +- *Crystal* updated with new keywords and syntaxes by [Tsuyusato Kitsune][]. +- *Julia* updated to the modern definitions by [Alex Arslan][]. +- *julia-repl* added by [Morten Piibeleht][]. +- [Stanislav Belov][] wrote a new definition for *1C*, replacing the one that + has not been updated for more than 8 years. The new version supports syntax + for versions 7.7 and 8. +- [Nicolas LLOBERA][] improved C# definition fixing edge cases with function + titles detection and added highlighting of `[Attributes]`. +- [nnnik][] provided a few correctness fixes for *Autohotkey*. +- [Martin Clausen][] made annotation collections in *Clojure* to look + consistently with other kinds. +- [Alejandro Alonso][] updated *Swift* keywords. + +[Tsuyusato Kitsune]: https://github.com/MakeNowJust +[Alex Arslan]: https://github.com/ararslan +[Morten Piibeleht]: https://github.com/mortenpi +[Stanislav Belov]: https://github.com/4ppl +[Ivan Dementev]: https://github.com/DiVAN1x +[Nicolas LLOBERA]: https://github.com/Nicolas01 +[nnnik]: https://github.com/nnnik +[Martin Clausen]: https://github.com/maacl +[Alejandro Alonso]: https://github.com/Azoy + + +## Version 9.11.0 + +New languages: + +- *Shell* by [Tsuyusato Kitsune][] +- *jboss-cli* by [Raphaël Parrëe][] + +Improvements: + +- [Joël Porquet] has [greatly improved the definition of *makefile*][5b3e0e6]. +- *C++* class titles are now highlighted as in other languages with classes. +- [Jordi Petit][] added rarely used `or`, `and` and `not` keywords to *C++*. +- [Pieter Vantorre][] fixed highlighting of negative floating point values. + + +[Tsuyusato Kitsune]: https://github.com/MakeNowJust +[Jordi Petit]: https://github.com/jordi-petit +[Raphaël Parrëe]: https://github.com/rparree +[Pieter Vantorre]: https://github.com/NuclearCookie +[5b3e0e6]: https://github.com/isagalaev/highlight.js/commit/5b3e0e68bfaae282faff6697d6a490567fa9d44b + + +## Version 9.10.0 + +Apologies for missing the previous release cycle. Some thing just can't be +automated… Anyway, we're back! + +New languages: + +- *Hy* by [Sergey Sobko][] +- *Leaf* by [Hale Chan][] +- *N1QL* by [Andres Täht][] and [Rene Saarsoo][] + +Improvements: + +- *Rust* got updated with new keywords by [Kasper Andersen][] and then + significantly modernized even more by [Eduard-Mihai Burtescu][] (yes, @eddyb, + Rust core team member!) +- *Python* updated with f-literals by [Philipp A][]. +- *YAML* updated with unquoted strings support. +- *Gauss* updated with new keywords by [Matt Evans][]. +- *Lua* updated with new keywords by [Joe Blow][]. +- *Kotlin* updated with new keywords by [Philipp Hauer][]. +- *TypeScript* got highlighting of function params and updated keywords by + [Ike Ku][]. +- *Scheme* now correctly handles \`-quoted lists thanks to [Guannan Wei]. +- [Sam Wu][] fixed handling of `<<` in *C++* defines. + +[Philipp A]: https://github.com/flying-sheep +[Philipp Hauer]: https://github.com/phauer +[Sergey Sobko]: https://github.com/profitware +[Hale Chan]: https://github.com/halechan +[Matt Evans]: https://github.com/matthewevans +[Joe Blow]: https://github.com/mossarelli +[Kasper Andersen]: https://github.com/kasma1990 +[Eduard-Mihai Burtescu]: https://github.com/eddyb +[Andres Täht]: https://github.com/andrestaht +[Rene Saarsoo]: https://github.com/nene +[Philipp Hauer]: https://github.com/phauer +[Ike Ku]: https://github.com/dempfi +[Guannan Wei]: https://github.com/Kraks +[Sam Wu]: https://github.com/samsam2310 + + +## Version 9.9.0 + +New languages + +- *LLVM* by [Michael Rodler][] + +Improvements: + +- *TypeScript* updated with annotations and param lists inside constructors, by + [Raphael Parree][]. +- *CoffeeScript* updated with new keywords and fixed to recognize JavaScript + in \`\`\`, thanks to thanks to [Geoffrey Booth][]. +- Compiler directives in *Delphi* are now correctly highlighted as "meta". + +[Raphael Parree]: https://github.com/rparree +[Michael Rodler]: https://github.com/f0rki +[Geoffrey Booth]: https://github.com/GeoffreyBooth + + +## Version 9.8.0 "New York" + +This version is the second one that deserved a name. Because I'm in New York, +and the release isn't missing the deadline only because it's still Tuesday on +West Coast. + +New languages: + +- *Clean* by [Camil Staps][] +- *Flix* by [Magnus Madsen][] + +Improvements: + +- [Kenton Hamaluik][] did a comprehensive update for *Haxe*. +- New commands for *PowerShell* from [Nicolas Le Gall][]. +- [Jan T. Sott][] updated *NSIS*. +- *Java* and *Swift* support unicode characters in identifiers thanks to + [Alexander Lichter][]. + +[Camil Staps]: https://github.com/camilstaps +[Magnus Madsen]: https://github.com/magnus-madsen +[Kenton Hamaluik]: https://github.com/FuzzyWuzzie +[Nicolas Le Gall]: https://github.com/darkitty +[Jan T. Sott]: https://github.com/idleberg +[Alexander Lichter]: https://github.com/manniL + + ## Version 9.7.0 A comprehensive bugfix release. This is one of the best things about Modified: trunk/themes/default/highlight.js/highlight.pack.js =================================================================== --- trunk/themes/default/highlight.js/highlight.pack.js 2017-10-03 16:33:54 UTC (rev 10037) +++ trunk/themes/default/highlight.js/highlight.pack.js 2017-10-03 17:01:05 UTC (rev 10038) @@ -1,2 +1,2 @@ -/*! highlight.js v9.7.0 | BSD3 License | git.io/hljslicense */ -!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/[&<>]/gm,function(e){return I[e]})}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return R(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||R(i))return i}function o(e,n){var t,r={};for(t in e)r[t]=e[t];if(n)for(t in n)r[t]=n[t];return r}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value)+'"'}l+="<"+t(e)+w.map.call(e.attributes,r).join("")+">"}function u(e){l+="</"+t(e)+">"}function c(e){("start"===e.event?o:u)(e.node)}for(var s=0,l="",f=[];e.length||r.length;){var g=i();if(l+=n(a.substr(s,g[0].offset-s)),s=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===s);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return l+n(a.substr(s))}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var u={},c=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");u[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?c("keyword",a.k):E(a.k).forEach(function(e){c(e,a.k[e])}),a.k=u}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]);var s=[];a.c.forEach(function(e){e.v?e.v.forEach(function(n){s.push(o(e,n))}):s.push("self"===e?a:e)}),a.c=s,a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var l=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=l.length?t(l.join("|"),!0):{exec:function(){return null}}}}r(e)}function l(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function g(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function h(e,n,t,r){var a=r?"":y.classPrefix,i='<span class="'+a,o=t?"":C;return i+=e+'">',i+n+o}function p(){var e,t,r,a;if(!E.k)return n(B);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(B);r;)a+=n(B.substr(t,r.index-t)),e=g(E,r),e?(M+=e[1],a+=h(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(B);return a+n(B.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!x[E.sL])return n(B);var t=e?l(E.sL,B,!0,L[E.sL]):f(B,E.sL.length?E.sL:void 0);return E.r>0&&(M+=t.r),e&&(L[E.sL]=t.top),h(t.language,t.value,!1,!0)}function b(){k+=null!=E.sL?d():p(),B=""}function v(e){k+=e.cN?h(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(B+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?B+=n:(t.eB&&(B+=n),b(),t.rB||t.eB||(B=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?B+=n:(a.rE||a.eE||(B+=n),b(),a.eE&&(B=n));do E.cN&&(k+=C),E.skip||(M+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return B+=n,n.length||1}var N=R(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var w,E=i||N,L={},k="";for(w=E;w!==N;w=w.parent)w.cN&&(k=h(w.cN,"",!0)+k);var B="",M=0;try{for(var I,j,O=0;;){if(E.t.lastIndex=O,I=E.t.exec(t),!I)break;j=m(t.substr(O,I.index-O),I[0]),O=I.index+j}for(m(t.substr(O)),w=E;w.parent;w=w.parent)w.cN&&(k+=C);return{r:M,value:k,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function f(e,t){t=t||y.languages||E(x);var r={r:0,value:n(e)},a=r;return t.filter(R).forEach(function(n){var t=l(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function g(e){return y.tabReplace||y.useBR?e.replace(M,function(e,n){return y.useBR&&"\n"===e?"<br>":y.tabReplace?n.replace(/\t/g,y.tabReplace):void 0}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function p(e){var n,t,r,o,s,p=i(e);a(p)||(y.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,s=n.textContent,r=p?l(p,s,!0):f(s),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),s)),r.value=g(r.value),e.innerHTML=r.value,e.className=h(e.className,p,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function d(e){y=o(y,e)}function b(){if(!b.called){b.called=!0;var e=document.querySelectorAll("pre code");w.forEach.call(e,p)}}function v(){addEventListener("DOMContentLoaded",b,!1),addEventListener("load",b,!1)}function m(n,t){var r=x[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function N(){return E(x)}function R(e){return e=(e||"").toLowerCase(),x[e]||x[L[e]]}var w=[],E=Object.keys,x={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="</span>",y={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0},I={"&":"&","<":"<",">":">"};return e.highlight=l,e.highlightAuto=f,e.fixMarkup=g,e.highlightBlock=p,e.configure=d,e.initHighlighting=b,e.initHighlightingOnLoad=v,e.registerLanguage=m,e.listLanguages=N,e.getLanguage=R,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|like)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BNM={cN:"number",b:e.BNR,r:0},e.CSSNM={cN:"number",b:e.NR+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",r:0},e.RM={cN:"regexp",b:/\//,e:/\/[gimuy]*/,i:/\n/,c:[e.BE,{b:/\[/,e:/\]/,r:0,c:[e.BE]}]},e.TM={cN:"title",b:e.IR,r:0},e.UTM={cN:"title",b:e.UIR,r:0},e.METHOD_GUARD={b:"\\.\\s*"+e.UIR,r:0},e});hljs.registerLanguage("php",function(e){var c={b:"\\$+[a-zA-Z_-ÿ][a-zA-Z0-9_-ÿ]*"},i={cN:"meta",b:/<\?(php)?|\?>/},t={cN:"string",c:[e.BE,i],v:[{b:'b"',e:'"'},{b:"b'",e:"'"},e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null})]},a={v:[e.BNM,e.CNM]};return{aliases:["php3","php4","php5","php6"],cI:!0,k:"and include_once list abstract global private echo interface as static endswitch array null if endwhile or const for endforeach self var while isset public protected exit foreach throw elseif include __FILE__ empty require_once do xor return parent clone use __CLASS__ __LINE__ else break print eval new catch __METHOD__ case exception default die require __FUNCTION__ enddeclare final try switch continue endfor endif declare unset true false trait goto instanceof insteadof __DIR__ __NAMESPACE__ yield finally",c:[e.HCM,e.C("//","$",{c:[i]}),e.C("/\\*","\\*/",{c:[{cN:"doctag",b:"@[A-Za-z]+"}]}),e.C("__halt_compiler.+?;",!1,{eW:!0,k:"__halt_compiler",l:e.UIR}),{cN:"string",b:/<<<['"]?\w+['"]?$/,e:/^\w+;?$/,c:[e.BE,{cN:"subst",v:[{b:/\$\w+/},{b:/\{\$/,e:/\}/}]}]},i,{cN:"keyword",b:/\$this\b/},c,{b:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{cN:"function",bK:"function",e:/[;{]/,eE:!0,i:"\\$|\\[|%",c:[e.UTM,{cN:"params",b:"\\(",e:"\\)",c:["self",c,e.CBCM,t,a]}]},{cN:"class",bK:"class interface",e:"{",eE:!0,i:/[:\(\$"]/,c:[{bK:"extends implements"},e.UTM]},{bK:"namespace",e:";",i:/[\.']/,c:[e.UTM]},{bK:"use",e:";",c:[e.UTM]},{b:"=>"},t,a]}});hljs.registerLanguage("diff",function(e){return{aliases:["patch"],c:[{cN:"meta",r:10,v:[{b:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{b:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{b:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{cN:"comment",v:[{b:/Index: /,e:/$/},{b:/={3,}/,e:/$/},{b:/^\-{3}/,e:/$/},{b:/^\*{3} /,e:/$/},{b:/^\+{3}/,e:/$/},{b:/\*{5}/,e:/\*{5}$/}]},{cN:"addition",b:"^\\+",e:"$"},{cN:"deletion",b:"^\\-",e:"$"},{cN:"addition",b:"^\\!",e:"$"}]}});hljs.registerLanguage("xml",function(s){var e="[A-Za-z0-9\\._:-]+",t={eW:!0,i:/</,r:0,c:[{cN:"attr",b:e,r:0},{b:/=\s*/,r:0,c:[{cN:"string",endsParent:!0,v:[{b:/"/,e:/"/},{b:/'/,e:/'/},{b:/[^\s"'=<>`]+/}]}]}]};return{aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist"],cI:!0,c:[{cN:"meta",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},s.C("<!--","-->",{r:10}),{b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{b:/<\?(php)?/,e:/\?>/,sL:"php",c:[{b:"/\\*",e:"\\*/",skip:!0}]},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{name:"style"},c:[t],starts:{e:"</style>",rE:!0,sL:["css","xml"]}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{name:"script"},c:[t],starts:{e:"</script>",rE:!0,sL:["actionscript","javascript","handlebars","xml"]}},{cN:"meta",v:[{b:/<\?xml/,e:/\?>/,r:10},{b:/<\?\w+/,e:/\?>/}]},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"name",b:/[^\/><\s]+/,r:0},t]}]}});hljs.registerLanguage("markdown",function(e){return{aliases:["md","mkdown","mkd"],c:[{cN:"section",v:[{b:"^#{1,6}",e:"$"},{b:"^.+?\\n[=-]{2,}$"}]},{b:"<",e:">",sL:"xml",r:0},{cN:"bullet",b:"^([*+-]|(\\d+\\.))\\s+"},{cN:"strong",b:"[*_]{2}.+?[*_]{2}"},{cN:"emphasis",v:[{b:"\\*.+?\\*"},{b:"_.+?_",r:0}]},{cN:"quote",b:"^>\\s+",e:"$"},{cN:"code",v:[{b:"^```w*s*$",e:"^```s*$"},{b:"`.+?`"},{b:"^( {4}| )",e:"$",r:0}]},{b:"^[-\\*]{3,}",e:"$"},{b:"\\[.+?\\][\\(\\[].*?[\\)\\]]",rB:!0,c:[{cN:"string",b:"\\[",e:"\\]",eB:!0,rE:!0,r:0},{cN:"link",b:"\\]\\(",e:"\\)",eB:!0,eE:!0},{cN:"symbol",b:"\\]\\[",e:"\\]",eB:!0,eE:!0}],r:10},{b:/^\[[^\n]+\]:/,rB:!0,c:[{cN:"symbol",b:/\[/,e:/\]/,eB:!0,eE:!0},{cN:"link",b:/:\s*/,e:/$/,eB:!0}]}]}});hljs.registerLanguage("java",function(e){var t=e.UIR+"(<"+e.UIR+"(\\s*,\\s*"+e.UIR+")*>)?",a="false synchronized int abstract float private char boolean static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports",r="\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?",s={cN:"number",b:r,r:0};return{aliases:["jsp"],k:a,i:/<\/|#/,c:[e.C("/\\*\\*","\\*/",{r:0,c:[{b:/\w+@/,r:0},{cN:"doctag",b:"@[A-Za-z]+"}]}),e.CLCM,e.CBCM,e.ASM,e.QSM,{cN:"class",bK:"class interface",e:/[{;=]/,eE:!0,k:"class interface",i:/[:"\[\]]/,c:[{bK:"extends implements"},e.UTM]},{bK:"new throw return else",r:0},{cN:"function",b:"("+t+"\\s+)+"+e.UIR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:a,c:[{b:e.UIR+"\\s*\\(",rB:!0,r:0,c:[e.UTM]},{cN:"params",b:/\(/,e:/\)/,k:a,r:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]},s,{cN:"meta",b:"@[A-Za-z]+"}]}});hljs.registerLanguage("coffeescript",function(e){var c={keyword:"in if for while finally new do return else break catch instanceof throw try this switch continue typeof delete debugger super then unless until loop of by when and or is isnt not",literal:"true false null undefined yes no on off",built_in:"npm require console print module global window document"},n="[A-Za-z$_][0-9A-Za-z$_]*",r={cN:"subst",b:/#\{/,e:/}/,k:c},s=[e.BNM,e.inherit(e.CNM,{starts:{e:"(\\s*/)?",r:0}}),{cN:"string",v:[{b:/'''/,e:/'''/,c:[e.BE]},{b:/'/,e:/'/,c:[e.BE]},{b:/"""/,e:/"""/,c:[e.BE,r]},{b:/"/,e:/"/,c:[e.BE,r]}]},{cN:"regexp",v:[{b:"///",e:"///",c:[r,e.HCM]},{b:"//[gim]*",r:0},{b:/\/(?![ *])(\\\/|.)*?\/[gim]*(?=\W|$)/}]},{b:"@"+n},{b:"`",e:"`",eB:!0,eE:!0,sL:"javascript"}];r.c=s;var i=e.inherit(e.TM,{b:n}),t="(\\(.*\\))?\\s*\\B[-=]>",o={cN:"params",b:"\\([^\\(]",rB:!0,c:[{b:/\(/,e:/\)/,k:c,c:["self"].concat(s)}]};return{aliases:["coffee","cson","iced"],k:c,i:/\/\*/,c:s.concat([e.C("###","###"),e.HCM,{cN:"function",b:"^\\s*"+n+"\\s*=\\s*"+t,e:"[-=]>",rB:!0,c:[i,o]},{b:/[:\(,=]\s*/,r:0,c:[{cN:"function",b:t,e:"[-=]>",rB:!0,c:[o]}]},{cN:"class",bK:"class",e:"$",i:/[:="\[\]]/,c:[{bK:"extends",eW:!0,i:/[:="\[\]]/,c:[i]},i]},{b:n+":",e:":",rB:!0,rE:!0,r:0}])}});hljs.registerLanguage("http",function(e){var t="HTTP/[0-9\\.]+";return{aliases:["https"],i:"\\S",c:[{b:"^"+t,e:"$",c:[{cN:"number",b:"\\b\\d{3}\\b"}]},{b:"^[A-Z]+ (.*?) "+t+"$",rB:!0,e:"$",c:[{cN:"string",b:" ",e:" ",eB:!0,eE:!0},{b:t},{cN:"keyword",b:"[A-Z]+"}]},{cN:"attribute",b:"^\\w",e:": ",eE:!0,i:"\\n|\\s|=",starts:{e:"$",r:0}},{b:"\\n\\n",starts:{sL:[],eW:!0}}]}});hljs.registerLanguage("css",function(e){var c="[a-zA-Z-][a-zA-Z0-9_-]*",t={b:/[A-Z\_\.\-]+\s*:/,rB:!0,e:";",eW:!0,c:[{cN:"attribute",b:/\S/,e:":",eE:!0,starts:{eW:!0,eE:!0,c:[{b:/[\w-]+\(/,rB:!0,c:[{cN:"built_in",b:/[\w-]+/},{b:/\(/,e:/\)/,c:[e.ASM,e.QSM]}]},e.CSSNM,e.QSM,e.ASM,e.CBCM,{cN:"number",b:"#[0-9A-Fa-f]+"},{cN:"meta",b:"!important"}]}}]};return{cI:!0,i:/[=\/|'\$]/,c:[e.CBCM,{cN:"selector-id",b:/#[A-Za-z0-9_-]+/},{cN:"selector-class",b:/\.[A-Za-z0-9_-]+/},{cN:"selector-attr",b:/\[/,e:/\]/,i:"$"},{cN:"selector-pseudo",b:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{b:"@(font-face|page)",l:"[a-z-]+",k:"font-face page"},{b:"@",e:"[{;]",i:/:/,c:[{cN:"keyword",b:/\w+/},{b:/\s/,eW:!0,eE:!0,r:0,c:[e.ASM,e.QSM,e.CSSNM]}]},{cN:"selector-tag",b:c,r:0},{b:"{",e:"}",i:/\S/,c:[e.CBCM,t]}]}});hljs.registerLanguage("sql",function(e){var t=e.C("--","$");return{cI:!0,i:/[<>{}*#]/,c:[{bK:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment",e:/;/,eW:!0,l:/[\w\.]+/,k:{keyword:"abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias allocate allow alter always analyze ancillary and any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second section securefile security seed segment select self sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek",literal:"true false null",built_in:"array bigint binary bit blob boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text varchar varying void"},c:[{cN:"string",b:"'",e:"'",c:[e.BE,{b:"''"}]},{cN:"string",b:'"',e:'"',c:[e.BE,{b:'""'}]},{cN:"string",b:"`",e:"`",c:[e.BE]},e.CNM,e.CBCM,t]},e.CBCM,t]}});hljs.registerLanguage("cpp",function(t){var e={cN:"keyword",b:"\\b[a-z\\d_]*_t\\b"},r={cN:"string",v:[{b:'(u8?|U)?L?"',e:'"',i:"\\n",c:[t.BE]},{b:'(u8?|U)?R"',e:'"',c:[t.BE]},{b:"'\\\\?.",e:"'",i:"."}]},s={cN:"number",v:[{b:"\\b(0b[01']+)"},{b:"\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{b:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)"}],r:0},i={cN:"meta",b:/#\s*[a-z]+\b/,e:/$/,k:{"meta-keyword":"if else elif endif define undef warning error line pragma ifdef ifndef include"},c:[{b:/\\\n/,r:0},t.inherit(r,{cN:"meta-string"}),{cN:"meta-string",b:"<",e:">",i:"\\n"},t.CLCM,t.CBCM]},a=t.IR+"\\s*\\(",c={keyword:"int float while private char catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const struct for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using class asm case typeid short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignof constexpr decltype noexcept static_assert thread_local restrict _Bool complex _Complex _Imaginary atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return",built_in:"std string cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap array shared_ptr abort abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr",literal:"true false nullptr NULL"},n=[e,t.CLCM,t.CBCM,s,r];return{aliases:["c","cc","h","c++","h++","hpp"],k:c,i:"</",c:n.concat([i,{b:"\\b(deque|list|queue|stack|vector|map|set|bitset|multiset|multimap|unordered_map|unordered_set|unordered_multiset|unordered_multimap|array)\\s*<",e:">",k:c,c:["self",e]},{b:t.IR+"::",k:c},{v:[{b:/=/,e:/;/},{b:/\(/,e:/\)/},{bK:"new throw return else",e:/;/}],k:c,c:n.concat([{b:/\(/,e:/\)/,k:c,c:n.concat(["self"]),r:0}]),r:0},{cN:"function",b:"("+t.IR+"[\\*&\\s]+)+"+a,rB:!0,e:/[{;=]/,eE:!0,k:c,i:/[^\w\s\*&]/,c:[{b:a,rB:!0,c:[t.TM],r:0},{cN:"params",b:/\(/,e:/\)/,k:c,r:0,c:[t.CLCM,t.CBCM,r,s,e]},t.CLCM,t.CBCM,i]}]),exports:{preprocessor:i,strings:r,k:c}}});hljs.registerLanguage("makefile",function(e){var a={cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]};return{aliases:["mk","mak"],c:[e.HCM,{b:/^\w+\s*\W*=/,rB:!0,r:0,starts:{e:/\s*\W*=/,eE:!0,starts:{e:/$/,r:0,c:[a]}}},{cN:"section",b:/^[\w]+:\s*$/},{cN:"meta",b:/^\.PHONY:/,e:/$/,k:{"meta-keyword":".PHONY"},l:/[\.\w]+/},{b:/^\t+/,e:/$/,r:0,c:[e.QSM,a]}]}});hljs.registerLanguage("cs",function(e){var i={keyword:"abstract as base bool break byte case catch char checked const continue decimal default delegate do double else enum event explicit extern finally fixed float for foreach goto if implicit in int interface internal is lock long object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this try typeof uint ulong unchecked unsafe ushort using virtual void volatile while nameof add alias ascending async await by descending dynamic equals from get global group into join let on orderby partial remove select set value var where yield",literal:"null false true"},r={cN:"string",b:'@"',e:'"',c:[{b:'""'}]},t=e.inherit(r,{i:/\n/}),a={cN:"subst",b:"{",e:"}",k:i},n=e.inherit(a,{i:/\n/}),c={cN:"string",b:/\$"/,e:'"',i:/\n/,c:[{b:"{{"},{b:"}}"},e.BE,n]},s={cN:"string",b:/\$@"/,e:'"',c:[{b:"{{"},{b:"}}"},{b:'""'},a]},o=e.inherit(s,{i:/\n/,c:[{b:"{{"},{b:"}}"},{b:'""'},n]});a.c=[s,c,r,e.ASM,e.QSM,e.CNM,e.CBCM],n.c=[o,c,t,e.ASM,e.QSM,e.CNM,e.inherit(e.CBCM,{i:/\n/})];var l={v:[s,c,r,e.ASM,e.QSM]},b=e.IR+"(<"+e.IR+"(\\s*,\\s*"+e.IR+")*>)?(\\[\\])?";return{aliases:["csharp"],k:i,i:/::/,c:[e.C("///","$",{rB:!0,c:[{cN:"doctag",v:[{b:"///",r:0},{b:"<!--|-->"},{b:"</?",e:">"}]}]}),e.CLCM,e.CBCM,{cN:"meta",b:"#",e:"$",k:{"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum"}},l,e.CNM,{bK:"class interface",e:/[{;=]/,i:/[^\s:]/,c:[e.TM,e.CLCM,e.CBCM]},{bK:"namespace",e:/[{;=]/,i:/[^\s:]/,c:[e.inherit(e.TM,{b:"[a-zA-Z](\\.?\\w)*"}),e.CLCM,e.CBCM]},{bK:"new return throw await",r:0},{cN:"function",b:"("+b+"\\s+)+"+e.IR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:i,c:[{b:e.IR+"\\s*\\(",rB:!0,c:[e.TM],r:0},{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,k:i,r:0,c:[l,e.CNM,e.CBCM]},e.CLCM,e.CBCM]}]}});hljs.registerLanguage("objectivec",function(e){var t={cN:"built_in",b:"\\b(AV|CA|CF|CG|CI|CL|CM|CN|CT|MK|MP|MTK|MTL|NS|SCN|SK|UI|WK|XC)\\w+"},_={keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN",literal:"false true FALSE TRUE nil YES NO NULL",built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once"},i=/[a-zA-Z@][a-zA-Z0-9_]*/,n="@interface @class @protocol @implementation";return{aliases:["mm","objc","obj-c"],k:_,l:i,i:"</",c:[t,e.CLCM,e.CBCM,e.CNM,e.QSM,{cN:"string",v:[{b:'@"',e:'"',i:"\\n",c:[e.BE]},{b:"'",e:"[^\\\\]'",i:"[^\\\\][^']"}]},{cN:"meta",b:"#",e:"$",c:[{cN:"meta-string",v:[{b:'"',e:'"'},{b:"<",e:">"}]}]},{cN:"class",b:"("+n.split(" ").join("|")+")\\b",e:"({|$)",eE:!0,k:n,l:i,c:[e.UTM]},{b:"\\."+e.UIR,r:0}]}});hljs.registerLanguage("ini",function(e){var b={cN:"string",c:[e.BE],v:[{b:"'''",e:"'''",r:10},{b:'"""',e:'"""',r:10},{b:'"',e:'"'},{b:"'",e:"'"}]};return{aliases:["toml"],cI:!0,i:/\S/,c:[e.C(";","$"),e.HCM,{cN:"section",b:/^\s*\[+/,e:/\]+/},{b:/^[a-z0-9\[\]_-]+\s*=\s*/,e:"$",rB:!0,c:[{cN:"attr",b:/[a-z0-9\[\]_-]+/},{b:/=/,eW:!0,r:0,c:[{cN:"literal",b:/\bon|off|true|false|yes|no\b/},{cN:"variable",v:[{b:/\$[\w\d"][\w\d_]*/},{b:/\$\{(.*?)}/}]},b,{cN:"number",b:/([\+\-]+)?[\d]+_[\d_]+/},e.NM]}]}]}});hljs.registerLanguage("python",function(e){var r={cN:"meta",b:/^(>>>|\.\.\.) /},b={cN:"string",c:[e.BE],v:[{b:/(u|b)?r?'''/,e:/'''/,c:[r],r:10},{b:/(u|b)?r?"""/,e:/"""/,c:[r],r:10},{b:/(u|r|ur)'/,e:/'/,r:10},{b:/(u|r|ur)"/,e:/"/,r:10},{b:/(b|br)'/,e:/'/},{b:/(b|br)"/,e:/"/},e.ASM,e.QSM]},a={cN:"number",r:0,v:[{b:e.BNR+"[lLjJ]?"},{b:"\\b(0o[0-7]+)[lLjJ]?"},{b:e.CNR+"[lLjJ]?"}]},l={cN:"params",b:/\(/,e:/\)/,c:["self",r,a,b]};return{aliases:["py","gyp"],k:{keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10 None True False",built_in:"Ellipsis NotImplemented"},i:/(<\/|->|\?)/,c:[r,a,b,e.HCM,{v:[{cN:"function",bK:"def",r:10},{cN:"class",bK:"class"}],e:/:/,i:/[${=;\n,]/,c:[e.UTM,l,{b:/->/,eW:!0,k:"None"}]},{cN:"meta",b:/^[\t ]*@/,e:/$/},{b:/\b(print|exec)\(/}]}});hljs.registerLanguage("json",function(e){var i={literal:"true false null"},n=[e.QSM,e.CNM],r={e:",",eW:!0,eE:!0,c:n,k:i},t={b:"{",e:"}",c:[{cN:"attr",b:/"/,e:/"/,c:[e.BE],i:"\\n"},e.inherit(r,{b:/:/})],i:"\\S"},c={b:"\\[",e:"\\]",c:[e.inherit(r)],i:"\\S"};return n.splice(n.length,0,t,c),{c:n,k:i,i:"\\S"}});hljs.registerLanguage("bash",function(e){var t={cN:"variable",v:[{b:/\$[\w\d#@][\w\d_]*/},{b:/\$\{(.*?)}/}]},s={cN:"string",b:/"/,e:/"/,c:[e.BE,t,{cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]}]},a={cN:"string",b:/'/,e:/'/};return{aliases:["sh","zsh"],l:/-?[a-z\._]+/,k:{keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},c:[{cN:"meta",b:/^#![^\n]+sh\s*$/,r:10},{cN:"function",b:/\w[\w\d_]*\s*\(\s*\)\s*\{/,rB:!0,c:[e.inherit(e.TM,{b:/\w[\w\d_]*/})],r:0},e.HCM,s,a,t]}});hljs.registerLanguage("apache",function(e){var r={cN:"number",b:"[\\$%]\\d+"};return{aliases:["apacheconf"],cI:!0,c:[e.HCM,{cN:"section",b:"</?",e:">"},{cN:"attribute",b:/\w+/,r:0,k:{nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername"},starts:{e:/$/,r:0,k:{literal:"on off all"},c:[{cN:"meta",b:"\\s\\[",e:"\\]$"},{cN:"variable",b:"[\\$%]\\{",e:"\\}",c:["self",r]},r,e.QSM]}}],i:/\S/}});hljs.registerLanguage("javascript",function(e){var r="[A-Za-z$_][0-9A-Za-z$_]*",t={keyword:"in of if for while finally var new function do return void else break catch instanceof with throw case default try this switch continue typeof delete let yield const export super debugger as async await static import from as",literal:"true false null undefined NaN Infinity",built_in:"eval isFinite isNaN parseFloat parseInt decodeURI decodeURIComponent encodeURI encodeURIComponent escape unescape Object Function Boolean Error EvalError InternalError RangeError ReferenceError StopIteration SyntaxError TypeError URIError Number Math Date String RegExp Array Float32Array Float64Array Int16Array Int32Array Int8Array Uint16Array Uint32Array Uint8Array Uint8ClampedArray ArrayBuffer DataView JSON Intl arguments require module console window document Symbol Set Map WeakSet WeakMap Proxy Reflect Promise"},a={cN:"number",v:[{b:"\\b(0[bB][01]+)"},{b:"\\b(0[oO][0-7]+)"},{b:e.CNR}],r:0},n={cN:"subst",b:"\\$\\{",e:"\\}",k:t,c:[]},c={cN:"string",b:"`",e:"`",c:[e.BE,n]};n.c=[e.ASM,e.QSM,c,a,e.RM];var s=n.c.concat([e.CBCM,e.CLCM]);return{aliases:["js","jsx"],k:t,c:[{cN:"meta",r:10,b:/^\s*['"]use (strict|asm)['"]/},{cN:"meta",b:/^#!/,e:/$/},e.ASM,e.QSM,c,e.CLCM,e.CBCM,a,{b:/[{,]\s*/,r:0,c:[{b:r+"\\s*:",rB:!0,r:0,c:[{cN:"attr",b:r,r:0}]}]},{b:"("+e.RSR+"|\\b(case|return|throw)\\b)\\s*",k:"return throw case",c:[e.CLCM,e.CBCM,e.RM,{cN:"function",b:"(\\(.*?\\)|"+r+")\\s*=>",rB:!0,e:"\\s*=>",c:[{cN:"params",v:[{b:r},{b:/\(\s*\)/},{b:/\(/,e:/\)/,eB:!0,eE:!0,k:t,c:s}]}]},{b:/</,e:/(\/\w+|\w+\/)>/,sL:"xml",c:[{b:/<\w+\s*\/>/,skip:!0},{b:/<\w+/,e:/(\/\w+|\w+\/)>/,skip:!0,c:[{b:/<\w+\s*\/>/,skip:!0},"self"]}]}],r:0},{cN:"function",bK:"function",e:/\{/,eE:!0,c:[e.inherit(e.TM,{b:r}),{cN:"params",b:/\(/,e:/\)/,eB:!0,eE:!0,c:s}],i:/\[|%/},{b:/\$[(.]/},e.METHOD_GUARD,{cN:"class",bK:"class",e:/[{;=]/,eE:!0,i:/[:"\[\]]/,c:[{bK:"extends"},e.UTM]},{bK:"constructor",e:/\{/,eE:!0}],i:/#(?!!)/}});hljs.registerLanguage("nginx",function(e){var r={cN:"variable",v:[{b:/\$\d+/},{b:/\$\{/,e:/}/},{b:"[\\$\\@]"+e.UIR}]},b={eW:!0,l:"[a-z/_]+",k:{literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll"},r:0,i:"=>",c:[e.HCM,{cN:"string",c:[e.BE,r],v:[{b:/"/,e:/"/},{b:/'/,e:/'/}]},{b:"([a-z]+):/",e:"\\s",eW:!0,eE:!0,c:[r]},{cN:"regexp",c:[e.BE,r],v:[{b:"\\s\\^",e:"\\s|{|;",rE:!0},{b:"~\\*?\\s+",e:"\\s|{|;",rE:!0},{b:"\\*(\\.[a-z\\-]+)+"},{b:"([a-z\\-]+\\.)+\\*"}]},{cN:"number",b:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{cN:"number",b:"\\b\\d+[kKmMgGdshdwy]*\\b",r:0},r]};return{aliases:["nginxconf"],c:[e.HCM,{b:e.UIR+"\\s+{",rB:!0,e:"{",c:[{cN:"section",b:e.UIR}],r:0},{b:e.UIR+"\\s",e:";|{",rB:!0,c:[{cN:"attribute",b:e.UIR,starts:b}],r:0}],i:"[^\\s\\}]"}});hljs.registerLanguage("ruby",function(e){var b="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",r={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},c={cN:"doctag",b:"@[A-Za-z]+"},a={b:"#<",e:">"},s=[e.C("#","$",{c:[c]}),e.C("^\\=begin","^\\=end",{c:[c],r:10}),e.C("^__END__","\\n$")],n={cN:"subst",b:"#\\{",e:"}",k:r},t={cN:"string",c:[e.BE,n],v:[{b:/'/,e:/'/},{b:/"/,e:/"/},{b:/`/,e:/`/},{b:"%[qQwWx]?\\(",e:"\\)"},{b:"%[qQwWx]?\\[",e:"\\]"},{b:"%[qQwWx]?{",e:"}"},{b:"%[qQwWx]?<",e:">"},{b:"%[qQwWx]?/",e:"/"},{b:"%[qQwWx]?%",e:"%"},{b:"%[qQwWx]?-",e:"-"},{b:"%[qQwWx]?\\|",e:"\\|"},{b:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{b:/<<(-?)\w+$/,e:/^\s*\w+$/}]},i={cN:"params",b:"\\(",e:"\\)",endsParent:!0,k:r},d=[t,a,{cN:"class",bK:"class module",e:"$|;",i:/=/,c:[e.inherit(e.TM,{b:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{b:"<\\s*",c:[{b:"("+e.IR+"::)?"+e.IR}]}].concat(s)},{cN:"function",bK:"def",e:"$|;",c:[e.inherit(e.TM,{b:b}),i].concat(s)},{b:e.IR+"::"},{cN:"symbol",b:e.UIR+"(\\!|\\?)?:",r:0},{cN:"symbol",b:":(?!\\s)",c:[t,{b:b}],r:0},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{cN:"params",b:/\|/,e:/\|/,k:r},{b:"("+e.RSR+")\\s*",c:[a,{cN:"regexp",c:[e.BE,n],i:/\n/,v:[{b:"/",e:"/[a-z]*"},{b:"%r{",e:"}[a-z]*"},{b:"%r\\(",e:"\\)[a-z]*"},{b:"%r!",e:"![a-z]*"},{b:"%r\\[",e:"\\][a-z]*"}]}].concat(s),r:0}].concat(s);n.c=d,i.c=d;var l="[>?]>",o="[\\w#]+\\(\\w+\\):\\d+:\\d+>",w="(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>",u=[{b:/^\s*=>/,starts:{e:"$",c:d}},{cN:"meta",b:"^("+l+"|"+o+"|"+w+")",starts:{e:"$",c:d}}];return{aliases:["rb","gemspec","podspec","thor","irb"],k:r,i:/\/\*/,c:s.concat(u).concat(d)}});hljs.registerLanguage("perl",function(e){var t="getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qqfileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmgetsub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedirioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when",r={cN:"subst",b:"[$@]\\{",e:"\\}",k:t},s={b:"->{",e:"}"},n={v:[{b:/\$\d/},{b:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{b:/[\$%@][^\s\w{]/,r:0}]},i=[e.BE,r,n],o=[n,e.HCM,e.C("^\\=\\w","\\=cut",{eW:!0}),s,{cN:"string",c:i,v:[{b:"q[qwxr]?\\s*\\(",e:"\\)",r:5},{b:"q[qwxr]?\\s*\\[",e:"\\]",r:5},{b:"q[qwxr]?\\s*\\{",e:"\\}",r:5},{b:"q[qwxr]?\\s*\\|",e:"\\|",r:5},{b:"q[qwxr]?\\s*\\<",e:"\\>",r:5},{b:"qw\\s+q",e:"q",r:5},{b:"'",e:"'",c:[e.BE]},{b:'"',e:'"'},{b:"`",e:"`",c:[e.BE]},{b:"{\\w+}",c:[],r:0},{b:"-?\\w+\\s*\\=\\>",c:[],r:0}]},{cN:"number",b:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",r:0},{b:"(\\/\\/|"+e.RSR+"|\\b(split|return|print|reverse|grep)\\b)\\s*",k:"split return print reverse grep",r:0,c:[e.HCM,{cN:"regexp",b:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",r:10},{cN:"regexp",b:"(m|qr)?/",e:"/[a-z]*",c:[e.BE],r:0}]},{cN:"function",bK:"sub",e:"(\\s*\\(.*?\\))?[;{]",eE:!0,r:5,c:[e.TM]},{b:"-\\w\\b",r:0},{b:"^__DATA__$",e:"^__END__$",sL:"mojolicious",c:[{b:"^@@.*",e:"$",cN:"comment"}]}];return r.c=o,s.c=o,{aliases:["pl","pm"],l:/[\w\.]+/,k:t,c:o}}); \ No newline at end of file +/*! highlight.js v9.12.0 | BSD3 License | git.io/hljslicense */ +!function(e){var n="object"==typeof window&&window||"object"==typeof self&&self;"undefined"!=typeof exports?e(exports):n&&(n.hljs=e({}),"function"==typeof define&&define.amd&&define([],function(){return n.hljs}))}(function(e){function n(e){return e.replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">")}function t(e){return e.nodeName.toLowerCase()}function r(e,n){var t=e&&e.exec(n);return t&&0===t.index}function a(e){return k.test(e)}function i(e){var n,t,r,i,o=e.className+" ";if(o+=e.parentNode?e.parentNode.className:"",t=B.exec(o))return w(t[1])?t[1]:"no-highlight";for(o=o.split(/\s+/),n=0,r=o.length;r>n;n++)if(i=o[n],a(i)||w(i))return i}function o(e){var n,t={},r=Array.prototype.slice.call(arguments,1);for(n in e)t[n]=e[n];return r.forEach(function(e){for(n in e)t[n]=e[n]}),t}function u(e){var n=[];return function r(e,a){for(var i=e.firstChild;i;i=i.nextSibling)3===i.nodeType?a+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:a,node:i}),a=r(i,a),t(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:a,node:i}));return a}(e,0),n}function c(e,r,a){function i(){return e.length&&r.length?e[0].offset!==r[0].offset?e[0].offset<r[0].offset?e:r:"start"===r[0].event?e:r:e.length?e:r}function o(e){function r(e){return" "+e.nodeName+'="'+n(e.value).replace('"',""")+'"'}s+="<"+t(e)+E.map.call(e.attributes,r).join("")+">"}function u(e){s+="</"+t(e)+">"}function c(e){("start"===e.event?o:u)(e.node)}for(var l=0,s="",f=[];e.length||r.length;){var g=i();if(s+=n(a.substring(l,g[0].offset)),l=g[0].offset,g===e){f.reverse().forEach(u);do c(g.splice(0,1)[0]),g=i();while(g===e&&g.length&&g[0].offset===l);f.reverse().forEach(o)}else"start"===g[0].event?f.push(g[0].node):f.pop(),c(g.splice(0,1)[0])}return s+n(a.substr(l))}function l(e){return e.v&&!e.cached_variants&&(e.cached_variants=e.v.map(function(n){return o(e,{v:null},n)})),e.cached_variants||e.eW&&[o(e)]||[e]}function s(e){function n(e){return e&&e.source||e}function t(t,r){return new RegExp(n(t),"m"+(e.cI?"i":"")+(r?"g":""))}function r(a,i){if(!a.compiled){if(a.compiled=!0,a.k=a.k||a.bK,a.k){var o={},u=function(n,t){e.cI&&(t=t.toLowerCase()),t.split(" ").forEach(function(e){var t=e.split("|");o[t[0]]=[n,t[1]?Number(t[1]):1]})};"string"==typeof a.k?u("keyword",a.k):x(a.k).forEach(function(e){u(e,a.k[e])}),a.k=o}a.lR=t(a.l||/\w+/,!0),i&&(a.bK&&(a.b="\\b("+a.bK.split(" ").join("|")+")\\b"),a.b||(a.b=/\B|\b/),a.bR=t(a.b),a.e||a.eW||(a.e=/\B|\b/),a.e&&(a.eR=t(a.e)),a.tE=n(a.e)||"",a.eW&&i.tE&&(a.tE+=(a.e?"|":"")+i.tE)),a.i&&(a.iR=t(a.i)),null==a.r&&(a.r=1),a.c||(a.c=[]),a.c=Array.prototype.concat.apply([],a.c.map(function(e){return l("self"===e?a:e)})),a.c.forEach(function(e){r(e,a)}),a.starts&&r(a.starts,i);var c=a.c.map(function(e){return e.bK?"\\.?("+e.b+")\\.?":e.b}).concat([a.tE,a.i]).map(n).filter(Boolean);a.t=c.length?t(c.join("|"),!0):{exec:function(){return null}}}}r(e)}function f(e,t,a,i){function o(e,n){var t,a;for(t=0,a=n.c.length;a>t;t++)if(r(n.c[t].bR,e))return n.c[t]}function u(e,n){if(r(e.eR,n)){for(;e.endsParent&&e.parent;)e=e.parent;return e}return e.eW?u(e.parent,n):void 0}function c(e,n){return!a&&r(n.iR,e)}function l(e,n){var t=N.cI?n[0].toLowerCase():n[0];return e.k.hasOwnProperty(t)&&e.k[t]}function p(e,n,t,r){var a=r?"":I.classPrefix,i='<span class="'+a,o=t?"":C;return i+=e+'">',i+n+o}function h(){var e,t,r,a;if(!E.k)return n(k);for(a="",t=0,E.lR.lastIndex=0,r=E.lR.exec(k);r;)a+=n(k.substring(t,r.index)),e=l(E,r),e?(B+=e[1],a+=p(e[0],n(r[0]))):a+=n(r[0]),t=E.lR.lastIndex,r=E.lR.exec(k);return a+n(k.substr(t))}function d(){var e="string"==typeof E.sL;if(e&&!y[E.sL])return n(k);var t=e?f(E.sL,k,!0,x[E.sL]):g(k,E.sL.length?E.sL:void 0);return E.r>0&&(B+=t.r),e&&(x[E.sL]=t.top),p(t.language,t.value,!1,!0)}function b(){L+=null!=E.sL?d():h(),k=""}function v(e){L+=e.cN?p(e.cN,"",!0):"",E=Object.create(e,{parent:{value:E}})}function m(e,n){if(k+=e,null==n)return b(),0;var t=o(n,E);if(t)return t.skip?k+=n:(t.eB&&(k+=n),b(),t.rB||t.eB||(k=n)),v(t,n),t.rB?0:n.length;var r=u(E,n);if(r){var a=E;a.skip?k+=n:(a.rE||a.eE||(k+=n),b(),a.eE&&(k=n));do E.cN&&(L+=C),E.skip||(B+=E.r),E=E.parent;while(E!==r.parent);return r.starts&&v(r.starts,""),a.rE?0:n.length}if(c(n,E))throw new Error('Illegal lexeme "'+n+'" for mode "'+(E.cN||"<unnamed>")+'"');return k+=n,n.length||1}var N=w(e);if(!N)throw new Error('Unknown language: "'+e+'"');s(N);var R,E=i||N,x={},L="";for(R=E;R!==N;R=R.parent)R.cN&&(L=p(R.cN,"",!0)+L);var k="",B=0;try{for(var M,j,O=0;;){if(E.t.lastIndex=O,M=E.t.exec(t),!M)break;j=m(t.substring(O,M.index),M[0]),O=M.index+j}for(m(t.substr(O)),R=E;R.parent;R=R.parent)R.cN&&(L+=C);return{r:B,value:L,language:e,top:E}}catch(T){if(T.message&&-1!==T.message.indexOf("Illegal"))return{r:0,value:n(t)};throw T}}function g(e,t){t=t||I.languages||x(y);var r={r:0,value:n(e)},a=r;return t.filter(w).forEach(function(n){var t=f(n,e,!1);t.language=n,t.r>a.r&&(a=t),t.r>r.r&&(a=r,r=t)}),a.language&&(r.second_best=a),r}function p(e){return I.tabReplace||I.useBR?e.replace(M,function(e,n){return I.useBR&&"\n"===e?"<br>":I.tabReplace?n.replace(/\t/g,I.tabReplace):""}):e}function h(e,n,t){var r=n?L[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),-1===e.indexOf(r)&&a.push(r),a.join(" ").trim()}function d(e){var n,t,r,o,l,s=i(e);a(s)||(I.useBR?(n=document.createElementNS("http://www.w3.org/1999/xhtml","div"),n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ \/]*>/g,"\n")):n=e,l=n.textContent,r=s?f(s,l,!0):g(l),t=u(n),t.length&&(o=document.createElementNS("http://www.w3.org/1999/xhtml","div"),o.innerHTML=r.value,r.value=c(t,u(o),l)),r.value=p(r.value),e.innerHTML=r.value,e.className=h(e.className,s,r.language),e.result={language:r.language,re:r.r},r.second_best&&(e.second_best={language:r.second_best.language,re:r.second_best.r}))}function b(e){I=o(I,e)}function v(){if(!v.called){v.called=!0;var e=document.querySelectorAll("pre code");E.forEach.call(e,d)}}function m(){addEventListener("DOMContentLoaded",v,!1),addEventListener("load",v,!1)}function N(n,t){var r=y[n]=t(e);r.aliases&&r.aliases.forEach(function(e){L[e]=n})}function R(){return x(y)}function w(e){return e=(e||"").toLowerCase(),y[e]||y[L[e]]}var E=[],x=Object.keys,y={},L={},k=/^(no-?highlight|plain|text)$/i,B=/\blang(?:uage)?-([\w-]+)\b/i,M=/((^(<[^>]+>|\t|)+|(?:\n)))/gm,C="</span>",I={classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:void 0};return e.highlight=f,e.highlightAuto=g,e.fixMarkup=p,e.highlightBlock=d,e.configure=b,e.initHighlighting=v,e.initHighlightingOnLoad=m,e.registerLanguage=N,e.listLanguages=R,e.getLanguage=w,e.inherit=o,e.IR="[a-zA-Z]\\w*",e.UIR="[a-zA-Z_]\\w*",e.NR="\\b\\d+(\\.\\d+)?",e.CNR="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",e.BNR="\\b(0b[01]+)",e.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",e.BE={b:"\\\\[\\s\\S]",r:0},e.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[e.BE]},e.QSM={cN:"string",b:'"',e:'"',i:"\\n",c:[e.BE]},e.PWM={b:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},e.C=function(n,t,r){var a=e.inherit({cN:"comment",b:n,e:t,c:[]},r||{});return a.c.push(e.PWM),a.c.push({cN:"doctag",b:"(?:TODO|FIXME|NOTE|BUG|XXX):",r:0}),a},e.CLCM=e.C("//","$"),e.CBCM=e.C("/\\*","\\*/"),e.HCM=e.C("#","$"),e.NM={cN:"number",b:e.NR,r:0},e.CNM={cN:"number",b:e.CNR,r:0},e.BN... [truncated message content] |
From: <var...@us...> - 2017-10-03 16:33:59
|
Revision: 10037 http://sourceforge.net/p/phpwiki/code/10037 Author: vargenau Date: 2017-10-03 16:33:54 +0000 (Tue, 03 Oct 2017) Log Message: ----------- Update Adodb to version 5.20.9 Modified Paths: -------------- trunk/lib/WikiDB/adodb/adodb-active-record.inc.php trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php trunk/lib/WikiDB/adodb/adodb-datadict.inc.php trunk/lib/WikiDB/adodb/adodb-error.inc.php trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php trunk/lib/WikiDB/adodb/adodb-iterator.inc.php trunk/lib/WikiDB/adodb/adodb-lib.inc.php trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php trunk/lib/WikiDB/adodb/adodb-pager.inc.php trunk/lib/WikiDB/adodb/adodb-pear.inc.php trunk/lib/WikiDB/adodb/adodb-perf.inc.php trunk/lib/WikiDB/adodb/adodb-php4.inc.php trunk/lib/WikiDB/adodb/adodb-time.inc.php trunk/lib/WikiDB/adodb/adodb.inc.php trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php trunk/lib/WikiDB/adodb/docs/changelog.md trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-oci8quercus.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-odbc_db2.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-odbtp_unicode.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-oracle.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-pdo.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-pdo_mssql.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-pdo_mysql.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-pdo_oci.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-pdo_pgsql.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-pdo_sqlite.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-postgres.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-postgres64.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-postgres7.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-postgres8.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-postgres9.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-proxy.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-sqlite3.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-sqlitepo.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-sybase.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-sybase_ase.inc.php trunk/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php trunk/lib/WikiDB/adodb/pear/Auth/Container/ADOdb.php trunk/lib/WikiDB/adodb/perf/perf-db2.inc.php trunk/lib/WikiDB/adodb/perf/perf-informix.inc.php trunk/lib/WikiDB/adodb/perf/perf-mssql.inc.php trunk/lib/WikiDB/adodb/perf/perf-mssqlnative.inc.php trunk/lib/WikiDB/adodb/perf/perf-mysql.inc.php trunk/lib/WikiDB/adodb/perf/perf-oci8.inc.php trunk/lib/WikiDB/adodb/perf/perf-postgres.inc.php trunk/lib/WikiDB/adodb/pivottable.inc.php trunk/lib/WikiDB/adodb/rsfilter.inc.php trunk/lib/WikiDB/adodb/server.php trunk/lib/WikiDB/adodb/session/adodb-compress-bzip2.php trunk/lib/WikiDB/adodb/session/adodb-compress-gzip.php trunk/lib/WikiDB/adodb/session/adodb-cryptsession.php trunk/lib/WikiDB/adodb/session/adodb-cryptsession2.php trunk/lib/WikiDB/adodb/session/adodb-encrypt-mcrypt.php trunk/lib/WikiDB/adodb/session/adodb-encrypt-md5.php trunk/lib/WikiDB/adodb/session/adodb-encrypt-secret.php trunk/lib/WikiDB/adodb/session/adodb-session-clob.php trunk/lib/WikiDB/adodb/session/adodb-session-clob2.php trunk/lib/WikiDB/adodb/session/adodb-session.php trunk/lib/WikiDB/adodb/session/adodb-session2.php trunk/lib/WikiDB/adodb/session/old/adodb-cryptsession.php trunk/lib/WikiDB/adodb/session/old/adodb-session-clob.php trunk/lib/WikiDB/adodb/session/old/adodb-session.php trunk/lib/WikiDB/adodb/toexport.inc.php trunk/lib/WikiDB/adodb/tohtml.inc.php trunk/pgsrc/ReleaseNotes Removed Paths: ------------- trunk/lib/WikiDB/adodb/0001-XML-add-support-for-DESCR-tags-for-tables-fields.patch trunk/lib/WikiDB/adodb/fix-202.php trunk/lib/WikiDB/adodb/fix-226.php trunk/lib/WikiDB/adodb/nbproject/ trunk/lib/WikiDB/adodb/pr265.php trunk/lib/WikiDB/adodb/test.xml Deleted: trunk/lib/WikiDB/adodb/0001-XML-add-support-for-DESCR-tags-for-tables-fields.patch =================================================================== --- trunk/lib/WikiDB/adodb/0001-XML-add-support-for-DESCR-tags-for-tables-fields.patch 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/0001-XML-add-support-for-DESCR-tags-for-tables-fields.patch 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,60 +0,0 @@ -From 9fbb2c7751c0fdb89062a87910730ea9ccb5d04c Mon Sep 17 00:00:00 2001 -From: peterdd <dd...@li...> -Date: Thu, 4 Aug 2016 04:10:12 +0200 -Subject: [PATCH] XML: add support for 'DESCR' tags for tables/fields - -Fixes #265 - -Signed-off-by: Damien Regad <dr...@ma...> - -Original commits squashed; commit message reworded; updated changelog. ---- - adodb-xmlschema03.inc.php | 12 ++++++++++++ - docs/changelog.md | 1 + - 2 files changed, 13 insertions(+) - -diff --git a/adodb-xmlschema03.inc.php b/adodb-xmlschema03.inc.php -index c1ecb88..794f5e2 100644 ---- a/adodb-xmlschema03.inc.php -+++ b/adodb-xmlschema03.inc.php -@@ -347,6 +347,14 @@ class dbTable extends dbObject { - */ - function _tag_cdata( &$parser, $cdata ) { - switch( $this->currentElement ) { -+ // Table or field comment -+ case 'DESCR': -+ if( isset( $this->current_field ) ) { -+ $this->addFieldOpt( $this->current_field, $this->currentElement, $cdata ); -+ } else { -+ $this->addTableComment( $cdata ); -+ } -+ break; - // Table/field constraint - case 'CONSTRAINT': - if( isset( $this->current_field ) ) { -@@ -511,6 +519,10 @@ class dbTable extends dbObject { - return $this->opts; - } - -+ function addTableComment( $opt ) { -+ $this->opts['comment'] = $opt; -+ return $this->opts; -+ } - - /** - * Generates the SQL that will create the table in the database -diff --git a/docs/changelog.md b/docs/changelog.md -index 742f4e4..1fe10f4 100644 ---- a/docs/changelog.md -+++ b/docs/changelog.md -@@ -44,6 +44,7 @@ Older changelogs: - - sqlite: Fix Metataypes mapping. #177 - - sqlite: driver did not support metaForeignKeys. #179 - - session: add 'httponly' flag to cookie. #190 -+- xml: add support for 'DESCR' tags for tables/fields. #265 - - ## 5.20.6 - 31-Aug-2016 - --- -2.7.4 - Modified: trunk/lib/WikiDB/adodb/adodb-active-record.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-active-record.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-active-record.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Latest version is available at http://adodb.sourceforge.net Modified: trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-active-recordx.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Latest version is available at http://adodb.sourceforge.net Modified: trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-csvlib.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -8,7 +8,7 @@ /* - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/adodb-datadict.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-datadict.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-datadict.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/adodb-error.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-error.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-error.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /** - * @version v5.20.7 20-Sep-2016 + * @version v5.20.9 21-Dec-2016 * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community * Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-errorhandler.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /** - * @version v5.20.7 20-Sep-2016 + * @version v5.20.9 21-Dec-2016 * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community * Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-errorpear.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /** - * @version v5.20.7 20-Sep-2016 + * @version v5.20.9 21-Dec-2016 * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community * Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-exceptions.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - * @version v5.20.7 20-Sep-2016 + * @version v5.20.9 21-Dec-2016 * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community * Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/adodb-iterator.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-iterator.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-iterator.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /* - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/adodb-lib.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-lib.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -6,7 +6,7 @@ $ADODB_INCLUDED_LIB = 1; /* - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-memcache.lib.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -11,7 +11,7 @@ /* - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/adodb-pager.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-pager.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-pager.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /* - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/adodb-pear.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-pear.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /** - * @version v5.20.7 20-Sep-2016 + * @version v5.20.9 21-Dec-2016 * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community * Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/adodb-perf.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-perf.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-perf.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/adodb-php4.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-php4.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-php4.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /* - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/adodb-time.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb-time.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb-time.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -3,7 +3,7 @@ ADOdb Date Library, part of the ADOdb abstraction library Download: http://adodb.sourceforge.net/#download -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Modified: trunk/lib/WikiDB/adodb/adodb.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/adodb.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/adodb.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -14,7 +14,7 @@ /** \mainpage - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community @@ -232,7 +232,7 @@ /** * ADODB version as a string. */ - $ADODB_vers = 'v5.20.7 20-Sep-2016'; + $ADODB_vers = 'v5.20.9 21-Dec-2016'; /** * Determines whether recordset->RecordCount() is used. Modified: trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/datadict/datadict-access.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/datadict/datadict-db2.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/datadict/datadict-firebird.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/datadict/datadict-generic.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/datadict/datadict-ibase.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/datadict/datadict-informix.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/datadict/datadict-mssql.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/datadict/datadict-mssqlnative.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. @@ -146,20 +146,70 @@ return $sql; } - /* - function AlterColumnSQL($tabname, $flds, $tableflds='', $tableoptions='') + function DefaultConstraintname($tabname, $colname) { + $constraintname = false; + $rs = $this->connection->Execute( + "SELECT name FROM sys.default_constraints + WHERE object_name(parent_object_id) = '$tabname' + AND col_name(parent_object_id, parent_column_id) = '$colname'" + ); + if ( is_object($rs) ) { + $row = $rs->FetchRow(); + $constraintname = $row['name']; + } + return $constraintname; + } + + function AlterColumnSQL($tabname, $flds, $tableflds='',$tableoptions='') + { $tabname = $this->TableName ($tabname); $sql = array(); - list($lines,$pkey) = $this->_GenFields($flds); + + list($lines,$pkey,$idxs) = $this->_GenFields($flds); + $alter = 'ALTER TABLE ' . $tabname . $this->alterCol . ' '; foreach($lines as $v) { - $sql[] = "ALTER TABLE $tabname $this->alterCol $v"; + $not_null = false; + if ($not_null = preg_match('/NOT NULL/i',$v)) { + $v = preg_replace('/NOT NULL/i','',$v); + } + if (preg_match('/^([^ ]+) .*DEFAULT (\'[^\']+\'|\"[^\"]+\"|[^ ]+)/',$v,$matches)) { + list(,$colname,$default) = $matches; + $v = preg_replace('/^' . preg_quote($colname) . '\s/', '', $v); + $t = trim(str_replace('DEFAULT '.$default,'',$v)); + if ( $constraintname = $this->DefaultConstraintname($tabname,$colname) ) { + $sql[] = 'ALTER TABLE '.$tabname.' DROP CONSTRAINT '. $constraintname; + } + if ($not_null) { + $sql[] = $alter . $colname . ' ' . $t . ' NOT NULL'; + } else { + $sql[] = $alter . $colname . ' ' . $t ; + } + $sql[] = 'ALTER TABLE ' . $tabname + . ' ADD CONSTRAINT DF__' . $tabname . '__' . $colname . '__' . dechex(rand()) + . ' DEFAULT ' . $default . ' FOR ' . $colname; + } else { + $colname = strtok($v," "); + if ( $constraintname = $this->DefaultConstraintname($tabname,$colname) ) { + $sql[] = 'ALTER TABLE '.$tabname.' DROP CONSTRAINT '. $constraintname; + } + if ($not_null) { + $sql[] = $alter . $v . ' NOT NULL'; + } else { + $sql[] = $alter . $v; + } + } } - + if (is_array($idxs)) { + foreach($idxs as $idx => $idxdef) { + $sql_idxs = $this->CreateIndexSql($idx, $tabname, $idxdef['cols'], $idxdef['opts']); + $sql = array_merge($sql, $sql_idxs); + } + } return $sql; } - */ + /** * Drop a column, syntax is ALTER TABLE table DROP COLUMN column,column * @@ -176,10 +226,12 @@ if (!is_array($flds)) $flds = explode(',',$flds); $f = array(); - $s = 'ALTER TABLE ' . $tabname . ' DROP COLUMN '; + $s = 'ALTER TABLE ' . $tabname; foreach($flds as $v) { - //$f[] = "\n$this->dropCol ".$this->NameQuote($v); - $f[] = $this->NameQuote($v); + if ( $constraintname = $this->DefaultConstraintname($tabname,$v) ) { + $sql[] = 'ALTER TABLE ' . $tabname . ' DROP CONSTRAINT ' . $constraintname; + } + $f[] = ' DROP COLUMN ' . $this->NameQuote($v); } $s .= implode(', ',$f); $sql[] = $s; Modified: trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/datadict/datadict-mysql.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/datadict/datadict-oci8.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/datadict/datadict-postgres.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/datadict/datadict-sapdb.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/datadict/datadict-sqlite.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/datadict/datadict-sybase.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/docs/changelog.md =================================================================== --- trunk/lib/WikiDB/adodb/docs/changelog.md 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/docs/changelog.md 2017-10-03 16:33:54 UTC (rev 10037) @@ -5,6 +5,21 @@ [v3.x](changelog_v3.x.md), [v2.x](changelog_v2.x.md). +## 5.20.9 - 21-Dec-2016 + +- mssql: fix syntax error in version matching regex #305 + +## 5.20.8 - 17-Dec-2016 + +- mssql: support MSSQL Server 2016 and later #294 +- mssql: fix Find() returning no results. #298 +- mssql: fix Sequence name forced to 'adodbseq'. #295, #300 +- mssql: fix GenId() not returning next sequence value with SQL Server 2005/2008. #302 +- mssql: fix drop/alter column with existing default constraint. #290 +- mssql: fix PHP notice in MetaColumns(). #289 +- oci8po: fix inconsistent variable binding in SelectLimit() #288 +- oci8po: fix SelectLimit() with prepared statements #282 + ## 5.20.7 - 20-Sep-2016 - security: Fix SQL injection in PDO drivers qstr() method (CVE-2016-7405). #226 @@ -28,7 +43,7 @@ - xml: Fix PHP strict warning. #260 - xml: remove calls to 'unset($this)' (PHP 7.1 compatibility). #257 -## 5.20.4 - 30-Mar-2016 +## 5.20.4 - 31-Mar-2016 - adodb: Fix BulkBind() param count validation. #199 - mysqli: fix PHP warning in recordset destructor. #217 @@ -41,6 +56,7 @@ ## 5.20.2 - 27-Dec-2015 - adodb: Remove a couple leftover PHP 4.x constructors (PHP7 compatibility). #139 +- db2ora: Remove deprecated preg_replace '/e' flag (PHP7 compatibility). #168 - mysql: MoveNext() now respects ADODB_ASSOC_CASE. #167 - mssql, mysql, informix: Avoid PHP warning when closing recordset from destructor. #170 Modified: trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-access.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-ado.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-ado5.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_access.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-ado_mssql.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-borland_ibase.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-csv.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-db2.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /** - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-firebird.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-ibase.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-informix.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /** -* @version v5.20.7 20-Sep-2016 +* @version v5.20.9 21-Dec-2016 * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community * Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-informix72.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim. All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-ldap.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-mssql.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlnative.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. @@ -125,6 +125,7 @@ var $_bindInputArray = true; var $_dropSeqSQL = "drop table %s"; var $connectionInfo = array(); + var $cachedSchemaFlush = false; var $sequences = false; var $mssql_version = ''; @@ -143,25 +144,22 @@ sqlsrv_configure('WarningsReturnAsErrors', 0); } } + + /** + * Initializes the SQL Server version. + * Dies if connected to a non-supported version (2000 and older) + */ function ServerVersion() { $data = $this->ServerInfo(); - if (preg_match('/^09/',$data['version'])){ - /* - * SQL Server 2005 - */ - $this->mssql_version = 9; - } elseif (preg_match('/^10/',$data['version'])){ - /* - * SQL Server 2008 - */ - $this->mssql_version = 10; - } elseif (preg_match('/^11/',$data['version'])){ - /* - * SQL Server 2012 - */ - $this->mssql_version = 11; - } else + preg_match('/^\d{2}/', $data['version'], $matches); + $version = (int)reset($matches); + + // We only support SQL Server 2005 and up + if($version < 9) { die("SQL SERVER VERSION {$data['version']} NOT SUPPORTED IN mssqlnative DRIVER"); + } + + $this->mssql_version = $version; } function ServerInfo() { @@ -211,10 +209,10 @@ switch($this->mssql_version){ case 9: case 10: - return $this->GenID2008(); + return $this->GenID2008($seq, $start); break; - case 11: - return $this->GenID2012(); + default: + return $this->GenID2012($seq, $start); break; } } @@ -221,16 +219,16 @@ function CreateSequence($seq='adodbseq',$start=1) { - if (!$this->mssql_vesion) + if (!$this->mssql_version) $this->ServerVersion(); switch($this->mssql_version){ case 9: case 10: - return $this->CreateSequence2008(); + return $this->CreateSequence2008($seq, $start); break; - case 11: - return $this->CreateSequence2012(); + default: + return $this->CreateSequence2012($seq, $start); break; } @@ -258,7 +256,7 @@ /** * Proper Sequences Only available to Server 2012 and up */ - function CreateSequence2012($seq='adodb',$start=1){ + function CreateSequence2012($seq='adodbseq',$start=1){ if (!$this->sequences){ $sql = "SELECT name FROM sys.sequences"; $this->sequences = $this->GetCol($sql); @@ -289,7 +287,7 @@ } $num = $this->GetOne("select id from $seq"); sqlsrv_commit($this->_connectionID); - return true; + return $num; } /** * Only available to Server 2012 and up @@ -313,7 +311,7 @@ } if (!is_array($this->sequences) || is_array($this->sequences) && !in_array($seq,$this->sequences)){ - $this->CreateSequence2012($seq='adodbseq',$start=1); + $this->CreateSequence2012($seq, $start); } $num = $this->GetOne("SELECT NEXT VALUE FOR $seq"); @@ -468,10 +466,9 @@ function ErrorNo() { - if ($this->_logsql && $this->_errorCode !== false) return $this->_errorCode; $err = sqlsrv_errors(SQLSRV_ERR_ALL); if($err[0]) return $err[0]['code']; - else return -1; + else return 0; } // returns true or false @@ -569,7 +566,7 @@ $insert = false; // handle native driver flaw for retrieving the last insert ID - if(preg_match('/^\W*insert\s(?:(?:(?:\'\')*\'[^\']+\'(?:\'\')*)|[^;\'])*;?$/i', $sql)) { + if(preg_match('/^\W*insert[\s\w()",.]+values\s*\((?:[^;\']|\'\'|(?:(?:\'\')*\'[^\']+\'(?:\'\')*))*;?$/i', $sql)) { $insert = true; $sql .= '; '.$this->identitySQL; // select scope_identity() } Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /** -* @version v5.20.7 20-Sep-2016 +* @version v5.20.9 21-Dec-2016 * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community * Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-mysql.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-netezza.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,7 +1,7 @@ <?php /* - @version v5.20.7 20-Sep-2016 + @version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim. All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community @@ -703,9 +703,19 @@ * This implementation does not appear to work with oracle 8.0.5 or earlier. * Comment out this function then, and the slower SelectLimit() in the base * class will be used. + * + * Note: FIRST_ROWS hinting is only used if $sql is a string; when + * processing a prepared statement's handle, no hinting is performed. */ function SelectLimit($sql,$nrows=-1,$offset=-1, $inputarr=false,$secs2cache=0) { + // Since the methods used to limit the number of returned rows rely + // on modifying the provided SQL query, we can't work with prepared + // statements so we just extract the SQL string. + if(is_array($sql)) { + $sql = $sql[0]; + } + // seems that oracle only supports 1 hint comment in 8i if ($this->firstrows) { if ($nrows > 500 && $nrows < 1000) { @@ -731,20 +741,13 @@ if ($offset > 0) { $nrows += $offset; } - //$inputarr['adodb_rownum'] = $nrows; - if ($this->databaseType == 'oci8po') { - $sql = "select * from (".$sql.") where rownum <= ?"; - } else { - $sql = "select * from (".$sql.") where rownum <= :adodb_offset"; - } + $sql = "select * from (".$sql.") where rownum <= :adodb_offset"; $inputarr['adodb_offset'] = $nrows; $nrows = -1; } // note that $nrows = 0 still has to work ==> no rows returned - $rs = ADOConnection::SelectLimit($sql,$nrows,$offset,$inputarr,$secs2cache); - return $rs; - + return ADOConnection::SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache); } else { // Algorithm by Tomas V V Cox, from PEAR DB oci8.php @@ -758,13 +761,19 @@ if (is_array($inputarr)) { foreach($inputarr as $k => $v) { + $i=0; + if ($this->databaseType == 'oci8po') { + $bv_name = ":".$i++; + } else { + $bv_name = ":".$k; + } if (is_array($v)) { // suggested by g.giunta@libero. if (sizeof($v) == 2) { - oci_bind_by_name($stmt,":$k",$inputarr[$k][0],$v[1]); + oci_bind_by_name($stmt,$bv_name,$inputarr[$k][0],$v[1]); } else { - oci_bind_by_name($stmt,":$k",$inputarr[$k][0],$v[1],$v[2]); + oci_bind_by_name($stmt,$bv_name,$inputarr[$k][0],$v[1],$v[2]); } } else { $len = -1; @@ -774,7 +783,7 @@ if (isset($bindarr)) { // is prepared sql, so no need to oci_bind_by_name again $bindarr[$k] = $v; } else { // dynamic sql, so rebind every time - oci_bind_by_name($stmt,":$k",$inputarr[$k],$len); + oci_bind_by_name($stmt,$bv_name,$inputarr[$k],$len); } } } @@ -801,24 +810,19 @@ } $offset += 1; // in Oracle rownum starts at 1 - if ($this->databaseType == 'oci8po') { - $sql = "SELECT $hint $fields FROM". - "(SELECT rownum as adodb_rownum, $fields FROM". - " ($sql) WHERE rownum <= ?". - ") WHERE adodb_rownum >= ?"; - } else { - $sql = "SELECT $hint $fields FROM". - "(SELECT rownum as adodb_rownum, $fields FROM". - " ($sql) WHERE rownum <= :adodb_nrows". - ") WHERE adodb_rownum >= :adodb_offset"; - } - $inputarr['adodb_nrows'] = $nrows; - $inputarr['adodb_offset'] = $offset; + $sql = "SELECT $hint $fields FROM". + "(SELECT rownum as adodb_rownum, $fields FROM". + " ($sql) WHERE rownum <= :adodb_nrows". + ") WHERE adodb_rownum >= :adodb_offset"; + $inputarr['adodb_nrows'] = $nrows; + $inputarr['adodb_offset'] = $offset; if ($secs2cache > 0) { $rs = $this->CacheExecute($secs2cache, $sql,$inputarr); } - else $rs = $this->Execute($sql,$inputarr); + else { + $rs = $this->Execute($sql, $inputarr); + } return $rs; } } Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-oci805.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /** - * @version v5.20.7 20-Sep-2016 + * @version v5.20.9 21-Dec-2016 * @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. * @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community * Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim. All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. @@ -56,6 +56,21 @@ return ADOConnection::Execute($sql,$inputarr); } + /** + * The optimizations performed by ADODB_oci8::SelectLimit() are not + * compatible with the oci8po driver, so we rely on the slower method + * from the base class. + * We can't properly handle prepared statements either due to preprocessing + * of query parameters, so we treat them as regular SQL statements. + */ + function SelectLimit($sql, $nrows=-1, $offset=-1, $inputarr=false, $secs2cache=0) + { + if(is_array($sql)) { +// $sql = $sql[0]; + } + return ADOConnection::SelectLimit($sql, $nrows, $offset, $inputarr, $secs2cache); + } + // emulate handling of parameters ? ?, replacing with :bind0 :bind1 function _query($sql,$inputarr=false) { @@ -74,11 +89,14 @@ $sql = str_replace($qmMatch, $qmReplace, $sql); } + // Replace parameters if any were found $sqlarr = explode('?',$sql); - $sql = $sqlarr[0]; + if(count($sqlarr) > 1) { + $sql = $sqlarr[0]; - foreach($inputarr as $k => $v) { - $sql .= ":$k" . $sqlarr[++$i]; + foreach ($inputarr as $k => $v) { + $sql .= ":$k" . $sqlarr[++$i]; + } } $sql = str_replace('-QUESTIONMARK-', '?', $sql); Modified: trunk/lib/WikiDB/adodb/drivers/adodb-oci8quercus.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-oci8quercus.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-oci8quercus.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim. All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc_db2.inc.php =================================================================== --- trunk/lib/WikiDB/adodb/drivers/adodb-odbc_db2.inc.php 2017-10-02 18:02:02 UTC (rev 10036) +++ trunk/lib/WikiDB/adodb/drivers/adodb-odbc_db2.inc.php 2017-10-03 16:33:54 UTC (rev 10037) @@ -1,6 +1,6 @@ <?php /* -@version v5.20.7 20-Sep-2016 +@version v5.20.9 21-Dec-2016 @copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved. @copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community Released under both BSD license and Lesser GPL library license. Modified: trunk/lib/WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php =... [truncated message content] |
From: <var...@us...> - 2017-10-02 18:02:04
|
Revision: 10036 http://sourceforge.net/p/phpwiki/code/10036 Author: vargenau Date: 2017-10-02 18:02:02 +0000 (Mon, 02 Oct 2017) Log Message: ----------- Update pgsrc/ReleaseNotes Modified Paths: -------------- trunk/pgsrc/ReleaseNotes Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2017-10-02 09:11:41 UTC (rev 10035) +++ trunk/pgsrc/ReleaseNotes 2017-10-02 18:02:02 UTC (rev 10036) @@ -1,4 +1,4 @@ -Date: Mon, 10 Jul 2017 18:25:18 +0000 +Date: Mon, 02 Oct 2017 18:25:18 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -8,7 +8,7 @@ <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>> -== 1.6.0 2016-XX-XX Marc-Etienne Vargenau == +== 1.6.0 2017-XX-XX Marc-Etienne Vargenau == Major release: * PHP 7 compatible @@ -27,6 +27,7 @@ * Better is_localhost() function (allow IPv6, allow Windows IIS). Patch by Thierry Nabeth. * Remove Fusionforge-specific files (g view.php wikiadmin.php wikilist.php) * PDO patch by Sébastien Le Callonnec +* Security fixes * Bugs: ** Make function IsSafeURL more strict ** Make XHTML ZIP Snapshot work again (broken since ~PhpWiki 1.5.3) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-10-02 09:11:43
|
Revision: 10035 http://sourceforge.net/p/phpwiki/code/10035 Author: vargenau Date: 2017-10-02 09:11:41 +0000 (Mon, 02 Oct 2017) Log Message: ----------- Check with isset() Modified Paths: -------------- trunk/lib/plugin/WikiAdminRename.php trunk/lib/stdlib.php Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2017-10-01 19:00:39 UTC (rev 10034) +++ trunk/lib/plugin/WikiAdminRename.php 2017-10-02 09:11:41 UTC (rev 10035) @@ -56,7 +56,7 @@ public static function renameHelper($name, $from, $to, $options = array()) { if (isset($options['regex'])) { - return preg_replace('/' . str_replace('/', '\/', $from) . '/'.($options['icase']?'i':''), $to, $name); + return preg_replace('/' . str_replace('/', '\/', $from) . '/' . (isset($options['icase']) ? 'i' : ''), $to, $name); } elseif (isset($options['icase'])) { return str_ireplace($from, $to, $name); } else { Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2017-10-01 19:00:39 UTC (rev 10034) +++ trunk/lib/stdlib.php 2017-10-02 09:11:41 UTC (rev 10035) @@ -1458,7 +1458,7 @@ $glob = str_replace("/", "\\/", $glob); // first convert some unescaped expressions to pcre style: . => \. $special = '.^$'; - $re = preg_replace('/([^\xff])?(['.preg_quote($special, '/').'])/', + $re = preg_replace('/([^\xff])?([' . preg_quote($special, '/') . '])/', "\\1\xff\\2", $glob); // * => .*, ? => . This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-10-01 19:00:42
|
Revision: 10034 http://sourceforge.net/p/phpwiki/code/10034 Author: vargenau Date: 2017-10-01 19:00:39 +0000 (Sun, 01 Oct 2017) Log Message: ----------- Remote code execution through preg_replace() calls. Patches by Thomas Gerbet, Tuleap Modified Paths: -------------- trunk/lib/ErrorManager.php trunk/lib/WikiTheme.php trunk/lib/plugin/WikiAdminRename.php trunk/lib/plugin/WikiAdminSearchReplace.php trunk/lib/stdlib.php trunk/lib/wikilens/Utils.php Modified: trunk/lib/ErrorManager.php =================================================================== --- trunk/lib/ErrorManager.php 2017-10-01 18:27:52 UTC (rev 10033) +++ trunk/lib/ErrorManager.php 2017-10-01 19:00:39 UTC (rev 10034) @@ -494,7 +494,7 @@ $dir .= "\\"; } else $dir .= '/'; - $errfile = preg_replace('|^' . preg_quote($dir) . '|', '', $this->errfile); + $errfile = preg_replace('|^' . preg_quote($dir, '|') . '|', '', $this->errfile); $lines = explode("\n", $this->errstr); if (DEBUG & _DEBUG_VERBOSE) { $msg = sprintf("%s:%d %s[%d]: %s", @@ -637,7 +637,7 @@ $dir .= "\\"; } else $dir .= '/'; - $errfile = preg_replace('|^' . preg_quote($dir) . '|', '', $this->errfile); + $errfile = preg_replace('|^' . preg_quote($dir, '|') . '|', '', $this->errfile); if (is_string($this->errstr)) $lines = explode("\n", $this->errstr); elseif (is_object($this->errstr)) Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2017-10-01 18:27:52 UTC (rev 10033) +++ trunk/lib/WikiTheme.php 2017-10-01 19:00:39 UTC (rev 10034) @@ -884,13 +884,25 @@ $qtext = urlencode($text); $url = $this->_findButton("$qtext.png"); if ($url && strstr($url, '%')) { - $url = preg_replace('|([^/]+)$|e', 'urlencode("\\1")', $url); + $url = preg_replace_callback( + '|([^/]+)$|', + function (array $matches) { + return urlencode($matches[1]); + }, + $url + ); } if (!$url) { // Jeff complained about png not supported everywhere. // This was not PC until 2005. $url = $this->_findButton("$qtext.gif"); if ($url && strstr($url, '%')) { - $url = preg_replace('|([^/]+)$|e', 'urlencode("\\1")', $url); + $url = preg_replace_callback( + '|([^/]+)$|', + function (array $matches) { + return urlencode($matches[1]); + }, + $url + ); } } if ($url and $this->DUMP_MODE) { Modified: trunk/lib/plugin/WikiAdminRename.php =================================================================== --- trunk/lib/plugin/WikiAdminRename.php 2017-10-01 18:27:52 UTC (rev 10033) +++ trunk/lib/plugin/WikiAdminRename.php 2017-10-01 19:00:39 UTC (rev 10034) @@ -56,7 +56,7 @@ public static function renameHelper($name, $from, $to, $options = array()) { if (isset($options['regex'])) { - return preg_replace('/' . $from . '/' . (isset($options['icase']) ? 'i' : ''), $to, $name); + return preg_replace('/' . str_replace('/', '\/', $from) . '/'.($options['icase']?'i':''), $to, $name); } elseif (isset($options['icase'])) { return str_ireplace($from, $to, $name); } else { Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2017-10-01 18:27:52 UTC (rev 10033) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2017-10-01 19:00:39 UTC (rev 10034) @@ -167,7 +167,7 @@ $version = $current->getVersion(); $text = $current->getPackedContent(); if ($regex) { - $newtext = preg_replace("/" . $from . "/" . ($case_exact ? '' : 'i'), $to, $text); + $newtext = preg_replace('/' . str_replace('/', '\/', $from) . '/' .($case_exact?'':'i'), $to, $text); } else { if ($case_exact) { $newtext = str_replace($from, $to, $text); Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2017-10-01 18:27:52 UTC (rev 10033) +++ trunk/lib/stdlib.php 2017-10-01 19:00:39 UTC (rev 10034) @@ -1458,7 +1458,7 @@ $glob = str_replace("/", "\\/", $glob); // first convert some unescaped expressions to pcre style: . => \. $special = '.^$'; - $re = preg_replace('/([^\xff])?([' . preg_quote($special) . '])/', + $re = preg_replace('/([^\xff])?(['.preg_quote($special, '/').'])/', "\\1\xff\\2", $glob); // * => .*, ? => . Modified: trunk/lib/wikilens/Utils.php =================================================================== --- trunk/lib/wikilens/Utils.php 2017-10-01 18:27:52 UTC (rev 10033) +++ trunk/lib/wikilens/Utils.php 2017-10-01 19:00:39 UTC (rev 10034) @@ -41,9 +41,9 @@ } // add new data to the appropriate line - if (preg_match('/^' . preg_quote($START_DELIM) . '/', $text)) { + if (preg_match('/^' . preg_quote($START_DELIM, '/') . '/', $text)) { // need multiline modifier to match EOL correctly - $text = preg_replace('/(^' . preg_quote($START_DELIM) . '.*)$/m', + $text = preg_replace('/(^' . preg_quote($START_DELIM, '/') . '.*)$/m', '$1' . $DELIM . $new_data, $text); } else { // handle case where the line does not yet exist This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-10-01 18:27:55
|
Revision: 10033 http://sourceforge.net/p/phpwiki/code/10033 Author: vargenau Date: 2017-10-01 18:27:52 +0000 (Sun, 01 Oct 2017) Log Message: ----------- Transclude plugin: use CSS Modified Paths: -------------- trunk/lib/plugin/Transclude.php trunk/themes/Crao/crao.css trunk/themes/Hawaiian/Hawaiian.css trunk/themes/MacOSX/MacOSX.css trunk/themes/MonoBook/monobook.css trunk/themes/Portland/portland.css trunk/themes/Sidebar/sidebar.css trunk/themes/SpaceWiki/SpaceWiki.css trunk/themes/Wordpress/Wordpress.css trunk/themes/blog/Kubrick.css trunk/themes/default/phpwiki.css trunk/themes/fusionforge/fusionforge.css trunk/themes/shamino_com/shamino_com.css Modified: trunk/lib/plugin/Transclude.php =================================================================== --- trunk/lib/plugin/Transclude.php 2017-08-10 15:47:27 UTC (rev 10032) +++ trunk/lib/plugin/Transclude.php 2017-10-01 18:27:52 UTC (rev 10033) @@ -98,10 +98,7 @@ $params = array('title' => $title, 'src' => $src, - 'width' => "100%", 'height' => $height, - 'marginwidth' => 0, - 'marginheight' => 0, 'class' => 'autoHeight transclude'); $iframe = HTML::iframe($params); Modified: trunk/themes/Crao/crao.css =================================================================== --- trunk/themes/Crao/crao.css 2017-08-10 15:47:27 UTC (rev 10032) +++ trunk/themes/Crao/crao.css 2017-10-01 18:27:52 UTC (rev 10033) @@ -1266,6 +1266,13 @@ padding: 0.5ex 0.5em; } +/* Transclude plugin ================================================= */ + +.transclude { + margin: 0; + width: 100%; +} + /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ /* Modified: trunk/themes/Hawaiian/Hawaiian.css =================================================================== --- trunk/themes/Hawaiian/Hawaiian.css 2017-08-10 15:47:27 UTC (rev 10032) +++ trunk/themes/Hawaiian/Hawaiian.css 2017-10-01 18:27:52 UTC (rev 10033) @@ -635,6 +635,13 @@ background-repeat: repeat; } +/* Transclude plugin ================================================= */ + +.transclude { + margin: 0; + width: 100%; +} + /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ /* Modified: trunk/themes/MacOSX/MacOSX.css =================================================================== --- trunk/themes/MacOSX/MacOSX.css 2017-08-10 15:47:27 UTC (rev 10032) +++ trunk/themes/MacOSX/MacOSX.css 2017-10-01 18:27:52 UTC (rev 10033) @@ -1157,6 +1157,13 @@ padding-right: 0.5ex; } +/* Transclude plugin ================================================= */ + +.transclude { + margin: 0; + width: 100%; +} + /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ /* Modified: trunk/themes/MonoBook/monobook.css =================================================================== --- trunk/themes/MonoBook/monobook.css 2017-08-10 15:47:27 UTC (rev 10032) +++ trunk/themes/MonoBook/monobook.css 2017-10-01 18:27:52 UTC (rev 10033) @@ -2205,12 +2205,20 @@ border: 1px solid #ffa500; } -/* PageTrail plugin */ +/* PageTrail plugin ================================================== */ + .pagetrail { background-color: #FFFF99; padding: 0.2em; } +/* Transclude plugin ================================================= */ + +.transclude { + margin: 0; + width: 100%; +} + /* IncludePage plugin ================================================= */ .transclusion-title { Modified: trunk/themes/Portland/portland.css =================================================================== --- trunk/themes/Portland/portland.css 2017-08-10 15:47:27 UTC (rev 10032) +++ trunk/themes/Portland/portland.css 2017-10-01 18:27:52 UTC (rev 10033) @@ -148,6 +148,13 @@ margin: 0.5ex 0; } +/* Transclude plugin ================================================= */ + +.transclude { + margin: 0; + width: 100%; +} + /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ /* Modified: trunk/themes/Sidebar/sidebar.css =================================================================== --- trunk/themes/Sidebar/sidebar.css 2017-08-10 15:47:27 UTC (rev 10032) +++ trunk/themes/Sidebar/sidebar.css 2017-10-01 18:27:52 UTC (rev 10033) @@ -2238,6 +2238,13 @@ margin: 0; } +/* Transclude plugin ================================================= */ + +.transclude { + margin: 0; + width: 100%; +} + /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ /* Modified: trunk/themes/SpaceWiki/SpaceWiki.css =================================================================== --- trunk/themes/SpaceWiki/SpaceWiki.css 2017-08-10 15:47:27 UTC (rev 10032) +++ trunk/themes/SpaceWiki/SpaceWiki.css 2017-10-01 18:27:52 UTC (rev 10033) @@ -999,6 +999,13 @@ margin: 1px; } +/* Transclude plugin ================================================= */ + +.transclude { + margin: 0; + width: 100%; +} + /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ /* Modified: trunk/themes/Wordpress/Wordpress.css =================================================================== --- trunk/themes/Wordpress/Wordpress.css 2017-08-10 15:47:27 UTC (rev 10032) +++ trunk/themes/Wordpress/Wordpress.css 2017-10-01 18:27:52 UTC (rev 10033) @@ -1070,6 +1070,13 @@ vertical-align: top; } +/* Transclude plugin ================================================= */ + +.transclude { + margin: 0; + width: 100%; +} + /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ /* Modified: trunk/themes/blog/Kubrick.css =================================================================== --- trunk/themes/blog/Kubrick.css 2017-08-10 15:47:27 UTC (rev 10032) +++ trunk/themes/blog/Kubrick.css 2017-10-01 18:27:52 UTC (rev 10033) @@ -986,6 +986,13 @@ vertical-align: top; } +/* Transclude plugin ================================================= */ + +.transclude { + margin: 0; + width: 100%; +} + /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ /* Modified: trunk/themes/default/phpwiki.css =================================================================== --- trunk/themes/default/phpwiki.css 2017-08-10 15:47:27 UTC (rev 10032) +++ trunk/themes/default/phpwiki.css 2017-10-01 18:27:52 UTC (rev 10033) @@ -1230,6 +1230,13 @@ padding-right: 1px; } +/* Transclude plugin ================================================= */ + +.transclude { + margin: 0; + width: 100%; +} + /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ /* Modified: trunk/themes/fusionforge/fusionforge.css =================================================================== --- trunk/themes/fusionforge/fusionforge.css 2017-08-10 15:47:27 UTC (rev 10032) +++ trunk/themes/fusionforge/fusionforge.css 2017-10-01 18:27:52 UTC (rev 10033) @@ -1251,6 +1251,13 @@ font-style: italic; } +/* Transclude plugin ================================================= */ + +.transclude { + margin: 0; + width: 100%; +} + /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ /* Modified: trunk/themes/shamino_com/shamino_com.css =================================================================== --- trunk/themes/shamino_com/shamino_com.css 2017-08-10 15:47:27 UTC (rev 10032) +++ trunk/themes/shamino_com/shamino_com.css 2017-10-01 18:27:52 UTC (rev 10033) @@ -356,6 +356,13 @@ margin: 0.5ex 0; } +/* Transclude plugin ================================================= */ + +.transclude { + margin: 0; + width: 100%; +} + /* WikicreoleTable, MediawikiTable and RichTable plugins ============== */ /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-08-10 15:47:29
|
Revision: 10032 http://sourceforge.net/p/phpwiki/code/10032 Author: vargenau Date: 2017-08-10 15:47:27 +0000 (Thu, 10 Aug 2017) Log Message: ----------- Align PDO code with Pear Modified Paths: -------------- trunk/lib/WikiUser/PdoDb.php Modified: trunk/lib/WikiUser/PdoDb.php =================================================================== --- trunk/lib/WikiUser/PdoDb.php 2017-08-10 15:46:30 UTC (rev 10031) +++ trunk/lib/WikiUser/PdoDb.php 2017-08-10 15:47:27 UTC (rev 10032) @@ -45,11 +45,13 @@ global $request; if (!$this->_prefs and is_a($this, "_PdoDbPassUser")) { - if ($prefs) $this->_prefs = $prefs; + if ($prefs) { + $this->_prefs = $prefs; + } } - if (!isset($this->_prefs->_method)) + if (!isset($this->_prefs->_method)) { _PassUser::__construct($UserName); - elseif (!$this->isValidName($UserName)) { + } elseif (!$this->isValidName($UserName)) { trigger_error(_("Invalid username."), E_USER_WARNING); return false; } @@ -67,7 +69,7 @@ _AnonUser::getPreferences(); $this->getAuthDbh(); if (isset($this->_prefs->_select)) { - $dbh =& $this->_auth_dbi; + $dbh = &$this->_auth_dbi; $db_result = $dbh->query(sprintf($this->_prefs->_select, $dbh->quote($this->_userid))); // patched by fre...@pa... $prefs = $db_result->fetch(PDO::FETCH_BOTH); @@ -77,7 +79,7 @@ return $this->_prefs; } } - if ($this->_HomePagehandle) { + if (isset($this->_HomePagehandle) && $this->_HomePagehandle) { if ($restored_from_page = $this->_prefs->retrieve ($this->_HomePagehandle->get('pref')) ) { @@ -106,11 +108,11 @@ return false; } //delete pageprefs: - if ($this->_HomePagehandle and $this->_HomePagehandle->get('pref')) + if (isset($this->_HomePagehandle) && $this->_HomePagehandle and $this->_HomePagehandle->get('pref')) $this->_HomePagehandle->set('pref', ''); } else { //store prefs in homepage, not in cookie - if ($this->_HomePagehandle and !$id_only) + if (isset($this->_HomePagehandle) && $this->_HomePagehandle and !$id_only) $this->_HomePagehandle->set('pref', $packed); } return $count; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-08-10 15:46:33
|
Revision: 10031 http://sourceforge.net/p/phpwiki/code/10031 Author: vargenau Date: 2017-08-10 15:46:30 +0000 (Thu, 10 Aug 2017) Log Message: ----------- Remove commented code Modified Paths: -------------- trunk/lib/WikiUser/PearDb.php Modified: trunk/lib/WikiUser/PearDb.php =================================================================== --- trunk/lib/WikiUser/PearDb.php 2017-08-10 15:44:36 UTC (rev 10030) +++ trunk/lib/WikiUser/PearDb.php 2017-08-10 15:46:30 UTC (rev 10031) @@ -98,11 +98,6 @@ // if the prefs are changed if ($count = _AnonUser::setPreferences($prefs, 1)) { - //global $request; - //$user = $request->_user; - //unset($user->_auth_dbi); - // this must be done in $request->_setUser, not here! - //$request->setSessionVar('wiki_user', $user); $this->getAuthDbh(); $packed = $this->_prefs->store(); if (!$id_only and isset($this->_prefs->_update)) { @@ -134,7 +129,7 @@ if (isset($this->_HomePagehandle) && $this->_HomePagehandle and !$id_only) $this->_HomePagehandle->set('pref', $packed); } - return $count; //count($this->_prefs->unpack($packed)); + return $count; } return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-08-10 15:44:38
|
Revision: 10030 http://sourceforge.net/p/phpwiki/code/10030 Author: vargenau Date: 2017-08-10 15:44:36 +0000 (Thu, 10 Aug 2017) Log Message: ----------- PHP Doc Modified Paths: -------------- trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php Modified: trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php =================================================================== --- trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php 2017-08-10 15:01:53 UTC (rev 10029) +++ trunk/lib/WikiDB/backend/dumb/AllRevisionsIter.php 2017-08-10 15:44:36 UTC (rev 10030) @@ -34,8 +34,8 @@ extends WikiDB_backend_iterator { /** - * @param $backend object A WikiDB_backend. - * @param $pagename string Page whose revisions to get. + * @param WikiDB_backend $backend + * @param string $pagename Page whose revisions to get. */ function __construct($backend, $pagename) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-08-10 15:01:56
|
Revision: 10029 http://sourceforge.net/p/phpwiki/code/10029 Author: vargenau Date: 2017-08-10 15:01:53 +0000 (Thu, 10 Aug 2017) Log Message: ----------- Align PDO code with Pear Modified Paths: -------------- trunk/lib/WikiDB/backend/PDO.php Modified: trunk/lib/WikiDB/backend/PDO.php =================================================================== --- trunk/lib/WikiDB/backend/PDO.php 2017-08-10 14:27:11 UTC (rev 10028) +++ trunk/lib/WikiDB/backend/PDO.php 2017-08-10 15:01:53 UTC (rev 10029) @@ -225,9 +225,9 @@ $dbh = &$this->_dbh; extract($this->_table_names); $sth = $dbh->prepare("SELECT $page_tbl.id AS id" - . " FROM $nonempty_tbl, $page_tbl" - . " WHERE $nonempty_tbl.id=$page_tbl.id" - . " AND pagename=?"); + . " FROM $nonempty_tbl, $page_tbl" + . " WHERE $nonempty_tbl.id=$page_tbl.id" + . " AND pagename=?"); $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100); if ($sth->execute()) return $sth->fetchColumn(); @@ -426,10 +426,10 @@ $dbh = &$this->_dbh; extract($this->_table_names); $sth = $dbh->prepare("SELECT latestversion" - . " FROM $page_tbl, $recent_tbl" - . " WHERE $page_tbl.id=$recent_tbl.id" - . " AND pagename=?" - . " LIMIT 1"); + . " FROM $page_tbl, $recent_tbl" + . " WHERE $page_tbl.id=$recent_tbl.id" + . " AND pagename=?" + . " LIMIT 1"); $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100); $sth->execute(); return $sth->fetchColumn(); @@ -473,8 +473,9 @@ // FIXME: optimization: sometimes don't get page data? if ($want_content) { - $fields = $this->page_tbl_fields . ", $page_tbl.pagedata AS pagedata" - . ', ' . $this->version_tbl_fields; + $fields = $this->page_tbl_fields + . ",$page_tbl.pagedata AS pagedata," + . $this->version_tbl_fields; } else { $fields = $this->page_tbl_fields . ", '' AS pagedata" . ", $version_tbl.version AS version, $version_tbl.mtime AS mtime, " @@ -482,11 +483,11 @@ . "$version_tbl.versiondata as versiondata"; } $sth = $dbh->prepare("SELECT $fields" - . " FROM $page_tbl, $version_tbl" - . " WHERE $page_tbl.id=$version_tbl.id" - . " AND pagename=?" - . " AND version=?" - . " LIMIT 1"); + . " FROM $page_tbl, $version_tbl" + . " WHERE $page_tbl.id=$version_tbl.id" + . " AND pagename=?" + . " AND version=?" + . " LIMIT 1"); $sth->bindParam(1, $pagename, PDO::PARAM_STR, 100); $sth->bindParam(2, $version, PDO::PARAM_INT); $sth->execute(); @@ -691,9 +692,9 @@ $this->lock(array('version', 'recent', 'nonempty', 'page', 'link')); if (($id = $this->_get_pageid($pagename, false))) { + $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$id"); + $dbh->query("DELETE FROM $recent_tbl WHERE id=$id"); $dbh->query("DELETE FROM $version_tbl WHERE id=$id"); - $dbh->query("DELETE FROM $recent_tbl WHERE id=$id"); - $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$id"); $this->set_links($pagename, array()); $sth = $dbh->prepare("SELECT COUNT(*) FROM $link_tbl WHERE linkto=$id"); $sth->execute(); @@ -837,13 +838,14 @@ extract($this->_table_names); $orderby = $this->sortby($sortby, 'db'); if ($orderby) $orderby = ' ORDER BY ' . $orderby; - if ($exclude) // array of pagenames + if ($exclude) { // array of pagenames $exclude = " AND $page_tbl.pagename NOT IN " . $this->_sql_set($exclude); - else + } else { $exclude = ''; + } $limit = $this->_limit_sql($limit); - if (strstr($orderby, 'mtime ')) { // was ' mtime' + if (strstr($orderby, 'mtime ')) { // multiple columns possible if ($include_empty) { $sql = "SELECT " . $this->page_tbl_fields @@ -885,7 +887,7 @@ } /* - * Title and fulltext search. + * Text search (title or full text) */ public function text_search($search, $fulltext = false, $sortby = '', $limit = '', $exclude = '') @@ -958,9 +960,10 @@ } else { $where = " AND hits > 0"; } + $orderby = ''; if ($sortby != '-hits') { - if ($order = $this->sortby($sortby, 'db')) $orderby = " ORDER BY " . $order; - else $orderby = ""; + if ($order = $this->sortby($sortby, 'db')) + $orderby = " ORDER BY " . $order; } else { $orderby = " ORDER BY hits $order"; } @@ -1108,13 +1111,13 @@ // Cludge Alert! // This page does not exist (already verified before), but exists in the page table. // So we delete this page. - $dbh->query("DELETE FROM $page_tbl WHERE id=$new"); + $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$new"); + $dbh->query("DELETE FROM $recent_tbl WHERE id=$new"); $dbh->query("DELETE FROM $version_tbl WHERE id=$new"); - $dbh->query("DELETE FROM $recent_tbl WHERE id=$new"); - $dbh->query("DELETE FROM $nonempty_tbl WHERE id=$new"); // We have to fix all referring tables to the old id $dbh->query("UPDATE $link_tbl SET linkfrom=$id WHERE linkfrom=$new"); $dbh->query("UPDATE $link_tbl SET linkto=$id WHERE linkto=$new"); + $dbh->query("DELETE FROM $page_tbl WHERE id=$new"); } $sth = $dbh->prepare("UPDATE $page_tbl SET pagename=? WHERE id=?"); $sth->bindParam(1, $to, PDO::PARAM_STR, 100); @@ -1137,11 +1140,11 @@ $backend_type = $this->backendType(); if (substr($backend_type, 0, 5) == 'mysql') { $sth = $dbh->prepare("REPLACE INTO $recent_tbl" - . " (id, latestversion, latestmajor, latestminor)" - . " SELECT id, $maxversion, $maxmajor, $maxminor" - . " FROM $version_tbl" - . ($pageid ? " WHERE id=$pageid" : "") - . " GROUP BY id"); + . " (id, latestversion, latestmajor, latestminor)" + . " SELECT id, $maxversion, $maxmajor, $maxminor" + . " FROM $version_tbl" + . ($pageid ? " WHERE id=$pageid" : "") + . " GROUP BY id"); $sth->execute(); } else { $this->lock(array('recent')); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-08-10 14:27:13
|
Revision: 10028 http://sourceforge.net/p/phpwiki/code/10028 Author: vargenau Date: 2017-08-10 14:27:11 +0000 (Thu, 10 Aug 2017) Log Message: ----------- Use __construct Modified Paths: -------------- trunk/lib/DbaPartition.php Modified: trunk/lib/DbaPartition.php =================================================================== --- trunk/lib/DbaPartition.php 2017-08-10 14:23:31 UTC (rev 10027) +++ trunk/lib/DbaPartition.php 2017-08-10 14:27:11 UTC (rev 10028) @@ -25,7 +25,7 @@ class DbaPartition { - function DbaPartition(&$dbm, $prefix) + function __construct(&$dbm, $prefix) { $this->_h = &$dbm; $this->_p = $prefix; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-08-10 14:23:34
|
Revision: 10027 http://sourceforge.net/p/phpwiki/code/10027 Author: vargenau Date: 2017-08-10 14:23:31 +0000 (Thu, 10 Aug 2017) Log Message: ----------- No self-closing <div> Modified Paths: -------------- trunk/lib/display.php Modified: trunk/lib/display.php =================================================================== --- trunk/lib/display.php 2017-08-10 14:22:04 UTC (rev 10026) +++ trunk/lib/display.php 2017-08-10 14:23:31 UTC (rev 10027) @@ -260,7 +260,7 @@ $request->finish(); } else { $request->cacheControl(); - echo('<div style="display:none;" />'); + echo('<div style="display:none;"></div>'); $request->_is_buffering_output = false; // avoid wrong Content-Length with errors $request->finish(); exit(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-08-10 14:22:07
|
Revision: 10026 http://sourceforge.net/p/phpwiki/code/10026 Author: vargenau Date: 2017-08-10 14:22:04 +0000 (Thu, 10 Aug 2017) Log Message: ----------- Remove $Id Modified Paths: -------------- trunk/doc/HISTORY trunk/locale/README Modified: trunk/doc/HISTORY =================================================================== --- trunk/doc/HISTORY 2017-08-10 14:13:16 UTC (rev 10025) +++ trunk/doc/HISTORY 2017-08-10 14:22:04 UTC (rev 10026) @@ -595,5 +595,3 @@ Prior to 0.02, there were no numbered releases, and in fact there was only one release, so I guess that would be 0.01 :-) - -$Id: HISTORY 7665 2010-08-31 15:54:37Z vargenau $ Modified: trunk/locale/README =================================================================== --- trunk/locale/README 2017-08-10 14:13:16 UTC (rev 10025) +++ trunk/locale/README 2017-08-10 14:22:04 UTC (rev 10026) @@ -371,5 +371,3 @@ Arno Hollosi <aho...@ma...> Carsten Klapp <car...@us...> Reini Urban <ru...@x-...> - -$Id: README 7001 2009-07-06 14:23:30Z vargenau $ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-08-10 14:13:18
|
Revision: 10025 http://sourceforge.net/p/phpwiki/code/10025 Author: vargenau Date: 2017-08-10 14:13:16 +0000 (Thu, 10 Aug 2017) Log Message: ----------- Use __construct Modified Paths: -------------- trunk/themes/Hawaiian/lib/random.php Modified: trunk/themes/Hawaiian/lib/random.php =================================================================== --- trunk/themes/Hawaiian/lib/random.php 2017-08-10 14:12:30 UTC (rev 10024) +++ trunk/themes/Hawaiian/lib/random.php 2017-08-10 14:13:16 UTC (rev 10025) @@ -30,7 +30,7 @@ * $imgSet = new randomImage($WikiTheme->file("images/pictures")); * $imgFile = "pictures/" . $imgSet->filename; */ - function randomImage($dirname) + function __construct($dirname) { $this->filename = ""; // Pick up your filename here. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2017-08-10 14:12:33
|
Revision: 10024 http://sourceforge.net/p/phpwiki/code/10024 Author: vargenau Date: 2017-08-10 14:12:30 +0000 (Thu, 10 Aug 2017) Log Message: ----------- Remove commented code Modified Paths: -------------- trunk/lib/wikilens/PageListColumns.php Modified: trunk/lib/wikilens/PageListColumns.php =================================================================== --- trunk/lib/wikilens/PageListColumns.php 2017-07-11 13:47:03 UTC (rev 10023) +++ trunk/lib/wikilens/PageListColumns.php 2017-08-10 14:12:30 UTC (rev 10024) @@ -391,7 +391,6 @@ $html->pushContent(_("None")); } - //return $top3list; return $html; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |