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
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
(5) |
2
(5) |
3
(11) |
4
(4) |
5
(1) |
|
6
|
7
(5) |
8
|
9
(8) |
10
(15) |
11
|
12
|
|
13
|
14
|
15
(7) |
16
(2) |
17
(1) |
18
|
19
|
|
20
|
21
|
22
|
23
(1) |
24
|
25
(1) |
26
|
|
27
|
28
|
29
|
30
|
31
(5) |
|
|
Revision: 7983 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7983&view=rev Author: vargenau Date: 2011年03月10日 11:03:10 +0000 (2011年3月10日) Log Message: ----------- explode background attributes Modified Paths: -------------- trunk/themes/Hawaiian/Hawaiian.css Modified: trunk/themes/Hawaiian/Hawaiian.css =================================================================== --- trunk/themes/Hawaiian/Hawaiian.css 2011年03月10日 10:52:54 UTC (rev 7982) +++ trunk/themes/Hawaiian/Hawaiian.css 2011年03月10日 11:03:10 UTC (rev 7983) @@ -41,7 +41,9 @@ /* Main wiki text box */ body { color: black; - background: white url("images/uhhbackground.jpg") repeat; + background-color: white; + background-image: url("images/uhhbackground.jpg"); + background-repeat: repeat; font-family: Arial, Helvetica, sans-serif; margin: 1ex 0.5em; } @@ -55,7 +57,7 @@ margin-bottom: 1ex; } img#signature { - background: white; + background-color: white; border: 1px outset gray; padding-left: 8px; padding-right: 8px; @@ -141,8 +143,8 @@ } .pagelist thead, .pagelist thead u { } -.pagelist tr.evenrow { background: #eee; } -.pagelist tr.oddrow { background: white; } +.pagelist tr.evenrow { background-color: #eee; } +.pagelist tr.oddrow { background-color: white; } th.gridbutton { background-color: ThreeDLightShadow; color: black; @@ -270,7 +272,8 @@ padding-top: 110px; } table.cal thead tr:first-child { - background: url("images/pictures/SteamVolcanoDusk.jpg") no-repeat; + background-image: url("images/pictures/SteamVolcanoDusk.jpg"); + background-repeat: no-repeat; background-position: center; font-size: larger; } @@ -278,7 +281,7 @@ table.cal table.cal-header td { text-align: center; color: white; - background: transparent; + background-color: transparent; border: 0; } /* arrow text */ @@ -304,7 +307,7 @@ /* cells */ table.cal tbody td { border: 0.5pt solid #ddd; - background: white; + background-color: white; text-align: right; } /* text */ @@ -317,7 +320,7 @@ /* cell */ table.cal td.cal-today { margin: 1px; - background: white; + background-color: white; border: 0.5pt solid black; } /* text */ @@ -328,7 +331,7 @@ /* cell */ table.cal td.cal-day { margin: 1px; - background: white; + background-color: white; border: 0.5pt solid black; } /* text */ @@ -344,14 +347,13 @@ /* main box */ .diff .block { - background: #ccc; - /*border: 1px solid black;*/ + background-color: #ccc; padding: 0.5ex 0.5em; margin: 0.5ex 0; } /* individual lines */ -.diff .context { background: white; } +.diff .context { background-color: white; } /* + - line prefix */ .diff .block tt{ @@ -365,11 +367,11 @@ font-weight: bold; text-decoration: none; } -.diff .original, .diff .deleted { background: #fcc; } -.diff .final, .diff .added { background: #cfc; } +.diff .original, .diff .deleted { background-color: #fcc; } +.diff .final, .diff .added { background-color: #cfc; } -.diff del { background: #f99; } -.diff ins { background: #9f9; } +.diff del { background-color: #f99; } +.diff ins { background-color: #9f9; } /** * Other @@ -405,9 +407,9 @@ /** * Search Results */ -.search-context { background: white; font-style: oblique; } +.search-context { background-color: white; font-style: oblique; } .search-term { - background: yellow; + background-color: yellow; font-weight: normal; } #LSResult { @@ -453,13 +455,16 @@ div.wikitext { width: auto; - background: url("images/tchecker-white.png") repeat; + background-image: url("images/tchecker-white.png"); + background-repeat: repeat; } .wiki-edithelp { - background: url("images/tchecker-sand.png") repeat; + background-image: url("images/tchecker-sand.png"); + background-repeat: repeat; } .wiki-edithelp p { - background: url("images/tchecker-white.png") repeat; + background-image: url("images/tchecker-white.png"); + background-repeat: repeat; } /** @@ -472,7 +477,8 @@ * Other */ .debug { - background: url("images/tchecker-sand.png") repeat; + background-image: url("images/tchecker-sand.png"); + background-repeat: repeat; } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7982 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7982&view=rev Author: vargenau Date: 2011年03月10日 10:52:54 +0000 (2011年3月10日) Log Message: ----------- Compress CSS Modified Paths: -------------- trunk/themes/fusionforge/fusionforge-min.css Modified: trunk/themes/fusionforge/fusionforge-min.css =================================================================== --- trunk/themes/fusionforge/fusionforge-min.css 2011年03月10日 10:52:34 UTC (rev 7981) +++ trunk/themes/fusionforge/fusionforge-min.css 2011年03月10日 10:52:54 UTC (rev 7982) @@ -1 +1 @@ -li p{margin:0;}div.wikitext table p{margin-top:.3em;margin-bottom:.3em;}img{vertical-align:baseline;}input{margin:.1em;}input.numeric{text-align:right;}fieldset{background-color:#e0f3f7;}legend{border:1px solid #d8d8e7;background-color:white;}img{border:0;}form{margin:0;}table{empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;}div.wikiaction,form.wikiadmin div{border-bottom:1px solid #d8d8e7;border-right:1px solid #d8d8e7;border-top:1px solid #96a2ae;border-left:1px solid #96a2ae;margin-top:.5ex;margin-bottom:.5ex;padding:.5ex .5em;display:table;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}div#actionbuttons{line-height:3.0ex;}.wikiunknown a,.named-wikiunknown a{border-top:1px solid #c6d2de;border-left:1px solid #c6d2de;border-bottom:1px solid #a2a2a2;border-right:1px solid #a2a2a2;padding-left:1px;padding-right:1px;padding-top:1px;margin-right:.15em;}img.linkicon{vertical-align:middle;}img.inlineimage{vertical-align:middle;}div.wikitext pre{font-family:monospace;border-width:1px;border-color:navy;border-style:dashed;padding:.5em;}div.wikitext{margin-top:1ex;margin-bottom:.5ex;padding-bottom:1em;clear:both;}body.sidebar{margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}.wiki,.named-wiki{font-weight:bold;}a.wikiaction,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;white-space:nowrap;}input.wikiaction,input.button,input.wikiadmin{margin-right:1em;margin-left:1em;}.wikiunsafe{background-color:#fcc;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;}h1 .backlinks{text-decoration:none;color:inherit;}.wikipage{font-weight:normal;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}div.toc{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;}div.toc ul{list-style:none;}div.toc p.toctitle{font-weight:bold;font-size:1.6em;margin-bottom:1ex;}div.toc p{margin:0;}.toclist a{text-decoration:none;}div.toc p.toctitle,h2,h3,h4,h5,h6{font-family:Verdana,Arial,Helvetica,sans-serif;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1,h1 .backlinks,h2,.wikitext h2 a,h3,.wikitext h3 a,h4,.wikitext h4 a,h5,h6{text-decoration:none;}.pagelist thead th{background:#d8d8d8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tr{vertical-align:top;}.pagelist tr.evenrow{background:#eee;}.pagelist tr.oddrow{background:white;}th.gridbutton{background-color:#d8d8d8;color:#565c5e;font-weight:bold;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:black;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;color:#565c5e;}.toolbar,input.button{font-family:Verdana,Arial,Helvetica,sans-serif;}.toolbar{padding:0;margin:0;}.toolbar li{margin-left:-20px;list-style-type:none;font-weight:bold;}.toolbar a{text-decoration:none;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}.tooltitle{font-weight:bold;}#actionbuttons{white-space:nowrap;}#actionbuttons .named-wiki,#actionbuttons .wikiaction,#actionbuttons .wikiadmin{font-weight:normal;color:#565c5e;}#actionbuttons .named-wiki:hover,#actionbuttons .wikiaction:hover,#actionbuttons .wikiadmin:hover{text-decoration:underline;}#actionbuttons td{border:1px solid #aaa;border-bottom:none;border-collapse:collapse;padding-left:.8em;padding-right:.8em;}#actionbuttons td.spacer{width:10px;border:none;padding-left:0;padding-right:0;}#actionbuttons td.bold a{font-weight:bold;}.editdate{font-family:Verdana,Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.5ex;border-top:1px #aaa solid;}#logo img{float:right;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}#search-replace{margin-top:1ex;text-align:left;font-size:smaller;}#toolbar{padding:0;}.search-context{background:white;}.search-term{background:yellow;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;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.pagetrail{background-color:#FF9;padding:.2em;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Verdana,Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}.diff .prefix{position:relative;left:-1em;}.diff del,.diff ins{padding-left:1px;padding-right:1px;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.error,.warning,.debug,.hint{font-weight:bold;font-size:11px;text-align:left;border-width:2px;border-style:solid;padding:.5em;}.error{background-color:#ffc0cb;border-color:red;}.warning{background-color:#ffd297;border-color:#FFA500;}.debug{background-color:white;border-color:#fff8dc;}.hint{background-color:#eee;border-color:black;}p.error,p.warning,p.debug,p.hint,div.error div.warning,div.debug,div.hint{border-radius:1em;-moz-border-radius:1em;-webkit-border-radius:1em;}span.error,span.warning,span.debug,span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}blockquote.mail-style-quote{margin:0;margin-bottom:1em;border:1px solid #284;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;background:transparent;border-style:none;border-left:medium solid #284;padding:0;padding-left:.5em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.clear-floats{clear:both;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid #888;}.box-title{font-weight:normal;background-color:#ccc;color:black;text-align:center;}.box-data{width:160px;font-size:9pt;font-weight:normal;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.rss{margin:1em;padding:1em;}div.feed{margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;font-size:1.2em;}.chandesc{font-weight:bold;}div.rssitem{padding-top:1em;padding-bottom:1em;border-top:2px solid #565c5e;}div.itemname{padding-bottom:1em;font-weight:bold;}div.itemdesc{padding-left:1em;}div.authordate{font-style:italic;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}#content{margin:0;padding:1em 1em 1.5em 1em;border:1px solid #aaa;line-height:1.2em;position:relative;z-index:2;}#footer{text-align:right;vertical-align:bottom;font-style:italic;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid;padding:.5em;}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px;}td.tdselected{color:white;background-color:#554295;}td.tdunselected{color:black;background-color:#e9e8de;}.browsebanner table{width:100%;background-color:#e9fbff;border-style:solid;border-color:blue;border-width:2px;}.browsebanner table td{text-align:center;font-weight:bold;font-style:oblique;}.rateit{font-size:60%;font-weight:bold;vertical-align:middle;} \ No newline at end of file +li p{margin:0;}div.wikitext table p{margin-top:.3em;margin-bottom:.3em;}img{vertical-align:baseline;}input{margin:.1em;}input.numeric{text-align:right;}fieldset{background-color:#e0f3f7;}legend{border:1px solid #d8d8e7;background-color:white;}img{border:0;}form{margin:0;}table{empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;}div.wikiaction,form.wikiadmin div{border-bottom:1px solid #d8d8e7;border-right:1px solid #d8d8e7;border-top:1px solid #96a2ae;border-left:1px solid #96a2ae;margin-top:.5ex;margin-bottom:.5ex;padding:.5ex .5em;display:table;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}div#actionbuttons{line-height:3.0ex;}.wikiunknown a,.named-wikiunknown a{border-top:1px solid #c6d2de;border-left:1px solid #c6d2de;border-bottom:1px solid #a2a2a2;border-right:1px solid #a2a2a2;padding-left:1px;padding-right:1px;padding-top:1px;margin-right:.15em;}img.linkicon{vertical-align:middle;}img.inlineimage{vertical-align:middle;}div.wikitext pre{font-family:monospace;border-width:1px;border-color:navy;border-style:dashed;padding:.5em;}div.wikitext{margin-top:1ex;margin-bottom:.5ex;padding-bottom:1em;clear:both;}body.sidebar{margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}.wiki,.named-wiki{font-weight:bold;}a.wikiaction,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;white-space:nowrap;}input.wikiaction,input.button,input.wikiadmin{margin-right:1em;margin-left:1em;}.wikiunsafe{background-color:#fcc;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;}h1 .backlinks{text-decoration:none;color:inherit;}.wikipage{font-weight:normal;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}div.toc{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;}div.toc ul{list-style:none;}div.toc p.toctitle{font-weight:bold;font-size:1.6em;margin-bottom:1ex;}div.toc p{margin:0;}.toclist a{text-decoration:none;}div.toc p.toctitle,h2,h3,h4,h5,h6{font-family:Verdana,Arial,Helvetica,sans-serif;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1,h1 .backlinks,h2,.wikitext h2 a,h3,.wikitext h3 a,h4,.wikitext h4 a,h5,h6{text-decoration:none;}.pagelist thead th{background:#d8d8d8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tr{vertical-align:top;}.pagelist tr.evenrow{background:#eee;}.pagelist tr.oddrow{background:white;}th.gridbutton{background-color:#d8d8d8;color:#565c5e;font-weight:bold;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:black;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;color:#565c5e;}.toolbar,input.button{font-family:Verdana,Arial,Helvetica,sans-serif;}.toolbar{padding:0;margin:0;}.toolbar li{margin-left:-20px;list-style-type:none;font-weight:bold;}.toolbar a{text-decoration:none;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}.tooltitle{font-weight:bold;}#actionbuttons{white-space:nowrap;}#actionbuttons .named-wiki,#actionbuttons .wikiaction,#actionbuttons .wikiadmin{font-weight:normal;color:#565c5e;}#actionbuttons .named-wiki:hover,#actionbuttons .wikiaction:hover,#actionbuttons .wikiadmin:hover{text-decoration:underline;}#actionbuttons td{border:1px solid #aaa;border-bottom:none;border-collapse:collapse;padding-left:.8em;padding-right:.8em;}#actionbuttons td.spacer{width:10px;border:none;padding-left:0;padding-right:0;}#actionbuttons td.bold a{font-weight:bold;}.editdate{font-family:Verdana,Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.5ex;border-top:1px #aaa solid;}#logo img{float:right;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}#search-replace{margin-top:1ex;text-align:left;font-size:smaller;}#toolbar{padding:0;}.search-context{background:white;}.search-term{background:yellow;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;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.pagetrail{background-color:#FF9;padding:.2em;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Verdana,Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}.diff .prefix{position:relative;left:-1em;}.diff del,.diff ins{padding-left:1px;padding-right:1px;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.error,.warning,.debug,.hint{font-weight:bold;font-size:11px;text-align:left;border-width:2px;border-style:solid;padding:.5em;}.error{background-color:#ffc0cb;border-color:red;}.warning{background-color:#ffd297;border-color:#FFA500;}.debug{background-color:white;border-color:#fff8dc;}.hint{background-color:#eee;border-color:black;}p.error,p.warning,p.debug,p.hint,div.error div.warning,div.debug,div.hint{border-radius:1em;-moz-border-radius:1em;-webkit-border-radius:1em;}span.error,span.warning,span.debug,span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}blockquote.mail-style-quote{margin:0;margin-bottom:1em;border:1px solid #284;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;background-color:transparent;border-style:none;border-left:medium solid #284;padding:0;padding-left:.5em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.clear-floats{clear:both;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid #888;}.box-title{font-weight:normal;background-color:#ccc;color:black;text-align:center;}.box-data{width:160px;font-size:9pt;font-weight:normal;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.rss{margin:1em;padding:1em;}div.feed{margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;font-size:1.2em;}.chandesc{font-weight:bold;}div.rssitem{padding-top:1em;padding-bottom:1em;border-top:2px solid #565c5e;}div.itemname{padding-bottom:1em;font-weight:bold;}div.itemdesc{padding-left:1em;}div.authordate{font-style:italic;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}#content{margin:0;padding:1em 1em 1.5em 1em;border:1px solid #aaa;line-height:1.2em;position:relative;z-index:2;}#footer{text-align:right;vertical-align:bottom;font-style:italic;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid;padding:.5em;}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px;}td.tdselected{color:white;background-color:#554295;}td.tdunselected{color:black;background-color:#e9e8de;}.browsebanner table{width:100%;background-color:#e9fbff;border-style:solid;border-color:blue;border-width:2px;}.browsebanner table td{text-align:center;font-weight:bold;font-style:oblique;}.rateit{font-size:60%;font-weight:bold;vertical-align:middle;} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7981 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7981&view=rev Author: vargenau Date: 2011年03月10日 10:52:34 +0000 (2011年3月10日) Log Message: ----------- Better use background-color Modified Paths: -------------- trunk/themes/fusionforge/fusionforge.css Modified: trunk/themes/fusionforge/fusionforge.css =================================================================== --- trunk/themes/fusionforge/fusionforge.css 2011年03月10日 10:48:31 UTC (rev 7980) +++ trunk/themes/fusionforge/fusionforge.css 2011年03月10日 10:52:34 UTC (rev 7981) @@ -722,7 +722,7 @@ .mail-style-quote blockquote.mail-style-quote { margin-left: 0.3em; margin-bottom : 0em; - background: transparent; + background-color: transparent; border-style: none; border-left: medium solid #284; padding: 0em; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7980 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7980&view=rev Author: vargenau Date: 2011年03月10日 10:48:31 +0000 (2011年3月10日) Log Message: ----------- Compress CSS Modified Paths: -------------- trunk/themes/Crao/crao-min.css Modified: trunk/themes/Crao/crao-min.css =================================================================== --- trunk/themes/Crao/crao-min.css 2011年03月10日 10:47:32 UTC (rev 7979) +++ trunk/themes/Crao/crao-min.css 2011年03月10日 10:48:31 UTC (rev 7980) @@ -1 +1 @@ -body{background-color:#ccc;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:12px;line-height:14px;margin:0;padding:0;border:0 none;color:#000;text-align:left;}img{border:0;vertical-align:middle;}table{border-spacing:0;empty-cells:show;}a:link,a{color:#33c;text-decoration:underline;background-color:transparent;}a:visited{color:#33c;text-decoration:underline;background-color:transparent;}a:hover{color:#03f;text-decoration:underline;background-color:transparent;}hr{background-color:#ccc;height:1px;border:1px solid #ccc;}div.wikitext pre{font-family:monospace;}p{font-size:1em;margin:0;margin-bottom:1em;}ul{position:relative;padding:0;margin:0;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:100%;line-height:120%;list-style:inside;background-color:transparent;}ul ul{position:relative;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:100%;margin-left:2em;}li.rc-major{list-style:none;display:block;background-color:#fff;margin:6px 0;border:1px #666 dashed;padding:.5ex;}li.evenrow{border:0;padding:1ex;}li.oddrow{border:0;padding:1ex;}li strong{font-weight:normal;background-color:transparent;}strong.wiki-summary{display:block;padding:5px 0;background-color:transparent;}li a.wiki-rc-action{display:inline;}li a.wiki-rc-action{border:0;}li.rc-major a.wiki{font-size:1.2em;font-weight:bold;}li>p{display:inline;}p.wiki-rc-action{text-align:center;vertical-align:middle;padding:5px 5px 5px 5px;border:1px #000 solid;background-color:transparent;}p a.wiki-rc-action{display:inline;padding:0 10px;font-weight:bold;background-color:transparent;}#header{background-color:#333;}#logo{color:#ccc;display:inline;margin-top:0;margin-left:0;height:50px;width:auto;background-color:transparent;font:bolder 67px/50px Verdana,Arial,Helvetica,sans-serif;letter-spacing:-0.1em;}#logo img{border:0;}#logo a{color:#ccc;font:bolder 67px/50px Arial,Verdana,Helvetica,sans-serif;text-decoration:none;}div.ie-actionbuttons{position:relative;height:22px;right:0;bottom:0;margin:0;background:transparent url(images/BG.png) no-repeat top right;text-align:right;vertical-align:bottom;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;border:0 none;}#actionbuttons{position:fixed;max-width:30%;height:22px;right:0;bottom:0;margin:0;background:transparent url(images/BG.png) top left;vertical-align:bottom;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;border:0 none;}#actionbuttons a,#actionbuttons a:link{position:relative;display:inline;text-align:right;width:100%;margin-bottom:.5em;margin-top:auto;background-color:transparent;border:0;}#content{margin-top:0;margin-left:7%;margin-right:7%;margin-bottom:7%;background-color:#f2f2f2;border:1px #999 solid;padding-left:2em;padding-right:15px;padding-top:15px;padding-bottom:.5ex;}div.wikitext{font-size:1em;line-height:130%;text-align:left;}blockquote.mail-style-quote{border-left:#F93;margin:0;margin-bottom:1em;border:1px solid #F93;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;background:transparent;border-style:none;border-left:2px solid #F93;padding:0;padding-left:.5em;}blockquote p{margin-top:.5ex;margin-bottom:.5ex;}.toolbar,input.button,#signin{font-family:Verdana,Arial,Helvetica,sans-serif;}div.toolbar{display:block;background-color:#f2f2f2;border:1px #666 solid;margin:2% 7%;}.toolbar{padding:0;margin:0;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}#navbuttons{display:inline;}#navbuttons img{margin:5px 0 5px 10px;}#navbuttons a:link,#navbuttons a{font-weight:bold;padding-left:1ex;padding-right:1ex;color:#333;}#signin{width:auto;text-align:right;padding-right:10px;background-color:transparent;color:#ccc;font-size:12px;}#signin form{text-align:center;padding:1px;margin:0;display:inline;}#signin input{padding:0;padding-left:3px;margin:0;font-family:Verdana,Arial,Helvetica,sans-serif;color:#333;font-size:12px;}#signin input.wikisignin{padding:0;margin:0;border:0 none;}#signin a.wiki{color:#FFF;background-color:transparent;}#search{font-size:12px;margin:5px 10px 5px 10px;float:right;}#search form{text-align:center;padding:1px;margin:0;display:inline;}#search input{padding:0;padding-left:3px;margin:0;font-family:Verdana,Arial,Helvetica,sans-serif;color:#333;font-size:12px;}#search input.wikiaction{padding:0;margin:0;border:0 none;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}#livesearch{height:13px;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;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar{padding-left:1em;}body.sidebar h2{margin-top:0;}form.wikiadmin div{color:#000;background-color:#f2f2f2;}a.wikiaction,a.wikiadmin{line-height:2.6ex;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}img.linkicon{vertical-align:middle;}img.rssicon{vertical-align:baseline;}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe{text-decoration:none;font-family:Verdana,Arial,Helvetica,sans-serif;}.wikiunsafe{color:#000;background-color:#f2f2f2;}input.wikiadmin{color:#000;background-color:#fff;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;background-color:transparent;}.wikiunknown a,.named-wikiunknown a{color:#FFF;background-color:#000;text-decoration:none;font-weight:normal;font-size:1em;padding:1px;padding-top:0;padding-bottom:0;border-top:1px solid #000;border-bottom:1px solid #000;margin-right:2px;}.backlinks{text-decoration:underline;background-color:transparent;color:#006;}.wikipage{font-weight:bold;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}h1,h2,h3,h4,h5,h6{font-family:Arial,Helvetica,sans-serif;}h1{margin-top:10px;background-color:transparent;color:#555;}h1 a.backlinks{color:#777;text-decoration:none;}h1 a.wiki{color:#777;text-decoration:none;}h1 a.pagetitle{color:#555;text-decoration:none;}h1 a:hover{color:#888;text-decoration:underline;}h4,h5,h6{margin-bottom:0;background-color:transparent;color:#111;}div.rss{background-color:#fff;color:#000;border:2px solid #ddd;}div.feed{font-size:1.4em;padding:.5em;}.chandesc{font-size:.9em;}div.rssitem{display:block;background-color:#fff;color:#000;border-top:1px solid #ddd;padding:0 .5em;}div.itemname{display:block;border:0;margin-top:.5em;}div.itemdesc{font-size:1em;margin-bottom:.5em;}table,td{font-family:Verdana,Arial,Helvetica,sans-serif;}caption{font-family:Verdana,Arial,Helvetica,sans-serif;width:auto;}.pagelist{background-color:white;border:1px #333 dashed;}.pagelist tr.evenrow{background-color:white;}.pagelist tr.oddrow{background-color:white;}.pagelist td{padding:3px;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;height:18px;margin:5px 0;float:none;white-space:nowrap;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.wikilink{display:block;}#revision{font-size:10px;text-align:right;background-color:#f2f2f2;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;clear:both;}.editdate{font-family:Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.25ex;}#xhtml-validator{font-size:small;text-align:center;margin-top:1em;}form{margin:0;}input,textarea{margin:.1em;background-color:#FFF;vertical-align:middle;font-size:1em;}input.wikisignin{border:0 none;background-color:#FFF;}input.wikiaction{border:1px solid black;background-color:#D7FA8C;}input.numeric{text-align:center;}textarea.wikiedit{width:90%;margin:.5ex;padding:2px;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;line-height:1em;padding:.2em;border:1px solid #333;background-color:#eee;}fieldset.editarea{margin:1ex;margin-top:1em;text-align:center;padding:10px;border:1px solid #333;background-color:#E8E8E5;}fieldset.toolbar{margin:1ex;margin-top:0;text-align:center;padding:3px;border:1px solid #FFF;background-color:#FFF;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background-color:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Verdana,Helvetica,Arial,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{float:right;font-size:10px;border:1px solid #333;background-color:#ccc;margin:10px;padding:1px;empty-cells:hide;}table.cal td{text-align:right;}table.cal-header{font-size:larger;background-color:#333;color:#f2f2f2;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;color:#fff;}a.cal-arrow{color:#fff;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:none;background-color:#f2f2f2;}a.cal-hide{font-size:9px;text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid #333;color:#000;background-color:#f2f2f2;}table.cal td.cal-day a.cal-day{font-size:9px;text-decoration:underline;}.diff .block div{position:relative;padding-left:1.5em;}.diff .prefix{position:absolute;left:.5em;top:0;}.diff{color:#000;background-color:transparent;border:1px solid black;}.diff .block{color:#000;background-color:#ccc;padding-left:1em;}.diff .context{color:#000;background-color:transparent;border:none;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;background-color:transparent;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{color:#000;background-color:white;}.diff .original,.diff .deleted{color:#000;background-color:#fcc;border:none;}.diff .final,.diff .added{color:#000;background-color:#cfc;border:none;}.diff del{color:#000;background-color:#f99;}.diff ins{color:#000;background-color:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.hint{color:black;background-color:#eee;font-size:smaller;margin-left:5em;border:thin solid #aaa;}#clear{clear:both;margin:0;margin-top:-7px;padding:2px;text-align:center;color:#000;background-color:#FFF;border:solid 0;}#clear{margin-top:0;}img.inlineimage{border:0;vertical-align:middle;margin:0 5px 0 5px;}em>img.inlineimage{float:left;border:0;vertical-align:middle;margin:5px 15px 15px 0;}strong>img.inlineimage{float:right;border:0;vertical-align:middle;margin:5px 0 15px 15px;}h2.wikiblog-heading{font-size:2em;padding-bottom:.5em;border-bottom:2px solid gray;}.interwiki-map thead td{text-decoration:underline;}.printer{display:none;}.error{color:black;background-color:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both;}.debug{color:black;background-color:transparent;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;} \ No newline at end of file +body{background-color:#ccc;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:12px;line-height:14px;margin:0;padding:0;border:0 none;color:#000;text-align:left;}img{border:0;vertical-align:middle;}table{border-spacing:0;empty-cells:show;}a:link,a{color:#33c;text-decoration:underline;background-color:transparent;}a:visited{color:#33c;text-decoration:underline;background-color:transparent;}a:hover{color:#03f;text-decoration:underline;background-color:transparent;}hr{background-color:#ccc;height:1px;border:1px solid #ccc;}div.wikitext pre{font-family:monospace;}p{font-size:1em;margin:0;margin-bottom:1em;}ul{position:relative;padding:0;margin:0;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:100%;line-height:120%;list-style:inside;background-color:transparent;}ul ul{position:relative;font-family:Helvetica,Verdana,Arial,sans-serif;font-size:100%;margin-left:2em;}li.rc-major{list-style:none;display:block;background-color:#fff;margin:6px 0;border:1px #666 dashed;padding:.5ex;}li.evenrow{border:0;padding:1ex;}li.oddrow{border:0;padding:1ex;}li strong{font-weight:normal;background-color:transparent;}strong.wiki-summary{display:block;padding:5px 0;background-color:transparent;}li a.wiki-rc-action{display:inline;}li a.wiki-rc-action{border:0;}li.rc-major a.wiki{font-size:1.2em;font-weight:bold;}li>p{display:inline;}p.wiki-rc-action{text-align:center;vertical-align:middle;padding:5px 5px 5px 5px;border:1px #000 solid;background-color:transparent;}p a.wiki-rc-action{display:inline;padding:0 10px;font-weight:bold;background-color:transparent;}#header{background-color:#333;}#logo{color:#ccc;display:inline;margin-top:0;margin-left:0;height:50px;width:auto;background-color:transparent;font:bolder 67px/50px Verdana,Arial,Helvetica,sans-serif;letter-spacing:-0.1em;}#logo img{border:0;}#logo a{color:#ccc;font:bolder 67px/50px Arial,Verdana,Helvetica,sans-serif;text-decoration:none;}div.ie-actionbuttons{position:relative;height:22px;right:0;bottom:0;margin:0;background-color:transparent;background-image:url(images/BG.png);background-repeat:no-repeat;background-position:top right;text-align:right;vertical-align:bottom;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;border:0 none;}#actionbuttons{position:fixed;max-width:30%;height:22px;right:0;bottom:0;margin:0;background-color:transparent;background-image:url(images/BG.png);background-position:top left;vertical-align:bottom;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;border:0 none;}#actionbuttons a,#actionbuttons a:link{position:relative;display:inline;text-align:right;width:100%;margin-bottom:.5em;margin-top:auto;background-color:transparent;border:0;}#content{margin-top:0;margin-left:7%;margin-right:7%;margin-bottom:7%;background-color:#f2f2f2;border:1px #999 solid;padding-left:2em;padding-right:15px;padding-top:15px;padding-bottom:.5ex;}div.wikitext{font-size:1em;line-height:130%;text-align:left;}blockquote.mail-style-quote{border-left:#F93;margin:0;margin-bottom:1em;border:1px solid #F93;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;background-color:transparent;border-style:none;border-left:2px solid #F93;padding:0;padding-left:.5em;}blockquote p{margin-top:.5ex;margin-bottom:.5ex;}.toolbar,input.button,#signin{font-family:Verdana,Arial,Helvetica,sans-serif;}div.toolbar{display:block;background-color:#f2f2f2;border:1px #666 solid;margin:2% 7%;}.toolbar{padding:0;margin:0;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}#navbuttons{display:inline;}#navbuttons img{margin:5px 0 5px 10px;}#navbuttons a:link,#navbuttons a{font-weight:bold;padding-left:1ex;padding-right:1ex;color:#333;}#signin{width:auto;text-align:right;padding-right:10px;background-color:transparent;color:#ccc;font-size:12px;}#signin form{text-align:center;padding:1px;margin:0;display:inline;}#signin input{padding:0;padding-left:3px;margin:0;font-family:Verdana,Arial,Helvetica,sans-serif;color:#333;font-size:12px;}#signin input.wikisignin{padding:0;margin:0;border:0 none;}#signin a.wiki{color:#FFF;background-color:transparent;}#search{font-size:12px;margin:5px 10px 5px 10px;float:right;}#search form{text-align:center;padding:1px;margin:0;display:inline;}#search input{padding:0;padding-left:3px;margin:0;font-family:Verdana,Arial,Helvetica,sans-serif;color:#333;font-size:12px;}#search input.wikiaction{padding:0;margin:0;border:0 none;}.search-context{background:white;font-style:oblique;}.search-term{background:yellow;font-weight:normal;}#livesearch{height:13px;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;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}body.sidebar{font-size:smaller;margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar{padding-left:1em;}body.sidebar h2{margin-top:0;}form.wikiadmin div{color:#000;background-color:#f2f2f2;}a.wikiaction,a.wikiadmin{line-height:2.6ex;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}img.linkicon{vertical-align:middle;}img.rssicon{vertical-align:baseline;}a.wikiaction,a.wikiadmin,a.wiki-rc-action,a.wikiunsafe{text-decoration:none;font-family:Verdana,Arial,Helvetica,sans-serif;}.wikiunsafe{color:#000;background-color:#f2f2f2;}input.wikiadmin{color:#000;background-color:#fff;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;background-color:transparent;}.wikiunknown a,.named-wikiunknown a{color:#FFF;background-color:#000;text-decoration:none;font-weight:normal;font-size:1em;padding:1px;padding-top:0;padding-bottom:0;border-top:1px solid #000;border-bottom:1px solid #000;margin-right:2px;}.backlinks{text-decoration:underline;background-color:transparent;color:#006;}.wikipage{font-weight:bold;}.interwiki{text-decoration:none;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}h1,h2,h3,h4,h5,h6{font-family:Arial,Helvetica,sans-serif;}h1{margin-top:10px;background-color:transparent;color:#555;}h1 a.backlinks{color:#777;text-decoration:none;}h1 a.wiki{color:#777;text-decoration:none;}h1 a.pagetitle{color:#555;text-decoration:none;}h1 a:hover{color:#888;text-decoration:underline;}h4,h5,h6{margin-bottom:0;background-color:transparent;color:#111;}div.rss{background-color:#fff;color:#000;border:2px solid #ddd;}div.feed{font-size:1.4em;padding:.5em;}.chandesc{font-size:.9em;}div.rssitem{display:block;background-color:#fff;color:#000;border-top:1px solid #ddd;padding:0 .5em;}div.itemname{display:block;border:0;margin-top:.5em;}div.itemdesc{font-size:1em;margin-bottom:.5em;}table,td{font-family:Verdana,Arial,Helvetica,sans-serif;}caption{font-family:Verdana,Arial,Helvetica,sans-serif;width:auto;}.pagelist{background-color:white;border:1px #333 dashed;}.pagelist tr.evenrow{background-color:white;}.pagelist tr.oddrow{background-color:white;}.pagelist td{padding:3px;}th.gridbutton{background-color:ThreeDLightShadow;color:black;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;height:18px;margin:5px 0;float:none;white-space:nowrap;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:ThreeDHighlight ThreeDDarkShadow ThreeDDarkShadow ThreeDHighlight;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;font-size:small;font-weight:normal;font-family:Tahoma,Arial,Helvetica,sans-serif;background-color:ThreeDLightShadow;color:black;}.wikilink{display:block;}#revision{font-size:10px;text-align:right;background-color:#f2f2f2;padding-left:2em;padding-right:1em;padding-top:.5ex;padding-bottom:.5ex;clear:both;}.editdate{font-family:Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.25ex;}#xhtml-validator{font-size:small;text-align:center;margin-top:1em;}form{margin:0;}input,textarea{margin:.1em;background-color:#FFF;vertical-align:middle;font-size:1em;}input.wikisignin{border:0 none;background-color:#FFF;}input.wikiaction{border:1px solid black;background-color:#D7FA8C;}input.numeric{text-align:center;}textarea.wikiedit{width:90%;margin:.5ex;padding:2px;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;line-height:1em;padding:.2em;border:1px solid #333;background-color:#eee;}fieldset.editarea{margin:1ex;margin-top:1em;text-align:center;padding:10px;border:1px solid #333;background-color:#E8E8E5;}fieldset.toolbar{margin:1ex;margin-top:0;text-align:center;padding:3px;border:1px solid #FFF;background-color:#FFF;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background-color:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Verdana,Helvetica,Arial,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{float:right;font-size:10px;border:1px solid #333;background-color:#ccc;margin:10px;padding:1px;empty-cells:hide;}table.cal td{text-align:right;}table.cal-header{font-size:larger;background-color:#333;color:#f2f2f2;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;color:#fff;}a.cal-arrow{color:#fff;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:none;background-color:#f2f2f2;}a.cal-hide{font-size:9px;text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid #333;color:#000;background-color:#f2f2f2;}table.cal td.cal-day a.cal-day{font-size:9px;text-decoration:underline;}.diff .block div{position:relative;padding-left:1.5em;}.diff .prefix{position:absolute;left:.5em;top:0;}.diff{color:#000;background-color:transparent;border:1px solid black;}.diff .block{color:#000;background-color:#ccc;padding-left:1em;}.diff .context{color:#000;background-color:transparent;border:none;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;background-color:transparent;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{color:#000;background-color:white;}.diff .original,.diff .deleted{color:#000;background-color:#fcc;border:none;}.diff .final,.diff .added{color:#000;background-color:#cfc;border:none;}.diff del{color:#000;background-color:#f99;}.diff ins{color:#000;background-color:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}.hint{color:black;background-color:#eee;font-size:smaller;margin-left:5em;border:thin solid #aaa;}#clear{clear:both;margin:0;margin-top:-7px;padding:2px;text-align:center;color:#000;background-color:#FFF;border:solid 0;}#clear{margin-top:0;}img.inlineimage{border:0;vertical-align:middle;margin:0 5px 0 5px;}em>img.inlineimage{float:left;border:0;vertical-align:middle;margin:5px 15px 15px 0;}strong>img.inlineimage{float:right;border:0;vertical-align:middle;margin:5px 0 15px 15px;}h2.wikiblog-heading{font-size:2em;padding-bottom:.5em;border-bottom:2px solid gray;}.interwiki-map thead td{text-decoration:underline;}.printer{display:none;}.error{color:black;background-color:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:medium solid red;clear:both;}.debug{color:black;background-color:transparent;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7979 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7979&view=rev Author: vargenau Date: 2011年03月10日 10:47:32 +0000 (2011年3月10日) Log Message: ----------- explode background attributes Modified Paths: -------------- trunk/themes/Crao/crao.css Modified: trunk/themes/Crao/crao.css =================================================================== --- trunk/themes/Crao/crao.css 2011年03月10日 08:54:06 UTC (rev 7978) +++ trunk/themes/Crao/crao.css 2011年03月10日 10:47:32 UTC (rev 7979) @@ -162,8 +162,7 @@ width:auto; background-color: transparent; font: bolder 67px/50px Verdana, Arial, Helvetica, sans-serif; - letter-spacing: -0.1em; - /* font-variant: condensed; */ + letter-spacing: -0.1em; } #logo img { border: 0px; @@ -171,7 +170,7 @@ #logo a { color: #ccc; font: bolder 67px/50px Arial, Verdana, Helvetica, sans-serif; - text-decoration: none; + text-decoration: none; } /* @@ -182,11 +181,14 @@ */ div.ie-actionbuttons { - position: relative/*absolute*/; - /*max-width: 30%;*/ height: 22px; + position: relative; + height: 22px; right: 0; bottom: 0; margin: 0px; - background: transparent url(images/BG.png) no-repeat top right; + background-color: transparent; + background-image: url(images/BG.png); + background-repeat: no-repeat; + background-position: top right; text-align: right; vertical-align: bottom; padding-left: 2em; @@ -196,14 +198,15 @@ border: 0px none; } -/* body>div#actionbuttons { position: fixed; } */ #actionbuttons { position: fixed; -/* position: absolute; */ - max-width: 30%; height: 22px; + max-width: 30%; + height: 22px; right: 0px; bottom: 0px; margin: 0px; - background: transparent url(images/BG.png) top left;/* MODIFY-IMG */ + background-color: transparent; + background-image: url(images/BG.png); + background-position: top left; vertical-align: bottom; padding-left: 2em; padding-right: 1em; @@ -219,8 +222,8 @@ width: 100%; margin-bottom: 0.5em; margin-top: auto; - background-color:transparent; - border: 0px; + background-color: transparent; + border: 0px; } /* @@ -258,7 +261,7 @@ .mail-style-quote blockquote.mail-style-quote { margin-left: 0.3em; margin-bottom : 0em; - background: transparent; + background-color: transparent; border-style: none; border-left: 2px solid #FF9933;/* MODIFY-color */ padding: 0em; @@ -319,7 +322,7 @@ width: auto; text-align: right; padding-right: 10px; - background-color:transparent; + background-color: transparent; color:#ccc; font-size:12px; } @@ -500,17 +503,17 @@ } /* QuestionMark #600 */ .wikiunknown a, .named-wikiunknown a { - color: #FFFFFF; - background-color: #000000;/* MODIFY-color */ - text-decoration: none; - font-weight: normal; - font-size: 1em; - padding: 1px; - padding-top: 0px; - padding-bottom: 0px; - border-top: 1px solid #000000; - border-bottom: 1px solid #000000; - margin-right: 2px; + color: #FFFFFF; + background-color: #000000;/* MODIFY-color */ + text-decoration: none; + font-weight: normal; + font-size: 1em; + padding: 1px; + padding-top: 0px; + padding-bottom: 0px; + border-top: 1px solid #000000; + border-bottom: 1px solid #000000; + margin-right: 2px; } /* Backlinks */ @@ -536,9 +539,9 @@ h1 { /* MODIFY-TXT */ margin-top: 10px; - background-color: transparent; - color: #555; - } + background-color: transparent; + color: #555; +} h1 a.backlinks{ /* MODIFY-TXT */ color: #777; @@ -558,8 +561,8 @@ } h4, h5, h6 { /* MODIFY-TXT */ margin-bottom: 0px; - background-color: transparent; - color: #111; + background-color: transparent; + color: #111; } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7978 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7978&view=rev Author: vargenau Date: 2011年03月10日 08:54:06 +0000 (2011年3月10日) Log Message: ----------- Wikicreole syntax Modified Paths: -------------- trunk/locale/sv/pgsrc/Framsida trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FL%C3%A4ggaTillSidor trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FWikiWikiWeb trunk/locale/sv/pgsrc/PhpWikiAdministration trunk/locale/sv/pgsrc/S%C3%B6kEfterSida Modified: trunk/locale/sv/pgsrc/Framsida =================================================================== --- trunk/locale/sv/pgsrc/Framsida 2011年03月09日 16:40:37 UTC (rev 7977) +++ trunk/locale/sv/pgsrc/Framsida 2011年03月10日 08:54:06 UTC (rev 7978) @@ -1,4 +1,4 @@ -Date: 2010年9月10日 13:48:48 +0000 +Date: Wed, 9 Mar 2011 18:04:46 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) X-Rcs-Id: $Id$ Content-Type: application/x-phpwiki; @@ -7,10 +7,10 @@ charset=utf-8 Content-Transfer-Encoding: binary -* Vad är WikiWikiWeb? En beskrivning av dess användning. -* Lär dig [HurManAnvänderWiki] och lär dig att [LäggaTillSidor]. -* Använd [Sandlådan] för att experimentera med Wiki-sidor. -* Signera gärna ditt namn i [Gästboken]. -* Se [SenasteÄndringar] för nya sidor och de senaste ändringarna. -* Kolla vilken sida som är [MestPopulär]. -* Läs ReleaseNotes (på engelska). +* Vad är [[WikiWikiWeb]]? En beskrivning av dess användning. +* Lär dig [[HurManAnvänderWiki] och lär dig att [LäggaTillSidor]]. +* Använd [[Sandlådan]] för att experimentera med Wiki-sidor. +* Signera gärna ditt namn i [[Gästboken]]. +* Se [[SenasteÄndringar]] för nya sidor och de senaste ändringarna. +* Kolla vilken sida som är [[MestPopulär]]. +* Läs [[ReleaseNotes]] (på engelska). Modified: trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FL%C3%A4ggaTillSidor =================================================================== --- trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FL%C3%A4ggaTillSidor 2011年03月09日 16:40:37 UTC (rev 7977) +++ trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FL%C3%A4ggaTillSidor 2011年03月10日 08:54:06 UTC (rev 7978) @@ -1,4 +1,4 @@ -Date: 2010年9月10日 13:48:48 +0000 +Date: Wed, 9 Mar 2011 18:04:46 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) X-Rcs-Id: $Id$ Content-Type: application/x-phpwiki; @@ -9,13 +9,13 @@ Allt du behöver göra för att skapa en sida i Wiki är att komma på en meningsfull titel, skriva alla ord med stor bokstav i början av ordet -och [SättaIhopDemSåHär]. Wiki kommer automatiskt att känna igen det som +och [[SättaIhopDemSåHär]]. Wiki kommer automatiskt att känna igen det som en hyperlänk. Alternativt kan du sätt vad som helst innanför -[hakparenteser]. Wiki känner inte igen länkar med sammansatta ord om +[[hakparenteser]]. Wiki känner inte igen länkar med sammansatta ord om orden innehåller å,ä eller ö, t.ex. GratisÖlÅtAllaÄlgar. I dessa fall måste hakparenteser användas. -Sedan kan du [KlickaPåFrågetecknet] efter hyperlänken så öppnar Wiki ett +Sedan kan du [[KlickaPåFrågetecknet]] efter hyperlänken så öppnar Wiki ett fönster där du kan beskriva den nya sidan. Vill du lägga till ett dokument med komplicerad design till Wiki är det @@ -24,7 +24,7 @@ Projekthemsidan för PhpWiki: http://phpwiki.sourceforge.net -Wiki stöder inte HTML-taggar (se [Textformateringsregler]). <taggar>De +Wiki stöder inte HTML-taggar (se [[Textformateringsregler]]). <taggar>De kommer att rendreras som text.</taggar> Wiki är menat att vara så enkelt som möjligt för att uppmuntra dess användning. Modified: trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FWikiWikiWeb =================================================================== --- trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FWikiWikiWeb 2011年03月09日 16:40:37 UTC (rev 7977) +++ trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FWikiWikiWeb 2011年03月10日 08:54:06 UTC (rev 7978) @@ -1,4 +1,4 @@ -Date: 2010年9月10日 13:48:48 +0000 +Date: Wed, 9 Mar 2011 18:04:46 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) X-Rcs-Id: $Id$ Content-Type: application/x-phpwiki; @@ -11,7 +11,7 @@ Där fann jag följande relevanta uttalanden (översatta till svenska): -''Meningen är att göra formuläret i RedigeraText enkelt och få [SökEfterSida] att söka snabbt.'' +''Meningen är att göra formuläret i RedigeraText enkelt och få [[SökEfterSida]] att söka snabbt.'' ''Förutom att vara snabb, strävar den här webbplatsen även efter zen-idealen som generellt kallas WabiSabi. Zen finner skönhet i det imperfekta och kortlivade. När det kommer till kritan är det allt som behövs.'' Modified: trunk/locale/sv/pgsrc/PhpWikiAdministration =================================================================== --- trunk/locale/sv/pgsrc/PhpWikiAdministration 2011年03月09日 16:40:37 UTC (rev 7977) +++ trunk/locale/sv/pgsrc/PhpWikiAdministration 2011年03月10日 08:54:06 UTC (rev 7978) @@ -1,4 +1,4 @@ -Date: 2010年9月10日 13:48:48 +0000 +Date: Wed, 9 Mar 2011 18:04:46 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) X-Rcs-Id: $Id$ Content-Type: application/x-phpwiki; @@ -10,8 +10,7 @@ **Note**: Most of the actions on this page require administrative privileges. They won't work unless you have set an admin username and password in the PhpWiki config file. ------------ -==== Log In +== Log In **[Log In | phpwiki:?action=login]** @@ -19,16 +18,14 @@ While you are logged in you will be able to ''lock'', ''unlock'' and ''delete'' pages. You will also be able to edit ''locked'' pages. ----------- -=== Cleanup +== Cleanup A Wiki SandBox is very easy to clean. Here you can restore it to pristine condition by loading the default from pgsrc: [ Rake the SandBox | phpwiki:?action=loadfile&source=pgsrc/SandBox ]. ----------- -=== Making Snapshots or Backups +== Making Snapshots or Backups -==== ZIP files of database +=== ZIP files of database These links lead to zip files, generated on the fly, which contain all the pages in your Wiki. The zip file will be downloaded to your local computer. @@ -42,7 +39,7 @@ If your php has ''zlib'' support, the files in the archive will be compressed, otherwise they will just be stored. -==== Dump to directory +=== Dump to directory Here you can dump pages of your Wiki into a directory of your choice. @@ -52,8 +49,7 @@ directory, one page per file. Your server must have write permissions to the directory! ------------ -=== Restoring +== Restoring If you have dumped a set of pages from PhpWiki, you can reload them here. Note that pages in your database will be overwritten; thus, if you dumped @@ -61,14 +57,14 @@ in your database now. If you want to be selective just delete the pages from the directory (or zip file) which you don't want to load. -==== Upload File +=== Upload File Here you can upload ZIP archives, or individual files from your (client) machine. [ Upload | phpwiki:?action=upload&file=50()upload ] -==== Load File +=== Load File Here you can load ZIP archives, individual files or entire directories. The file or directory must be local to the http server. @@ -76,7 +72,6 @@ [ Load | phpwiki:?action=loadfile&source=50(/tmp/wikidump) ] ------------ === Format of the files Currently the pages are stored, one per @@ -89,7 +84,7 @@ with type ''application/x-phpwiki''.) The message body contains the page text. -==== Old Formats +=== Old Formats **Serialized Files** @@ -129,8 +124,6 @@ ordning). Brevkroppen innehåller texten till sidan medan sidans metadata finns som parametrar till Content-Type i brevhuvudet. ------------ - ==== Ladda / Dumpa serialiserade sidor Här kan du ladda eller dumpa sidor av din Wiki i valfri katalog. @@ -152,5 +145,3 @@ Observera att sidorna i din databas kommer att skrivas över. Om du vill kan du bara ta bort de sidor från katalogen som du inte vill ladda. - ------------ Modified: trunk/locale/sv/pgsrc/S%C3%B6kEfterSida =================================================================== --- trunk/locale/sv/pgsrc/S%C3%B6kEfterSida 2011年03月09日 16:40:37 UTC (rev 7977) +++ trunk/locale/sv/pgsrc/S%C3%B6kEfterSida 2011年03月10日 08:54:06 UTC (rev 7978) @@ -1,4 +1,4 @@ -Date: 2010年9月10日 13:48:48 +0000 +Date: Wed, 9 Mar 2011 18:04:46 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) X-Rcs-Id: $Id$ Content-Type: application/x-phpwiki; @@ -9,8 +9,8 @@ Här är några bra startpunkter för att leta. -* [HurManAnvänderWiki] är en snabb introduktion till hur man skriver i Wiki. -* [SenasteÄndringar] ändras automatiskt. +* [[HurManAnvänderWiki]] är en snabb introduktion till hur man skriver i Wiki. +* [[SenasteÄndringar]] ändras automatiskt. * MerOmMekanismerna om hur man söker och ändrar på den här servern. Här är titelsökningen. Försök med ord wom ''wiki'' eller ''smörgås''. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7977 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7977&view=rev Author: vargenau Date: 2011年03月09日 16:40:37 +0000 (2011年3月09日) Log Message: ----------- PhpWiki 1.4.0RC1 Modified Paths: -------------- trunk/locale/po/de.po trunk/locale/po/es.po trunk/locale/po/fr.po trunk/locale/po/it.po trunk/locale/po/ja.po trunk/locale/po/nl.po trunk/locale/po/sv.po trunk/locale/po/zh.po Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2011年03月09日 16:33:40 UTC (rev 7976) +++ trunk/locale/po/de.po 2011年03月09日 16:40:37 UTC (rev 7977) @@ -4,7 +4,7 @@ # ThePhpWikiProgrammingTeam. msgid "" msgstr "" -"Project-Id-Version: PhpWiki-1.3.15\n" +"Project-Id-Version: PhpWiki 1.4.0RC1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011年03月03日 16:49+0100\n" "PO-Revision-Date: 2000年10月31日 02:23+0200\n" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2011年03月09日 16:33:40 UTC (rev 7976) +++ trunk/locale/po/es.po 2011年03月09日 16:40:37 UTC (rev 7977) @@ -9,7 +9,7 @@ # msgid "" msgstr "" -"Project-Id-Version: PhpWiki-1.3.11\n" +"Project-Id-Version: PhpWiki 1.4.0RC1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011年03月03日 16:49+0100\n" "PO-Revision-Date: 2000年02月01日 00:50-0500\n" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2011年03月09日 16:33:40 UTC (rev 7976) +++ trunk/locale/po/fr.po 2011年03月09日 16:40:37 UTC (rev 7977) @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: PhpWiki-1.3.11\n" +"Project-Id-Version: PhpWiki 1.4.0RC1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011年03月03日 16:49+0100\n" "PO-Revision-Date: 2004年06月22日 21:10+0200\n" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2011年03月09日 16:33:40 UTC (rev 7976) +++ trunk/locale/po/it.po 2011年03月09日 16:40:37 UTC (rev 7977) @@ -5,7 +5,7 @@ # Several guessed fixes by Reini Urban for 1.3.11 msgid "" msgstr "" -"Project-Id-Version: PhpWiki-1.3.4pre\n" +"Project-Id-Version: PhpWiki 1.4.0RC1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011年03月03日 16:49+0100\n" "PO-Revision-Date: 2005年02月12日 16:23+0100\n" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2011年03月09日 16:33:40 UTC (rev 7976) +++ trunk/locale/po/ja.po 2011年03月09日 16:40:37 UTC (rev 7977) @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: PhpWiki-1.3.11\n" +"Project-Id-Version: PhpWiki 1.4.0RC1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011年03月03日 16:49+0100\n" "PO-Revision-Date: 2003年06月07日 09:01+0900\n" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2011年03月09日 16:33:40 UTC (rev 7976) +++ trunk/locale/po/nl.po 2011年03月09日 16:40:37 UTC (rev 7977) @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: PhpWiki-1.3.4pre\n" +"Project-Id-Version: PhpWiki 1.4.0RC1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011年03月03日 16:49+0100\n" "PO-Revision-Date: 2000年09月30日 02:23+0200\n" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2011年03月09日 16:33:40 UTC (rev 7976) +++ trunk/locale/po/sv.po 2011年03月09日 16:40:37 UTC (rev 7977) @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: PhpWiki-1.3.4pre\n" +"Project-Id-Version: PhpWiki 1.4.0RC1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011年03月03日 16:49+0100\n" "PO-Revision-Date: 2001年01月27日 01:58+0200\n" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2011年03月09日 16:33:40 UTC (rev 7976) +++ trunk/locale/po/zh.po 2011年03月09日 16:40:37 UTC (rev 7977) @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: PhpWiki-1.3.9\n" +"Project-Id-Version: PhpWiki 1.4.0RC1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011年03月03日 16:49+0100\n" "PO-Revision-Date: 2004年04月21日 10:08+0800\n" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7976 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7976&view=rev Author: vargenau Date: 2011年03月09日 16:33:40 +0000 (2011年3月09日) Log Message: ----------- Update sv translations Modified Paths: -------------- trunk/locale/po/sv.po Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2011年03月09日 16:23:07 UTC (rev 7975) +++ trunk/locale/po/sv.po 2011年03月09日 16:33:40 UTC (rev 7976) @@ -348,9 +348,8 @@ #: ../lib/plugin/ModeratedPage.php:261 ../lib/plugin/ModeratedPage.php:263 #: ../lib/plugin/ModeratedPage.php:347 ../lib/plugin/ModeratedPage.php:351 #: ../lib/plugin/ModeratedPage.php:406 ../lib/plugin/ModeratedPage.php:431 -#, fuzzy msgid "ModeratedPage" -msgstr "SökEfterSida" +msgstr "" #: ../lib/editpage.php:569 #, php-format @@ -431,9 +430,8 @@ msgstr "Spara" #: ../lib/editpage.php:709 -#, fuzzy msgid "Changes" -msgstr "SenasteÄndringar" +msgstr "Ändringar" #: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:161 #: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:101 @@ -603,7 +601,6 @@ #: ../lib/EditToolbar.php:192 ../lib/plugin/CreateToc.php:469 #: ../lib/plugin/CreateToc.php:484 -#, fuzzy msgid "Table of Contents" msgstr "Innehåll" @@ -3542,7 +3539,7 @@ #: ../lib/plugin/PluginManager.php:122 ../lib/plugin/PluginManager.php:124 #: ../lib/upgrade.php:205 ../themes/MonoBook/templates/navbar.tmpl:21 msgid "Help" -msgstr "" +msgstr "Hjälp" #: ../lib/plugin/PopularNearby.php:44 msgid "PopularNearby" @@ -3568,9 +3565,8 @@ msgstr "De %d mest populära grannarna: " #: ../lib/plugin/PopularTags.php:33 -#, fuzzy msgid "PopularTags" -msgstr "MestPopulär" +msgstr "" #: ../lib/plugin/PopularTags.php:37 msgid "List the most popular tags." @@ -3581,9 +3577,8 @@ msgstr "" #: ../lib/plugin/PopularTags.php:71 -#, fuzzy msgid "Category" -msgstr "Nuvarande sida:" +msgstr "" #: ../lib/plugin/PopularTags.php:72 msgid "Topic" @@ -5979,9 +5974,8 @@ msgstr "" #: ../lib/plugin/_WikiTranslation.php:69 -#, fuzzy msgid "Help/IncludePagePlugin" -msgstr "SökEfterSida" +msgstr "Hjälp/SökEfterSida" #: ../lib/plugin/_WikiTranslation.php:70 msgid "Help/LinkIcons" @@ -5993,7 +5987,7 @@ #: ../lib/plugin/_WikiTranslation.php:72 msgid "Help/MoreAboutMechanics" -msgstr "" +msgstr "Hjälp/MerOmMekanismerna" #: ../lib/plugin/_WikiTranslation.php:73 msgid "Help/OldStyleTablePlugin" @@ -7301,9 +7295,8 @@ #: ../themes/Portland/templates/editpage.tmpl:83 #: ../themes/Wordpress/templates/editpage.tmpl:91 #: ../themes/Wordpress/templates/editpage.tmpl:96 -#, fuzzy msgid "Help/GoodStyle" -msgstr "BraStil" +msgstr "Hjälp/BraStil" #: ../themes/blog/templates/blogform.tmpl:24 #: ../themes/Crao/templates/editpage.tmpl:93 @@ -7326,9 +7319,8 @@ #: ../themes/fusionforge/templates/editpage.tmpl:79 #: ../themes/Portland/templates/editpage.tmpl:84 #: ../themes/Wordpress/templates/editpage.tmpl:97 -#, fuzzy msgid "Help/TextFormattingRules" -msgstr "Textformateringsregler" +msgstr "Hjälp/Textformateringsregler" #: ../themes/blog/templates/blogform.tmpl:25 #: ../themes/Crao/templates/editpage.tmpl:94 @@ -7606,9 +7598,8 @@ #: ../themes/default/templates/editpage.tmpl:118 #: ../themes/Portland/templates/editpage.tmpl:79 #: ../themes/Wordpress/templates/editpage.tmpl:92 -#, fuzzy msgid "Help/OldTextFormattingRules" -msgstr "Textformateringsregler" +msgstr "Hjälp/Textformateringsregler" #: ../themes/Crao/templates/head.tmpl:24 ../themes/Crao/templates/head.tmpl:25 #: ../themes/Crao/templates/htmldump.tmpl:15 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7975 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7975&view=rev Author: vargenau Date: 2011年03月09日 16:23:07 +0000 (2011年3月09日) Log Message: ----------- Update nl translations Modified Paths: -------------- trunk/locale/po/nl.po Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2011年03月09日 13:35:32 UTC (rev 7974) +++ trunk/locale/po/nl.po 2011年03月09日 16:23:07 UTC (rev 7975) @@ -229,7 +229,7 @@ #: ../themes/wikilens/templates/head.tmpl:61 #: ../themes/wikilens/templates/head.tmpl:62 msgid "SandBox" -msgstr "" +msgstr "ZandBak" #: ../lib/editpage.php:163 ../lib/editpage.php:584 msgid "Your version" @@ -432,9 +432,8 @@ msgstr "Bewaar" #: ../lib/editpage.php:709 -#, fuzzy msgid "Changes" -msgstr "RecenteVeranderingen" +msgstr "Veranderingen" #: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:161 #: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:101 @@ -3062,7 +3061,7 @@ #: ../lib/plugin/MostPopular.php:30 msgid "MostPopular" -msgstr "Meestbezochte" +msgstr "MeestBezocht" #: ../lib/plugin/MostPopular.php:34 msgid "List the most popular pages." @@ -3531,7 +3530,7 @@ #: ../lib/plugin/PluginManager.php:122 ../lib/plugin/PluginManager.php:124 #: ../lib/upgrade.php:205 ../themes/MonoBook/templates/navbar.tmpl:21 msgid "Help" -msgstr "" +msgstr "Help" #: ../lib/plugin/PopularNearby.php:44 msgid "PopularNearby" @@ -3750,9 +3749,8 @@ #: ../lib/plugin/RecentChanges.php:59 #: ../themes/MonoBook/templates/navbar.tmpl:18 #: ../themes/Sidebar/templates/navbar.tmpl:46 -#, fuzzy msgid "RecentNewPages" -msgstr "RecenteVeranderingen" +msgstr "" #: ../lib/plugin/RecentChanges.php:61 ../lib/plugin/RecentChanges.php:393 #: ../lib/plugin/RecentChanges.php:681 ../lib/plugin/RecentEdits.php:29 @@ -3946,9 +3944,8 @@ msgstr "Sidan är Låst" #: ../lib/plugin/RecentChanges.php:1483 -#, fuzzy msgid "Full changes" -msgstr "RecenteVeranderingen" +msgstr "" #: ../lib/plugin/RecentChanges.php:1494 #, fuzzy @@ -5237,9 +5234,8 @@ msgstr "" #: ../lib/plugin/WikiAdminChown.php:198 -#, fuzzy msgid "Change owner to: " -msgstr "RecenteVeranderingen" +msgstr "" #: ../lib/plugin/WikiAdminMarkup.php:36 msgid "WikiAdminMarkup" @@ -5265,14 +5261,12 @@ msgstr "" #: ../lib/plugin/WikiAdminMarkup.php:109 -#, fuzzy msgid "PhpWikiAdministration/Markup" -msgstr "PhpWikiBeheer" +msgstr "PhpWikiBeheer/Markup" #: ../lib/plugin/WikiAdminMarkup.php:163 -#, fuzzy msgid "Are you sure you want to change the markup type of the selected files?" -msgstr "Verwijder pagina" +msgstr "" #: ../lib/plugin/WikiAdminMarkup.php:167 msgid "Change markup type" @@ -5287,9 +5281,8 @@ msgstr "" #: ../lib/plugin/WikiAdminPurge.php:34 -#, fuzzy msgid "WikiAdminPurge" -msgstr "PhpWikiBeheer" +msgstr "" #: ../lib/plugin/WikiAdminPurge.php:38 #, fuzzy @@ -5312,19 +5305,16 @@ msgstr "" #: ../lib/plugin/WikiAdminPurge.php:92 -#, fuzzy msgid "PhpWikiAdministration/Purge" -msgstr "PhpWikiBeheer" +msgstr "" #: ../lib/plugin/WikiAdminPurge.php:144 -#, fuzzy msgid "Are you sure you want to permanently purge the following files?" -msgstr "Verwijder pagina" +msgstr "" #: ../lib/plugin/WikiAdminPurge.php:147 -#, fuzzy msgid "Permanently purge selected pages" -msgstr "PaginaGeschiedenis" +msgstr "" #: ../lib/plugin/WikiAdminPurge.php:148 msgid "Select the files to purge" @@ -5642,14 +5632,12 @@ msgstr "Pagina '%s' verwijderd." #: ../lib/plugin/WikiAdminSetExternal.php:95 -#, fuzzy msgid "PhpWikiAdministration/SetExternal" -msgstr "PhpWikiBeheer" +msgstr "" #: ../lib/plugin/WikiAdminSetExternal.php:125 -#, fuzzy msgid "Set pages to external" -msgstr "Nieuw pagina" +msgstr "" #: ../lib/plugin/WikiAdminSetExternal.php:126 msgid "Select the pages to set as external" @@ -6041,7 +6029,7 @@ #: ../lib/plugin/_WikiTranslation.php:86 msgid "Help/WabiSabi" -msgstr "" +msgstr "Help/WabiSabi" #: ../lib/plugin/_WikiTranslation.php:87 msgid "Help/WikiBlogPlugin" @@ -6053,7 +6041,7 @@ #: ../lib/plugin/_WikiTranslation.php:89 msgid "Help/WikiWikiWeb" -msgstr "" +msgstr "Help/WikiWikiWeb" #: ../lib/plugin/_WikiTranslation.php:90 msgid "HomePageAlias" @@ -6391,14 +6379,12 @@ #: ../lib/upgrade.php:119 ../themes/MonoBook/templates/actionbar.tmpl:18 #: ../themes/MonoBook/templates/actionbar.tmpl:31 -#, fuzzy msgid "ActionPage" -msgstr "ZoekPagina" +msgstr "" #: ../lib/upgrade.php:121 -#, fuzzy msgid "_AuthInfo" -msgstr "Vorige Auteur" +msgstr "" #: ../lib/upgrade.php:121 msgid "DebugAuthInfo" @@ -7295,9 +7281,8 @@ #: ../themes/Portland/templates/editpage.tmpl:83 #: ../themes/Wordpress/templates/editpage.tmpl:91 #: ../themes/Wordpress/templates/editpage.tmpl:96 -#, fuzzy msgid "Help/GoodStyle" -msgstr "GoedeStijl" +msgstr "Help/GoedeStijl" #: ../themes/blog/templates/blogform.tmpl:24 #: ../themes/Crao/templates/editpage.tmpl:93 @@ -7320,9 +7305,8 @@ #: ../themes/fusionforge/templates/editpage.tmpl:79 #: ../themes/Portland/templates/editpage.tmpl:84 #: ../themes/Wordpress/templates/editpage.tmpl:97 -#, fuzzy msgid "Help/TextFormattingRules" -msgstr "TekstFormatteringsRegels" +msgstr "Help/TekstFormatteringsRegels" #: ../themes/blog/templates/blogform.tmpl:25 #: ../themes/Crao/templates/editpage.tmpl:94 @@ -7598,9 +7582,8 @@ #: ../themes/default/templates/editpage.tmpl:118 #: ../themes/Portland/templates/editpage.tmpl:79 #: ../themes/Wordpress/templates/editpage.tmpl:92 -#, fuzzy msgid "Help/OldTextFormattingRules" -msgstr "OudTekstFormatteringsRegels" +msgstr "Help/OudTekstFormatteringsRegels" #: ../themes/Crao/templates/head.tmpl:24 ../themes/Crao/templates/head.tmpl:25 #: ../themes/Crao/templates/htmldump.tmpl:15 @@ -8301,35 +8284,30 @@ #: ../themes/fusionforge/templates/actionbar.tmpl:20 #: ../themes/fusionforge/templates/actionbar.tmpl:40 -#, fuzzy msgid "Action Page" -msgstr "ZoekPagina" +msgstr "" #: ../themes/fusionforge/templates/actionbar.tmpl:20 #: ../themes/fusionforge/templates/actionbar.tmpl:40 -#, fuzzy msgid "Page" -msgstr "ThuisPagina" +msgstr "Pagina" #: ../themes/fusionforge/templates/actionbar.tmpl:32 #: ../themes/MonoBook/templates/actionbar.tmpl:25 -#, fuzzy msgid "Template/Talk" -msgstr "Pagina Naam" +msgstr "" #: ../themes/fusionforge/templates/actionbar.tmpl:54 #: ../themes/MonoBook/templates/actionbar.tmpl:35 #: ../themes/Sidebar/templates/actionbar.tmpl:20 -#, fuzzy msgid "Create Page" -msgstr "Bewaard: %s" +msgstr "" #: ../themes/fusionforge/templates/actionbar.tmpl:68 #: ../themes/MonoBook/templates/actionbar.tmpl:43 #: ../themes/Sidebar/templates/actionbar.tmpl:27 -#, fuzzy msgid "History" -msgstr "PaginaGeschiedenis" +msgstr "Geschiedenis" #: ../themes/fusionforge/templates/actionbar.tmpl:72 #: ../themes/fusionforge/templates/userprefs.tmpl:248 @@ -8343,15 +8321,13 @@ msgstr "Sidan är Låst" #: ../themes/fusionforge/templates/actionbar.tmpl:84 -#, fuzzy msgid "Back Links" -msgstr "TerugLinks" +msgstr "Terug Links" #: ../themes/fusionforge/templates/actionbar.tmpl:108 #: ../themes/fusionforge/templates/userprefs.tmpl:270 -#, fuzzy msgid "Change Owner" -msgstr "RecenteVeranderingen" +msgstr "" #: ../themes/fusionforge/templates/actionbar.tmpl:113 #: ../themes/fusionforge/templates/userprefs.tmpl:275 @@ -8384,14 +8360,12 @@ msgstr "" #: ../themes/fusionforge/templates/navbar.tmpl:9 -#, fuzzy msgid "Home Page" -msgstr "ThuisPagina" +msgstr "Thuis Pagina" #: ../themes/fusionforge/templates/navbar.tmpl:10 -#, fuzzy msgid "Recent Changes" -msgstr "RecenteVeranderingen" +msgstr "Recente Veranderingen" #: ../themes/fusionforge/templates/navbar.tmpl:11 msgid "SpecialPages" @@ -8413,9 +8387,8 @@ msgstr "" #: ../themes/fusionforge/templates/navbar.tmpl:21 -#, fuzzy msgid "Wiki Admin" -msgstr "PhpWikiBeheer" +msgstr "PhpWiki Beheer" #: ../themes/fusionforge/templates/navbar.tmpl:25 msgid "My User Page" @@ -8529,14 +8502,12 @@ msgstr "" #: ../themes/MonoBook/templates/navbar.tmpl:15 -#, fuzzy msgid "Home page" -msgstr "ThuisPagina" +msgstr "Thuis Pagina" #: ../themes/MonoBook/templates/navbar.tmpl:16 -#, fuzzy msgid "Recent changes" -msgstr "RecenteVeranderingen" +msgstr "Recente Veranderingen" #: ../themes/MonoBook/templates/navbar.tmpl:16 #: ../themes/Sidebar/templates/navbar.tmpl:45 @@ -8545,14 +8516,12 @@ msgstr "De %d meestbezochte pagina's van deze Wiki:" #: ../themes/MonoBook/templates/navbar.tmpl:17 -#, fuzzy msgid "Recent comments" -msgstr "RecenteVeranderingen" +msgstr "" #: ../themes/MonoBook/templates/navbar.tmpl:18 -#, fuzzy msgid "Recent new pages" -msgstr "RecenteVeranderingen" +msgstr "" #: ../themes/MonoBook/templates/navbar.tmpl:19 #, fuzzy @@ -8585,15 +8554,13 @@ msgstr "" #: ../themes/MonoBook/templates/navbar.tmpl:55 -#, fuzzy msgid "Related changes" -msgstr "RecenteVeranderingen" +msgstr "" #: ../themes/MonoBook/templates/navbar.tmpl:58 #: ../themes/Sidebar/templates/navbar.tmpl:71 -#, fuzzy msgid "Administration" -msgstr "PhpWikiBeheer" +msgstr "Beheer" #: ../themes/MonoBook/templates/navbar.tmpl:61 #: ../themes/Sidebar/templates/navbar.tmpl:51 @@ -8629,14 +8596,12 @@ msgstr "GebruikersVoorkeuren" #: ../themes/MonoBook/templates/signin.tmpl:12 -#, fuzzy msgid "MyRecentChanges" -msgstr "RecenteVeranderingen" +msgstr "MijnRecenteVeranderingen" #: ../themes/MonoBook/templates/signin.tmpl:12 -#, fuzzy msgid "My Changes" -msgstr "RecenteVeranderingen" +msgstr "Mijn Veranderingen" #: ../themes/MonoBook/templates/signin.tmpl:13 #: ../themes/Sidebar/templates/signin.tmpl:10 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7974 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7974&view=rev Author: vargenau Date: 2011年03月09日 13:35:32 +0000 (2011年3月09日) Log Message: ----------- Improve Italian translation Modified Paths: -------------- trunk/locale/po/it.po Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2011年03月09日 13:33:05 UTC (rev 7973) +++ trunk/locale/po/it.po 2011年03月09日 13:35:32 UTC (rev 7974) @@ -3560,7 +3560,7 @@ #: ../lib/plugin/PluginManager.php:122 ../lib/plugin/PluginManager.php:124 #: ../lib/upgrade.php:205 ../themes/MonoBook/templates/navbar.tmpl:21 msgid "Help" -msgstr "" +msgstr "Aiuto" #: ../lib/plugin/PopularNearby.php:44 msgid "PopularNearby" @@ -4246,9 +4246,8 @@ msgstr "" #: ../lib/plugin/SemanticSearch.php:287 -#, fuzzy msgid "Help:SemanticRelations" -msgstr "Annulla" +msgstr "" #: ../lib/plugin/SemanticSearch.php:335 #, php-format @@ -5956,24 +5955,20 @@ msgstr "" #: ../lib/plugin/_WikiTranslation.php:58 -#, fuzzy msgid "Help/AddCommentPlugin" -msgstr "InsertoPlugin" +msgstr "" #: ../lib/plugin/_WikiTranslation.php:59 -#, fuzzy msgid "Help/AuthorHistoryPlugin" -msgstr "Autore" +msgstr "" #: ../lib/plugin/_WikiTranslation.php:60 -#, fuzzy msgid "Help/CalendarListPlugin" -msgstr "CalendarioListPlugin" +msgstr "Aiuto/CalendarioListPlugin" #: ../lib/plugin/_WikiTranslation.php:61 -#, fuzzy msgid "Help/CalendarPlugin" -msgstr "CalendarioPlugin" +msgstr "Aiuto/CalendarioPlugin" #: ../lib/plugin/_WikiTranslation.php:62 msgid "Help/CommentPlugin" @@ -5996,18 +5991,16 @@ msgstr "" #: ../lib/plugin/_WikiTranslation.php:67 -#, fuzzy msgid "Help/FrameIncludePlugin" -msgstr "InserireLaPaginaPlugin" +msgstr "" #: ../lib/plugin/_WikiTranslation.php:68 msgid "Help/HelloWorldPlugin" msgstr "" #: ../lib/plugin/_WikiTranslation.php:69 -#, fuzzy msgid "Help/IncludePagePlugin" -msgstr "InserireLaPaginaPlugin" +msgstr "Aiuto/InserireLaPaginaPlugin" #: ../lib/plugin/_WikiTranslation.php:70 msgid "Help/LinkIcons" @@ -6062,9 +6055,8 @@ msgstr "" #: ../lib/plugin/_WikiTranslation.php:83 -#, fuzzy msgid "Help/TranscludePlugin" -msgstr "InserireLaPaginaPlugin" +msgstr "" #: ../lib/plugin/_WikiTranslation.php:84 msgid "Help/UnfoldSubpagesPlugin" @@ -6121,7 +6113,7 @@ #: ../lib/plugin/_WikiTranslation.php:101 msgid "RecentVisitors" -msgstr "" +msgstr "VisitatoriRecenti" #: ../lib/plugin/_WikiTranslation.php:102 msgid "ReleaseNotes" @@ -7332,9 +7324,8 @@ #: ../themes/Portland/templates/editpage.tmpl:83 #: ../themes/Wordpress/templates/editpage.tmpl:91 #: ../themes/Wordpress/templates/editpage.tmpl:96 -#, fuzzy msgid "Help/GoodStyle" -msgstr "BuonStile" +msgstr "Aiuto/BuonStile" #: ../themes/blog/templates/blogform.tmpl:24 #: ../themes/Crao/templates/editpage.tmpl:93 @@ -7357,9 +7348,8 @@ #: ../themes/fusionforge/templates/editpage.tmpl:79 #: ../themes/Portland/templates/editpage.tmpl:84 #: ../themes/Wordpress/templates/editpage.tmpl:97 -#, fuzzy msgid "Help/TextFormattingRules" -msgstr "RegoleFormattazioneTesto" +msgstr "Aiuto/RegoleFormattazioneTesto" #: ../themes/blog/templates/blogform.tmpl:25 #: ../themes/Crao/templates/editpage.tmpl:94 @@ -7634,9 +7624,8 @@ #: ../themes/default/templates/editpage.tmpl:118 #: ../themes/Portland/templates/editpage.tmpl:79 #: ../themes/Wordpress/templates/editpage.tmpl:92 -#, fuzzy msgid "Help/OldTextFormattingRules" -msgstr "RegoleFormattazioneTesto" +msgstr "Aiuto/RegoleFormattazioneTesto" #: ../themes/Crao/templates/head.tmpl:24 ../themes/Crao/templates/head.tmpl:25 #: ../themes/Crao/templates/htmldump.tmpl:15 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7973 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7973&view=rev Author: vargenau Date: 2011年03月09日 13:33:05 +0000 (2011年3月09日) Log Message: ----------- Not translated Removed Paths: ------------- trunk/locale/it/pgsrc/UserPreferences Deleted: trunk/locale/it/pgsrc/UserPreferences =================================================================== --- trunk/locale/it/pgsrc/UserPreferences 2011年03月09日 13:24:52 UTC (rev 7972) +++ trunk/locale/it/pgsrc/UserPreferences 2011年03月09日 13:33:05 UTC (rev 7973) @@ -1,12 +0,0 @@ -Date: 2010年9月10日 13:48:47 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1) -X-Rcs-Id: $Id$ -Content-Type: application/x-phpwiki; - pagename=UserPreferences; - flags=PAGE_LOCKED; - charset=utf-8 -Content-Transfer-Encoding: binary - -You can now set some user preferences. The values of these preferences are currently stored in a cookie (so you must have cookies enabled to use this feature.) - -<<UserPreferences>> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7972 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7972&view=rev Author: vargenau Date: 2011年03月09日 13:24:52 +0000 (2011年3月09日) Log Message: ----------- Improve German translation Modified Paths: -------------- trunk/locale/po/de.po Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2011年03月09日 13:23:17 UTC (rev 7971) +++ trunk/locale/po/de.po 2011年03月09日 13:24:52 UTC (rev 7972) @@ -689,14 +689,12 @@ msgstr "SeitenLink einfügen (Doppelklick)" #: ../lib/EditToolbar.php:435 ../lib/EditToolbar.php:436 -#, fuzzy msgid "Add Image or Video" -msgstr "Bild einfügen" +msgstr "Bild oder Video einfügen" #: ../lib/EditToolbar.php:438 -#, fuzzy msgid "Insert Image or Video" -msgstr "Bild einfügen" +msgstr "Bild oder Video einfügen" #: ../lib/EditToolbar.php:470 ../lib/EditToolbar.php:471 msgid "AddTemplate" @@ -751,9 +749,8 @@ #: ../themes/default/templates/blogform.tmpl:10 #: ../themes/fusionforge/templates/blogform.tmpl:10 #: ../themes/fusionforge/themeinfo.php:42 -#, fuzzy msgid ": " -msgstr "%s: %s" +msgstr ": " #: ../lib/InlineParser.php:911 #, php-format @@ -1139,9 +1136,9 @@ msgstr "Seiten Änderung" #: ../lib/MailNotify.php:288 -#, fuzzy, php-format +#, php-format msgid "Summary: %s" -msgstr "Zusammenfassung:" +msgstr "Zusammenfassung: %s" #: ../lib/MailNotify.php:305 #, php-format @@ -2376,14 +2373,13 @@ msgstr "" #: ../lib/plugin/CreateToc.php:376 ../lib/plugin/Template.php:108 -#, fuzzy msgid "No page specified." -msgstr "Keine Seite angegeben" +msgstr "Keine Seite angegeben." #: ../lib/plugin/CreateToc.php:387 ../lib/plugin/Template.php:129 -#, fuzzy, php-format +#, php-format msgid "Page '%s' does not exist." -msgstr "Gruppenseite »%s« existiert nicht" +msgstr "Seite »%s« existiert nicht" #: ../lib/plugin/CreateToc.php:392 ../lib/plugin/Diff.php:86 #: ../lib/plugin/PageDump.php:85 @@ -2393,14 +2389,13 @@ #: ../lib/plugin/CreateToc.php:401 ../lib/plugin/IncludePage.php:104 #: ../lib/plugin/PageGroup.php:124 ../lib/plugin/Template.php:142 -#, fuzzy, php-format +#, php-format msgid "%s: no such revision %d." msgstr "%s(%d): keine solche Version" #: ../lib/plugin/CreateToc.php:412 -#, fuzzy msgid "CreateToc disabled for old markup." -msgstr "InhaltsVerzeichnis deaktiviert für altes Markup" +msgstr "InhaltsVerzeichnis deaktiviert für altes Markup." #: ../lib/plugin/CreateToc.php:475 msgid "Click to display to TOC" @@ -2444,9 +2439,8 @@ msgstr "Versionen sind identisch" #: ../lib/plugin/Diff.php:188 -#, fuzzy msgid "Version " -msgstr "Version" +msgstr "Version " #: ../lib/plugin/Diff.php:189 msgid " was created because: " @@ -3070,9 +3064,8 @@ # OldTextFormattingRules AlteTextFormatierungsRegeln #: ../lib/plugin/MediawikiTable.php:60 -#, fuzzy msgid "Layout tables using a Mediawiki-like markup style." -msgstr "Tabellen mit erweiterter HTML Syntax." +msgstr "Tabellen mit Mediawiki Syntax." #: ../lib/plugin/ModeratedPage.php:45 msgid "Support moderated pages" @@ -3135,9 +3128,9 @@ msgstr "Ablehnen" #: ../lib/plugin/ModeratedPage.php:432 ../lib/plugin/ModeratedPage.php:439 -#, fuzzy, php-format +#, php-format msgid "<<ModeratedPage ... >> not found in first line of %s" -msgstr "<?plugin ModeratedPage ... ?> nicht in erster Zeile von %s gefunden" +msgstr "<<ModeratedPage ... >> nicht in erster Zeile von %s gefunden" #: ../lib/plugin/ModeratedPage.php:435 #, php-format @@ -3224,16 +3217,15 @@ msgstr "Seite %s nicht gefunden." #: ../lib/plugin/PageDump.php:149 -#, fuzzy msgid "Download for Subversion" -msgstr "Für CVS herunterladen." +msgstr "Für Subversion herunterladen" # Admin Button: download page dump of this page as WikiQuelltext which -# has been reformatted for developer CVS. +# has been reformatted for developer Subversion. # Choice of English text here is poor but it must be concise enough to # fit inside a button. # -# msgid "Download for CVS" +# msgid "Download for Subversion" # msgstr "" # Admin Button: download page dump of this page as WikiQuelltext # formatted for general backup purposes. @@ -3244,11 +3236,11 @@ msgstr "Für Backup herunterladen" # Admin Button: download page dump of this page as WikiQuelltext which -# has been reformatted for developer CVS. +# has been reformatted for developer Subversion. # Choice of English text here is poor but it must be concise enough to # fit inside a button. # -# msgid "Download for CVS" +# msgid "Download for Subversion" # msgstr "" # Admin Button: download page dump of this page as WikiQuelltext # formatted for general backup purposes. @@ -3876,7 +3868,6 @@ #: ../lib/plugin/RecentChanges.php:51 ../lib/plugin/RecentChanges.php:57 #: ../lib/plugin/RecentChanges.php:532 -#, fuzzy msgid "UserContribs" msgstr "BenutzerBewertungen" @@ -4056,9 +4047,8 @@ msgstr "%s Tagen" #: ../lib/plugin/RecentChanges.php:1432 -#, fuzzy msgid "All users" -msgstr "AlleBenutzer" +msgstr "Alle Benutzer" #: ../lib/plugin/RecentChanges.php:1435 msgid "My modifications only" @@ -4066,7 +4056,6 @@ #: ../lib/plugin/RecentChanges.php:1452 #: ../themes/MonoBook/templates/navbar.tmpl:78 -#, fuzzy msgid "All pages" msgstr "Alle Seiten" @@ -4375,9 +4364,8 @@ msgstr "" #: ../lib/plugin/SemanticSearch.php:287 -#, fuzzy msgid "Help:SemanticRelations" -msgstr "SemantischeBeziehungen" +msgstr "Hilfe:SemantischeBeziehungen" #: ../lib/plugin/SemanticSearch.php:335 #, php-format @@ -6164,76 +6152,62 @@ msgstr "AlleNeuesteÄnderungen" #: ../lib/plugin/_WikiTranslation.php:57 -#, fuzzy msgid "Help/AddingPages" -msgstr "SeitenErzeugen" +msgstr "Hilfe/SeitenErzeugen" #: ../lib/plugin/_WikiTranslation.php:58 -#, fuzzy msgid "Help/AddCommentPlugin" -msgstr "NeuerKommentarPlugin" +msgstr "Hilfe/NeuerKommentarPlugin" #: ../lib/plugin/_WikiTranslation.php:59 -#, fuzzy msgid "Help/AuthorHistoryPlugin" -msgstr "AutorenProtokollPlugin" +msgstr "Hilfe/AutorenProtokollPlugin" #: ../lib/plugin/_WikiTranslation.php:60 -#, fuzzy msgid "Help/CalendarListPlugin" -msgstr "KalenderListePlugin" +msgstr "Hilfe/KalenderListePlugin" #: ../lib/plugin/_WikiTranslation.php:61 -#, fuzzy msgid "Help/CalendarPlugin" -msgstr "KalenderPlugin" +msgstr "Hilfe/KalenderPlugin" #: ../lib/plugin/_WikiTranslation.php:62 -#, fuzzy msgid "Help/CommentPlugin" -msgstr "KommentarPlugin" +msgstr "Hilfe/KommentarPlugin" #: ../lib/plugin/_WikiTranslation.php:63 -#, fuzzy msgid "Help/CreateTocPlugin" -msgstr "InhaltsVerzeichnisPlugin" +msgstr "Hilfe/InhaltsVerzeichnisPlugin" #: ../lib/plugin/_WikiTranslation.php:64 -#, fuzzy msgid "Help/EditMetaDataPlugin" -msgstr "MetaDatenBearbeitenPlugin" +msgstr "Hilfe/MetaDatenBearbeitenPlugin" #: ../lib/plugin/_WikiTranslation.php:65 -#, fuzzy msgid "Help/ExternalSearchPlugin" -msgstr "FremdSuchePlugin" +msgstr "Hilfe/FremdSuchePlugin" #: ../lib/plugin/_WikiTranslation.php:66 -#, fuzzy msgid "Help/FoafViewerPlugin" -msgstr "FoafViewerPlugin" +msgstr "Hilfe/FoafViewerPlugin" # (??? Frame=Rahmen; FrameInclude=InnenRahmenSeite; Seite mit # eingeschlossenem Rahmen) #: ../lib/plugin/_WikiTranslation.php:67 -#, fuzzy msgid "Help/FrameIncludePlugin" -msgstr "FrameEinbettenPlugin" +msgstr "Hilfe/FrameEinbettenPlugin" #: ../lib/plugin/_WikiTranslation.php:68 -#, fuzzy msgid "Help/HelloWorldPlugin" -msgstr "HalloWeltPlugin" +msgstr "Hilfe/HalloWeltPlugin" #: ../lib/plugin/_WikiTranslation.php:69 -#, fuzzy msgid "Help/IncludePagePlugin" -msgstr "SeiteEinfügenPlugin" +msgstr "Hilfe/SeiteEinfügenPlugin" #: ../lib/plugin/_WikiTranslation.php:70 -#, fuzzy msgid "Help/LinkIcons" -msgstr "LinksIcons" +msgstr "Hilfe/LinksIcons" #: ../lib/plugin/_WikiTranslation.php:71 msgid "Help/MagicPhpWikiURLs" @@ -6244,87 +6218,72 @@ msgstr "" #: ../lib/plugin/_WikiTranslation.php:73 -#, fuzzy msgid "Help/OldStyleTablePlugin" -msgstr "TraditionellerTabellenStilPlugin" +msgstr "Hilfe/TraditionellerTabellenStilPlugin" #: ../lib/plugin/_WikiTranslation.php:74 -#, fuzzy msgid "Help/PhotoAlbumPlugin" -msgstr "BilderAlbumPlugin" +msgstr "Hilfe/BilderAlbumPlugin" #: ../lib/plugin/_WikiTranslation.php:75 -#, fuzzy msgid "Help/PhpHighlightPlugin" -msgstr "PhpHighlightPlugin" +msgstr "Hilfe/PhpHighlightPlugin" #: ../lib/plugin/_WikiTranslation.php:76 -#, fuzzy msgid "Help/PhpWeatherPlugin" -msgstr "PhpWetterPlugin" +msgstr "Hilfe/PhpWetterPlugin" #: ../lib/plugin/_WikiTranslation.php:77 -#, fuzzy msgid "Help/PhpWiki" -msgstr "PhpWiki" +msgstr "Hilfe/PhpWiki" #: ../lib/plugin/_WikiTranslation.php:78 -#, fuzzy msgid "Help/PloticusPlugin" -msgstr "PloticusPlugin" +msgstr "Hilfe/PloticusPlugin" #: ../lib/plugin/_WikiTranslation.php:79 -#, fuzzy msgid "Help/RawHtmlPlugin" -msgstr "RawHtmlPlugin" +msgstr "Hilfe/RawHtmlPlugin" #: ../lib/plugin/_WikiTranslation.php:80 -#, fuzzy msgid "Help/RedirectToPlugin" -msgstr "WeiterLeitenPlugin" +msgstr "Hilfe/WeiterLeitenPlugin" #: ../lib/plugin/_WikiTranslation.php:81 -#, fuzzy msgid "Help/RichTablePlugin" -msgstr "ErweiterteTabellenPlugin" +msgstr "Hilfe/ErweiterteTabellenPlugin" #: ../lib/plugin/_WikiTranslation.php:82 msgid "Help/SystemInfoPlugin" msgstr "" #: ../lib/plugin/_WikiTranslation.php:83 -#, fuzzy msgid "Help/TranscludePlugin" -msgstr "EinbettenPlugin" +msgstr "Hilfe/EinbettenPlugin" #: ../lib/plugin/_WikiTranslation.php:84 -#, fuzzy msgid "Help/UnfoldSubpagesPlugin" -msgstr "UnterseitenEntfaltenPlugin" +msgstr "Hilfe/UnterseitenEntfaltenPlugin" #: ../lib/plugin/_WikiTranslation.php:85 -#, fuzzy msgid "Help/UpLoadPlugin" -msgstr "HochLadenPlugin" +msgstr "Hilfe/HochLadenPlugin" #: ../lib/plugin/_WikiTranslation.php:86 msgid "Help/WabiSabi" msgstr "" #: ../lib/plugin/_WikiTranslation.php:87 -#, fuzzy msgid "Help/WikiBlogPlugin" -msgstr "WikiBlogPlugin" +msgstr "Hilfe/WikiBlogPlugin" #: ../lib/plugin/_WikiTranslation.php:88 -#, fuzzy msgid "Help/WikiPlugin" -msgstr "WikiPlugin" +msgstr "Hilfe/WikiPlugin" #: ../lib/plugin/_WikiTranslation.php:89 -#, fuzzy msgid "Help/WikiWikiWeb" -msgstr "WikiWikiWeb" +msgstr "Hilfe/WikiWikiWeb" #: ../lib/plugin/_WikiTranslation.php:90 msgid "HomePageAlias" @@ -6412,21 +6371,20 @@ msgstr "" #: ../lib/plugin/YouTube.php:67 -#, fuzzy, php-format +#, php-format msgid "Required argument %s missing" -msgstr "Erforderliches Argument »%s« fehlt." +msgstr "Erforderliches Argument »%s« fehlt" #: ../lib/plugin/YouTube.php:104 ../lib/plugin/YouTube.php:106 #: ../lib/plugin/YouTube.php:108 ../lib/plugin/YouTube.php:110 #: ../lib/plugin/YouTube.php:134 ../lib/plugin/YouTube.php:136 -#, fuzzy, php-format +#, php-format msgid "Invalid argument %s" msgstr "Ungültiger Parameter %s" #: ../lib/purgepage.php:18 ../lib/removepage.php:18 -#, fuzzy msgid "Sorry, this page does not exist." -msgstr "Leider, Seite »%s« ist nicht in der Datenbank." +msgstr "Leider, diese Seite ist nicht in der Datenbank." #: ../lib/purgepage.php:22 ../lib/purgepage.php:56 ../lib/WikiTheme.php:1048 msgid "Purge Page" @@ -6601,9 +6559,9 @@ msgstr "" #: ../lib/stdlib.php:1431 ../themes/MonoBook/templates/info.tmpl:33 -#, fuzzy, php-format +#, php-format msgid "%s KiB (%s bytes)" -msgstr "%s KB (%s Bytes)" +msgstr "%s KiB (%s Bytes)" #: ../lib/stdlib.php:1518 ../lib/XmlElement.php:487 #, php-format @@ -6649,9 +6607,8 @@ #: ../lib/upgrade.php:73 ../lib/upgrade.php:104 ../lib/upgrade.php:108 #: ../lib/upgrade.php:200 ../lib/upgrade.php:1119 -#, fuzzy msgid " Skipped" -msgstr "Ausgelassen." +msgstr "Ausgelassen" #: ../lib/upgrade.php:98 msgid "newer than the existing page." @@ -6678,7 +6635,6 @@ #: ../lib/upgrade.php:119 ../themes/MonoBook/templates/actionbar.tmpl:18 #: ../themes/MonoBook/templates/actionbar.tmpl:31 -#, fuzzy msgid "ActionPage" msgstr "Aktion Seite" @@ -6804,14 +6760,12 @@ msgstr "AUSGEBESSERT" #: ../lib/upgrade.php:647 -#, fuzzy msgid "Check for ACCESS_LOG_SQL passwords in POST requests" -msgstr "prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests" +msgstr "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests" #: ../lib/upgrade.php:670 -#, fuzzy msgid "Check for ACCESS_LOG_SQL remote_host varchar(50)" -msgstr "prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests" +msgstr "Prüfe auf ACCESS_LOG_SQL Passwörter in POST Requests" #: ../lib/upgrade.php:678 #, fuzzy @@ -7628,7 +7582,7 @@ #: ../themes/Wordpress/templates/editpage.tmpl:96 #, fuzzy msgid "Help/GoodStyle" -msgstr "GuterStil" +msgstr "Hilfe/GuterStil" #: ../themes/blog/templates/blogform.tmpl:24 #: ../themes/Crao/templates/editpage.tmpl:93 @@ -7653,7 +7607,7 @@ #: ../themes/Wordpress/templates/editpage.tmpl:97 #, fuzzy msgid "Help/TextFormattingRules" -msgstr "TextFormatierungsRegeln" +msgstr "Hilfe/TextFormatierungsRegeln" #: ../themes/blog/templates/blogform.tmpl:25 #: ../themes/Crao/templates/editpage.tmpl:94 @@ -7936,7 +7890,7 @@ #: ../themes/Wordpress/templates/editpage.tmpl:92 #, fuzzy msgid "Help/OldTextFormattingRules" -msgstr "AlteTextFormatierungsRegeln" +msgstr "Hilfe/AlteTextFormatierungsRegeln" #: ../themes/Crao/templates/head.tmpl:24 ../themes/Crao/templates/head.tmpl:25 #: ../themes/Crao/templates/htmldump.tmpl:15 @@ -9753,7 +9707,7 @@ #~ msgstr "Versuch die neueste Version von »%s« zu kombinieren" #~ msgid "Creating new repository [%s]" -#~ msgstr "Das CVS Verzeichnis [%s] wird erzeugt" +#~ msgstr "Das Subversion Verzeichnis [%s] wird erzeugt" #~ msgid "Found [%s] in [%s]" #~ msgstr "[%s] in [%s] gefunden" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7971 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7971&view=rev Author: vargenau Date: 2011年03月09日 13:23:17 +0000 (2011年3月09日) Log Message: ----------- Improve Spanish translation Modified Paths: -------------- trunk/locale/po/es.po Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2011年03月09日 12:37:13 UTC (rev 7970) +++ trunk/locale/po/es.po 2011年03月09日 13:23:17 UTC (rev 7971) @@ -38,9 +38,9 @@ # lib/msql.php:221 lib/msql.php:296 #: ../lib/CachedMarkup.php:577 -#, fuzzy, php-format +#, php-format msgid "Relation %s to page %s" -msgstr "Eliminación en %s falló: %s" +msgstr "" #: ../lib/CachedMarkup.php:632 msgid "Found by " @@ -458,9 +458,8 @@ # lib/stdlib.php:384 lib/stdlib.php:445 #: ../lib/editpage.php:709 -#, fuzzy msgid "Changes" -msgstr "CambiosRecientes" +msgstr "Cambios" #: ../lib/editpage.php:713 ../lib/plugin/UpLoad.php:161 #: ../lib/plugin/UpLoad.php:166 ../lib/plugin/WikiForm.php:101 @@ -521,7 +520,6 @@ # lib/stdlib.php:207 lib/stdlib.php:215 #: ../lib/EditToolbar.php:55 -#, fuzzy msgid "Search for" msgstr "Buscar" @@ -552,18 +550,16 @@ msgstr "Texto en negrilla" #: ../lib/EditToolbar.php:127 -#, fuzzy msgid "Bold text [alt-b]" -msgstr "Texto en negrilla" +msgstr "Texto en negrilla [alt-b]" #: ../lib/EditToolbar.php:131 msgid "Italic text" msgstr "Texto del itálico" #: ../lib/EditToolbar.php:132 -#, fuzzy msgid "Italic text [alt-i]" -msgstr "Texto del itálico" +msgstr "Texto del itálico [alt-i]" #: ../lib/EditToolbar.php:136 msgid "Strike-through text" @@ -664,7 +660,7 @@ #: ../lib/EditToolbar.php:202 ../lib/plugin/PopularTags.php:57 #: ../lib/plugin/Template.php:61 msgid "Template" -msgstr "" +msgstr "Plantilla" #: ../lib/EditToolbar.php:234 msgid "Click a button to get an example text" @@ -696,18 +692,16 @@ msgstr "AgreguePlugin" #: ../lib/EditToolbar.php:370 -#, fuzzy msgid "Insert Plugin" -msgstr "Relleno Plugin (doble-tecleo)" +msgstr "Relleno Plugin" #: ../lib/EditToolbar.php:397 ../lib/EditToolbar.php:398 msgid "AddPageLink" msgstr "AgregueElAcoplamientoDeLaPágina" #: ../lib/EditToolbar.php:400 -#, fuzzy msgid "Insert PageLink" -msgstr "Inserte el AcoplamientoDeLaPágina (doble-tecleo)" +msgstr "Inserte el AcoplamientoDeLaPágina" #: ../lib/EditToolbar.php:435 ../lib/EditToolbar.php:436 #, fuzzy @@ -724,9 +718,8 @@ msgstr "AgregueLaPlantilla" #: ../lib/EditToolbar.php:473 -#, fuzzy msgid "Insert Template" -msgstr "Inserte la plantilla (doble-tecleo)" +msgstr "Inserte la plantilla" #: ../lib/ErrorManager.php:220 #, php-format @@ -772,9 +765,8 @@ #: ../themes/default/templates/blogform.tmpl:10 #: ../themes/fusionforge/templates/blogform.tmpl:10 #: ../themes/fusionforge/themeinfo.php:42 -#, fuzzy msgid ": " -msgstr "%s: %s" +msgstr ": " #: ../lib/InlineParser.php:911 #, php-format @@ -1711,7 +1703,6 @@ msgstr "Columnas: %s." #: ../lib/PagePerm.php:191 -#, fuzzy msgid "SearchReplace" msgstr "Busque Y Substituya" @@ -3653,7 +3644,7 @@ #: ../lib/plugin/PluginManager.php:122 ../lib/plugin/PluginManager.php:124 #: ../lib/upgrade.php:205 ../themes/MonoBook/templates/navbar.tmpl:21 msgid "Help" -msgstr "" +msgstr "Ayuda" #: ../lib/plugin/PopularNearby.php:44 msgid "PopularNearby" @@ -4372,9 +4363,8 @@ msgstr "" #: ../lib/plugin/SemanticSearch.php:287 -#, fuzzy msgid "Help:SemanticRelations" -msgstr "Cancelar" +msgstr "" #: ../lib/plugin/SemanticSearch.php:335 #, php-format @@ -6114,23 +6104,20 @@ msgstr "" #: ../lib/plugin/_WikiTranslation.php:60 -#, fuzzy msgid "Help/CalendarListPlugin" -msgstr "CalendarioListaPlugin" +msgstr "Ayuda/CalendarioListaPlugin" #: ../lib/plugin/_WikiTranslation.php:61 -#, fuzzy msgid "Help/CalendarPlugin" -msgstr "CalendarioPlugin" +msgstr "Ayuda/CalendarioPlugin" #: ../lib/plugin/_WikiTranslation.php:62 msgid "Help/CommentPlugin" msgstr "" #: ../lib/plugin/_WikiTranslation.php:63 -#, fuzzy msgid "Help/CreateTocPlugin" -msgstr "CreeToc" +msgstr "Ayuda/CreeToc" #: ../lib/plugin/_WikiTranslation.php:64 msgid "Help/EditMetaDataPlugin" @@ -6153,9 +6140,8 @@ msgstr "" #: ../lib/plugin/_WikiTranslation.php:69 -#, fuzzy msgid "Help/IncludePagePlugin" -msgstr "BuscarPágina" +msgstr "Ayuda/BuscarPágina" #: ../lib/plugin/_WikiTranslation.php:70 msgid "Help/LinkIcons" @@ -6214,14 +6200,12 @@ msgstr "" #: ../lib/plugin/_WikiTranslation.php:84 -#, fuzzy msgid "Help/UnfoldSubpagesPlugin" -msgstr "IncluyaPáginasSecundariaPlugin" +msgstr "Ayuda/IncluyaPáginasSecundariaPlugin" #: ../lib/plugin/_WikiTranslation.php:85 -#, fuzzy msgid "Help/UpLoadPlugin" -msgstr "UpLoadPlugin" +msgstr "Ayuda/UpLoadPlugin" #: ../lib/plugin/_WikiTranslation.php:86 msgid "Help/WabiSabi" @@ -7537,9 +7521,8 @@ #: ../themes/Portland/templates/editpage.tmpl:83 #: ../themes/Wordpress/templates/editpage.tmpl:91 #: ../themes/Wordpress/templates/editpage.tmpl:96 -#, fuzzy msgid "Help/GoodStyle" -msgstr "BuenEstilo" +msgstr "Ayuda/BuenEstilo" #: ../themes/blog/templates/blogform.tmpl:24 #: ../themes/Crao/templates/editpage.tmpl:93 @@ -7562,9 +7545,8 @@ #: ../themes/fusionforge/templates/editpage.tmpl:79 #: ../themes/Portland/templates/editpage.tmpl:84 #: ../themes/Wordpress/templates/editpage.tmpl:97 -#, fuzzy msgid "Help/TextFormattingRules" -msgstr "ReglasDeFormatoDeTexto" +msgstr "Ayuda/ReglasDeFormatoDeTexto" #: ../themes/blog/templates/blogform.tmpl:25 #: ../themes/Crao/templates/editpage.tmpl:94 @@ -7842,9 +7824,8 @@ #: ../themes/default/templates/editpage.tmpl:118 #: ../themes/Portland/templates/editpage.tmpl:79 #: ../themes/Wordpress/templates/editpage.tmpl:92 -#, fuzzy msgid "Help/OldTextFormattingRules" -msgstr "ViejoReglasDeFormatoDeTexto" +msgstr "Ayuda/ViejoReglasDeFormatoDeTexto" #: ../themes/Crao/templates/head.tmpl:24 ../themes/Crao/templates/head.tmpl:25 #: ../themes/Crao/templates/htmldump.tmpl:15 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7970 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7970&view=rev Author: vargenau Date: 2011年03月09日 12:37:13 +0000 (2011年3月09日) Log Message: ----------- All locales are now in UTF-8 Removed Paths: ------------- trunk/locale/cvt-utf8.sh Deleted: trunk/locale/cvt-utf8.sh =================================================================== --- trunk/locale/cvt-utf8.sh 2011年03月07日 15:23:53 UTC (rev 7969) +++ trunk/locale/cvt-utf8.sh 2011年03月09日 12:37:13 UTC (rev 7970) @@ -1,46 +0,0 @@ -#! /bin/sh - -# convert all locales to utf-8 -for po in po/??.po; do - to="`echo $po|sed -e's/\.po/.utf8.po/'`" - from=iso-8859-1 - if [ "$po" = "po/ja.po" ]; then from=utf-8; fi - if [ "$po" = "po/zh.po" ] - then - from=utf-8 - else - iconv -f $from -t utf-8 $po > $to - mv $po $po.$from - perl -pi -e"s/charset=$from/charset=utf-8/" $to - mv $to $po - fi -done - -for po in ??; do - to="$po.utf8" - from=iso-8859-1 - if [ "$po" = "ja" ]; then from=utf-8; fi - if [ "$po" = "zh" ] - then - from=utf-8 - else - if [ "$po" != "po" ]; then - cp -Ru $po $to - for pgsrc in $to/pgsrc/*; do - case "$pgsrc" in - $to/pgsrc/CVS) ;; - $to/pgsrc/*.bak) ;; - *) iconv -f $from -t utf-8 $pgsrc > .tmp && mv .tmp $pgsrc - perl -pi.bak -e"s/charset=$from/charset=utf-8/" $pgsrc - ;; - esac - done - iconv -f $from -t utf-8 $to/LC_MESSAGES/phpwiki.php > .tmp && mv .tmp $to/LC_MESSAGES/phpwiki.php - mv $po "$po.$from" - mv $to $po - fi - fi -done - -make depend -make This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7969 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7969&view=rev Author: vargenau Date: 2011年03月07日 15:23:53 +0000 (2011年3月07日) Log Message: ----------- Revert removing getCookieName ("grep -i" is better) Modified Paths: -------------- trunk/lib/stdlib.php Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2011年03月07日 13:39:47 UTC (rev 7968) +++ trunk/lib/stdlib.php 2011年03月07日 15:23:53 UTC (rev 7969) @@ -150,6 +150,16 @@ } /** +* Returns a name for the WIKI_ID cookie that should be unique on the host. +* But for it to be unique you must have set a unique WIKI_NAME in your +* configuration file. +* @return string The name of the WIKI_ID cookie to use for this wiki. +*/ +function getCookieName() { + return preg_replace("/[^\d\w]/", "_", WIKI_NAME) . "_WIKI_ID"; +} + +/** * Generates a valid URL for a given Wiki pagename. * @param mixed $pagename If a string this will be the name of the Wiki page to link to. * If a WikiDB_Page object function will extract the name to link to. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7968 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7968&view=rev Author: vargenau Date: 2011年03月07日 13:39:47 +0000 (2011年3月07日) Log Message: ----------- No tabs Modified Paths: -------------- trunk/themes/Crao/themeinfo.php trunk/themes/Hawaiian/themeinfo.php trunk/themes/MacOSX/themeinfo.php trunk/themes/MonoBook/themeinfo.php trunk/themes/Portland/themeinfo.php trunk/themes/Sidebar/clock.php trunk/themes/Sidebar/hyperapplet.php trunk/themes/Sidebar/hyperwiki.php trunk/themes/Sidebar/themeinfo.php trunk/themes/SpaceWiki/themeinfo.php trunk/themes/Wordpress/themeinfo.php trunk/themes/blog/themeinfo.php trunk/themes/default/themeinfo.php trunk/themes/shamino_com/themeinfo.php trunk/themes/smaller/themeinfo.php trunk/themes/wikilens/themeinfo.php Modified: trunk/themes/Crao/themeinfo.php =================================================================== --- trunk/themes/Crao/themeinfo.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/Crao/themeinfo.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -17,77 +17,63 @@ class WikiTheme_Crao extends WikiTheme { function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - // This should result in phpwiki-printer.css being used when - // printing or print-previewing with style "PhpWiki" selected. - $this->setDefaultCSS('Crao', - array('' => 'crao.css', - 'print' => '')); + // This should result in phpwiki-printer.css being used when + // printing or print-previewing with style "PhpWiki" selected. + $this->setDefaultCSS('Crao', array(''=> 'crao.css', 'print' => '')); - // This allows one to manually select "Printer" style (when browsing page) - // to see what the printer style looks like. - //$this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css'); - //$this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css'); - //$this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + /** + * The Signature image is shown after saving an edited page. If this + * is not set, any signature defined in index.php will be used. If it + * is not defined by index.php or in here then the "Thank you for + * editing..." screen will be omitted. + */ + // Comment this next line out to enable signature. + $this->addImageAlias('signature', false); - /** - * The logo image appears on every page and links to the HomePage. - */ - //$this->addImageAlias('logo', 'logo.png'); + /* + * Link icons. + */ + $this->setLinkIcon('http'); + $this->setLinkIcon('https'); + $this->setLinkIcon('ftp'); + $this->setLinkIcon('mailto'); + $this->setLinkIcon('interwiki'); + $this->setLinkIcon('*', 'url'); - /** - * The Signature image is shown after saving an edited page. If this - * is not set, any signature defined in index.php will be used. If it - * is not defined by index.php or in here then the "Thank you for - * editing..." screen will be omitted. - */ + $this->setButtonSeparator(HTML::raw(" | ")); - // Comment this next line out to enable signature. - $this->addImageAlias('signature', false); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + $this->setAutosplitWikiWords(false); - /* - * Link icons. - */ - $this->setLinkIcon('http'); - $this->setLinkIcon('https'); - $this->setLinkIcon('ftp'); - $this->setLinkIcon('mailto'); - $this->setLinkIcon('interwiki'); - $this->setLinkIcon('*', 'url'); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + //$this->setDateFormat("%B %d, %Y"); + //$this->setTimeFormat("%I:%M %p"); - $this->setButtonSeparator(HTML::raw(" | ")); + /* + * To suppress times in the "Last edited on" messages, give a + * give a second argument of false: + */ + //$this->setDateFormat("%B %d, %Y", false); + $this->setDateFormat("%A %e %B %Y"); // must not contain time + //$this->setDateFormat("%x"); // must not contain time + $this->setTimeFormat("%H:%M:%S"); + //$this->setTimeFormat("%X"); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - $this->setAutosplitWikiWords(false); - - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - //$this->setDateFormat("%B %d, %Y"); - //$this->setTimeFormat("%I:%M %p"); - - /* - * To suppress times in the "Last edited on" messages, give a - * give a second argument of false: - */ - //$this->setDateFormat("%B %d, %Y", false); - $this->setDateFormat("%A %e %B %Y"); // must not contain time - //$this->setDateFormat("%x"); // must not contain time - $this->setTimeFormat("%H:%M:%S"); - //$this->setTimeFormat("%X"); - } } @@ -99,5 +85,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/Hawaiian/themeinfo.php =================================================================== --- trunk/themes/Hawaiian/themeinfo.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/Hawaiian/themeinfo.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -26,66 +26,66 @@ } function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - $this->setDefaultCSS('Hawaiian', 'Hawaiian.css'); - $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); - $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); + $this->setDefaultCSS('Hawaiian', 'Hawaiian.css'); + $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); + $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - $this->addImageAlias('logo', 'PalmBeach.jpg'); - $this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + $this->addImageAlias('logo', 'PalmBeach.jpg'); + $this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is set to false then the "Thank you for editing..." screen will - * be omitted. - */ - //$this->addImageAlias('signature', 'SubmersiblePiscesV.jpg'); - $this->addImageAlias('signature', 'WaterFall.jpg'); - $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); - // Uncomment this next line to disable the signature. - //$this->addImageAlias('signature', false); + /** + * The Signature image is shown after saving an edited page. If this + * is set to false then the "Thank you for editing..." screen will + * be omitted. + */ + //$this->addImageAlias('signature', 'SubmersiblePiscesV.jpg'); + $this->addImageAlias('signature', 'WaterFall.jpg'); + $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); + // Uncomment this next line to disable the signature. + //$this->addImageAlias('signature', false); - // If you want to see more than just the waterfall let a random - // picture be chosen for the signature image: - //include_once($this->file('lib/random.php')); - include_once("themes/$this->_name/lib/random.php"); - $imgSet = new randomImage($this->file("images/pictures")); - $imgFile = "pictures/" . $imgSet->filename; - $this->addImageAlias('signature', $imgFile); + // If you want to see more than just the waterfall let a random + // picture be chosen for the signature image: + //include_once($this->file('lib/random.php')); + include_once("themes/$this->_name/lib/random.php"); + $imgSet = new randomImage($this->file("images/pictures")); + $imgFile = "pictures/" . $imgSet->filename; + $this->addImageAlias('signature', $imgFile); - //To test out the randomization just use logo instead of signature - //$this->addImageAlias('logo', $imgFile); + //To test out the randomization just use logo instead of signature + //$this->addImageAlias('logo', $imgFile); - /* - * Link Icons - */ - $this->setLinkIcon('interwiki'); - $this->setLinkIcon('*', 'flower.png'); + /* + * Link Icons + */ + $this->setLinkIcon('interwiki'); + $this->setLinkIcon('*', 'flower.png'); - $this->setButtonSeparator(' '); + $this->setButtonSeparator(' '); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - $this->setAutosplitWikiWords(true); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + $this->setAutosplitWikiWords(true); - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - //$this->setDateFormat("%B %d, %Y"); // must not contain time + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + //$this->setDateFormat("%B %d, %Y"); // must not contain time } } @@ -98,5 +98,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/MacOSX/themeinfo.php =================================================================== --- trunk/themes/MacOSX/themeinfo.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/MacOSX/themeinfo.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -71,7 +71,7 @@ else { $default_text = $wikiword; } - + $url = WikiURL($wikiword, array('action' => 'create')); //$link = HTML::span(HTML::a(array('href' => $url), '?')); $button = $this->makeButton('?', $url); @@ -92,70 +92,68 @@ } function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - // This should result in phpwiki-printer.css being used when - // printing or print-previewing with style "PhpWiki" or "MacOSX" selected. - $this->setDefaultCSS('MacOSX', - array('' => 'MacOSX.css', - 'print' => 'phpwiki-printer.css')); + // This should result in phpwiki-printer.css being used when + // printing or print-previewing with style "PhpWiki" or "MacOSX" selected. + $this->setDefaultCSS('MacOSX', array('' => 'MacOSX.css', 'print' => 'phpwiki-printer.css')); - // This allows one to manually select "Printer" style (when browsing page) - // to see what the printer style looks like. - $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); - $this->addAlternateCSS(_("Top & bottom toolbars"), 'MacOSX-topbottombars.css'); + // This allows one to manually select "Printer" style (when browsing page) + // to see what the printer style looks like. + $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); + $this->addAlternateCSS(_("Top & bottom toolbars"), 'MacOSX-topbottombars.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - $this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + $this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is set to false then the "Thank you for editing..." screen will - * be omitted. - */ - $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); - // Uncomment this next line to disable the signature. - //$this->addImageAlias('signature', false); + /** + * The Signature image is shown after saving an edited page. If this + * is set to false then the "Thank you for editing..." screen will + * be omitted. + */ + $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); + // Uncomment this next line to disable the signature. + //$this->addImageAlias('signature', false); - /* - * Link icons. - */ - $this->setLinkIcon('http'); - $this->setLinkIcon('https'); - $this->setLinkIcon('ftp'); - $this->setLinkIcon('mailto'); - $this->setLinkIcon('interwiki'); - $this->setLinkIcon('wikiuser'); - $this->setLinkIcon('*', 'url'); + /* + * Link icons. + */ + $this->setLinkIcon('http'); + $this->setLinkIcon('https'); + $this->setLinkIcon('ftp'); + $this->setLinkIcon('mailto'); + $this->setLinkIcon('interwiki'); + $this->setLinkIcon('wikiuser'); + $this->setLinkIcon('*', 'url'); - $this->setButtonSeparator(""); //use no separator instead of default + $this->setButtonSeparator(""); //use no separator instead of default - $this->addButtonAlias('?', 'uww'); - $this->addButtonAlias(_("Lock Page"), "Lock Page"); - $this->addButtonAlias(_("Unlock Page"), "Unlock Page"); - $this->addButtonAlias(_("Page Locked"), "Page Locked"); - $this->addButtonAlias("...", "alltime"); + $this->addButtonAlias('?', 'uww'); + $this->addButtonAlias(_("Lock Page"), "Lock Page"); + $this->addButtonAlias(_("Unlock Page"), "Unlock Page"); + $this->addButtonAlias(_("Page Locked"), "Page Locked"); + $this->addButtonAlias("...", "alltime"); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - //$this->setAutosplitWikiWords(false); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + //$this->setAutosplitWikiWords(false); - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - $this->setDateFormat("%A, %B %d, %Y"); // must not contain time - $this->setTimeFormat("%I:%M:%S %p"); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + $this->setDateFormat("%A, %B %d, %Y"); // must not contain time + $this->setTimeFormat("%I:%M:%S %p"); } } @@ -167,5 +165,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/MonoBook/themeinfo.php =================================================================== --- trunk/themes/MonoBook/themeinfo.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/MonoBook/themeinfo.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -44,7 +44,7 @@ class WikiTheme_MonoBook extends WikiTheme_Wikilens { - + /* this adds selected to the class */ function makeActionButton ($action, $label=false, $page_or_rev=false, $options=false) { extract($this->_get_name_and_rev($page_or_rev)); @@ -78,90 +78,90 @@ } function load() { - $this->addMoreHeaders(JavaScript("var ta;\nvar skin = '".$this->_name."';\n")); - $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikibits.js")))); - if (isBrowserIE()) { - $ver = browserVersion(); - if ($ver > 5.5 and $ver < 7.0) - $this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE60Fixes.css'),'all')); - elseif ($ver >= 7.0) - $this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE70Fixes.css'),'all')); - unset($ver); - $this->addMoreHeaders("\n"); - $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("IEFixes.js")))); - $this->addMoreHeaders("\n"); - $this->addMoreHeaders(HTML::Raw('<meta http-equiv="imagetoolbar" content="no" />')); - } - $this->addMoreAttr('body', "class-ns-0", HTML::Raw('class="ns-0"')); + $this->addMoreHeaders(JavaScript("var ta;\nvar skin = '".$this->_name."';\n")); + $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikibits.js")))); + if (isBrowserIE()) { + $ver = browserVersion(); + if ($ver > 5.5 and $ver < 7.0) + $this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE60Fixes.css'),'all')); + elseif ($ver >= 7.0) + $this->addMoreHeaders($this->_CSSlink(0,$this->_findFile('IE70Fixes.css'),'all')); + unset($ver); + $this->addMoreHeaders("\n"); + $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("IEFixes.js")))); + $this->addMoreHeaders("\n"); + $this->addMoreHeaders(HTML::Raw('<meta http-equiv="imagetoolbar" content="no" />')); + } + $this->addMoreAttr('body', "class-ns-0", HTML::Raw('class="ns-0"')); - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - // This should result in phpwiki-printer.css being used when - // printing or print-previewing with style "PhpWiki" or "MacOSX" selected. - $this->setDefaultCSS('PhpWiki', - array('' => 'monobook.css', - 'print' => 'commonPrint.css')); + // This should result in phpwiki-printer.css being used when + // printing or print-previewing with style "PhpWiki" or "MacOSX" selected. + $this->setDefaultCSS('PhpWiki', + array('' => 'monobook.css', + 'print' => 'commonPrint.css')); - // This allows one to manually select "Printer" style (when browsing page) - // to see what the printer style looks like. - $this->addAlternateCSS(_("Printer"), 'commonPrint.css', 'print, screen'); - $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css'); - $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + // This allows one to manually select "Printer" style (when browsing page) + // to see what the printer style looks like. + $this->addAlternateCSS(_("Printer"), 'commonPrint.css', 'print, screen'); + $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css'); + $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - $this->addImageAlias('logo', 'MonoBook-Logo.png'); - //$this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + $this->addImageAlias('logo', 'MonoBook-Logo.png'); + //$this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is set to false then the "Thank you for editing..." screen will - * be omitted. - */ + /** + * The Signature image is shown after saving an edited page. If this + * is set to false then the "Thank you for editing..." screen will + * be omitted. + */ - $this->addImageAlias('signature', "Signature.png"); - // Uncomment this next line to disable the signature. - $this->addImageAlias('signature', false); + $this->addImageAlias('signature', "Signature.png"); + // Uncomment this next line to disable the signature. + $this->addImageAlias('signature', false); - /* - * Link icons. - */ - $this->setLinkIcon('wikiuser'); + /* + * Link icons. + */ + $this->setLinkIcon('wikiuser'); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - //$this->setAutosplitWikiWords(false); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + //$this->setAutosplitWikiWords(false); - /** - * Layout improvement with dangling links for mostly closed wiki's: - * If false, only users with edit permissions will be presented the - * special wikiunknown class with "?" and Tooltip. - * If true (default), any user will see the ?, but will be presented - * the PrintLoginForm on a click. - */ - $this->setAnonEditUnknownLinks(false); + /** + * Layout improvement with dangling links for mostly closed wiki's: + * If false, only users with edit permissions will be presented the + * special wikiunknown class with "?" and Tooltip. + * If true (default), any user will see the ?, but will be presented + * the PrintLoginForm on a click. + */ + $this->setAnonEditUnknownLinks(false); - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - $this->setDateFormat("%B %d, %Y"); - $this->setTimeFormat("%H:%M"); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + $this->setDateFormat("%B %d, %Y"); + $this->setTimeFormat("%H:%M"); - /* - * To suppress times in the "Last edited on" messages, give a - * give a second argument of false: - */ - //$this->setDateFormat("%B %d, %Y", false); + /* + * To suppress times in the "Last edited on" messages, give a + * give a second argument of false: + */ + //$this->setDateFormat("%B %d, %Y", false); } } @@ -173,5 +173,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/Portland/themeinfo.php =================================================================== --- trunk/themes/Portland/themeinfo.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/Portland/themeinfo.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -25,7 +25,7 @@ else { $default_text = $wikiword; } - + $url = WikiURL($wikiword, array('action' => 'create')); $link = HTML::span(HTML::a(array('href' => $url, 'rel' => 'nofollow'), '?')); @@ -55,56 +55,50 @@ } function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - $this->setDefaultCSS('Portland', 'portland.css'); - $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); - $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); + $this->setDefaultCSS('Portland', 'portland.css'); + $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); + $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - $this->addImageAlias('logo', WIKI_NAME . 'logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + $this->addImageAlias('logo', WIKI_NAME . 'logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is set to false then the "Thank you for editing..." screen will - * be omitted. - */ - $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); - // Uncomment this next line to disable the signature. - //$this->addImageAlias('signature', false); + /** + * The Signature image is shown after saving an edited page. If this + * is set to false then the "Thank you for editing..." screen will + * be omitted. + */ + $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); + // Uncomment this next line to disable the signature. + //$this->addImageAlias('signature', false); - /* - * Link icons. - */ - //$this->setLinkIcon('http'); - //$this->setLinkIcon('https'); - //$this->setLinkIcon('ftp'); - //$this->setLinkIcon('mailto'); - //$this->setLinkIcon('interwiki'); - //$this->setLinkIcon('*', 'url'); + /* + * Link icons. + */ - $this->setButtonSeparator(' '); + $this->setButtonSeparator(' '); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - $this->setAutosplitWikiWords(false); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + $this->setAutosplitWikiWords(false); - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - $this->setDateFormat("%B %d, %Y", false); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + $this->setDateFormat("%B %d, %Y", false); } } @@ -117,5 +111,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/Sidebar/clock.php =================================================================== --- trunk/themes/Sidebar/clock.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/Sidebar/clock.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -1,4 +1,4 @@ -<?php +<?php // $Id$ $ora = isset($GLOBALS['WikiTheme']) ? DATA_PATH . '/' . $GLOBALS['WikiTheme']->_findFile("ora.swf") : "ora.swf"; ?> Modified: trunk/themes/Sidebar/hyperapplet.php =================================================================== --- trunk/themes/Sidebar/hyperapplet.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/Sidebar/hyperapplet.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -1,16 +1,16 @@ -<?php +<?php // $Id$ -/* Download hyperapplet.jar (or hyperwiki.jar) and GraphXML.dtd from +/* Download hyperapplet.jar (or hyperwiki.jar) and GraphXML.dtd from * http://hypergraph.sourceforge.net/download.html * and place it into your theme directory. * Include this php file and adjust the width/height. - * The static version requires a dumped "LinkDatabase.xml" via + * The static version requires a dumped "LinkDatabase.xml" via * cd themes/default; wget http://localhost/wiki/index.php/LinkDatabase?format=xml -O LinkDatabase.xml * into the same dir as hyperapplet.jar */ global $WikiTheme; ?> -<applet code="hypergraph.applications.hexplorer.HExplorerApplet.class" align="baseline" +<applet code="hypergraph.applications.hexplorer.HExplorerApplet.class" align="baseline" archive="<?php echo $WikiTheme->_finddata("hyperapplet.jar") ?>" width="160" height="360"> <?php // the dynamic version: ?> Modified: trunk/themes/Sidebar/hyperwiki.php =================================================================== --- trunk/themes/Sidebar/hyperwiki.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/Sidebar/hyperwiki.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -1,15 +1,15 @@ -<?php +<?php // $Id$ - /* Download hyperwiki.jar and GraphXML.dtd from + /* Download hyperwiki.jar and GraphXML.dtd from * http://hypergraph.sourceforge.net/download.html * and place it into your theme directory. * Include this php file and adjust the width/height. */ global $WikiTheme; - // via the RPC interface it goes like this... + // via the RPC interface it goes like this... ?> -<applet code="hypergraph.applications.hwiki.HWikiApplet.class" - archive="<?php echo $WikiTheme->_finddata("hyperwiki.jar") ?>" +<applet code="hypergraph.applications.hwiki.HWikiApplet.class" + archive="<?php echo $WikiTheme->_finddata("hyperwiki.jar") ?>" width="162" height="240"> <param name="startPage" value="<?php echo $page->getName() ?>" /> <param name="properties" value="<?php echo $WikiTheme->_finddata("hwiki.prop") ?>" /> Modified: trunk/themes/Sidebar/themeinfo.php =================================================================== --- trunk/themes/Sidebar/themeinfo.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/Sidebar/themeinfo.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -43,26 +43,26 @@ /* Display up/down button with persistent state */ /* persistent state per block in cookie for 30 days */ function folderArrow ($id, $init='Open') { - global $request; - if ($cookie = $request->cookies->get("folder_".$id)) { - $init = $cookie; - } + global $request; + if ($cookie = $request->cookies->get("folder_".$id)) { + $init = $cookie; + } if ($init == 'Open' or $init == 'Closed') $png = $this->_findData('images/folderArrow'.$init.'.png'); else $png = $this->_findData('images/folderArrowOpen.png'); - return HTML::img(array('id' => $id.'-img', - 'src' => $png, - //'align' => 'right', - 'onclick' => "showHideFolder('$id')", - 'alt' => _("Click to hide/show"), - 'title' => _("Click to hide/show"))); + return HTML::img(array('id' => $id.'-img', + 'src' => $png, + //'align' => 'right', + 'onclick' => "showHideFolder('$id')", + 'alt' => _("Click to hide/show"), + 'title' => _("Click to hide/show"))); } /* Callback when a new user creates or edits a page */ function CbNewUserEdit (&$request, $userid) { - $userid = strtoupper($userid); - $content = "{{Template/UserPage}}"; + $userid = strtoupper($userid); + $content = "{{Template/UserPage}}"; $dbi =& $request->_dbi; $page = $dbi->getPage($userid); $page->save($content, WIKIDB_FORCE_CREATE, array('author' => $userid)); @@ -81,19 +81,19 @@ */ function CbUpload (&$request, $pathname) { $cmdline = CLAMDSCAN_PATH . " --nosummary --move=" . CLAMDSCAN_VIRUS; - $report = `$cmdline "$pathname"`; - if (!$report) { - trigger_error("clamdscan failed", E_USER_WARNING); - return true; - } - if (!preg_match("/: OK$/", $report)) { - //preg_match("/: (.+)$/", $report, $m); - trigger_error("Upload failed. virus-scanner: $report", E_USER_WARNING); - return false; - } else { - return true; - } + $report = `$cmdline "$pathname"`; + if (!$report) { + trigger_error("clamdscan failed", E_USER_WARNING); + return true; } + if (!preg_match("/: OK$/", $report)) { + //preg_match("/: (.+)$/", $report, $m); + trigger_error("Upload failed. virus-scanner: $report", E_USER_WARNING); + return false; + } else { + return true; + } + } function findTemplate ($name) { @@ -111,87 +111,87 @@ $this->initGlobals(); - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - $this->setDefaultCSS(_("Sidebar"), array('' => 'sidebar.css', + $this->setDefaultCSS(_("Sidebar"), array('' => 'sidebar.css', 'print' => 'phpwiki-printer.css')); - $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); - $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); + $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - //$this->addImageAlias('logo', 'logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + //$this->addImageAlias('logo', 'logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is not set, any signature defined in index.php will be used. If it - * is not defined by index.php or in here then the "Thank you for - * editing..." screen will be omitted. - */ + /** + * The Signature image is shown after saving an edited page. If this + * is not set, any signature defined in index.php will be used. If it + * is not defined by index.php or in here then the "Thank you for + * editing..." screen will be omitted. + */ - // Comment this next line out to enable signature. - $this->addImageAlias('signature', false); + // Comment this next line out to enable signature. + $this->addImageAlias('signature', false); - $this->addImageAlias('search', 'search.png'); + $this->addImageAlias('search', 'search.png'); - /* - * Link icons. - */ - $this->setLinkIcon('http'); - $this->setLinkIcon('https'); - $this->setLinkIcon('ftp'); - $this->setLinkIcon('mailto'); - $this->setLinkIcon('interwiki'); - $this->setLinkIcon('*', 'url'); + /* + * Link icons. + */ + $this->setLinkIcon('http'); + $this->setLinkIcon('https'); + $this->setLinkIcon('ftp'); + $this->setLinkIcon('mailto'); + $this->setLinkIcon('interwiki'); + $this->setLinkIcon('*', 'url'); - //$this->setButtonSeparator(' | '); + //$this->setButtonSeparator(' | '); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - //$this->setAutosplitWikiWords(true); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + //$this->setAutosplitWikiWords(true); - /** - * If true (default) show create '?' buttons on not existing pages, even if the - * user is not signed in. - * If false, anon users get no links and it looks cleaner, but then they - * cannot easily fix missing pages. - */ - $this->setAnonEditUnknownLinks(false); + /** + * If true (default) show create '?' buttons on not existing pages, even if the + * user is not signed in. + * If false, anon users get no links and it looks cleaner, but then they + * cannot easily fix missing pages. + */ + $this->setAnonEditUnknownLinks(false); - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - //$this->setDateFormat("%B %d, %Y"); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + //$this->setDateFormat("%B %d, %Y"); - /** - * Custom UserPreferences: - * A list of name => _UserPreference class pairs. - * Rationale: Certain themes should be able to extend the predefined list - * of preferences. Display/editing is done in the theme specific userprefs.tmpl - * but storage/sanification/update/... must be extended to the Get/SetPreferences methods. - * See themes/wikilens/themeinfo.php - */ - //$this->customUserPreference(); + /** + * Custom UserPreferences: + * A list of name => _UserPreference class pairs. + * Rationale: Certain themes should be able to extend the predefined list + * of preferences. Display/editing is done in the theme specific userprefs.tmpl + * but storage/sanification/update/... must be extended to the Get/SetPreferences methods. + * See themes/wikilens/themeinfo.php + */ + //$this->customUserPreference(); - /** - * Register custom PageList type and define custom PageList classes. - * Rationale: Certain themes should be able to extend the predefined list - * of pagelist types. E.g. certain plugins, like MostPopular might use - * info=pagename,hits,rating - * which displays the rating column whenever the wikilens theme is active. - * See themes/wikilens/themeinfo.php - */ - //$this->addPageListColumn(); + /** + * Register custom PageList type and define custom PageList classes. + * Rationale: Certain themes should be able to extend the predefined list + * of pagelist types. E.g. certain plugins, like MostPopular might use + * info=pagename,hits,rating + * which displays the rating column whenever the wikilens theme is active. + * See themes/wikilens/themeinfo.php + */ + //$this->addPageListColumn(); } } @@ -214,5 +214,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/SpaceWiki/themeinfo.php =================================================================== --- trunk/themes/SpaceWiki/themeinfo.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/SpaceWiki/themeinfo.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -36,51 +36,51 @@ return false; // use default return '_SpaceWiki_PageHistory_Formatter'; } - + function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - $this->setDefaultCSS('SpaceWiki', 'SpaceWiki.css'); - $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); - $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); + $this->setDefaultCSS('SpaceWiki', 'SpaceWiki.css'); + $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); + $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - //$this->addImageAlias('logo', 'logo.png'); - $this->addImageAlias('logo', 'Ufp-logo.jpg'); - $this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + //$this->addImageAlias('logo', 'logo.png'); + $this->addImageAlias('logo', 'Ufp-logo.jpg'); + $this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is set to false then the "Thank you for editing..." screen will - * be omitted. - */ - $this->addImageAlias('signature', 'lights.png'); - $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); - // Uncomment this next line to disable the signature. - //$this->addImageAlias('signature', false); + /** + * The Signature image is shown after saving an edited page. If this + * is set to false then the "Thank you for editing..." screen will + * be omitted. + */ + $this->addImageAlias('signature', 'lights.png'); + $this->addImageAlias('signature', WIKI_NAME . "Signature.png"); + // Uncomment this next line to disable the signature. + //$this->addImageAlias('signature', false); - $this->addImageAlias('hr', 'hr.png'); + $this->addImageAlias('hr', 'hr.png'); - $this->setButtonSeparator(" "); + $this->setButtonSeparator(" "); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - //$this->setAutosplitWikiWords(false); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + //$this->setAutosplitWikiWords(false); - /** - * The "stardate" format here is really just metricdate.24hourtime. A - * "real" date2startdate conversion function might be fun but not very - * useful on a wiki. - */ - $this->setTimeFormat("%H%M%S"); - $this->setDateFormat("%Y%m%d"); // must not contain time + /** + * The "stardate" format here is really just metricdate.24hourtime. A + * "real" date2startdate conversion function might be fun but not very + * useful on a wiki. + */ + $this->setTimeFormat("%H%M%S"); + $this->setDateFormat("%Y%m%d"); // must not contain time } } @@ -93,5 +93,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/Wordpress/themeinfo.php =================================================================== --- trunk/themes/Wordpress/themeinfo.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/Wordpress/themeinfo.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -27,7 +27,7 @@ else { $default_text = $wikiword; } - + $url = WikiURL($wikiword, array('action' => 'create')); $link = HTML::span(HTML::a(array('href' => $url, 'rel' => 'nofollow'), '?')); @@ -57,55 +57,49 @@ } function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - $this->setDefaultCSS('Wordpress', 'Wordpress.css'); - $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); - $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); + $this->setDefaultCSS('Wordpress', 'Wordpress.css'); + $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); + $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + $this->addAlternateCSS('PhpWiki', 'phpwiki.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - //$this->addImageAlias('logo', 'logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + //$this->addImageAlias('logo', 'logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is not set, any signature defined in index.php will be used. If it - * is not defined by index.php or in here then the "Thank you for - * editing..." screen will be omitted. - */ - $this->addImageAlias('signature', 'signature.png'); + /** + * The Signature image is shown after saving an edited page. If this + * is not set, any signature defined in index.php will be used. If it + * is not defined by index.php or in here then the "Thank you for + * editing..." screen will be omitted. + */ + $this->addImageAlias('signature', 'signature.png'); - /* - * Link icons. - */ - //$this->setLinkIcon('http'); - //$this->setLinkIcon('https'); - //$this->setLinkIcon('ftp'); - //$this->setLinkIcon('mailto'); - //$this->setLinkIcon('interwiki'); - //$this->setLinkIcon('*', 'url'); + /* + * Link icons. + */ - $this->setButtonSeparator(' '); + $this->setButtonSeparator(' '); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - $this->setAutosplitWikiWords(false); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + $this->setAutosplitWikiWords(false); - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - $this->setDateFormat("%B %d, %Y", false); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + $this->setDateFormat("%B %d, %Y", false); } } @@ -117,5 +111,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/blog/themeinfo.php =================================================================== --- trunk/themes/blog/themeinfo.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/blog/themeinfo.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -52,7 +52,7 @@ $this->calendarInit(true); } - /* overload to load from Sidebar */ + /* overload to load from Sidebar */ function _findFile ($file, $missing_okay=false) { if (file_exists($this->_path . "themes/".$this->_name."/$file")) return "themes/".$this->_name."/$file"; @@ -83,7 +83,7 @@ return '_blog_RecentChanges_BoxFormatter'; return '_blog_RecentChanges_Formatter'; } - + /* TODO: use the blog summary as label instead of the pagename */ function linkExistingWikiWord($wikiword, $linktext = '', $version = false) { global $request; @@ -103,7 +103,7 @@ $default_text = $wikiword->shortName; else $default_text = $wikiword; - + if (!empty($linktext)) { $link->pushContent($linktext); $link->setAttr('class', 'named-wiki'); @@ -118,44 +118,44 @@ } function load() { - // CSS file defines fonts, colors and background images for this - // style. + // CSS file defines fonts, colors and background images for this + // style. - // override sidebar definitions: - $this->setDefaultCSS(_("blog"), 'Kubrick.css'); - if (isBrowserIE()) { - $this->addMoreHeaders($this->_CSSlink(0, $this->_findFile('IEFixes.css'),'all')); - } - $this->addButtonAlias(_("(diff)"), "[diff]" ); - $this->addButtonAlias("...", "alltime"); + // override sidebar definitions: + $this->setDefaultCSS(_("blog"), 'Kubrick.css'); + if (isBrowserIE()) { + $this->addMoreHeaders($this->_CSSlink(0, $this->_findFile('IEFixes.css'),'all')); + } + $this->addButtonAlias(_("(diff)"), "[diff]" ); + $this->addButtonAlias("...", "alltime"); - $this->setButtonSeparator(""); + $this->setButtonSeparator(""); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - $this->setAutosplitWikiWords(false); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + $this->setAutosplitWikiWords(false); - /** - * If true (default) show create '?' buttons on not existing pages, even if the - * user is not signed in. - * If false, anon users get no links and it looks cleaner, but then they - * cannot easily fix missing pages. - */ - $this->setAnonEditUnknownLinks(false); + /** + * If true (default) show create '?' buttons on not existing pages, even if the + * user is not signed in. + * If false, anon users get no links and it looks cleaner, but then they + * cannot easily fix missing pages. + */ + $this->setAnonEditUnknownLinks(false); - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - //$this->setDateFormat("%B %d, %Y"); - $this->setDateFormat("%A, %B %e, %Y"); // must not contain time - $this->setTimeFormat("%H:%M:%S"); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + //$this->setDateFormat("%B %d, %Y"); + $this->setDateFormat("%A, %B %e, %Y"); // must not contain time + $this->setTimeFormat("%H:%M:%S"); } } @@ -168,5 +168,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/default/themeinfo.php =================================================================== --- trunk/themes/default/themeinfo.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/default/themeinfo.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -22,5 +22,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/shamino_com/themeinfo.php =================================================================== --- trunk/themes/shamino_com/themeinfo.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/shamino_com/themeinfo.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -46,81 +46,66 @@ } function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - // This should result in phpwiki-printer.css being used when - // printing or print-previewing with style "PhpWiki" or "MacOSX" selected. - $this->setDefaultCSS('PhpWiki', - array('' => 'shamino_com.css', - 'print' => 'phpwiki-printer.css')); + // This should result in phpwiki-printer.css being used when + // printing or print-previewing with style "PhpWiki" or "MacOSX" selected. + $this->setDefaultCSS('PhpWiki', array('' => 'shamino_com.css', 'print' => 'phpwiki-printer.css')); - // This allows one to manually select "Printer" style (when browsing page) - // to see what the printer style looks like. - $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); - $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css'); - $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); + // This allows one to manually select "Printer" style (when browsing page) + // to see what the printer style looks like. + $this->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen'); + $this->addAlternateCSS(_("Top & bottom toolbars"), 'phpwiki-topbottombars.css'); + $this->addAlternateCSS(_("Modern"), 'phpwiki-modern.css'); - /** - * The logo image appears on every page and links to the HomePage. - */ - //$this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); + /** + * The logo image appears on every page and links to the HomePage. + */ + //$this->addImageAlias('logo', WIKI_NAME . 'Logo.png'); - /** - * The Signature image is shown after saving an edited page. If this - * is set to false then the "Thank you for editing..." screen will - * be omitted. - */ + /** + * The Signature image is shown after saving an edited page. If this + * is set to false then the "Thank you for editing..." screen will + * be omitted. + */ - //$this->addImageAlias('signature', WIKI_NAME . "Signature.png"); - // Uncomment this next line to disable the signature. - $this->addImageAlias('signature', false); + //$this->addImageAlias('signature', WIKI_NAME . "Signature.png"); + // Uncomment this next line to disable the signature. + $this->addImageAlias('signature', false); - /* - * Link icons. - */ - //$this->setLinkIcon('http'); - //$this->setLinkIcon('https'); - //$this->setLinkIcon('ftp'); - //$this->setLinkIcon('mailto'); - //$this->setLinkIcon('interwiki'); - //$this->setLinkIcon('wikiuser'); - //$this->setLinkIcon('*', 'url'); + /** + * WikiWords can automatically be split by inserting spaces between + * the words. The default is to leave WordsSmashedTogetherLikeSo. + */ + //$this->setAutosplitWikiWords(false); - //$this->setButtonSeparator("\n | "); + /** + * Layout improvement with dangling links for mostly closed wiki's: + * If false, only users with edit permissions will be presented the + * special wikiunknown class with "?" and Tooltip. + * If true (default), any user will see the ?, but will be presented + * the PrintLoginForm on a click. + */ + $this->setAnonEditUnknownLinks(false); - /** - * WikiWords can automatically be split by inserting spaces between - * the words. The default is to leave WordsSmashedTogetherLikeSo. - */ - //$this->setAutosplitWikiWords(false); + /* + * You may adjust the formats used for formatting dates and times + * below. (These examples give the default formats.) + * Formats are given as format strings to PHP strftime() function See + * http://www.php.net/manual/en/function.strftime.php for details. + * Do not include the server's zone (%Z), times are converted to the + * user's time zone. + */ + $this->setDateFormat("%B %d, %Y"); + $this->setTimeFormat("%H:%M"); - /** - * Layout improvement with dangling links for mostly closed wiki's: - * If false, only users with edit permissions will be presented the - * special wikiunknown class with "?" and Tooltip. - * If true (default), any user will see the ?, but will be presented - * the PrintLoginForm on a click. - */ - $this->setAnonEditUnknownLinks(false); - - /* - * You may adjust the formats used for formatting dates and times - * below. (These examples give the default formats.) - * Formats are given as format strings to PHP strftime() function See - * http://www.php.net/manual/en/function.strftime.php for details. - * Do not include the server's zone (%Z), times are converted to the - * user's time zone. - */ - $this->setDateFormat("%B %d, %Y"); - $this->setTimeFormat("%H:%M"); - - /* - * To suppress times in the "Last edited on" messages, give a - * give a second argument of false: - */ - //$this->setDateFormat("%B %d, %Y", false); + /* + * To suppress times in the "Last edited on" messages, give a + * give a second argument of false: + */ + //$this->setDateFormat("%B %d, %Y", false); } } @@ -132,5 +117,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/smaller/themeinfo.php =================================================================== --- trunk/themes/smaller/themeinfo.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/smaller/themeinfo.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -40,18 +40,15 @@ return $this->makeButton($label, WikiURL($pagename, $attr), $class); } - } $WikiTheme = new WikiTheme_smaller('smaller'); -// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -// (c-file-style: "gnu") // Local Variables: // mode: php // tab-width: 8 // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/themes/wikilens/themeinfo.php =================================================================== --- trunk/themes/wikilens/themeinfo.php 2011年03月07日 13:08:01 UTC (rev 7967) +++ trunk/themes/wikilens/themeinfo.php 2011年03月07日 13:39:47 UTC (rev 7968) @@ -18,82 +18,78 @@ class WikiTheme_Wikilens extends WikiTheme { function load() { - // CSS file defines fonts, colors and background images for this - // style. The companion '*-heavy.css' file isn't defined, it's just - // expected to be in the same directory that the base style is in. + // CSS file defines fonts, colors and background images for this + // style. The companion '*-heavy.css' file isn't defined, it's just + // expected to be in the same directory that the base style is in. - // This should result in ... [truncated message content]
Revision: 7967 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7967&view=rev Author: vargenau Date: 2011年03月07日 13:08:01 +0000 (2011年3月07日) Log Message: ----------- No tabs Modified Paths: -------------- trunk/lib/wikilens/Buddy.php trunk/lib/wikilens/CustomPrefs.php trunk/lib/wikilens/RatingsDb.php trunk/lib/wikilens/RatingsUser.php trunk/lib/wikilens/Utils.php Modified: trunk/lib/wikilens/Buddy.php =================================================================== --- trunk/lib/wikilens/Buddy.php 2011年03月07日 10:02:01 UTC (rev 7966) +++ trunk/lib/wikilens/Buddy.php 2011年03月07日 13:08:01 UTC (rev 7967) @@ -15,16 +15,8 @@ // serialized string. // If no homepage, fallback to prefs in cookie as in 1.3.3. - -/** -* -*/ require_once (dirname(__FILE__)."/Utils.php"); -/* -class Buddy extends WikiUserNew {} -*/ - function addBuddy($user, $buddy, $dbi) { $START_DELIM = _("Buddies:"); @@ -43,95 +35,95 @@ $buddies_array = getPageTextData($fromUser, $dbi, _("Buddies:"), $DELIM); } if (empty($buddies_array)) { - // 1. calculate buddies automatically from the 10 top raters with the most numratings (min. 5 ratings). - // of all pages (only SQL) - // or 2. from 10 random raters of this page (non-SQL) - // or 3. from all members of your group (department) if <= 20 - $rdbi = RatingsDb::getTheRatingsDb(); - $dimension = ''; + // 1. calculate buddies automatically from the 10 top raters with the most numratings (min. 5 ratings). + // of all pages (only SQL) + // or 2. from 10 random raters of this page (non-SQL) + // or 3. from all members of your group (department) if <= 20 + $rdbi = RatingsDb::getTheRatingsDb(); + $dimension = ''; if (RATING_STORAGE == 'SQL') { - //$result = $this->_sql_get_rating_result($dimension, null, null, 'numrating', "rater"); - $dbh = &$rdbi->_sqlbackend; - extract($dbh->_table_names); - $query = "SELECT raterpage, COUNT(rateepage) as numrating" - . " FROM $rating_tbl r, $page_tbl p " -// . " WHERE ratingvalue > 0 AND numrating > 5" - . " WHERE ratingvalue > 0" - . " GROUP BY raterpage" - . " ORDER BY numrating" - . " LIMIT 10"; - $result = $dbh->_dbh->query($query); - } else { - // from 10 random raters of this page (non-SQL) - ; - } + //$result = $this->_sql_get_rating_result($dimension, null, null, 'numrating', "rater"); + $dbh = &$rdbi->_sqlbackend; + extract($dbh->_table_names); + $query = "SELECT raterpage, COUNT(rateepage) as numrating" + . " FROM $rating_tbl r, $page_tbl p " +// . " WHERE ratingvalue > 0 AND numrating > 5" + . " WHERE ratingvalue > 0" + . " GROUP BY raterpage" + . " ORDER BY numrating" + . " LIMIT 10"; + $result = $dbh->_dbh->query($query); + } else { + // from 10 random raters of this page (non-SQL) + ; + } } $result = array(); if (is_array($buddies_array)) - foreach ($buddies_array as $userid) { - $result[] = new RatingsUser($userid); + foreach ($buddies_array as $userid) { + $result[] = new RatingsUser($userid); } return $result; } function CoAgreement($dbi, $page, $users, $active_userid){ - //Returns a "yes" 1, "no" -1, or "unsure" 0 for whether - //the group agrees on the page based on their ratings - $cur_page = $page; - - $my_ratings_iter = $dbi->get_rating(0, $active_userid, $page); - $my_ratings_single = $my_ratings_iter->next(); - $cur_rating = $my_ratings_single['ratingvalue']; - - $MIDDLE_RATING = 3; - - if($cur_rating >= $MIDDLE_RATING){ - $agreePos = 1; - } else { - $agreePos = 0; - } - foreach($users as $buddy){ - $buddy_rating_iter = $dbi->get_rating(0, $buddy, $cur_page); - $buddy_rating_array = $buddy_rating_iter->next(); - $buddy_rating = $buddy_rating_array['ratingvalue']; - if($buddy_rating == ""){ - $agree = 1; - }else if($agreePos && $buddy_rating >= $MIDDLE_RATING){ - $agree = 1; - } else if(!$agreePos && $buddy_rating < $MIDDLE_RATING){ - $agree = 1; - } else { - $agree = 0; - break; - } - } - if($agree && $agreePos){ - return 1; - } else if($agree && !$agreePos){ - return -1; - } else { - return 0; - } + //Returns a "yes" 1, "no" -1, or "unsure" 0 for whether + //the group agrees on the page based on their ratings + $cur_page = $page; + + $my_ratings_iter = $dbi->get_rating(0, $active_userid, $page); + $my_ratings_single = $my_ratings_iter->next(); + $cur_rating = $my_ratings_single['ratingvalue']; + + $MIDDLE_RATING = 3; + + if($cur_rating >= $MIDDLE_RATING){ + $agreePos = 1; + } else { + $agreePos = 0; + } + foreach($users as $buddy){ + $buddy_rating_iter = $dbi->get_rating(0, $buddy, $cur_page); + $buddy_rating_array = $buddy_rating_iter->next(); + $buddy_rating = $buddy_rating_array['ratingvalue']; + if($buddy_rating == ""){ + $agree = 1; + }else if($agreePos && $buddy_rating >= $MIDDLE_RATING){ + $agree = 1; + } else if(!$agreePos && $buddy_rating < $MIDDLE_RATING){ + $agree = 1; + } else { + $agree = 0; + break; + } + } + if($agree && $agreePos){ + return 1; + } else if($agree && !$agreePos){ + return -1; + } else { + return 0; + } } function MinMisery($dbi, $page, $users, $active_userid){ //Returns the minimum rating for the page //from all the users. - + $cur_page = $page; - + $my_ratings_iter = $dbi->get_rating(0, $active_userid, $page); $my_ratings_single = $my_ratings_iter->next(); $cur_rating = $my_ratings_single['ratingvalue']; - + $min = $cur_rating; foreach($users as $buddy){ $buddy_rating_iter = $dbi->get_rating(0, $buddy, $cur_page); $buddy_rating_array = $buddy_rating_iter->next(); $buddy_rating = $buddy_rating_array['ratingvalue']; if($buddy_rating != "" && $buddy_rating < $min){ - $min = $buddy_rating; + $min = $buddy_rating; } } return $min; @@ -140,9 +132,9 @@ function AverageRating($dbi, $page, $users, $active_userid){ //Returns the average rating for the page //from all the users. - + $cur_page = $page; - + $my_ratings_iter = $dbi->get_rating(0, $active_userid, $page); $my_ratings_single = $my_ratings_iter->next(); $cur_rating = $my_ratings_single['ratingvalue']; @@ -157,9 +149,9 @@ $buddy_rating_iter = $dbi->get_rating(0, $buddy, $cur_page); $buddy_rating_array = $buddy_rating_iter->next(); $buddy_rating = $buddy_rating_array['ratingvalue']; - if($buddy_rating != ""){ + if($buddy_rating != ""){ $total = $total + $buddy_rating; - $count++; + $count++; } } if($count == 0){ Modified: trunk/lib/wikilens/CustomPrefs.php =================================================================== --- trunk/lib/wikilens/CustomPrefs.php 2011年03月07日 10:02:01 UTC (rev 7966) +++ trunk/lib/wikilens/CustomPrefs.php 2011年03月07日 13:08:01 UTC (rev 7967) @@ -4,7 +4,7 @@ /** * Custom UserPreferences: * A list of name => _UserPreference class pairs. - * Rationale: Certain themes should be able to extend the predefined list + * Rationale: Certain themes should be able to extend the predefined list * of preferences. Display/editing is done in the theme specific userprefs.tmpl * but storage/sanification/update/... must be extended to the Get/SetPreferences methods. * @@ -29,7 +29,7 @@ var $valid_values = array ( 'itemCos', // Item-based Top-N recommendation algorithm with cosine-based similarity function - 'itemProb', // Item-based Top-N recommendation algorithm with probability-based similarity function. + 'itemProb', // Item-based Top-N recommendation algorithm with probability-based similarity function. // This algorithms tends to outperform the rest. 'userCos', // User-based Top-N recommendation algorithm with cosine-based similarity function. 'bayes'); // Naïve Bayesian Classifier @@ -45,7 +45,7 @@ extends _UserPreference_numeric{}; $WikiTheme->customUserPreferences - (array + (array ( 'recengine' => new _UserPreference_recengine('php'), 'recalgo' => new _UserPreference_recalgo('itemProb'), Modified: trunk/lib/wikilens/RatingsDb.php =================================================================== --- trunk/lib/wikilens/RatingsDb.php 2011年03月07日 10:02:01 UTC (rev 7966) +++ trunk/lib/wikilens/RatingsDb.php 2011年03月07日 13:08:01 UTC (rev 7967) @@ -4,7 +4,7 @@ /* * @author: Dan Frankowski (wikilens group manager), Reini Urban (as plugin) * - * TODO: + * TODO: * - fix RATING_STORAGE = WIKIPAGE (dba, file) * - fix smart caching * - finish mysuggest.c (external engine with data from mysql) @@ -30,7 +30,7 @@ // but this is problematic. define('RATING_STORAGE', $GLOBALS['request']->_dbi->_backend->isSQL() ? 'SQL' : 'WIKIPAGE'); //define('RATING_STORAGE','WIKIPAGE'); // not fully supported yet - + // leave undefined for internal, slow php engine. //if (!defined('RATING_EXTERNAL')) // define('RATING_EXTERNAL',PHPWIKI_DIR . 'suggest.exe'); @@ -61,39 +61,39 @@ } elseif (isa($this->_backend, 'WikiDB_backend_ADODOB')) { $this->_sqlbackend = &$this->_backend; $this->dbtype = "ADODB"; - } else { - include_once("lib/WikiDB/backend/ADODB.php"); - // It is not possible to decouple a ref from the source again. (4.3.11) - // It replaced the main request backend. So we don't initialize _sqlbackend before. - //$this->_sqlbackend = clone($this->_backend); + } else { + include_once("lib/WikiDB/backend/ADODB.php"); + // It is not possible to decouple a ref from the source again. (4.3.11) + // It replaced the main request backend. So we don't initialize _sqlbackend before. + //$this->_sqlbackend = clone($this->_backend); $this->_sqlbackend = new WikiDB_backend_ADODB($GLOBALS['DBParams']); - $this->dbtype = "ADODB"; + $this->dbtype = "ADODB"; } $this->iter_class = "WikiDB_backend_".$this->dbtype."_generic_iter"; extract($this->_sqlbackend->_table_names); if (empty($rating_tbl)) { - $rating_tbl = (!empty($GLOBALS['DBParams']['prefix']) + $rating_tbl = (!empty($GLOBALS['DBParams']['prefix']) ? $GLOBALS['DBParams']['prefix'] : '') . 'rating'; $this->_sqlbackend->_table_names['rating_tbl'] = $rating_tbl; } } else { - $this->iter_class = "WikiDB_Array_PageIterator"; + $this->iter_class = "WikiDB_Array_PageIterator"; } } - + // this is a singleton. It ensures there is only 1 ratingsDB. function & getTheRatingsDb(){ static $_theRatingsDb; - + if (!isset($_theRatingsDb)){ $_theRatingsDb = new RatingsDb(); - } + } //echo "rating db is $_theRatingsDb"; return $_theRatingsDb; } - + /// ************************************************************************************* // FIXME // from Reini Urban's RateIt plugin @@ -110,7 +110,7 @@ function deleteRating($userid=null, $pagename=null, $dimension=null) { if (is_null($dimension)) $dimension = $this->dimension; - if (is_null($userid)) $userid = $this->userid; + if (is_null($userid)) $userid = $this->userid; if (is_null($pagename)) $pagename = $this->pagename; if (RATING_STORAGE == 'SQL') { $this->sql_delete_rating($userid, $pagename, $dimension); @@ -118,13 +118,13 @@ $this->metadata_set_rating($userid, $pagename, $dimension, -1); } } - + function getRating($userid=null, $pagename=null, $dimension=null) { if (RATING_STORAGE == 'SQL') { $ratings_iter = $this->sql_get_rating($dimension, $userid, $pagename); if ($rating = $ratings_iter->next() and isset($rating['ratingvalue'])) { return $rating['ratingvalue']; - } else + } else return false; } else { return $this->metadata_get_rating($userid, $pagename, $dimension); @@ -133,20 +133,19 @@ function getUsersRated($dimension=null, $orderby = null) { if (is_null($dimension)) $dimension = $this->dimension; - //if (is_null($userid)) $userid = $this->userid; + //if (is_null($userid)) $userid = $this->userid; //if (is_null($pagename)) $pagename = $this->pagename; if (RATING_STORAGE == 'SQL') { $ratings_iter = $this->sql_get_users_rated($dimension, $orderby); if ($rating = $ratings_iter->next() and isset($rating['ratingvalue'])) { return $rating['ratingvalue']; - } else + } else return false; } else { return $this->metadata_get_users_rated($dimension, $orderby); } } - - + /** * Get ratings. * @@ -184,7 +183,7 @@ * If this is null (or left off), the info returned * is for the 'ratee' page (i.e., thing being rated). * - * @return DB iterator with results + * @return DB iterator with results */ function get_rating($dimension=null, $rater=null, $ratee=null, $orderby = null, $pageinfo = "ratee") { @@ -192,7 +191,7 @@ $ratings_iter = $this->sql_get_rating($dimension, $rater, $pagename); if ($rating = $ratings_iter->next() and isset($rating['ratingvalue'])) { return $rating['ratingvalue']; - } else + } else return false; } else { return $this->metadata_get_rating($rater, $pagename, $dimension); @@ -205,12 +204,12 @@ function get_users_rated($dimension=null, $pagename = null, $orderby = null) { if (RATING_STORAGE == 'SQL') { $ratings_iter = $this->sql_get_users_rated($dimension, $pagename, $orderby); - // iter as userid - $users = array(); - while ($rating = $ratings_iter->next()) { - $users[] = $rating['userid']; - } - return $users; + // iter as userid + $users = array(); + while ($rating = $ratings_iter->next()) { + $users[] = $rating['userid']; + } + return $users; } else { return $this->metadata_get_users_rated($dimension, $pagename, $orderby); } @@ -225,9 +224,9 @@ if (RATING_STORAGE == 'SQL') { return $this->sql_get_rating($dimension, $rater, $ratee, $orderby, $pageinfo); } else { - // empty dummy iterator - $pages = array(); - return new WikiDB_Array_PageIterator($pages); + // empty dummy iterator + $pages = array(); + return new WikiDB_Array_PageIterator($pages); } } @@ -275,9 +274,9 @@ $this->metadata_set_rating($userid, $pagename, $dimension, $rating); } } - + //function getUsersRated(){} - + //******************************************************************************* // TODO: // Use wikilens/RatingsUser.php for the php methods. @@ -287,22 +286,22 @@ // http://www-users.cs.umn.edu/~karypis/suggest/ // until we implement a simple recommendation engine. // Note that "suggest" is only free for non-profit organizations. - // I am currently writing a binary CGI mysuggest using suggest, which loads + // I am currently writing a binary CGI mysuggest using suggest, which loads // data from mysql. function getPrediction($userid=null, $pagename=null, $dimension=null) { if (is_null($dimension)) $dimension = $this->dimension; - if (is_null($userid)) $userid = $this->userid; + if (is_null($userid)) $userid = $this->userid; if (is_null($pagename)) $pagename = $this->pagename; if (RATING_STORAGE == 'SQL') { $dbh = &$this->_sqlbackend; if (isset($pagename)) $page = $dbh->_get_pageid($pagename); - else + else return 0; if (isset($userid)) $user = $dbh->_get_pageid($userid); - else + else return 0; } if (defined('RATING_EXTERNAL') and RATING_EXTERNAL) { @@ -325,7 +324,7 @@ */ function php_prediction($userid=null, $pagename=null, $dimension=null) { if (is_null($dimension)) $dimension = $this->dimension; - if (is_null($userid)) $userid = $this->userid; + if (is_null($userid)) $userid = $this->userid; if (is_null($pagename)) $pagename = $this->pagename; if (empty($this->buddies)) { require_once("lib/wikilens/RatingsUser.php"); @@ -335,7 +334,7 @@ } return $user->knn_uu_predict($pagename, $this->buddies, $dimension); } - + function getNumUsers($pagename=null, $dimension=null) { if (is_null($dimension)) $dimension = $this->dimension; if (is_null($pagename)) $pagename = $this->pagename; @@ -349,7 +348,7 @@ $data = $page->get('rating'); if (!empty($data[$dimension])) return count($data[$dimension]); - else + else return 0; } } @@ -359,23 +358,23 @@ if (is_null($pagename)) $pagename = $this->pagename; if (RATING_STORAGE == 'SQL') { $dbi = &$this->_sqlbackend; - if (isset($pagename) || isset($dimension)) { - $where = "WHERE"; - } + if (isset($pagename) || isset($dimension)) { + $where = "WHERE"; + } if (isset($pagename)) { $raterid = $this->_sqlbackend->_get_pageid($pagename, true); $where .= " raterpage=$raterid"; } if (isset($dimension)) { - if (isset($pagename)) $where .= " AND"; + if (isset($pagename)) $where .= " AND"; $where .= " dimension=$dimension"; } //$dbh = &$this->_dbi; extract($dbi->_table_names); $query = "SELECT AVG(ratingvalue) as avg" - . " FROM $rating_tbl r, $page_tbl p " - . $where - . " GROUP BY raterpage"; + . " FROM $rating_tbl r, $page_tbl p " + . $where + . " GROUP BY raterpage"; $result = $dbi->_dbh->query($query); $iter = new $this->iter_class($this, $result); $row = $iter->next(); @@ -387,8 +386,8 @@ if (!empty($data[$dimension])) // hash of userid => rating return array_sum(array_values($data[$dimension])) / count($data[$dimension]); - else - return 0; + else + return 0; } } //******************************************************************************* @@ -431,7 +430,7 @@ * If this is null (or left off), the info returned * is for the 'ratee' page (i.e., thing being rated). * - * @return DB iterator with results + * @return DB iterator with results */ function sql_get_rating($dimension=null, $rater=null, $ratee=null, $orderby=null, $pageinfo = "ratee") { @@ -449,16 +448,16 @@ // all users who rated this page resp if null all pages.. needed? function metadata_get_users_rated($dimension=null, $pagename=null, $orderby=null) { if (is_null($dimension)) $dimension = $this->dimension; - $users = array(); - if (!$pagename) { - // TODO: all pages? - return new WikiDB_Array_PageIterator($users); - } - $page = $this->_dbi->getPage($pagename); - $data = $page->get('rating'); - if (!empty($data[$dimension])) { - //array($userid => (float)$rating); - return new WikiDB_Array_PageIterator(array_keys($data[$dimension])); + $users = array(); + if (!$pagename) { + // TODO: all pages? + return new WikiDB_Array_PageIterator($users); + } + $page = $this->_dbi->getPage($pagename); + $data = $page->get('rating'); + if (!empty($data[$dimension])) { + //array($userid => (float)$rating); + return new WikiDB_Array_PageIterator(array_keys($data[$dimension])); } return new WikiDB_Array_PageIterator($users); } @@ -487,19 +486,19 @@ } if (isset($ratee)) { if(is_array($ratee)){ - $where .= " AND ("; - for($i = 0; $i < count($ratee); $i++){ - $rateeid = $dbi->_get_pageid($ratee[$i], true); - $where .= "rateepage=$rateeid"; - if($i != (count($ratee) - 1)){ - $where .= " OR "; - } - } - $where .= ")"; - } else { - $rateeid = $dbi->_get_pageid($ratee, true); - $where .= " AND rateepage=$rateeid"; - } + $where .= " AND ("; + for($i = 0; $i < count($ratee); $i++){ + $rateeid = $dbi->_get_pageid($ratee[$i], true); + $where .= "rateepage=$rateeid"; + if($i != (count($ratee) - 1)){ + $where .= " OR "; + } + } + $where .= ")"; + } else { + $rateeid = $dbi->_get_pageid($ratee, true); + $where .= " AND rateepage=$rateeid"; + } } $orderbyStr = ""; if (isset($orderby)) { @@ -508,10 +507,10 @@ if (isset($rater) or isset($ratee)) $what = '*'; // same as _get_users_rated_result() else { - $what = 'DISTINCT p.pagename'; - if ($pageinfo == 'rater') - $what = 'DISTINCT p.pagename as userid'; - } + $what = 'DISTINCT p.pagename'; + if ($pageinfo == 'rater') + $what = 'DISTINCT p.pagename as userid'; + } $query = "SELECT $what" . " FROM $rating_tbl r, $page_tbl p " @@ -582,24 +581,24 @@ $insert = "INSERT INTO $rating_tbl (dimension, raterpage, rateepage, ratingvalue, rateeversion)" ." VALUES ('$dimension', $raterid, $rateeid, '$rating', '$rateeversion')"; $dbi->_dbh->query($insert); - + $dbi->unlock(); return true; } function metadata_get_rating($userid, $pagename, $dimension) { - if (!$pagename) return false; + if (!$pagename) return false; $page = $this->_dbi->getPage($pagename); $data = $page->get('rating'); if (!empty($data[$dimension][$userid])) return (float)$data[$dimension][$userid]; - else + else return false; } function metadata_set_rating($userid, $pagename, $dimension, $rating = -1) { - if (!$pagename) return false; - $page = $this->_dbi->getPage($pagename); + if (!$pagename) return false; + $page = $this->_dbi->getPage($pagename); $data = $page->get('rating'); if ($rating == -1) unset($data[$dimension][$userid]); @@ -615,7 +614,7 @@ } /* -class RatingsDB_backend_PearDB +class RatingsDB_backend_PearDB extends WikiDB_backend_PearDB { function get_rating($dimension=null, $rater=null, $ratee=null, $orderby=null, $pageinfo = "ratee") { @@ -623,7 +622,7 @@ $dimension, $rater, $ratee, $orderby, $pageinfo); return new WikiDB_backend_PearDB_generic_iter($this, $result); } - + function get_users_rated($dimension=null, $orderby=null) { $result = $this->_get_users_rated_result( $dimension, $orderby); @@ -655,20 +654,20 @@ $where .= " AND raterpage=$raterid"; } if (isset($ratee)) { - if(is_array($ratee)){ - $where .= " AND ("; - for($i = 0; $i < count($ratee); $i++){ - $rateeid = $this->_get_pageid($ratee[$i], true); - $where .= "rateepage=$rateeid"; - if($i != (count($ratee) - 1)){ - $where .= " OR "; - } - } - $where .= ")"; - } else { - $rateeid = $this->_get_pageid($ratee, true); - $where .= " AND rateepage=$rateeid"; - } + if(is_array($ratee)){ + $where .= " AND ("; + for($i = 0; $i < count($ratee); $i++){ + $rateeid = $this->_get_pageid($ratee[$i], true); + $where .= "rateepage=$rateeid"; + if($i != (count($ratee) - 1)){ + $where .= " OR "; + } + } + $where .= ")"; + } else { + $rateeid = $this->_get_pageid($ratee, true); + $where .= " AND rateepage=$rateeid"; + } } $orderbyStr = ""; @@ -685,7 +684,7 @@ return $result; } - + function _get_users_rated_result($dimension=null, $orderby=null) { $dbh = &$this->_dbh; extract($this->_table_names); @@ -735,7 +734,7 @@ $this->unlock(); return true; } -} +} */ // Local Variables: Modified: trunk/lib/wikilens/RatingsUser.php =================================================================== --- trunk/lib/wikilens/RatingsUser.php 2011年03月07日 10:02:01 UTC (rev 7966) +++ trunk/lib/wikilens/RatingsUser.php 2011年03月07日 13:08:01 UTC (rev 7967) @@ -77,13 +77,13 @@ return $this->_rdbi; } - // XXX: may want to think about caching ratings in the PHP session + // XXX: may want to think about caching ratings in the PHP session // since a WikiUser is created for *every* access, in which case rate.php // will want to change to use this object instead of direct db access /** * Check whether $user is allowed to view this user's ratings - * + * * @return bool True if $user can view this user's ratings, false otherwise */ function allow_view_ratings($user) @@ -93,7 +93,7 @@ /** * Gets this user's ratings - * + * * @return array Assoc. array [page_name][dimension] = _UserRating object */ function get_ratings() @@ -104,13 +104,13 @@ /** * Gets this user's mean rating across a dimension - * + * * @return float Mean rating */ function mean_rating($dimension = 0) { // use memoized result if available - if (isset($this->_mean_ratings[$dimension])) + if (isset($this->_mean_ratings[$dimension])) { return $this->_mean_ratings[$dimension]; } @@ -147,8 +147,6 @@ $this->_load_ratings(); if (isset($dimension)) { - - if (isset($this->_ratings[$pagename][$dimension])) { return true; @@ -231,7 +229,7 @@ { return $this->_pearson_sims[$user->getId()][$dimension]; } - + $ratings1 = $this->get_ratings(); $mean1 = $this->mean_rating($dimension); // XXX: sanify user input? @@ -278,7 +276,7 @@ // items that the similarity was based on // prevent division-by-zero - if (sqrt($sum11) == 0 || sqrt($sum12) == 0) + if (sqrt($sum11) == 0 || sqrt($sum12) == 0) $sim = array(0, $n); else // Pearson similarity @@ -368,9 +366,9 @@ } $this->_num_ratings++; $this->_ratings[$rating['pagename']][$rating['dimension']] - = new _UserRating($this->_userid, + = new _UserRating($this->_userid, $rating['pagename'], - $rating['dimension'], + $rating['dimension'], $rating['ratingvalue']); } @@ -382,7 +380,7 @@ /** Represent a rating. */ class _UserRating { - function _UserRating ($rater, $ratee, $dimension, $rating) + function _UserRating ($rater, $ratee, $dimension, $rating) { $this->rater = (string)$rater; $this->ratee = (string)$ratee; @@ -390,42 +388,42 @@ $this->rating = (float)$rating; } - function get_rater() + function get_rater() { return $this->rater; } - function get_ratee() + function get_ratee() { return $this->ratee; } - function get_rating() + function get_rating() { return $this->rating; } - function get_dimension() + function get_dimension() { return $this->dimension; } - function set_rater() + function set_rater() { $this->rater = (string)$rater; } - function set_ratee() + function set_ratee() { $this->ratee = (string)$ratee; } - function set_rating() + function set_rating() { $this->rating = (float)$rating; } - function set_dimension() + function set_dimension() { $this->dimension = (int)$dimension; } Modified: trunk/lib/wikilens/Utils.php =================================================================== --- trunk/lib/wikilens/Utils.php 2011年03月07日 10:02:01 UTC (rev 7966) +++ trunk/lib/wikilens/Utils.php 2011年03月07日 13:08:01 UTC (rev 7967) @@ -20,9 +20,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/** - */ - function addPageTextData($user, $dbi, $new_data, $START_DELIM, $DELIM) { // This is largely lifted from the TranslateText plugin, which performs a // similar set of functions (retrieves a user's homepage, modifies it @@ -64,15 +61,15 @@ if (is_object($fromUser)) $fromUser = $fromUser->getId(); if ($fromUser == "") - return ""; + return ""; $userPage = $dbi->getPage($fromUser); $transformed = $userPage->getCurrentRevision(); $pageArray = $transformed->getContent(); $p = -1; for ($i = 0; $i < count($pageArray); $i++){ - if($pageArray[$i] != ""){ + if($pageArray[$i] != ""){ if(!((strpos($pageArray[$i], $START_DELIM)) === FALSE)){ - $p = $i; + $p = $i; break; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7966 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7966&view=rev Author: vargenau Date: 2011年03月07日 10:02:01 +0000 (2011年3月07日) Log Message: ----------- PHP 5.2.17 and PHP 5.3.5 Modified Paths: -------------- trunk/INSTALL Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2011年03月07日 09:47:31 UTC (rev 7965) +++ trunk/INSTALL 2011年03月07日 10:02:01 UTC (rev 7966) @@ -5,8 +5,8 @@ PhpWiki was tested with 4.4.7 (centos4), 4.3.9, 4.3.10, 4.4.9, 5.0.3, 5.1.6 (centos5), 5.2.10, 5.3.2, 5.3.3. -All users of PHP are strongly encouraged to upgrade to PHP 5.2.14 -or PHP 5.3.3 that are the supported versions. +All users of PHP are strongly encouraged to upgrade to PHP 5.2.17 +or PHP 5.3.5 that are the supported versions. Visit <http://www.php.net> for downloads and information. You need the Perl regular expressions package compiled in; this is the This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7965 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7965&view=rev Author: vargenau Date: 2011年03月07日 09:47:31 +0000 (2011年3月07日) Log Message: ----------- No tabs Modified Paths: -------------- trunk/themes/Crao/crao.css trunk/themes/MonoBook/IE60Fixes.css trunk/themes/MonoBook/IE70Fixes.css trunk/themes/MonoBook/commonPrint.css trunk/themes/MonoBook/main.css trunk/themes/MonoBook/rtl.css trunk/themes/MonoBook/wikiprintable.css trunk/themes/Sidebar/sidebar.css trunk/themes/Wordpress/Wordpress.css trunk/themes/default/highlight.css trunk/themes/default/phpwiki-modern.css trunk/themes/default/phpwiki.css Modified: trunk/themes/Crao/crao.css =================================================================== --- trunk/themes/Crao/crao.css 2011年03月05日 17:05:30 UTC (rev 7964) +++ trunk/themes/Crao/crao.css 2011年03月07日 09:47:31 UTC (rev 7965) @@ -34,32 +34,32 @@ empty-cells: show; } a:link, a {/* MODIFY-TXT */ - color: #33c; - text-decoration: underline; - background-color: transparent; + color: #33c; + text-decoration: underline; + background-color: transparent; } a:visited {/* MODIFY-TXT */ - color: #33c; - text-decoration: underline; - background-color: transparent; + color: #33c; + text-decoration: underline; + background-color: transparent; } a:hover {/* MODIFY-TXT */ - color: #03f; - text-decoration:underline; - background-color: transparent; + color: #03f; + text-decoration:underline; + background-color: transparent; } a.wiki, a.wikiadmin, a.named-wiki { } -hr { - background-color: #ccc;/* MODIFY-color */ - height: 1px; - border: 1px solid #ccc; /* MODIFY-color */ +hr { + background-color: #ccc;/* MODIFY-color */ + height: 1px; + border: 1px solid #ccc; /* MODIFY-color */ } div.wikitext pre { font-family: monospace; } -p { - font-size: 1em; - margin: 0em; - margin-bottom: 1em; +p { + font-size: 1em; + margin: 0em; + margin-bottom: 1em; } @@ -69,31 +69,31 @@ ****************************** */ ul{ - position: relative; - padding : 0px; - margin: 0em; - font-family: Helvetica, Verdana, Arial, sans-serif; - font-size: 100%; - line-height: 120%; - list-style: inside; - background-color: transparent; + position: relative; + padding : 0px; + margin: 0em; + font-family: Helvetica, Verdana, Arial, sans-serif; + font-size: 100%; + line-height: 120%; + list-style: inside; + background-color: transparent; } ul ul{ - position: relative; - font-family: Helvetica, Verdana, Arial, sans-serif; - font-size: 100%; - margin-left: 2em; + position: relative; + font-family: Helvetica, Verdana, Arial, sans-serif; + font-size: 100%; + margin-left: 2em; } li.rc-major { - list-style: none; - display: block; - background-color: #fff;/* MODIFY-color */ - margin: 6px 0px; - border: 1px #666 dashed;/* MODIFY-color */ - padding:0.5ex; + list-style: none; + display: block; + background-color: #fff;/* MODIFY-color */ + margin: 6px 0px; + border: 1px #666 dashed;/* MODIFY-color */ + padding:0.5ex; } - + li.evenrow{ border: 0px; padding:1ex; @@ -130,50 +130,48 @@ } p.wiki-rc-action { - text-align: center; - vertical-align: middle; - padding: 5px 5px 5px 5px; - border: 1px #000 solid; - background-color: transparent; + text-align: center; + vertical-align: middle; + padding: 5px 5px 5px 5px; + border: 1px #000 solid; + background-color: transparent; } p a.wiki-rc-action { - display: inline; - padding:0px 10px; - font-weight: bold; - background-color: transparent; + display: inline; + padding:0px 10px; + font-weight: bold; + background-color: transparent; } - - /* ****************************** *****HEADER ****************************** */ #header { - background-color: #333;/* MODIFY-color */ + background-color: #333;/* MODIFY-color */ } #logo {/* MODIFY-TXT */ - color: #ccc; - display: inline; - margin-top: 0px; - margin-left: 0px; - height: 50px; - width:auto; - background-color: transparent; - font: bolder 67px/50px Verdana, Arial, Helvetica, sans-serif; + color: #ccc; + display: inline; + margin-top: 0px; + margin-left: 0px; + height: 50px; + width:auto; + background-color: transparent; + font: bolder 67px/50px Verdana, Arial, Helvetica, sans-serif; letter-spacing: -0.1em; /* font-variant: condensed; */ } #logo img { - border: 0px; + border: 0px; } #logo a { - color: #ccc; - font: bolder 67px/50px Arial, Verdana, Helvetica, sans-serif; - text-decoration: none; + color: #ccc; + font: bolder 67px/50px Arial, Verdana, Helvetica, sans-serif; + text-decoration: none; } /* @@ -186,43 +184,43 @@ div.ie-actionbuttons { position: relative/*absolute*/; /*max-width: 30%;*/ height: 22px; - right: 0; bottom: 0; - margin: 0px; + right: 0; bottom: 0; + margin: 0px; background: transparent url(images/BG.png) no-repeat top right; - text-align: right; - vertical-align: bottom; - padding-left: 2em; - padding-right: 1em; - padding-top: 0.5ex; - padding-bottom: 0.5ex; - border: 0px none; + text-align: right; + vertical-align: bottom; + padding-left: 2em; + padding-right: 1em; + padding-top: 0.5ex; + padding-bottom: 0.5ex; + border: 0px none; } /* body>div#actionbuttons { position: fixed; } */ #actionbuttons { - position: fixed; -/* position: absolute; */ - max-width: 30%; height: 22px; - right: 0px; bottom: 0px; - margin: 0px; - background: transparent url(images/BG.png) top left;/* MODIFY-IMG */ - vertical-align: bottom; - padding-left: 2em; - padding-right: 1em; - padding-top: 0.5ex; - padding-bottom: 0.5ex; - border: 0px none; + position: fixed; +/* position: absolute; */ + max-width: 30%; height: 22px; + right: 0px; bottom: 0px; + margin: 0px; + background: transparent url(images/BG.png) top left;/* MODIFY-IMG */ + vertical-align: bottom; + padding-left: 2em; + padding-right: 1em; + padding-top: 0.5ex; + padding-bottom: 0.5ex; + border: 0px none; } #actionbuttons div { } #actionbuttons a, #actionbuttons a:link { - position: relative; - display: inline; - text-align: right; - width: 100%; - margin-bottom: 0.5em; - margin-top: auto; - background-color:transparent; - border: 0px; + position: relative; + display: inline; + text-align: right; + width: 100%; + margin-bottom: 0.5em; + margin-top: auto; + background-color:transparent; + border: 0px; } /* @@ -230,45 +228,45 @@ *****CONTENT-ZONE ****************************** */ -#content { - margin-top: 0px; - margin-left:7%; - margin-right: 7%; - margin-bottom:7%; - background-color: #f2f2f2;/* MODIFY-color */ - border: 1px #999 solid;/* MODIFY-color */ - padding-left: 2em; - padding-right: 15px; - padding-top: 15px; - padding-bottom: 0.5ex; +#content { + margin-top: 0px; + margin-left:7%; + margin-right: 7%; + margin-bottom:7%; + background-color: #f2f2f2;/* MODIFY-color */ + border: 1px #999 solid;/* MODIFY-color */ + padding-left: 2em; + padding-right: 15px; + padding-top: 15px; + padding-bottom: 0.5ex; } /* titre */ div.boxtitrehead {} div.boxtitrehead a.backlinks {} div.wikitext { - font-size: 1em; - line-height: 130%; - text-align: left; + font-size: 1em; + line-height: 130%; + text-align: left; } blockquote.mail-style-quote { - border-left: #FF9933;/* MODIFY-color */ - margin: 0em; - margin-bottom: 1em; - border: 1px solid #FF9933;/* MODIFY-color */ - padding: 0.5em; + border-left: #FF9933;/* MODIFY-color */ + margin: 0em; + margin-bottom: 1em; + border: 1px solid #FF9933;/* MODIFY-color */ + padding: 0.5em; } .mail-style-quote blockquote.mail-style-quote { - margin-left: 0.3em; - margin-bottom : 0em; - background: transparent; - border-style: none; - border-left: 2px solid #FF9933;/* MODIFY-color */ - padding: 0em; - padding-left: 0.5em; + margin-left: 0.3em; + margin-bottom : 0em; + background: transparent; + border-style: none; + border-left: 2px solid #FF9933;/* MODIFY-color */ + padding: 0em; + padding-left: 0.5em; } blockquote p { - margin-top: 0.5ex; - margin-bottom: 0.5ex; + margin-top: 0.5ex; + margin-bottom: 0.5ex; } /* @@ -298,16 +296,16 @@ } #navbuttons { - display: inline; + display: inline; } #navbuttons img{ - margin:5px 0px 5px 10px; + margin:5px 0px 5px 10px; } #navbuttons a:link, #navbuttons a{/* MODIFY-TXT */ - font-weight: bold; - padding-left: 1ex; - padding-right: 1ex; - color:#333; + font-weight: bold; + padding-left: 1ex; + padding-right: 1ex; + color:#333; } #navbuttons a:visited{} #navbuttons a:hover{} @@ -318,36 +316,36 @@ ****************************** */ #signin{/* MODIFY-TXT */ - width: auto; - text-align: right; - padding-right: 10px; - background-color:transparent; - color:#ccc; - font-size:12px; + width: auto; + text-align: right; + padding-right: 10px; + background-color:transparent; + color:#ccc; + font-size:12px; } #signin form{/* MODIFY-TXT */ - text-align: center; - padding: 1px; - margin: 0px; - display: inline; -} + text-align: center; + padding: 1px; + margin: 0px; + display: inline; +} #signin input{/* MODIFY-TXT */ - padding: 0px; - padding-left: 3px; - margin: 0px; - font-family: Verdana, Arial, Helvetica, sans-serif ; - color:#333; - font-size: 12px; + padding: 0px; + padding-left: 3px; + margin: 0px; + font-family: Verdana, Arial, Helvetica, sans-serif ; + color:#333; + font-size: 12px; } #signin input.wikisignin{ - padding: 0px; - margin: 0px; - border: 0px none; + padding: 0px; + margin: 0px; + border: 0px none; } #signin a.wiki{/* MODIFY-TXT */ - color:#FFF; - background-color: transparent; + color:#FFF; + background-color: transparent; } /* @@ -356,29 +354,29 @@ ****************************** */ #search { - font-size: 12px; - margin: 5px 10px 5px 10px; - /*padding-right: 10px;*/ - float: right; + font-size: 12px; + margin: 5px 10px 5px 10px; + /*padding-right: 10px;*/ + float: right; } #search form{ - text-align: center; - padding: 1px; - margin: 0px; - display: inline; + text-align: center; + padding: 1px; + margin: 0px; + display: inline; } #search input{ - padding: 0px; - padding-left: 3px; - margin: 0px; - font-family: Verdana, Arial, Helvetica, sans-serif; - color: #333; - font-size: 12px; + padding: 0px; + padding-left: 3px; + margin: 0px; + font-family: Verdana, Arial, Helvetica, sans-serif; + color: #333; + font-size: 12px; } #search input.wikiaction{ - padding: 0px; - margin: 0px; - border: 0px none; + padding: 0px; + margin: 0px; + border: 0px none; } .search-context { background: white; font-style: oblique; } .search-term { @@ -395,7 +393,7 @@ display: none; z-index: 100; background-color: white; - border: 1px solid #d0d0d0; + border: 1px solid #d0d0d0; font-size: 9px; overflow: hidden; } @@ -404,9 +402,9 @@ } #LSResult .evenrow { background-color: #f0f0f0; -} +} #LSREsult .oddrow { -} +} .LSEnd { text-align: right; } @@ -415,7 +413,7 @@ } .LSRow { padding: 1px; -} +} ul.LSRes { margin: 0px; padding: 0px; @@ -427,16 +425,6 @@ /* ****************************** - *****NEWS - ****************************** - */ -#news{ -} - - - -/* - ****************************** *****MOZ-SIDEBAR ****************************** */ @@ -450,8 +438,6 @@ body.sidebar { padding-left: 1em; } body.sidebar h2 { margin-top: 0; } - - /* ****************************** *****WIKI-FORM @@ -473,8 +459,6 @@ /* Add space between the input field and following buttons, but not after the last button. */ div.wikiaction input[type=text], div.wikiadmin input[type=text], form.wikiadmin input[type=file] { margin-right: 0.5em; } - - /* ****************************** *****LINK-ICON @@ -485,22 +469,19 @@ img.linkicon { vertical-align: middle; } img.rssicon { vertical-align: baseline; } - - /* ****************************** *****ADMIN-ACTION ****************************** */ a.wikiaction, a.wikiadmin, a.wiki-rc-action, a.wikiunsafe { - text-decoration: none; - font-family: Verdana, Arial, Helvetica, sans-serif; + text-decoration: none; + font-family: Verdana, Arial, Helvetica, sans-serif; } - .wikiunsafe { - color: #000; - background-color: #f2f2f2;/* MODIFY-color */ + color: #000; + background-color: #f2f2f2;/* MODIFY-color */ } input.wikiadmin {color: #000; background-color: #fff; } @@ -513,30 +494,30 @@ /* Unknown links */ .wikiunknown, .named-wikiunknown { - font-weight: normal; - font-size: 100%; - background-color: transparent; + font-weight: normal; + font-size: 100%; + background-color: transparent; } /* QuestionMark #600 */ .wikiunknown a, .named-wikiunknown a { - color: #FFFFFF; - background-color: #000000;/* MODIFY-color */ - text-decoration: none; - font-weight: normal; - font-size: 1em; - padding: 1px; - padding-top: 0px; - padding-bottom: 0px; - border-top: 1px solid #000000; - border-bottom: 1px solid #000000; - margin-right: 2px; + color: #FFFFFF; + background-color: #000000;/* MODIFY-color */ + text-decoration: none; + font-weight: normal; + font-size: 1em; + padding: 1px; + padding-top: 0px; + padding-bottom: 0px; + border-top: 1px solid #000000; + border-bottom: 1px solid #000000; + margin-right: 2px; } /* Backlinks */ .backlinks { - text-decoration: underline; - background-color: transparent; - color: #006; + text-decoration: underline; + background-color: transparent; + color: #006; } @@ -546,8 +527,6 @@ .interwiki, i.interwiki .wikipage, em .interwiki .wikipage { font-style: oblique; } .interwiki .wikipage, i .interwiki, em .interwiki { font-style: normal; } - - /* ****************************** *****HEADING @@ -556,34 +535,33 @@ h1, h2, h3, h4, h5, h6 { font-family: Arial, Helvetica, sans-serif; } h1 { /* MODIFY-TXT */ - margin-top: 10px; - background-color: transparent; - color: #555; + margin-top: 10px; + background-color: transparent; + color: #555; } h1 a.backlinks{ /* MODIFY-TXT */ - color: #777; - text-decoration:none; + color: #777; + text-decoration:none; } h1 a.wiki{ /* MODIFY-TXT */ - color: #777; - text-decoration:none; + color: #777; + text-decoration:none; } h1 a.pagetitle{ /* MODIFY-TXT */ - color: #555; - text-decoration:none; + color: #555; + text-decoration:none; } h1 a:hover{ /* MODIFY-TXT */ - color: #888; - text-decoration:underline; + color: #888; + text-decoration:underline; } h4, h5, h6 { /* MODIFY-TXT */ - margin-bottom: 0px; - background-color: transparent; - color: #111; - } + margin-bottom: 0px; + background-color: transparent; + color: #111; +} - /* ****************************** *****RSS @@ -593,54 +571,52 @@ /* rss feed */ div.rss { - background-color: #fff; - color:#000; - border: 2px solid #ddd; + background-color: #fff; + color:#000; + border: 2px solid #ddd; } div.feed { - font-size: 1.4em; - padding: 0.5em; + font-size: 1.4em; + padding: 0.5em; } .chandesc { - font-size: 0.9em; + font-size: 0.9em; } div.rssitem { - display: block; - background-color: #fff; - color:#000; - border-top: 1px solid #ddd; - padding: 0em 0.5em; - + display: block; + background-color: #fff; + color:#000; + border-top: 1px solid #ddd; + padding: 0em 0.5em; + } div.itemname { - display: block; - border: 0px; - margin-top: 0.5em; + display: block; + border: 0px; + margin-top: 0.5em; } div.itemdesc { - font-size: 1em; - margin-bottom: 0.5em; + font-size: 1em; + margin-bottom: 0.5em; } - - /* ****************************** *****TABLES ****************************** */ table, td { font-family: Verdana, Arial, Helvetica, sans-serif; } -caption { - font-family: Verdana, Arial, Helvetica, sans-serif; - width: auto; +caption { + font-family: Verdana, Arial, Helvetica, sans-serif; + width: auto; } .pagelist { - background-color: white;/* MODIFY-color */ - border:1px #333 dashed;/* MODIFY-color */ + background-color: white;/* MODIFY-color */ + border:1px #333 dashed;/* MODIFY-color */ } .pagelist thead, .pagelist thead u {} @@ -673,32 +649,32 @@ } .wikilink{ - display:block; + display:block; } #revision{ - font-size:10px; - text-align:right; - background-color: #f2f2f2;/* MODIFY-color */ - /* "paper" borders */ - padding-left: 2em; - padding-right: 1em; - padding-top: 0.5ex; - padding-bottom: 0.5ex; - clear: both; + font-size:10px; + text-align:right; + background-color: #f2f2f2;/* MODIFY-color */ + /* "paper" borders */ + padding-left: 2em; + padding-right: 1em; + padding-top: 0.5ex; + padding-bottom: 0.5ex; + clear: both; } .editdate { - font-family: Arial, Helvetica, sans-serif; - margin: 0; - padding: 0; - padding-top: 0.25ex; + font-family: Arial, Helvetica, sans-serif; + margin: 0; + padding: 0; + padding-top: 0.25ex; } #xhtml-validator { - font-size: small; - text-align: center; - margin-top: 1em; + font-size: small; + text-align: center; + margin-top: 1em; } @@ -708,112 +684,112 @@ ****************************** */ form { margin: 0; } -input, textarea { - margin: 0.1em; - background-color: #FFF; - vertical-align: middle; - font-size: 1em; +input, textarea { + margin: 0.1em; + background-color: #FFF; + vertical-align: middle; + font-size: 1em; } input.wikisignin{ - border: 0px none; - background-color:#FFF; + border: 0px none; + background-color:#FFF; } input.wikiaction{ - border: 1px solid black; - background-color:#D7FA8C; + border: 1px solid black; + background-color:#D7FA8C; } input.numeric { text-align: center; } /* Make the textarea the full page width */ textarea.wikiedit { - width: 90%; - margin: 0.5ex; - padding: 2px; - font-family: Verdana, Arial, Helvetica, sans-serif; + width: 90%; + margin: 0.5ex; + padding: 2px; + font-family: Verdana, Arial, Helvetica, sans-serif; } #editarea-size { - margin-top: 1ex; - margin-bottom: -1ex; - text-align: right; - font-size: smaller; - border: 1px none; + 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; + 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; - line-height: 1em; - padding: 0.2em; - border: 1px solid #333; - background-color: #eee; + font-family: Verdana, Helvetica, Arial, sans-serif; + font-size: 1em; + line-height: 1em; + padding: 0.2em; + border: 1px solid #333; + background-color: #eee; } fieldset.editarea { - margin : 1ex; - margin-top: 1em; - text-align: center; - padding : 10px; - border: 1px solid #333; - background-color: #E8E8E5; + margin : 1ex; + margin-top: 1em; + text-align: center; + padding : 10px; + border: 1px solid #333; + background-color: #E8E8E5; } fieldset.toolbar { - margin : 1ex; - margin-top: 0em; - text-align: center; - padding : 3px; - border: 1px solid #FFF; - background-color: #FFF; + margin : 1ex; + margin-top: 0em; + text-align: center; + padding : 3px; + border: 1px solid #FFF; + background-color: #FFF; } /* IncludePage plugin ================================================= */ .transclusion-title { - text-align: right; - font-style: oblique; - font-size: smaller; - text-decoration: underline; - margin-bottom: 0.25ex; - margin-right: 0.25em; -} + text-align: right; + font-style: oblique; + font-size: smaller; + text-decoration: underline; + margin-bottom: 0.25ex; + margin-right: 0.25em; +} .transclusion, .wiki-edithelp { - font-size: smaller; + font-size: smaller; } .transclusion { - border: 1px solid gray;/* MODIFY-color */ - padding-left: 0.8em; - padding-right: 0.8em; - padding-top: 0px; - padding-bottom: 0px; - margin-left: 0.25em; - margin-right: 0.25em; - margin-bottom: 0.1ex; + border: 1px solid gray;/* MODIFY-color */ + padding-left: 0.8em; + padding-right: 0.8em; + padding-top: 0px; + padding-bottom: 0px; + margin-left: 0.25em; + margin-right: 0.25em; + margin-bottom: 0.1ex; } .wiki-edithelp { - background-color: white; - border: medium solid #fff8dc; /* MODIFY-color */ - padding-left: 0.5em; - padding-right: 0.5em; - padding-top: 0.75ex; - padding-bottom: 0.75ex; - margin-left: 0; - margin-right: 0; - margin-top: 1ex; - margin-bottom: 1ex; + background-color: white; + border: medium solid #fff8dc; /* MODIFY-color */ + padding-left: 0.5em; + padding-right: 0.5em; + padding-top: 0.75ex; + padding-bottom: 0.75ex; + margin-left: 0; + margin-right: 0; + margin-top: 1ex; + margin-bottom: 1ex; } .wiki-edithelp .wiki { - /* color: #5454ff;*/ + /* color: #5454ff;*/ } .wiki-edithelp p { - font-family: Verdana, Helvetica, Arial, sans-serif; - padding-left: 0.5em; - padding-right: 0.5em; - padding-top: 0.5ex; - padding-bottom: 0.5ex; - margin: 0; + font-family: Verdana, Helvetica, Arial, sans-serif; + padding-left: 0.5em; + padding-right: 0.5em; + padding-top: 0.5ex; + padding-bottom: 0.5ex; + margin: 0; } @@ -825,33 +801,33 @@ */ table.cal { - float:right; - font-size:10px; - border: 1px solid #333; - background-color: #ccc;/* MODIFY-color */ - margin: 10px; - padding: 1px; - /* For Mozilla */ - empty-cells: hide;} + float:right; + font-size:10px; + border: 1px solid #333; + background-color: #ccc;/* MODIFY-color */ + margin: 10px; + padding: 1px; + /* For Mozilla */ + empty-cells: hide;} /* cells */ table.cal td { - text-align: right; -} + text-align: right; +} /* Month-name header */ table.cal-header { /* MODIFY-TXT */ -font-size: larger; +font-size: larger; background-color: #333;/* MODIFY-color */ color: #f2f2f2;} table.cal-header tr, table.cal-header td { text-align: center; } .cal-arrow {/* MODIFY-TXT */ - font-weight: bold; - text-decoration: none; - color: #fff; + font-weight: bold; + text-decoration: none; + color: #fff; } a.cal-arrow {/* MODIFY-TXT */ - color:#fff; + color:#fff; } /* Day-names header */ @@ -859,88 +835,86 @@ .cal-dayname td { text-align: center; - font-size: smaller; - text-decoration: none; - background-color: #f2f2f2;/* MODIFY-color */ + font-size: smaller; + text-decoration: none; + background-color: #f2f2f2;/* MODIFY-color */ } /* Individual days */ -a.cal-hide { - font-size: 9px; +a.cal-hide { + font-size: 9px; text-decoration: none; } /* Today */ /* cell */ table.cal td.cal-today { - margin: 1px; - border: 1px solid #333;/* MODIFY-color */ - color: #000; - background-color: #f2f2f2;/* MODIFY-color */ + margin: 1px; + border: 1px solid #333;/* MODIFY-color */ + color: #000; + background-color: #f2f2f2;/* MODIFY-color */ } /* text */ -table.cal td.cal-day a.cal-day {font-size: 9px; +table.cal td.cal-day a.cal-day {font-size: 9px; text-decoration: underline; } - - /* ****************************** *****DIFF ****************************** */ -.diff .block div { position: relative; padding-left: 1.5em; } +.diff .block div { position: relative; padding-left: 1.5em; } .diff .prefix { position: absolute; left: 0.5em; top: 0; } /* main box */ .diff { color: #000; - background-color: transparent; - border: 1px solid black; + background-color: transparent; + border: 1px solid black; } .diff .block { color: #000; - background-color: #ccc; - padding-left: 1em; + background-color: #ccc; + padding-left: 1em; } /* individual blocks */ .diff .context { color: #000; - background-color: transparent; - border: none; + background-color: transparent; + border: none; } /* + - line prefix */ .diff .block tt { - font-weight: normal; - font-family: monospace; - color: black; - background-color: transparent; - margin-left: 0; - border: none; + font-weight: normal; + font-family: monospace; + color: black; + background-color: transparent; + margin-left: 0; + border: none; } /* changed words */ .diff del, .diff ins { - font-weight: bold; - text-decoration: none; + font-weight: bold; + text-decoration: none; } /* blocks containing deleted or added words */ .diff .original, .diff .deleted, .diff .final, .diff .added { color: #000; - background-color: white; + background-color: white; } /* blocks containing deleted words */ .diff .original, .diff .deleted { color: #000; - background-color: #fcc; - border: none; + background-color: #fcc; + border: none; } /* blocks containing added words */ .diff .final, .diff .added { color: #000; - background-color: #cfc; - border: none; + background-color: #cfc; + border: none; } /* deleted words */ @@ -948,8 +922,6 @@ /* added words */ .diff ins {color: #000; background-color: #9f9; } - - /* ****************************** *****INFO-HISTORY @@ -957,28 +929,24 @@ */ td.pageinfo { font-weight: bold; } .pageinfo-minoredit, .pageinfo-authorid { - font-size: smaller; - font-style: oblique; + font-size: smaller; + font-style: oblique; } - - /* ****************************** *****HINTS ****************************** */ .hint { - color: black; - background-color: #eeeeee; - font-size: smaller; - margin-left: 5em; - /* padding: -0.5em 0 -0.5em; */ - border: thin solid #aaaaaa; + color: black; + background-color: #eeeeee; + font-size: smaller; + margin-left: 5em; + /* padding: -0.5em 0 -0.5em; */ + border: thin solid #aaaaaa; } - - /* ****************************** *****CLEAR @@ -986,53 +954,48 @@ */ #clear - { - clear : both; - margin : 0px; - margin-top : -7px; - padding : 2px; - text-align : center; - color : #000; - background-color : #FFF; - border : solid 0px; + { + clear : both; + margin : 0px; + margin-top : -7px; + padding : 2px; + text-align : center; + color : #000; + background-color : #FFF; + border : solid 0px; } /* reset post NN4 */ /*/*/ #clear - { - margin-top : 0px; + { + margin-top : 0px; } -/* */ - - /* ****************************** *****IMG-HACK ****************************** */ img.inlineimage{ - border: 0px; - vertical-align: middle; - margin : 0px 5px 0px 5px; + border: 0px; + vertical-align: middle; + margin : 0px 5px 0px 5px; } em > img.inlineimage{ - float: left; - border: 0px; - vertical-align: middle; - margin : 5px 15px 15px 0px; + float: left; + border: 0px; + vertical-align: middle; + margin : 5px 15px 15px 0px; } - + strong > img.inlineimage{ - float: right; - border: 0px; - vertical-align: middle; - margin : 5px 0px 15px 15px; + float: right; + border: 0px; + vertical-align: middle; + margin : 5px 0px 15px 15px; } - - /* ****************************** *****WIKI-BLOG @@ -1040,12 +1003,11 @@ */ h2.wikiblog-heading { - font-size: 2em; - padding-bottom: 0.5em; - border-bottom: 2px solid gray;/* MODIFY-color */ + font-size: 2em; + padding-bottom: 0.5em; + border-bottom: 2px solid gray;/* MODIFY-color */ } - /* ****************************** *****OTHER @@ -1056,26 +1018,26 @@ .printer { display: none; } .error { - color: black; - background-color: #eee; - margin-top: 1em; - margin-bottom: 1em; - padding-left: 0.8em; - padding-right: 0.8em; - padding-top: 0.8ex; - padding-bottom: 0; - border: medium solid red; - clear: both; + color: black; + background-color: #eee; + margin-top: 1em; + margin-bottom: 1em; + padding-left: 0.8em; + padding-right: 0.8em; + padding-top: 0.8ex; + padding-bottom: 0; + border: medium solid red; + clear: both; } /* Debug */ .debug { - color: black; - background-color: transparent; - font-family: monospace; - font-size: smaller; - margin: 1ex 0; - padding: 0.5ex 0.5em; + color: black; + background-color: transparent; + font-family: monospace; + font-size: smaller; + margin: 1ex 0; + padding: 0.5ex 0.5em; } /* @@ -1127,5 +1089,3 @@ * indent-tabs-mode: nil * End: */ - - Modified: trunk/themes/MonoBook/IE60Fixes.css =================================================================== --- trunk/themes/MonoBook/IE60Fixes.css 2011年03月05日 17:05:30 UTC (rev 7964) +++ trunk/themes/MonoBook/IE60Fixes.css 2011年03月07日 09:47:31 UTC (rev 7965) @@ -1,95 +1,93 @@ /** * $Id$ - */ + */ /* 6.0 - only fixes */ -/* content area */ +/* content area */ /* workaround for various ie float bugs */ -#column-content { - float: none; - margin-left: 0; - height: 1%; +#column-content { + float: none; + margin-left: 0; + height: 1%; } #column-content #content { - margin-left: 12.2em; - margin-top: 3em; - height: 1%; + margin-left: 12.2em; + margin-top: 3em; + height: 1%; } #column-one { - position: absolute; - z-index: 4; - top: 0; - left: 0; + position: absolute; + z-index: 4; + top: 0; + left: 0; } #footer { - margin-left: 13.6em; - border-left: 1px solid #fabd23; + margin-left: 13.6em; + border-left: 1px solid #fabd23; } body { font-size: 80%;} -tt { - font-size: 110%; -} +tt { font-size: 110%; } /* the tabs */ #p-cactions { - z-index: 3; + z-index: 3; } #p-cactions li { - padding-bottom: 0 !important; - border: none; - background-color: transparent; - cursor: default; - float: none !important; + padding-bottom: 0 !important; + border: none; + background-color: transparent; + cursor: default; + float: none !important; } #p-cactions li a { - display: inline-block !important; - vertical-align: top; - padding-bottom: 0; - border: solid #aaa; - border-width: 1px 1px 0; + display: inline-block !important; + vertical-align: top; + padding-bottom: 0; + border: solid #aaa; + border-width: 1px 1px 0; } #p-cactions li.selected a { - border-color: #fabd23; - padding-bottom: 0.17em !important; + border-color: #fabd23; + padding-bottom: 0.17em !important; } #p-cactions li a:hover { - padding-bottom: 0.17em; + padding-bottom: 0.17em; } #p-navigation a { - display: inline-block; - width: 100%; + display: inline-block; + width: 100%; } #portal-personaltools { - padding-bottom: 0.1em; + padding-bottom: 0.1em; } #bodyContent a.external { - background: url(images/external.png) center right no-repeat; - padding-right: 13px; + background: url(images/external.png) center right no-repeat; + padding-right: 13px; } /* show the hand */ #p-logo a, #p-logo a:hover { - cursor: pointer; + cursor: pointer; } div.visualClear { - width:100%; - line-height: 0; + width:100%; + line-height: 0; } textarea { - width: 96%; + width: 96%; } div.editsection, #catlinks, div.tright, div.tleft { - position: relative; + position: relative; } -/*{ border:1px solid Red !important;}*/ + span.rateit { text-decoration: none; font-family: Arial, Helvetica, sans-serif; @@ -98,9 +96,3 @@ div#rateit-widget-top { top: 38px; } -/* -div#rateit-widget-top { - top: 15px; - right: 90px; -} -*/ Modified: trunk/themes/MonoBook/IE70Fixes.css =================================================================== --- trunk/themes/MonoBook/IE70Fixes.css 2011年03月05日 17:05:30 UTC (rev 7964) +++ trunk/themes/MonoBook/IE70Fixes.css 2011年03月07日 09:47:31 UTC (rev 7965) @@ -1,81 +1,71 @@ /** * $Id$ - */ + */ /* 7.0 - only fixes */ -/* content area */ +/* content area */ /* workaround for various ie float bugs */ /* This bit is needed to make links clickable... WTF */ #column-content #content { - margin-left: 12.2em; - margin-top: 3em; - height: 1%; + margin-left: 12.2em; + margin-top: 3em; + height: 1%; } .rtl #column-one { - /* For some reason it tries to inherit the padding-top into every div, - * and I can't figure out how to get it back off. - */ - padding-top: 0; + /* For some reason it tries to inherit the padding-top into every div, + * and I can't figure out how to get it back off. + */ + padding-top: 0; } .rtl #column-one #p-navigation { - margin-top: 160px; + margin-top: 160px; } /* the tabs */ #p-cactions { - z-index: 3; + z-index: 3; } #p-cactions li { - padding-bottom: 0 !important; - border: none; - background-color: transparent; - cursor: default; - float: none !important; + padding-bottom: 0 !important; + border: none; + background-color: transparent; + cursor: default; + float: none !important; } #p-cactions li a { - display: inline-block !important; - vertical-align: top; - padding-bottom: 0; - border: solid #aaa; - border-width: 1px 1px 0; + display: inline-block !important; + vertical-align: top; + padding-bottom: 0; + border: solid #aaa; + border-width: 1px 1px 0; } #p-cactions li.selected a { - border-color: #fabd23; - padding-bottom: 0.17em !important; + border-color: #fabd23; + padding-bottom: 0.17em !important; } #p-cactions li a:hover { - padding-bottom: 0.17em !important; + padding-bottom: 0.17em !important; } #p-navigation a { - display: inline-block; - width: 100%; + display: inline-block; + width: 100%; } #portal-personaltools { - padding-bottom: 0.1em; + padding-bottom: 0.1em; } textarea { - width: 96%; + width: 96%; } tt { - font-size: 110%; + font-size: 110%; } -/* -div.editsection, -#catlinks, -div.tright, -div.tleft { - position: relative; -} -*/ - - #footer li { - /* Work around bug with inline <li> tags with right margins and nowrap */ - margin-right: 0; + /* Work around bug with inline <li> tags with right margins and nowrap */ + margin-right: 0; } Modified: trunk/themes/MonoBook/commonPrint.css =================================================================== --- trunk/themes/MonoBook/commonPrint.css 2011年03月05日 17:05:30 UTC (rev 7964) +++ trunk/themes/MonoBook/commonPrint.css 2011年03月07日 09:47:31 UTC (rev 7965) @@ -1,6 +1,6 @@ /** * $Id$ - */ + */ /* ** Mediawiki Print style sheet for CSS2-capable browsers. @@ -10,10 +10,10 @@ ** Copyright Alexander Limi */ -@page { - size: A4 portrait; +@page { + size: A4 portrait; margin: 17mm 10mm 17mm 10mm; -} +} h1 { string-set: header content(); @@ -24,7 +24,7 @@ content: "Phpwiki"; } @top-right { - content: string(header); + content: string(header); } @bottom-left { content: "Page " counter(page) " of " counter(pages); @@ -33,7 +33,7 @@ @page :right { @top-left { - content: string(header); + content: string(header); } @top-right { content: "Phpwiki"; @@ -52,7 +52,7 @@ } } -h1, h2, h3, h4, h5, h6 { page-break-after: avoid; } +h1, h2, h3, h4, h5, h6 { page-break-after: avoid; } /* Do not cut tables with class "nobreak" */ @@ -65,20 +65,19 @@ a.new{ color:#ba0000; text-decoration:none; } .toc, -#toc { - /*border:1px solid #2f6fab;*/ +#toc { border:1px solid #aaaaaa; background-color:#f9f9f9; padding:5px; } .tocindent { - margin-left: 2em; + margin-left: 2em; } .tocline { - margin-bottom: 0px; + margin-bottom: 0px; } .toctoggle, .editsection { - font-size: smaller; + font-size: smaller; } div.toclist a::after { @@ -86,22 +85,22 @@ } /* images */ -div.floatright { - float: right; +div.floatright { + float: right; margin: 0; position:relative; border: 0.5em solid White; border-width: 0.5em 0 0.8em 1.4em; } -div.floatright p { font-style: italic;} -div.floatleft { - float: left; +div.floatright p { font-style: italic;} +div.floatleft { + float: left; margin: 0.3em 0.5em 0.5em 0; position:relative; border: 0.5em solid White; border-width: 0.5em 1.4em 0.8em 0; } -div.floatleft p { font-style: italic; } +div.floatleft p { font-style: italic; } /* thumbnails */ div.thumb { margin-bottom: 0.5em; @@ -136,10 +135,10 @@ /* table standards */ table.rimage { - float:right; - width:1pt; + float:right; + width:1pt; position:relative; - margin-left:1em; + margin-left:1em; margin-bottom:1em; text-align:center; } @@ -174,7 +173,7 @@ display: none; } -ul { +ul { list-style-type: square; } @@ -197,7 +196,7 @@ p, .documentDescription { margin: 1em 0 ! important; - line-height: 1.2em; + line-height: 1.2em; } pre { @@ -225,7 +224,7 @@ text-decoration: underline; } /* -#content a:link:after, +#content a:link:after, #content a:visited:after { content: " ( " attr(href) " ) "; }*/ @@ -245,20 +244,20 @@ } /* MSIE/Win doesn't understand 'inherit' */ a, a.external, a.new, a.stub { - color: black ! important; - text-decoration: none ! important; + color: black ! important; + text-decoration: none ! important; } /* Continue ... */ a, a.external, a.new, a.stub { - color: inherit ! important; - text-decoration: inherit ! important; + color: inherit ! important; + text-decoration: inherit ! important; } /* Show some stuff */ .urlexpansion { - display: inline ! important; + display: inline ! important; } div.townBox { @@ -274,7 +273,7 @@ } div.townBox dl { padding: 0; - margin: 0 0 0.3em 0; + margin: 0 0 0.3em 0; font-size: 96%; } div.townBox dl dt { Modified: trunk/themes/MonoBook/main.css =================================================================== --- trunk/themes/MonoBook/main.css 2011年03月05日 17:05:30 UTC (rev 7964) +++ trunk/themes/MonoBook/main.css 2011年03月07日 09:47:31 UTC (rev 7965) @@ -1,6 +1,6 @@ /** * $Id$ - */ + */ /* ** MediaWiki 'monobook' style sheet for CSS2-capable browsers. @@ -11,34 +11,34 @@ ** and the Plone 2.0 styles, see http://plone.org/ (Alexander Limi, Joe Geldart & Tom Croucher, ** Michael Zeltner and Geir Bækholt) ** All you guys rock :) -** Added phpwiki integration: Reini Urban, based on the phpwiki.css +** Added phpwiki integration: Reini Urban, based on the phpwiki.css ** by Jeff Dairiki */ #column-content { - width: 100%; - float: right; - margin: 0 0 .6em -12.2em; - padding: 0; - height: 1%; + width: 100%; + float: right; + margin: 0 0 .6em -12.2em; + padding: 0; + height: 1%; } #content { - position: relative; - z-index: 2; - margin: 2.8em 0 0 12.2em; - padding: 0 1em 1.5em 1em; - background: white; - color: black; - border: 1px solid #aaa; - border-right: none; - line-height: 1.5em; + position: relative; + z-index: 2; + margin: 2.8em 0 0 12.2em; + padding: 0 1em 1.5em 1em; + background: white; + color: black; + border: 1px solid #aaa; + border-right: none; + line-height: 1.5em; } #column-one { - position: absolute; - /*z-index: 3;*/ - padding-top: 160px; - top: 0; - left: 0; + position: absolute; + /*z-index: 3;*/ + padding-top: 160px; + top: 0; + left: 0; } /* the left column width is specified in class .portlet */ @@ -49,76 +49,76 @@ */ body { - font: small sans-serif; - background: #f9f9f9 url("images/headbg.jpg") 0 0 no-repeat; - color: black; - margin: 0; - padding: 0; + font: small sans-serif; + background: #f9f9f9 url("images/headbg.jpg") 0 0 no-repeat; + color: black; + margin: 0; + padding: 0; } /* scale back up to a sane default */ #globalWrapper { - font-size: 127%; - width: 100%; - margin: 0; - padding: 0; + font-size: 127%; + width: 100%; + margin: 0; + padding: 0; } .visualClear { - clear: both; + clear: both; } /* general styles */ table { - font-size: 100%; - color: black; + font-size: 100%; + color: black; } a { - text-decoration: none; - color: #002bb8; - background: none; + text-decoration: none; + color: #002bb8; + background: none; } a:visited { - color: #5a3696; + color: #5a3696; } a:active { - color: #faa700; + color: #faa700; } a:hover { - text-decoration: underline; + text-decoration: underline; } a.stub { - color: #772233; + color: #772233; } img { - border: 0; - vertical-align: middle; + border: 0; + vertical-align: middle; } p { - margin: .4em 0 .5em 0; - line-height: 1.5em; + margin: .4em 0 .5em 0; + line-height: 1.5em; } p img { - margin: 0; + margin: 0; } hr { - height: 1px; - color: #aaa; - background-color: #aaa; - border: 0; - margin: .2em 0 .2em 0; + height: 1px; + color: #aaa; + background-color: #aaa; + border: 0; + margin: .2em 0 .2em 0; } h1, h2, h3, h4, h5, h6 { - color: black; - background: none; - font-weight: bold; - font-family: Tahoma, sans-serif; - margin: 0; - padding-top: 0.5em; - padding-bottom: 0.17em; - border-bottom: 1px solid #aaa; + color: black; + background: none; + font-weight: bold; + font-family: Tahoma, sans-serif; + margin: 0; + padding-top: 0.5em; + padding-bottom: 0.17em; + border-bottom: 1px solid #aaa; } h1 { font-size: 188%; } h2 { font-size: 150%; } @@ -126,97 +126,97 @@ h4 { font-size: 116%; } h5 { font-size: 100%; } h6 { font-size: 80%; } -h4, h5, h6 { - border-bottom: none; - font-weight: normal; +h4, h5, h6 { + border-bottom: none; + font-weight: normal; } /* Because in some cases there is a <p> in nested lists */ li p { margin:0; } -ul { - line-height: 1.5em; - list-style-type: square; - margin: 0.3em 0 0 1.5em; - padding:0; - list-style-image: url("images/bullet.png"); +ul { + line-height: 1.5em; + list-style-type: square; + margin: 0.3em 0 0 1.5em; + padding:0; + list-style-image: url("images/bullet.png"); } ol { - line-height: 1.5em; - margin: 0.3em 0 0 3.2em; - padding:0; - list-style-image: none; + line-height: 1.5em; + margin: 0.3em 0 0 3.2em; + padding:0; + list-style-image: none; } -li { margin-bottom: 0.1em; } -dt { - font-weight: bold; - margin-bottom: .1em; +li { margin-bottom: 0.1em; } +dt { + font-weight: bold; + margin-bottom: .1em; } dl { - margin-top: .2em; - margin-bottom: .5em; + margin-top: .2em; + margin-bottom: .5em; } dd { - line-height: 1.5em; - margin-left: 2em; - margin-bottom: .1em; + line-height: 1.5em; + margin-left: 2em; + margin-bottom: .1em; } fieldset { - border: 1px solid #2f6fab; - margin: 1em 0 1em 0; - padding: 0 1em 1em 1em; - line-height: 1.5em; + border: 1px solid #2f6fab; + margin: 1em 0 1em 0; + padding: 0 1em 1em 1em; + line-height: 1.5em; } legend { - /*background: white;*/ - padding: 0.5em; - font-size: 95%; + /*background: white;*/ + padding: 0.5em; + font-size: 95%; } form { - border: none; - margin: 0; + border: none; + margin: 0; } textarea { - width: 100%; - padding: .1em; + width: 100%; + padding: .1em; } input.historysubmit { - padding: 0 0.3em 0.3em 0.3em !important; - font-size: 94%; - cursor: pointer; - height: 1.7em !important; - margin-left: 1.6em; + padding: 0 0.3em 0.3em 0.3em !important; + font-size: 94%; + cursor: pointer; + height: 1.7em !important; + margin-left: 1.6em; } select { - vertical-align: top; + vertical-align: top; } abbr, acronym, .explain { - border-bottom: 1px dotted black; - color: black; - background: none; - cursor: help; + border-bottom: 1px dotted black; + color: black; + background: none; + cursor: help; } q { - font-family: Times, "Times New Roman", serif; - font-style: italic; + font-family: Times, "Times New Roman", serif; + font-style: italic; } /* disabled for now blockquote { - font-family: Times, "Times New Roman", serif; - font-style: italic; + font-family: Times, "Times New Roman", serif; + font-style: italic; }*/ code { - background-color: #f9f9f9; + background-color: #f9f9f9; } pre { - padding: 1em; - border: 1px dashed #2f6fab; - color: black; - background-color: #f9f9f9; - line-height: 1.1em; + padding: 1em; + border: 1px dashed #2f6fab; + color: black; + background-color: #f9f9f9; + line-height: 1.1em; } /* @@ -225,108 +225,108 @@ #siteSub { display: none; } #jump-to-nav { - display: none; + display: none; } #contentSub { - font-size: 84%; - line-height: 1.2em; - margin: 0 0 1.4em 1em; - color: #7d7d7d; - width: auto; + font-size: 84%; + line-height: 1.2em; + margin: 0 0 1.4em 1em; + color: #7d7d7d; + width: auto; } span.subpages { display: block; } /* Some space under the headers in the content area */ #bodyContent h1, #bodyContent h2 { - margin-bottom: .6em; + margin-bottom: .6em; } #bodyContent h3, #bodyContent h4, #bodyContent h5 { - margin-bottom: .3em; + margin-bottom: .3em; } .firstHeading { margin-bottom:0.1em; } /* user notification thing */ .usermessage { - background-color: #ffce7b; - border: 1px solid #ffa500; - color: black; - font-weight: bold; - margin: 2em 0 1em; - padding: .5em 1em; - vertical-align: middle; + background-color: #ffce7b; + border: 1px solid #ffa500; + color: black; + font-weight: bold; + margin: 2em 0 1em; + padding: .5em 1em; + vertical-align: middle; } #siteNotice { - text-align: center; - font-size: 95%; - padding: 0 .9em; + text-align: center; + font-size: 95%; + padding: 0 .9em; } #siteNotice p { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } .errorbox, .successbox { - font-size: larger; - border: 2px solid; - padding: .5em 1em; - float: left; - margin-bottom: 2em; - color: #000; + font-size: larger; + border: 2px solid; + padding: .5em 1em; + float: left; + margin-bottom: 2em; + color: #000; } .errorbox { - border-color: red; - background-color: #fff2f2; + border-color: red; + background-color: #fff2f2; } .successbox { - border-color: green; - background-color: #dfd; + border-color: green; + background-color: #dfd; } .errorbox h2, .successbox h2 { - font-size: 1em; - font-weight: bold; - display: inline; - margin: 0 .5em 0 0; - border: none; + font-size: 1em; + font-weight: bold; + display: inline; + margin: 0 .5em 0 0; + border: none; } #catlinks { - border: 1px solid #aaa; - background-color: #f9f9f9; - padding: 5px; - margin-top: 1em; - clear: both; + border: 1px solid #aaa; + background-color: #f9f9f9; + padding: 5px; + margin-top: 1em; + clear: both; } /* currently unused, intended to be used by a metadata box in the bottom-right corner of the content area */ .documentDescription { - /* The summary text describing the document */ - font-weight: bold; - display: block; - margin: 1em 0; - line-height: 1.5em; + /* The summary text describing the document */ + font-weight: bold; + display: block; + margin: 1em 0; + line-height: 1.5em; } .documentByLine { - text-align: right; - font-size: 90%; - clear: both; - font-weight: normal; - color: #76797c; + text-align: right; + font-size: 90%; + clear: both; + font-weight: normal; + color: #76797c; } /* emulate center */ .center { - width: 100%; - text-align: center; + width: 100%; + text-align: center; } *.center * { - margin-left: auto; - margin-right: auto; + margin-left: auto; + margin-right: auto; } /* small for tables and similar */ .small, .small * { - font-size: 94%; + font-size: 94%; } table.small { - font-size: 100%; + font-size: 100%; } /* @@ -334,140 +334,140 @@ */ #toc, .toc { - width: 200px; - border: 1px solid #aaa; - background-color: #f9f9f9; - padding: 5px; - font-size: 95%; - float: right; - clear: right; + width: 200px; + border: 1px solid #aaa; + background-color: #f9f9f9; + padding: 5px; + font-size: 95%; + float: right; + clear: right; } #toc #toctitle, .toc .toctitle, .toc #toctitle { - display: inline; - border: none; - padding: 0; - font-size: 110%; - font-weight: bold; + display: inline; + border: none; + padding: 0; + font-size: 110%; + font-weight: bold; } .toc .toclist, .toc #toclist { - width: auto; - border: none; + width: auto; + border: none; } #toc #toctitle, .toc #toctitle, #toc .toctitle, .toc .toctitle { - text-align: center; + text-align: center; } -#toc p, -.toc p { +#toc p, +.toc p { margin: 0; } #toc ul, .toc ul { - width: auto; - border: none; - line-height: 1.5em; - list-style-type: square; - list-style-image: url("images/bullet.png"); - font-size: 95%; - margin-left: 5px; - padding-left: 5px; + width: auto; + border: none; + line-height: 1.5em; + list-style-type: square; + list-style-image: url("images/bullet.png"); + font-size: 95%; + margin-left: 5px; + padding-left: 5px; } #toc ul ul, .toc ul ul { - margin: 0 0 0 2em; + margin: 0 0 0 2em; } #toc .toctoggle, .toc .toctoggle { - font-size: 94%; + font-size: 94%; } .mw-warning { - border: 1px solid #aaa; - background-color: #f9f9f9; - padding: 5px; - font-size: 95%; + border: 1px solid #aaa; + background-color: #f9f9f9; + padding: 5px; + font-size: 95%; } .mw-warning { - margin-left: 50px; - margin-right: 50px; - text-align: center; + margin-left: 50px; + margin-right: 50px; + text-align: center; } /* images */ div.floatright, table.floatright { - clear: right; - float: right; - position: relative; - margin: 0 0 .5em .5em; - border: 0; + clear: right; + float: right; + position: relative; + margin: 0 0 .5em .5em; + border: 0; } div.floatright p { font-style: italic; } div.floatleft, table.floatleft { - float: left; - position: relative; - margin: 0 .5em .5em 0; - border: 0; + float: left; + position: relative; + margin: 0 .5em .5em 0; + border: 0; } div.floatleft p { font-style: italic; } /* thumbnails */ div.thumb { - margin-bottom: .5em; - border-style: solid; - border-color: white; - width: auto; + margin-bottom: .5em; + border-style: solid; + border-color: white; + width: auto; } div.thumb div { - border: 1px solid #ccc; - padding: 3px !important; - background-color: #f9f9f9; - font-size: 94%; - text-align: center; - overflow: hidden; + border: 1px solid #ccc; + padding: 3px !important; + background-color: #f9f9f9; + font-size: 94%; + text-align: center; + overflow: hidden; } div.thumb div a img { - border: 1px solid #ccc; + border: 1px solid #ccc; } div.thumb div div.thumbcaption { - border: none; - text-align: left; - line-height: 1.4em; - padding: .3em 0 .1em 0; + border: none; + text-align: left; + line-height: 1.4em; + padding: .3em 0 .1em 0; } div.magnify { - float: right; - border: none !important; - background: none !important; + float: right; + border: none !important; + background: none !important; } div.magnify a, div.magnify img { - display: block; - border: none !important; - background: none !important; + display: block; + border: none !important; + background: none !important; } div.tright { - clear: right; - float: right; - border-width: .5em 0 .8em 1.4em; + clear: right; + float: right; + border-width: .5em 0 .8em 1.4em; } div.tleft { - float: left; - margin-right: .5em; - border-width: .5em 1.4em .8em 0; + float: left; + margin-right: .5em; + border-width: .5em 1.4em .8em 0; } .hiddenStructure { - display: none; - speak: none; + display: none; + speak: none; } img.tex { - vertical-align: middle; + vertical-align: middle; } span.texhtml { - font-family: serif; + font-family: serif; } /* @@ -480,104 +480,104 @@ */ /* table standards */ table.rimage { - float: right; - position: relative; - margin-left: 1em; - margin-bottom: 1em; - text-align: center; + float: right; + position: relative; + margin-left: 1em; + margin-bottom: 1em; + text-align: center; } .toccolours { - border: 1px solid #aaa; - background-color: #f9f9f9; - padding: 5px; - font-size: 95%; + border: 1px solid #aaa; + background-color: #f9f9f9; + padding: 5px; + font-size: 95%; } div.townBox { - position: relative; - float: right; - background: white; - margin-left: 1em; - border: 1px solid gray; - padding: .3em; - width: 200px; - overflow: hidden; - clear: right; + position: relative; + float: right; + background: 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%; + padding: 0; + margin: 0 0 .3em; + font-size: 96%; } div.townBox dl dt { - background: none; - margin: .4em 0 0; + background: none; + margin: .4em 0 0; } div.townBox dl dd { - margin: .1em 0 0 1.1em; - background-color: #f3f3f3; + margin: .1em 0 0 1.1em; + background-color: #f3f3f3; } /* ** edit views etc */ .special li { - line-height: 1.4em; - margin: 0; - padding: 0; + line-height: 1.4em; + margin: 0; + padding: 0; } /* ** RecentChanges */ -.pageinfo-majoredit { - font-weight: normal; /*bold;*/ +.pageinfo-majoredit { + font-weight: normal; /*bold;*/ } .wiki-summary { - font-size: 94%; - font-style: italic; + font-size: 94%; + font-style: italic; } /* Page history styling */ /* the auto-generated edit comments */ .autocomment { - color: gray; + color: gray; } #pagehistory span.user { - margin-left: 1.4em; - margin-right: .4em; + margin-left: 1.4em; + margin-right: .4em; } #pagehistory span.minor { - font-weight: bold; + font-weight: bold; } #pagehistory li { - border: 1px solid white; + border: 1px solid white; } #pagehistory li.selected { - background-color: #f9f9f9; - border: 1px dashed #aaa; + background-color: #f9f9f9; + border: 1px dashed #aaa; } /* ** Diff rendering (unused) */ table.diff, td.diff-otitle, td.diff-ntitle { - background-color: white; + background-color: white; } td.diff-addedline { - background: #cfc; - font-size: smaller; + background: #cfc; + font-size: smaller; } td.diff-deletedline { - background: #ffa; - font-size: smaller; + background: #ffa; + font-size: smaller; } td.diff-context { - background: #eee; - font-size: smaller; + background: #eee; + font-size: smaller; } span.diffchange { - color: red; - font-weight: bold; + color: red; + font-weight: bold; } /** @@ -585,74 +585,74 @@ */ /* main box */ .diff { - margin-top: 1ex; - margin-bottom: 0.5ex; - background: white; - color: black; - border-top: 1px solid #494f5d; - border-left: 1px solid #494f5d; - border-bottom: 1px solid #c6d2de; - border-right: 1px solid #c6d2de; - padding-top: 1px; - padding-bottom: 1px; - padding-left: .125em; - padding-right: .125em; - padding: 0; - clear: both; + margin-top: 1ex; + margin-bottom: 0.5ex; + background: white; + color: black; + border-top: 1px solid #494f5d; + border-left: 1px solid #494f5d; + border-bottom: 1px solid #c6d2de; + border-right: 1px solid #c6d2de; + padding-top: 1px; + padding-bottom: 1px; + padding-left: .125em; + padding-right: .125em; + padding: 0; + clear: both; } .diff .block { - background: #ddd; - padding-left: 1em; + background: #ddd; + padding-left: 1em; } /* individual blocks */ .diff .context { - background: white; - border: none; + background: white; + border: none; } /* entire difftextblock */ .difftext { - margin-top: 0; - margin-bottom: 0; - background: white; - border-top: 1px #e8e6df solid; - border-left: 1px #e8e6df solid; - border-bottom: 1px #d2d2d2 solid; - border-right: 1px #b2b2b2 solid; - padding-left: 0em; - padding-right: 0em; - padding-top: 0ex; - padding-bottom: 0ex; - clear: both; + margin-top: 0; + margin-bottom: 0; + background: white; + border-top: 1px #e8e6df solid; + border-left: 1px #e8e6df solid; + border-bottom: 1px #d2d2d2 solid; + border-right: 1px #b2b2b2 solid; + padding-left: 0em; + padding-right: 0em; + padding-top: 0ex; + padding-bottom: 0ex; + clear: both; } /* + - line prefix */ .diff .block tt { - font-weight: normal; - font-family: monospace; - color: black; - margin-left: 0; - border: none; + font-weight: normal; + font-family: monospace; + color: black; + margin-left: 0; + border: none; } /* changed words */ .diff del, .diff ins { - font-weight: bold; - text-decoration: none; + font-weight: bold; + text-decoration: none; } /* blocks containing deleted or added words */ .diff .original, .diff .deleted, .diff .final, .diff .added { - background: white; + background: white; } /* blocks containing deleted words */ .diff .original, .diff .deleted { - background: #fcc; - border: none; + background: #fcc; + border: none; } /* blocks containing added words */ .diff .final, .diff .added { - background: #cfc; - border: none; + background: #cfc; + border: none; } /* deleted words */ @@ -665,8 +665,8 @@ */ td.pageinfo { font-weight: bold; } .pageinfo-minoredit, .pageinfo-authorid { - font-size: smaller; - font-style: oblique; + font-size: smaller; + font-style: oblique; } /* RssFeed */ @@ -680,34 +680,34 @@ * Calendar plugin */ table.cal { - border: 1px outset gray; - background: white; - margin: 0.5ex 0.5em; - padding: 1px; - /* For Mozilla */ - empty-cells: hide; -} + border: 1px outset gray; + background: white; + margin: 0.5ex 0.5em; + padding: 1px; + /* For Mozilla */ + empty-cells: hide; +} /* cells */ table.cal td { - background: white; - text-align: right; -} + background: white; + text-align: right; +} /* Month-name header */ table.cal-header { font-size: larger; } table.cal-header tr, table.cal-header td { text-align: center; } .cal-arrow { - font-weight: bold; - text-decoration: none; + font-weight: bold; + text-decoration: none; } /* Day-names header */ table.cal tbody tr .cal-dayname { } .cal-dayname td { - text-align: center; - font-size: smaller; - text-decoration: underline; + text-align: center; + font-size: smaller; + text-decoration: underline; } /* Individual days */ @@ -716,60 +716,60 @@ /* Today */ /* cell */ table.cal td.cal-today { - margin: 1px; - border: 1px solid gray; + margin: 1px; + 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 +** this is css3, the validator doesn't like it when validating as css2 */ #bodyContent a.external, #bodyContent a[href ^="gopher://"] { - background: url("images/url.png") center right no-repeat; - padding-right: 13px; + background: url("images/url.png") center right no-repeat; + padding-right: 13px; } #bodyContent a[href ^="https://"], .link-https { - background: url("images/lock_icon.png") center right no-repeat; - padding-right: 16px; + background: url("images/lock_icon.png") center right no-repeat; + padding-right: 16px; } #bodyContent a[href ^="mailto:"], .link-mailto { - background: url("images/mail_icon.png") center right no-repeat; - padding-right: 18px; + background: url("images/mail_icon.png") center right no-repeat; + padding-right: 18px; } #bodyContent a[href ^="news://"] { - background: url("images/news_icon.png") center right no-repeat; - padding-right: 18px; + background: url("images/news_icon.png") center right no-repeat; + padding-right: 18px; } #bodyContent a[href ^="ftp://"], .link-ftp { - background: url("images/file_icon.png") center right no-repeat; - padding-right: 18px; + background: url("images/file_icon.png") center right no-repeat; + padding-right: 18px; } #bodyContent a[href ^="irc://"], .link-irc { - background: url("images/discussionitem_icon.png") center right no-repeat; - padding-right: 18px; + background: url("images/discussionitem_icon.png") center right no-repeat; + padding-right: 18px; } /* disabl... [truncated message content]
Revision: 7964 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7964&view=rev Author: vargenau Date: 2011年03月05日 17:05:30 +0000 (2011年3月05日) Log Message: ----------- No tabs Modified Paths: -------------- trunk/lib/AccessLog.php trunk/lib/ArchiveCleaner.php trunk/lib/AtomParser.php trunk/lib/BlockParser.php trunk/lib/CachedMarkup.php trunk/lib/Captcha.php trunk/lib/DbSession.php trunk/lib/DbaDatabase.php trunk/lib/DbaListSet.php trunk/lib/DbaPartition.php trunk/lib/EditToolbar.php trunk/lib/ErrorManager.php trunk/lib/ExternalReferrer.php trunk/lib/FileFinder.php trunk/lib/Google.php trunk/lib/HtmlElement.php trunk/lib/HtmlElement5.php trunk/lib/HtmlParser.php trunk/lib/HttpClient.php trunk/lib/InlineParser.php trunk/lib/MailNotify.php trunk/lib/PageList.php trunk/lib/PagePerm.php trunk/lib/PageType.php trunk/lib/RSSWriter091.php trunk/lib/Request.php trunk/lib/RssParser.php trunk/lib/RssWriter.php trunk/lib/RssWriter2.php trunk/lib/SemanticWeb.php trunk/lib/SpamBlocklist.php trunk/lib/Template.php trunk/lib/TextSearchQuery.php trunk/lib/Units.php trunk/lib/WikiCallback.php trunk/lib/WikiDB.php trunk/lib/WikiGroup.php trunk/lib/WikiPlugin.php trunk/lib/WikiPluginCached.php trunk/lib/WikiTheme.php trunk/lib/WikiUser.php trunk/lib/WikiUserNew.php trunk/lib/WysiwygEdit.php trunk/lib/XmlElement.php trunk/lib/XmlParser.php trunk/lib/XmlRpcClient.php trunk/lib/XmlRpcServer.php trunk/lib/config.php trunk/lib/diff3.php trunk/lib/difflib.php trunk/lib/display.php trunk/lib/editpage.php trunk/lib/fortune.php trunk/lib/fpdf.php trunk/lib/gif.php trunk/lib/imagecache.php trunk/lib/imdb.php trunk/lib/install.php trunk/lib/loadsave.php trunk/lib/main.php trunk/lib/pdf.php trunk/lib/prepend.php trunk/lib/spam_babycart.php trunk/lib/stdlib.php trunk/lib/upgrade.php trunk/lib/ziplib.php trunk/tests/CompatInfo.php trunk/tests/unit_test_backend_cvs.php trunk/uploads/index.php Modified: trunk/lib/AccessLog.php =================================================================== --- trunk/lib/AccessLog.php 2011年03月04日 16:43:43 UTC (rev 7963) +++ trunk/lib/AccessLog.php 2011年03月05日 17:05:30 UTC (rev 7964) @@ -57,7 +57,7 @@ if (!$request->_dbi->isSQL()) { trigger_error("Unsupported database backend for ACCESS_LOG_SQL.\nNeed DATABASE_TYPE=SQL or ADODB or PDO"); } else { - global $DBParams; + global $DBParams; //$this->_dbi =& $request->_dbi; $this->logtable = (!empty($DBParams['prefix']) ? $DBParams['prefix'] : '')."accesslog"; } @@ -126,8 +126,8 @@ if ($this->logtable) { // mysql specific only: return $this->read_sql("request_host=".$this->_dbi->quote($host) - ." AND time_stamp > ". (time()-$since_minutes*60) - ." ORDER BY time_stamp DESC"); + ." AND time_stamp > ". (time()-$since_minutes*60) + ." ORDER BY time_stamp DESC"); } else { $iter = new WikiDB_Array_generic_iter(); $logs =& $iter->_array; @@ -160,7 +160,7 @@ $entry = new Request_AccessLogEntry($this); $re = '/^(\S+)\s(\S+)\s(\S+)\s\[(.+?)\] "([^"]+)" (\d+) (\d+) "([^"]*)" "([^"]*)"$/'; if (preg_match($re, $s, $m)) { - list(,$entry->host, $entry->ident, $entry->user, $entry->time, + list(,$entry->host, $entry->ident, $entry->user, $entry->time, $entry->request, $entry->status, $entry->size, $entry->referer, $entry->user_agent) = $m; } @@ -176,8 +176,8 @@ return $this->sqliter->next(); } function _read_sql_query($where='') { - global $request; - $dbh =& $request->_dbi; + global $request; + $dbh =& $request->_dbi; $log_tbl =& $this->logtable; return $dbh->genericSqlIter("SELECT *,request_uri as request,request_time as time,remote_user as user," ."remote_host as host,agent as user_agent" @@ -187,8 +187,8 @@ /* done in request->finish() before the db is closed */ function write_sql() { - global $request; - $dbh =& $request->_dbi; + global $request; + $dbh =& $request->_dbi; if (isset($this->entries) and $dbh and $dbh->isOpen()) foreach ($this->entries as $entry) { $entry->write_sql(); @@ -236,7 +236,7 @@ $this->logfile = $accesslog->logfile; $this->time = time(); $this->status = 200; // see setStatus() - $this->size = 0; // see setSize() + $this->size = 0; // see setSize() } /** @@ -350,7 +350,7 @@ /* This is better been done by apache mod_log_sql */ /* If ACCESS_LOG_SQL & 2 we do write it by our own */ function write_sql() { - global $request; + global $request; $dbh =& $request->_dbi; if ($dbh and $dbh->isOpen() and $this->_accesslog->logtable) { @@ -365,7 +365,7 @@ if (!empty($args['pref']['passwd2'])) $args['pref']['passwd2'] = '<not displayed>'; $this->request_args = substr(serialize($args),0,254); // if VARCHAR(255) is used. } else { - $this->request_args = $request->get('QUERY_STRING'); + $this->request_args = $request->get('QUERY_STRING'); } $this->request_method = $request->get('REQUEST_METHOD'); $this->request_uri = $request->get('REQUEST_URI'); Modified: trunk/lib/ArchiveCleaner.php =================================================================== --- trunk/lib/ArchiveCleaner.php 2011年03月04日 16:43:43 UTC (rev 7963) +++ trunk/lib/ArchiveCleaner.php 2011年03月05日 17:05:30 UTC (rev 7964) @@ -1,19 +1,19 @@ -<?php +<?php // $Id$ /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...> * * This file is part of PhpWiki. - * + * * PhpWiki is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * PhpWiki is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with PhpWiki; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -24,7 +24,7 @@ function ArchiveCleaner ($expire_params) { $this->expire_params = $expire_params; } - + function isMergeable($revision) { if ( ! $revision->get('is_minor_edit') ) return false; @@ -43,20 +43,20 @@ while ($page = $iter->next()) $this->cleanPageRevisions($page); } - + function cleanPageRevisions($page) { $INFINITY = 0x7fffffff; $expire = &$this->expire_params; foreach (array('major', 'minor', 'author') as $class) $counter[$class] = new ArchiveCleaner_Counter($expire[$class]); - // shortcut to keep all - if (($counter['minor']->min_keep == $INFINITY) + // shortcut to keep all + if (($counter['minor']->min_keep == $INFINITY) and ($counter['major']->min_keep == $INFINITY)) return; $authors_seen = array(); - + $current = $page->getCurrentRevision(false); for ( $revision = $page->getRevisionBefore($current,false); @@ -117,11 +117,11 @@ if ($this->min_age > $this->max_age) $this->min_age = $this->max_age; - + $this->now = time(); $this->count = 0; $this->previous_supplanted = false; - + } function computeAge($revision) { @@ -148,14 +148,14 @@ $this->previous_supplanted = $supplanted; return ($this->now - $supplanted) / (24 * 3600); } - + function keep($revision) { - $INFINITY = 0x7fffffff; - if ($this->min_keep == $INFINITY) - return true; + $INFINITY = 0x7fffffff; + if ($this->min_keep == $INFINITY) + return true; $count = ++$this->count; $age = $this->computeAge($revision); - + if ($count > $this->max_keep) return false; if ($age <= $this->min_age || $count <= $this->min_keep) @@ -170,5 +170,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/lib/AtomParser.php =================================================================== --- trunk/lib/AtomParser.php 2011年03月04日 16:43:43 UTC (rev 7963) +++ trunk/lib/AtomParser.php 2011年03月05日 17:05:30 UTC (rev 7964) @@ -23,7 +23,7 @@ * This class is a poor-man Atom parser, it does no validation of the feed. * The content of an entry ("payload") is not parsed but rather returned "as-is", * as its format can be text, html or xhtml. - * + * * @author: Sébastien Le Callonnec */ require_once('lib/XmlParser.php'); @@ -44,7 +44,7 @@ var $icon = ''; var $rights = ''; var $logo = ''; - + var $categories = array(); var $authors = array(); @@ -64,7 +64,7 @@ var $id = ''; var $links = array(); var $summary = ''; - + var $inside_content = false; var $content = ''; @@ -165,7 +165,7 @@ function cdata($parser, $data) { global $current_tag, $current_attrs; - + if ($this->inside_content) { $this->content .= $data; } else { @@ -244,7 +244,7 @@ return trim($element); } } - + function serialize_tag($tag_name, $attributes) { $tag = "<" . $tag_name; foreach ($attributes as $k => $v) { Modified: trunk/lib/BlockParser.php =================================================================== --- trunk/lib/BlockParser.php 2011年03月04日 16:43:43 UTC (rev 7963) +++ trunk/lib/BlockParser.php 2011年03月05日 17:05:30 UTC (rev 7964) @@ -93,11 +93,11 @@ * @return object A RegexpSet_match object, or false if no match. */ function match ($text) { - if (!is_string($text)) return false; + if (!is_string($text)) return false; if (! preg_match($this->_re, $text, $m)) { return false; } - + $match = new AnchoredRegexpSet_match; $match->postmatch = substr($text, strlen($m[0])); $match->match = $m[1]; @@ -136,7 +136,7 @@ if (! preg_match($pat, $text, $m)) { return false; } - + $match = new AnchoredRegexpSet_match; $match->postmatch = substr($text, strlen($m[0])); $match->match = $m[1]; @@ -146,11 +146,11 @@ } - + class BlockParser_Input { function BlockParser_Input ($text) { - + // Expand leading tabs. // FIXME: do this better. // @@ -182,14 +182,14 @@ } return $this->_atSpace; } - + function currentLine () { if ($this->_pos >= count($this->_lines)) { return false; } return $this->_lines[$this->_pos]; } - + function nextLine () { $this->_atSpace = $this->_lines[$this->_pos++] === ''; if ($this->_pos >= count($this->_lines)) { @@ -202,7 +202,7 @@ $this->_atSpace = ($this->_lines[$this->_pos] === ''); $this->_pos++; } - + function getPos () { return array($this->_pos, $this->_atSpace); } @@ -225,7 +225,7 @@ else return "<EOF>"; } - + function _debug ($tab, $msg) { //return ; $where = $this->where(); @@ -233,7 +233,7 @@ printXML(HTML::div("$tab $msg: at: '", HTML::tt($where), "'")); - flush(); + flush(); } } @@ -271,7 +271,7 @@ else return $this->_atSpace; } - + function currentLine () { return $this->_line; } @@ -296,7 +296,7 @@ function advance () { $this->nextLine(); } - + function getPos () { return array($this->_line, $this->_atSpace, $this->_input->getPos()); } @@ -306,7 +306,7 @@ $this->_atSpace = $pos[1]; $this->_input->setPos($pos[2]); } - + function getPrefix () { assert ($this->_line !== false); $line = $this->_input->currentLine(); @@ -322,8 +322,8 @@ return $this->_input->where(); } } - + class Block_HtmlElement extends HtmlElement { function Block_HtmlElement($tag /*, ... */) { @@ -335,7 +335,7 @@ } class ParsedBlock extends Block_HtmlElement { - + function ParsedBlock (&$input, $tag = 'div', $attr = false) { $this->Block_HtmlElement($tag, $attr); $this->_initBlockTypes(); @@ -362,22 +362,22 @@ // FIXME: hackish. This should only be called once. function _initBlockTypes () { - // better static or global? - static $_regexpset, $_block_types; + // better static or global? + static $_regexpset, $_block_types; - if (!is_object($_regexpset)) { + if (!is_object($_regexpset)) { // nowiki_wikicreole must be before template_plugin - $Block_types = array - ('nowiki_wikicreole', 'template_plugin', 'placeholder', 'oldlists', 'list', 'dl', + $Block_types = array + ('nowiki_wikicreole', 'template_plugin', 'placeholder', 'oldlists', 'list', 'dl', 'table_dl', 'table_wikicreole', 'table_mediawiki', 'blockquote', 'heading', 'heading_wikicreole', 'hr', 'pre', 'email_blockquote', 'wikicreole_indented', - 'plugin', 'plugin_wikicreole', 'p'); + 'plugin', 'plugin_wikicreole', 'p'); // insert it before p! if (ENABLE_MARKUP_DIVSPAN) { - array_pop($Block_types); - $Block_types[] = 'divspan'; - $Block_types[] = 'p'; + array_pop($Block_types); + $Block_types[] = 'divspan'; + $Block_types[] = 'p'; } foreach ($Block_types as $type) { $class = "Block_$type"; @@ -389,7 +389,7 @@ $_regexpset = $this->_regexpset; $_block_types = $this->_block_types; unset($Block_types); - } else { + } else { $this->_regexpset = $_regexpset; $this->_block_types = $_block_types; } @@ -409,9 +409,9 @@ $block = clone($this->_block_types[$m->regexp_ind]); if (DEBUG & _DEBUG_PARSER) $input->_debug('>', get_class($block)); - + if ($block->_match($input, $m)) { - //$block->_text = $line; + //$block->_text = $line; if (DEBUG & _DEBUG_PARSER) $input->_debug('<', get_class($block)); $tight_bottom = ! $input->skipSpace(); @@ -500,12 +500,12 @@ 'blockquote'); return true; } - + function merge ($nextBlock) { if (get_class($nextBlock) == get_class($this)) { assert ($nextBlock->_depth < $this->_depth); $nextBlock->_element->unshiftContent($this->_element); - if (!empty($this->_tight_top)) + if (!empty($this->_tight_top)) $nextBlock->_tight_top = $this->_tight_top; return $nextBlock; } @@ -535,7 +535,7 @@ if (preg_match('/[*#+-o]/', $input->getPrefix())) { return false; } - + $prefix = $m->match; $indent = sprintf("\\ {%d}", strlen($prefix)); @@ -619,13 +619,13 @@ { var $nrows; var $ncols; - + function Block_table_dl_defn ($term, $defn) { $this->XmlContent(); if (!is_array($defn)) $defn = $defn->getContent(); - $this->_next_tight_top = false; // value irrelevant - gets fixed later + $this->_next_tight_top = false; // value irrelevant - gets fixed later $this->_ncols = $this->_ComputeNcols($defn); $this->_nrows = 0; @@ -645,9 +645,9 @@ function setTightness($tight_top, $tight_bot) { $this->_tight_top = $tight_top; - $this->_tight_bot = $tight_bot; + $this->_tight_bot = $tight_bot; } - + function _addToRow ($item) { if (empty($this->_accum)) { $this->_accum = HTML::td(); @@ -663,7 +663,7 @@ $row->setTightness($this->_next_tight_top, $tight_bottom); $this->_next_tight_top = $tight_bottom; - + $this->pushContent($row); $this->_accum = false; $this->_nrows++; @@ -675,7 +675,7 @@ return; $this->_flushRow($table_rows[0]->_tight_top); - + foreach ($table_rows as $subdef) { $this->pushContent($subdef); $this->_nrows += $subdef->nrows(); @@ -690,7 +690,7 @@ else $first_row->unshiftContent($th); } - + function _ComputeNcols ($defn) { $ncols = 2; foreach ($defn as $item) { @@ -722,17 +722,17 @@ } function & firstTR() { - $first = &$this->_content[0]; - if (isa($first, 'Block_table_dl_defn')) - return $first->firstTR(); - return $first; + $first = &$this->_content[0]; + if (isa($first, 'Block_table_dl_defn')) + return $first->firstTR(); + return $first; } function & lastTR() { - $last = &$this->_content[$this->_nrows - 1]; - if (isa($last, 'Block_table_dl_defn')) - return $last->lastTR(); - return $last; + $last = &$this->_content[$this->_nrows - 1]; + if (isa($last, 'Block_table_dl_defn')) + return $last->lastTR(); + return $last; } function setWidth ($ncols) { @@ -774,7 +774,7 @@ function _setTightness($top, $bot) { $this->_content[0]->setTightness($top, $bot); } - + function finish () { $defs = &$this->_content; @@ -782,7 +782,7 @@ $ncols = 0; foreach ($defs as $defn) $ncols = max($ncols, $defn->ncols()); - + foreach ($defs as $key => $defn) $defs[$key]->setWidth($ncols); @@ -807,8 +807,8 @@ if (!preg_match('/[*#;]*$/A', $input->getPrefix())) { return false; } - + $prefix = $m->match; $oldindent = '[*#;](?=[#*]|;.*:.*\S)'; $newindent = sprintf('\\ {%d}', strlen($prefix)); @@ -873,7 +873,7 @@ */ echo 'count($this->_content): ', count($this->_content),"\n"; echo "\$this->_content[0]: "; var_dump ($this->_content[0]); - + for ($i=1; $i < min(5, count($this->_content)); $i++) { $c =& $this->_content[$i]; echo '$this->_content[',$i,"]: \n"; @@ -918,26 +918,26 @@ } } $input->advance(); - - if ($m->match == '<nowiki>') - $text = join("<br>\n", $text); - else + + if ($m->match == '<nowiki>') + $text = join("<br>\n", $text); + else $text = join("\n", $text); - + // FIXME: no <img>, <big>, <small>, <sup>, or <sub>'s allowed // in a <pre>. if ($m->match == '<pre>') { $text = TransformInline($text); } - if ($m->match == '<noinclude>') { - $text = TransformText($text); - $this->_element = new Block_HtmlElement('div', false, $text); - } else if ($m->match == '<nowiki>') { + if ($m->match == '<noinclude>') { + $text = TransformText($text); + $this->_element = new Block_HtmlElement('div', false, $text); + } else if ($m->match == '<nowiki>') { $text = TransformInlineNowiki($text); - $this->_element = new Block_HtmlElement('p', false, $text); - } else { + $this->_element = new Block_HtmlElement('p', false, $text); + } else { $this->_element = new Block_HtmlElement('pre', false, $text); - } + } return true; } } @@ -1019,7 +1019,7 @@ } $input->advance(); - $this->_element = new Cached_PluginInvocation($pi); + $this->_element = new Cached_PluginInvocation($pi); return true; } } @@ -1207,7 +1207,7 @@ { var $_attr = array('class' => 'mail-style-quote'); var $_re = '>\ ?'; - + function _match (&$input, $m) { //$indent = str_replace(' ', '\\ ', $m->match) . '|>$'; $indent = $this->_re; @@ -1244,14 +1244,14 @@ class Block_heading extends BlockMarkup { var $_re = '!{1,3}'; - + function _match (&$input, $m) { $tag = "h" . (5 - strlen($m->match)); $text = TransformInline(trim($m->postmatch)); $input->advance(); $this->_element = new Block_HtmlElement($tag, false, $text); - + return true; } } @@ -1259,7 +1259,7 @@ class Block_heading_wikicreole extends BlockMarkup { var $_re = '={2,6}'; - + function _match (&$input, $m) { $tag = "h" . strlen($m->match); // Remove spaces @@ -1270,7 +1270,7 @@ $input->advance(); $this->_element = new Block_HtmlElement($tag, false, $text); - + return true; } } @@ -1315,12 +1315,12 @@ var $_re = '<(?im)(?: div|span)(?:[^>]*)?>'; function _match (&$input, $m) { - if (substr($m->match,1,4) == 'span') { - $tag = 'span'; - } else { - $tag = 'div'; - } - // without last > + if (substr($m->match,1,4) == 'span') { + $tag = 'span'; + } else { + $tag = 'div'; + } + // without last > $argstr = substr(trim(substr($m->match,strlen($tag)+1)),0,-1); $pos = $input->getPos(); $pi = $content = $m->postmatch; @@ -1339,22 +1339,22 @@ $input->advance(); if (strstr($content, "\n")) $content = TransformText($content); - else + else $content = TransformInline($content); if (!$argstr) $args = false; else { $args = array(); while (preg_match("/(\w+)=(.+)/", $argstr, $m)) { - $k = $m[1]; $v = $m[2]; - if (preg_match("/^\"(.+?)\"(.*)$/", $v, $m)) { - $v = $m[1]; - $argstr = $m[2]; - } else { - preg_match("/^(\s+)(.*)$/", $v, $m); - $v = $m[1]; - $argstr = $m[2]; - } + $k = $m[1]; $v = $m[2]; + if (preg_match("/^\"(.+?)\"(.*)$/", $v, $m)) { + $v = $m[1]; + $argstr = $m[2]; + } else { + preg_match("/^(\s+)(.*)$/", $v, $m); + $v = $m[1]; + $argstr = $m[2]; + } if (trim($k) and trim($v)) $args[$k] = $v; } } @@ -1382,7 +1382,7 @@ } // WikiCreole /*if (!empty($markup) && $markup == 3) { - $text = ConvertFromCreole($text); + $text = ConvertFromCreole($text); }*/ // Expand leading tabs. $text = expand_tabs($text); @@ -1413,5 +1413,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/lib/CachedMarkup.php =================================================================== --- trunk/lib/CachedMarkup.php 2011年03月04日 16:43:43 UTC (rev 7963) +++ trunk/lib/CachedMarkup.php 2011年03月05日 17:05:30 UTC (rev 7964) @@ -27,12 +27,12 @@ function CacheableMarkup($content, $basepage) { $this->_basepage = $basepage; - $this->_buf = ''; - $this->_content = array(); - $this->_append($content); - if ($this->_buf != '') - $this->_content[] = $this->_buf; - unset($this->_buf); + $this->_buf = ''; + $this->_content = array(); + $this->_append($content); + if ($this->_buf != '') + $this->_content[] = $this->_buf; + unset($this->_buf); } function pack() { @@ -88,15 +88,15 @@ E_USER_WARNING); return false; } - + /** Get names of wikipages linked to. * * @return array of hashes { linkto=>pagename, relation=>pagename } */ function getWikiPageLinks() { - $links = array(); - foreach ($this->_content as $item) { - if (!isa($item, 'Cached_DynamicContent')) + $links = array(); + foreach ($this->_content as $item) { + if (!isa($item, 'Cached_DynamicContent')) continue; if (!($item_links = $item->getWikiPageLinks($this->_basepage))) continue; @@ -104,8 +104,8 @@ } // array_unique has a bug with hashes! // set_links checks for duplicates, array_merge does not - //return array_unique($links); - return $links; + //return array_unique($links); + return $links; } /** Get link info. @@ -116,63 +116,63 @@ * Returns an array of hashes. */ function getLinkInfo() { - $link = array(); - foreach ($this->_content as $link) { - if (! isa($link, 'Cached_Link')) - continue; - $info = $link->getLinkInfo($this->_basepage); - $links[$info->href] = $info; - } - return array_values($links); + $link = array(); + foreach ($this->_content as $link) { + if (! isa($link, 'Cached_Link')) + continue; + $info = $link->getLinkInfo($this->_basepage); + $links[$info->href] = $info; } + return array_values($links); + } function _append($item) { - if (is_array($item)) { - foreach ($item as $subitem) - $this->_append($subitem); - } - elseif (!is_object($item)) { - $this->_buf .= $this->_quote((string) $item); - } - elseif (isa($item, 'Cached_DynamicContent')) { - if ($this->_buf) { - $this->_content[] = $this->_buf; - $this->_buf = ''; - } - $this->_content[] = $item; - } - elseif (isa($item, 'XmlElement')) { - if ($item->isEmpty()) { - $this->_buf .= $item->emptyTag(); - } - else { - $this->_buf .= $item->startTag(); - foreach ($item->getContent() as $subitem) - $this->_append($subitem); - $this->_buf .= "</$item->_tag>"; + if (is_array($item)) { + foreach ($item as $subitem) + $this->_append($subitem); + } + elseif (!is_object($item)) { + $this->_buf .= $this->_quote((string) $item); + } + elseif (isa($item, 'Cached_DynamicContent')) { + if ($this->_buf) { + $this->_content[] = $this->_buf; + $this->_buf = ''; + } + $this->_content[] = $item; + } + elseif (isa($item, 'XmlElement')) { + if ($item->isEmpty()) { + $this->_buf .= $item->emptyTag(); + } + else { + $this->_buf .= $item->startTag(); + foreach ($item->getContent() as $subitem) + $this->_append($subitem); + $this->_buf .= "</$item->_tag>"; if (!$this->getDescription() and $item->getTag() == 'p') { // performance: when is this really needed? $this->_glean_description($item->asString()); } - } - if (!$item->isInlineElement()) - $this->_buf .= "\n"; - } - elseif (isa($item, 'XmlContent')) { - foreach ($item->getContent() as $item) - $this->_append($item); - } - elseif (method_exists($item, 'asXML')) { - $this->_buf .= $item->asXML(); - } - elseif (method_exists($item, 'asString')) { - $this->_buf .= $this->_quote($item->asString()); - } - else { - $this->_buf .= sprintf("==Object(%s)==", get_class($item)); - } + } + if (!$item->isInlineElement()) + $this->_buf .= "\n"; } + elseif (isa($item, 'XmlContent')) { + foreach ($item->getContent() as $item) + $this->_append($item); + } + elseif (method_exists($item, 'asXML')) { + $this->_buf .= $item->asXML(); + } + elseif (method_exists($item, 'asString')) { + $this->_buf .= $this->_quote($item->asString()); + } + else { + $this->_buf .= sprintf("==Object(%s)==", get_class($item)); + } + } function _glean_description($text) { static $two_sentences; @@ -181,7 +181,7 @@ . ".*" . "[.?!][\")]*\s*[\"(]*([[:upper:])]|$)"; } - + if (!isset($this->_description) and preg_match("/$two_sentences/sx", $text)) $this->_description = preg_replace("/\s*\n\s*/", " ", trim($text)); } @@ -204,12 +204,12 @@ function getDescription () { return isset($this->_description) ? $this->_description : ''; } - + function asXML () { - $xml = ''; + $xml = ''; $basepage = $this->_basepage; - - foreach ($this->_content as $item) { + + foreach ($this->_content as $item) { if (is_string($item)) { $xml .= $item; } @@ -224,15 +224,15 @@ else { $xml .= $item->asXML(); } - } - return $xml; } + return $xml; + } function printXML () { $basepage = $this->_basepage; // _content might be changed from a plugin (CreateToc) - for ($i=0; $i < count($this->_content); $i++) { - $item = $this->_content[$i]; + for ($i=0; $i < count($this->_content); $i++) { + $item = $this->_content[$i]; if (is_string($item)) { print $item; } @@ -240,8 +240,8 @@ check_php_version(5) ? 'Cached_DynamicContent' : 'cached_dynamiccontent')) - { // give the content the chance to know about itself or even - // to change itself + { // give the content the chance to know about itself or even + // to change itself $val = $item->expand($basepage, $this); if ($val) $val->printXML(); else trigger_error('empty item ' . print_r($item, true)); @@ -249,8 +249,8 @@ else { $item->printXML(); } - } } + } } /** @@ -262,7 +262,7 @@ class Cached_DynamicContent { function cache(&$cache) { - $cache[] = $this; + $cache[] = $this; } function expand($basepage, &$obj) { @@ -276,18 +276,18 @@ class XmlRpc_LinkInfo { function XmlRpc_LinkInfo($page, $type, $href, $relation = '') { - $this->page = $page; - $this->type = $type; - $this->href = $href; - $this->relation = $relation; - //$this->pageref = str_replace("/RPC2.php", "/index.php", $href); + $this->page = $page; + $this->type = $type; + $this->href = $href; + $this->relation = $relation; + //$this->pageref = str_replace("/RPC2.php", "/index.php", $href); } } class Cached_Link extends Cached_DynamicContent { function isInlineElement() { - return true; + return true; } /** Get link info (for XML-RPC support) @@ -296,17 +296,17 @@ * (See http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=WikiRPCInterface) */ function getLinkInfo($basepage) { - return new XmlRpc_LinkInfo($this->_getName($basepage), + return new XmlRpc_LinkInfo($this->_getName($basepage), $this->_getType(), $this->_getURL($basepage), $this->_getRelation($basepage)); } - + function _getURL($basepage) { - return $this->_url; + return $this->_url; } function __getRelation($basepage) { - return $this->_relation; + return $this->_relation; } } /* @@ -315,55 +315,55 @@ */ class Cached_InlinedImage extends Cached_DynamicContent { function isInlineElement() { - return true; + return true; } function _getURL($basepage) { - return $this->_url; + return $this->_url; } // TODO: fix interwiki inline links in case of static dumps function expand($basepage, &$markup) { - global $WikiTheme; - $this->_basepage = $basepage; - $label = isset($this->_label) ? $this->_label : false; - if ($WikiTheme->DUMP_MODE) { + global $WikiTheme; + $this->_basepage = $basepage; + $label = isset($this->_label) ? $this->_label : false; + if ($WikiTheme->DUMP_MODE) { // In case of static dumps we need to check if we should // inline the image or not: external: keep link, internal: copy locally - return LinkImage($label); - } else { - return LinkImage($label); - } + return LinkImage($label); + } else { + return LinkImage($label); } + } } class Cached_WikiLink extends Cached_Link { function Cached_WikiLink ($page, $label = false, $anchor = false) { - $this->_page = $page; - /* ":DontStoreLink" */ - if (substr($this->_page,0,1) == ':') { - $this->_page = substr($this->_page,1); - $this->_nolink = true; - } + $this->_page = $page; + /* ":DontStoreLink" */ + if (substr($this->_page,0,1) == ':') { + $this->_page = substr($this->_page,1); + $this->_nolink = true; + } if ($anchor) $this->_anchor = $anchor; if ($label and $label != $page) $this->_label = $label; - $this->_basepage = false; + $this->_basepage = false; } function _getType() { return 'internal'; } - + function getPagename($basepage) { $page = new WikiPageName($this->_page, $basepage); - if ($page->isValid()) return $page->name; - else return false; + if ($page->isValid()) return $page->name; + else return false; } function getWikiPageLinks($basepage) { if ($basepage == '') return false; - if (isset($this->_nolink)) return false; + if (isset($this->_nolink)) return false; if ($link = $this->getPagename($basepage)) return array(array('linkto' => $link)); else @@ -371,41 +371,41 @@ } function _getName($basepage) { - return $this->getPagename($basepage); + return $this->getPagename($basepage); } function _getURL($basepage) { - return WikiURL($this->getPagename($basepage)); - //return WikiURL($this->getPagename($basepage), false, 'abs_url'); + return WikiURL($this->getPagename($basepage)); + //return WikiURL($this->getPagename($basepage), false, 'abs_url'); } function expand($basepage, &$markup) { - global $WikiTheme; - $this->_basepage = $basepage; - $label = isset($this->_label) ? $this->_label : false; - $anchor = isset($this->_anchor) ? (string)$this->_anchor : ''; + global $WikiTheme; + $this->_basepage = $basepage; + $label = isset($this->_label) ? $this->_label : false; + $anchor = isset($this->_anchor) ? (string)$this->_anchor : ''; $page = new WikiPageName($this->_page, $basepage, $anchor); - if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) { - if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) - return HTML($label ? $label : $page->getName()); - } + if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) { + if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) + return HTML($label ? $label : $page->getName()); + } if ($page->isValid()) return WikiLink($page, 'auto', $label); - else return HTML($label); + else return HTML($label); } function asXML() { - global $WikiTheme; - $label = isset($this->_label) ? $this->_label : false; - $anchor = isset($this->_anchor) ? (string)$this->_anchor : ''; - //TODO: need basepage for subpages like /Remove (within CreateTOC) + global $WikiTheme; + $label = isset($this->_label) ? $this->_label : false; + $anchor = isset($this->_anchor) ? (string)$this->_anchor : ''; + //TODO: need basepage for subpages like /Remove (within CreateTOC) $page = new WikiPageName($this->_page, $this->_basepage, $anchor); - if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { - if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) - return $label ? $label : $page->getName(); - } - $link = WikiLink($page, 'auto', $label); - return $link->asXML(); + if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { + if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) + return $label ? $label : $page->getName(); } + $link = WikiLink($page, 'auto', $label); + return $link->asXML(); + } function asString() { if (isset($this->_label)) @@ -417,54 +417,54 @@ class Cached_WikiLinkIfKnown extends Cached_WikiLink { function Cached_WikiLinkIfKnown ($moniker) { - $this->_page = $moniker; + $this->_page = $moniker; } function expand($basepage, &$markup) { - global $WikiTheme; - if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { - if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) - return HTML($label ? $label : $page->getName()); - } + global $WikiTheme; + if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { + if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) + return HTML($label ? $label : $page->getName()); + } return WikiLink($this->_page, 'if_known'); } -} +} class Cached_SpellCheck extends Cached_WikiLink { function Cached_SpellCheck ($word, $suggs) { - $this->_page = $word; - $this->suggestions = $suggs; + $this->_page = $word; + $this->suggestions = $suggs; } function expand($basepage, &$markup) { $link = HTML::a(array('class' => 'spell-wrong', - 'title' => 'SpellCheck: '.join(', ', $this->suggestions), - 'name' => $this->_page), - $this->_page); + 'title' => 'SpellCheck: '.join(', ', $this->suggestions), + 'name' => $this->_page), + $this->_page); return $link; } -} - +} + class Cached_PhpwikiURL extends Cached_DynamicContent { function Cached_PhpwikiURL ($url, $label) { - $this->_url = $url; + $this->_url = $url; if ($label) $this->_label = $label; } function isInlineElement() { - return true; + return true; } function expand($basepage, &$markup) { - global $WikiTheme; + global $WikiTheme; $label = isset($this->_label) ? $this->_label : false; - if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { - if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) - return HTML($label ? $label : $page->getName()); - } + if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { + if (!in_array($this->_page, $WikiTheme->VALID_LINKS)) + return HTML($label ? $label : $page->getName()); + } return LinkPhpwikiURL($this->_url, $label, $basepage); } @@ -479,7 +479,7 @@ return $this->_label; return $this->_url; } -} +} /* * Relations (::) are named links to pages. @@ -494,21 +494,21 @@ class Cached_SemanticLink extends Cached_WikiLink { function Cached_SemanticLink ($url, $label=false) { - $this->_url = $url; + $this->_url = $url; if ($label && $label != $url) $this->_label = $label; $this->_expandurl($this->_url); } function isInlineElement() { - return true; + return true; } function getPagename($basepage) { - if (!isset($this->_page)) return false; - $page = new WikiPageName($this->_page, $basepage); - if ($page->isValid()) return $page->name; - else return false; + if (!isset($this->_page)) return false; + $page = new WikiPageName($this->_page, $basepage); + if ($page->isValid()) return $page->name; + else return false; } /* Add relation to the link table. @@ -516,14 +516,14 @@ */ function getWikiPageLinks($basepage) { if ($basepage == '') return false; - if (!isset($this->_page) and isset($this->_attribute)) { + if (!isset($this->_page) and isset($this->_attribute)) { // An attribute: we store it in the basepage now, to fill the cache for page->save // TODO: side-effect free query $page = $GLOBALS['request']->getPage($basepage); $page->setAttribute($this->_relation, $this->_attribute); $this->_page = $basepage; return array(array('linkto' => '', 'relation' => $this->_relation)); - } + } if ($link = $this->getPagename($basepage)) return array(array('linkto' => $link, 'relation' => $this->_relation)); else @@ -535,67 +535,67 @@ if (!preg_match('/^ ([^:]+) (:[:=]) (.+) $/x', $url, $m)) { return HTML::span(array('class' => 'error'), _("BAD semantic relation link")); } - $this->_relation = urldecode($m[1]); + $this->_relation = urldecode($m[1]); $is_attribute = ($m[2] == ':='); if ($is_attribute) { $this->_attribute = urldecode($m[3]); - // since this stored in the markup cache, we are extra sensible - // not to store false empty stuff. - $units = new Units(); + // since this stored in the markup cache, we are extra sensible + // not to store false empty stuff. + $units = new Units(); if (!DISABLE_UNITS and !$units->errcode) - { - $this->_attribute_base = $units->Definition($this->_attribute); - $this->_unit = $units->baseunit($this->_attribute); - } + { + $this->_attribute_base = $units->Definition($this->_attribute); + $this->_unit = $units->baseunit($this->_attribute); + } } else { - $this->_page = urldecode($m[3]); + $this->_page = urldecode($m[3]); } - return $m; + return $m; } function _expand($url, $label = false) { - global $WikiTheme; - $m = $this->_expandurl($url); + global $WikiTheme; + $m = $this->_expandurl($url); $class = 'wiki'; // do not link to the attribute value, but to the attribute $is_attribute = ($m[2] == ':='); - if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { - if (isset($this->_page) and !in_array($this->_page, $WikiTheme->VALID_LINKS)) - return HTML($label ? $label : ($is_attribute ? $this->_relation : $this->_page)); - } - if ($is_attribute) - $title = isset($this->_attribute_base) - ? sprintf(_("Attribute %s, base value: %s"), $this->_relation, $this->_attribute_base) - : sprintf(_("Attribute %s, value: %s"), $this->_relation, $this->_attribute); + if ($WikiTheme->DUMP_MODE and $WikiTheme->VALID_LINKS) { + if (isset($this->_page) and !in_array($this->_page, $WikiTheme->VALID_LINKS)) + return HTML($label ? $label : ($is_attribute ? $this->_relation : $this->_page)); + } + if ($is_attribute) + $title = isset($this->_attribute_base) + ? sprintf(_("Attribute %s, base value: %s"), $this->_relation, $this->_attribute_base) + : sprintf(_("Attribute %s, value: %s"), $this->_relation, $this->_attribute); if ($label) { return HTML::span - ( - HTML::a(array('href' => WikiURL($is_attribute ? $this->_relation : $this->_page), - 'class' => "wiki ".($is_attribute ? "attribute" : "relation"), - 'title' => $is_attribute - ? $title - : sprintf(_("Relation %s to page %s"), $this->_relation, $this->_page)), - $label) - ); + ( + HTML::a(array('href' => WikiURL($is_attribute ? $this->_relation : $this->_page), + 'class' => "wiki ".($is_attribute ? "attribute" : "relation"), + 'title' => $is_attribute + ? $title + : sprintf(_("Relation %s to page %s"), $this->_relation, $this->_page)), + $label) + ); } elseif ($is_attribute) { return HTML::span - ( - HTML::a(array('href' => WikiURL($this->_relation), - 'class' => "wiki attribute", - 'title' => $title), - $url) - ); + ( + HTML::a(array('href' => WikiURL($this->_relation), + 'class' => "wiki attribute", + 'title' => $title), + $url) + ); } else { return HTML::span - ( - HTML::a(array('href' => WikiURL($this->_relation), - 'class' => "wiki relation"), - $this->_relation), - HTML::span(array('class'=>'relation-symbol'), $m[2]), - HTML::a(array('href' => WikiURL($this->_page), - 'class' => "wiki"), - $this->_page) - ); + ( + HTML::a(array('href' => WikiURL($this->_relation), + 'class' => "wiki relation"), + $this->_relation), + HTML::span(array('class'=>'relation-symbol'), $m[2]), + HTML::a(array('href' => WikiURL($this->_page), + 'class' => "wiki"), + $this->_page) + ); } } @@ -623,8 +623,8 @@ class Cached_SearchHighlight extends Cached_DynamicContent { function Cached_SearchHighlight ($word, $engine) { - $this->_word = $word; - $this->engine = $engine; + $this->_word = $word; + $this->engine = $engine; } function expand($basepage, &$markup) { @@ -632,12 +632,12 @@ 'title' => _("Found by ") . $this->engine), $this->_word); } -} - +} + class Cached_ExternalLink extends Cached_Link { function Cached_ExternalLink($url, $label=false) { - $this->_url = $url; + $this->_url = $url; if ($label && $label != $url) $this->_label = $label; } @@ -645,17 +645,17 @@ function _getType() { return 'external'; } - + function _getName($basepage) { - $label = isset($this->_label) ? $this->_label : false; - return ($label and is_string($label)) ? $label : $this->_url; + $label = isset($this->_label) ? $this->_label : false; + return ($label and is_string($label)) ? $label : $this->_url; } function expand($basepage, &$markup) { global $request; - $label = isset($this->_label) ? $this->_label : false; - $link = LinkURL($this->_url, $label); + $label = isset($this->_label) ? $this->_label : false; + $link = LinkURL($this->_url, $label); if (GOOGLE_LINKS_NOFOLLOW) { // Ignores nofollow when the user who saved the page was authenticated. @@ -675,26 +675,26 @@ } class Cached_InterwikiLink extends Cached_ExternalLink { - + function Cached_InterwikiLink($link, $label=false) { - $this->_link = $link; + $this->_link = $link; if ($label) $this->_label = $label; } function getPagename($basepage) { list ($moniker, $page) = explode (":", $this->_link, 2); - $page = new WikiPageName($page, $basepage); - if ($page->isValid()) return $page->name; - else return false; + $page = new WikiPageName($page, $basepage); + if ($page->isValid()) return $page->name; + else return false; } function getWikiPageLinks($basepage) { if ($basepage == '') return false; - /* ":DontStoreLink" */ - if (substr($this->_link,0,1) == ':') return false; - /* store only links to valid pagenames */ - $dbi = $GLOBALS['request']->getDbh(); + /* ":DontStoreLink" */ + if (substr($this->_link,0,1) == ':') return false; + /* store only links to valid pagenames */ + $dbi = $GLOBALS['request']->getDbh(); if ($link = $this->getPagename($basepage) and $dbi->isWikiPage($link)) { return array(array('linkto' => $link)); } else { @@ -703,31 +703,31 @@ } function _getName($basepage) { - $label = isset($this->_label) ? $this->_label : false; - return ($label and is_string($label)) ? $label : $this->_link; + $label = isset($this->_label) ? $this->_label : false; + return ($label and is_string($label)) ? $label : $this->_link; } - + /* there may be internal interwiki links also */ function _getType() { return $this->getPagename(false) ? 'internal' : 'external'; } function _getURL($basepage) { - $link = $this->expand($basepage, $this); - return $link->getAttr('href'); + $link = $this->expand($basepage, $this); + return $link->getAttr('href'); } function expand($basepage, &$markup) { - global $WikiTheme; - $intermap = getInterwikiMap(); - $label = isset($this->_label) ? $this->_label : false; - //FIXME: check Upload: inlined images - if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) { - if (!in_array($this->_link, $WikiTheme->VALID_LINKS)) - return HTML($label ? $label : $this->_link); - } - return $intermap->link($this->_link, $label); + global $WikiTheme; + $intermap = getInterwikiMap(); + $label = isset($this->_label) ? $this->_label : false; + //FIXME: check Upload: inlined images + if ($WikiTheme->DUMP_MODE and !empty($WikiTheme->VALID_LINKS)) { + if (!in_array($this->_link, $WikiTheme->VALID_LINKS)) + return HTML($label ? $label : $this->_link); } + return $intermap->link($this->_link, $label); + } function asString() { if (isset($this->_label)) @@ -742,9 +742,9 @@ class Cached_UserLink extends Cached_WikiLink { function expand($basepage, &$markup) { $label = isset($this->_label) ? $this->_label : false; - $anchor = isset($this->_anchor) ? (string)$this->_anchor : ''; + $anchor = isset($this->_anchor) ? (string)$this->_anchor : ''; $page = new WikiPageName($this->_page, $basepage, $anchor); - $link = WikiLink($page, 'auto', $label); + $link = WikiLink($page, 'auto', $label); // $link = HTML::a(array('href' => $PageName)); $link->setContent(PossiblyGlueIconToText('wikiuser', $this->_page)); $link->setAttr('class', 'wikiuser'); @@ -760,8 +760,8 @@ class Cached_PluginInvocation extends Cached_DynamicContent { function Cached_PluginInvocation ($pi) { - $this->_pi = $pi; - $loader = $this->_getLoader(); + $this->_pi = $pi; + $loader = $this->_getLoader(); if (is_array($plugin_cmdline = $loader->parsePI($pi)) and $plugin_cmdline[1]) { $this->pi_name = $plugin_cmdline[0]; // plugin, plugin-form, plugin-list $this->name = $plugin_cmdline[1]->getName(); @@ -771,9 +771,9 @@ function setTightness($top, $bottom) { } - + function isInlineElement() { - return false; + return false; } function expand($basepage, &$markup) { @@ -795,9 +795,9 @@ function & _getLoader() { static $loader = false; - if (!$loader) { + if (!$loader) { include_once('lib/WikiPlugin.php'); - $loader = new WikiPluginLoader; + $loader = new WikiPluginLoader; } return $loader; } @@ -809,5 +809,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/lib/Captcha.php =================================================================== --- trunk/lib/Captcha.php 2011年03月04日 16:43:43 UTC (rev 7963) +++ trunk/lib/Captcha.php 2011年03月05日 17:05:30 UTC (rev 7964) @@ -11,7 +11,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This File is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -35,20 +35,20 @@ function captchaword() { if ( ! $this->request->getSessionVar('captchaword')) { - $this->request->setSessionVar('captchaword', $this->get_word()); - } + $this->request->setSessionVar('captchaword', $this->get_word()); + } return $this->request->getSessionVar('captchaword'); } function Failed () { if ($this->request->getSessionVar('captcha_ok') == true) return false; - + if ( ! array_key_exists ( 'captcha_input', $this->meta ) or ($this->request->getSessionVar('captchaword') and ($this->request->getSessionVar('captchaword') != $this->meta['captcha_input']))) return true; - + $this->request->setSessionVar('captcha_ok', true); return false; } @@ -70,9 +70,9 @@ return $el; } - function get_word () { + function get_word () { if (USE_CAPTCHA_RANDOM_WORD) - return get_dictionary_word(); + return get_dictionary_word(); else return rand_ascii_readable($this->length); // lib/stdlib.php } @@ -99,10 +99,10 @@ // Draw the Spiral function spiral( &$im, $origin_x = 100, $origin_y = 100, $r = 0, $g = 0, $b = 0 ) { $theta = 1; - $thetac = 6; - $radius = 15; - $circles = 10; - $points = 35; + $thetac = 6; + $radius = 15; + $circles = 10; + $points = 35; $lcolor = imagecolorallocate( $im, $r, $g, $b ); for( $i = 0; $i < ( $circles * $points ) - 1; $i++ ) { $theta = $theta + $thetac; @@ -121,7 +121,7 @@ function image ( $word ) { $width =& $this->width; $height =& $this->height; - + // Create the Image $jpg = ImageCreate($width,$height); $bg = ImageColorAllocate($jpg,255,255,255); @@ -134,7 +134,7 @@ $x = rand(10, 30); $y = rand(50, $height-20); //50-60 - + // randomize the chars for ($i=0; $i < strlen($word); $i++) { $angle += rand(-5, 5); @@ -145,8 +145,8 @@ if ( $y < 10 ) $y = 11; elseif ( $y > $height-10 ) $y = $height-11; $x += rand($size, $size*2); - imagettftext($jpg, $size, $angle, $x, $y, $tx, - realpath(findfile("lib/captcha/Vera.ttf")), + imagettftext($jpg, $size, $angle, $x, $y, $tx, + realpath(findfile("lib/captcha/Vera.ttf")), $word[$i]); } @@ -159,19 +159,19 @@ imageline($jpg, 0,$height-1,$width-1,$height-1,$tx); imageline($jpg, $width-1,0,$width-1,$height-1,$tx); - if (function_exists("ImageJpeg")) { - header("Content-type: image/jpeg"); - ImageJpeg($jpg); - } elseif (function_exists("ImagePNG")) { - header("Content-type: image/png"); - ImagePNG($jpg); - } elseif (function_exists("ImageGIF")) { - header("Content-type: image/gif"); - ImageGIF($jpg); - } else { - trigger_error("missing GD bitmap support", E_USER_WARNING); - } + if (function_exists("ImageJpeg")) { + header("Content-type: image/jpeg"); + ImageJpeg($jpg); + } elseif (function_exists("ImagePNG")) { + header("Content-type: image/png"); + ImagePNG($jpg); + } elseif (function_exists("ImageGIF")) { + header("Content-type: image/gif"); + ImageGIF($jpg); + } else { + trigger_error("missing GD bitmap support", E_USER_WARNING); } + } } @@ -181,5 +181,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/lib/DbSession.php =================================================================== --- trunk/lib/DbSession.php 2011年03月04日 16:43:43 UTC (rev 7963) +++ trunk/lib/DbSession.php 2011年03月05日 17:05:30 UTC (rev 7964) @@ -29,7 +29,7 @@ $db_type = $dbh->getParam('dbtype'); if (isa($dbh, 'WikiDB')) { @include_once("lib/DbSession/".$db_type.".php"); - + $class = "DbSession_".$db_type; if (class_exists($class)) { // dba has no ->_dbh, so this is used for the session link @@ -43,7 +43,7 @@ $db_type), E_USER_WARNING); return false; } - + function currentSessions() { return $this->_backend->currentSessions(); } Modified: trunk/lib/DbaDatabase.php =================================================================== --- trunk/lib/DbaDatabase.php 2011年03月04日 16:43:43 UTC (rev 7963) +++ trunk/lib/DbaDatabase.php 2011年03月05日 17:05:30 UTC (rev 7964) @@ -18,9 +18,9 @@ if (!in_array($handler, dba_handlers())) $this->_error( sprintf( - _("The DBA handler %s is unsupported!")."\n". - _("Supported handlers are: %s"), - $handler, join(",",dba_handlers()))); + _("The DBA handler %s is unsupported!")."\n". + _("Supported handlers are: %s"), + $handler, join(",",dba_handlers()))); } $this->readonly = false; if ($mode) @@ -30,11 +30,11 @@ function set_timeout($timeout) { $this->_timeout = $timeout; } - + function open($mode = 'w') { if ($this->_dbh) return; // already open. - + $watchdog = $this->_timeout; global $ErrorManager; @@ -53,9 +53,9 @@ if ((strlen($mode) == 1)) { // PHP 4.3.x Windows lock bug workaround: http://bugs.php.net/bug.php?id=23975 if (isWindows()) { - $mode .= "-"; // suppress locking, or - } elseif ($this->_handler != 'gdbm') { // gdbm does it internally - $mode .= "d"; // else use internal locking + $mode .= "-"; // suppress locking, or + } elseif ($this->_handler != 'gdbm') { // gdbm does it internally + $mode .= "d"; // else use internal locking } } while (($dbh = dba_open($this->_file, $mode, $this->_handler)) < 1) { @@ -96,7 +96,7 @@ $this->readonly = true; if (!file_exists($this->_file)) { $ErrorManager->handleError($error); - flush(); + flush(); } } else { @@ -116,7 +116,7 @@ function exists($key) { return dba_exists($key, $this->_dbh); } - + function fetch($key) { $val = dba_fetch($key, $this->_dbh); if ($val === false) @@ -134,7 +134,7 @@ return $this->_error("replace($key)"); } - + function firstkey() { return dba_firstkey($this->_dbh); } @@ -182,7 +182,7 @@ return $this->_error("optimize()"); return 1; } - + function _error($mes) { //trigger_error("DbaDatabase: $mes", E_USER_WARNING); //return false; @@ -207,5 +207,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/lib/DbaListSet.php =================================================================== --- trunk/lib/DbaListSet.php 2011年03月04日 16:43:43 UTC (rev 7963) +++ trunk/lib/DbaListSet.php 2011年03月05日 17:05:30 UTC (rev 7964) @@ -52,7 +52,7 @@ list( $prev , , ) = explode(':', $this->_dbh->fetch(intval($i)), 3); return intval($prev); } - + function exists($i) { $i = intval($i); return $i && $this->_dbh->exists($i); @@ -68,7 +68,7 @@ list($prev, $next,) = explode(':', $dbh->fetch(intval($i)), 3); $dbh->replace($i, "$prev:$next:$data"); } - + function insert_before($i, $data) { assert(intval($i)); return $this->_insert_before_nc($i, $data); @@ -78,7 +78,7 @@ assert(intval($i)); return $this->_insert_after_nc($i, $data); } - + function append($seq, $data) { $key = "s" . urlencode($seq); $this->_insert_before_nc($key, $data); @@ -88,7 +88,7 @@ $key = "s" . urlencode($seq); $this->_insert_after_nc($key, $data); } - + function _insert_before_nc($i, &$data) { $newkey = $this->_new_key();... [truncated message content]
Revision: 7963 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7963&view=rev Author: vargenau Date: 2011年03月04日 16:43:43 +0000 (2011年3月04日) Log Message: ----------- Remove unused function Modified Paths: -------------- trunk/lib/stdlib.php Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2011年03月04日 16:30:15 UTC (rev 7962) +++ trunk/lib/stdlib.php 2011年03月04日 16:43:43 UTC (rev 7963) @@ -150,16 +150,6 @@ } /** - * Returns a name for the WIKI_ID cookie that should be unique on the host. - * But for it to be unique you must have set a unique WIKI_NAME in your - * configuration file. - * @return string The name of the WIKI_ID cookie to use for this wiki. - */ -function GetCookieName() { - return preg_replace("/[^\d\w]/", "_", WIKI_NAME) . "_WIKI_ID"; -} - -/** * Generates a valid URL for a given Wiki pagename. * @param mixed $pagename If a string this will be the name of the Wiki page to link to. * If a WikiDB_Page object function will extract the name to link to. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7962 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7962&view=rev Author: vargenau Date: 2011年03月04日 16:30:15 +0000 (2011年3月04日) Log Message: ----------- Remove too optimistic comments Modified Paths: -------------- trunk/themes/MonoBook/themeinfo.php Modified: trunk/themes/MonoBook/themeinfo.php =================================================================== --- trunk/themes/MonoBook/themeinfo.php 2011年03月04日 16:21:08 UTC (rev 7961) +++ trunk/themes/MonoBook/themeinfo.php 2011年03月04日 16:30:15 UTC (rev 7962) @@ -15,13 +15,6 @@ * * Problems with IE: signin is at the left. * - * We don't (yet) support all mediawiki UI options, but we try to. - * Besides that, maybe the mediawiki folks will see how much better phpwiki - * will scale, esp. with a true database, not just mysql. - * Technically phpwiki has about 2-3 years advantage and our plugins - * cannot destroy the layout. - * Anyway, the WikiParser perl module (and our php version) will be able to import - * and convert back and forth. */ require_once('lib/WikiTheme.php'); require_once('themes/wikilens/themeinfo.php'); @@ -136,20 +129,8 @@ /* * Link icons. */ - /* - $this->setLinkIcon('http'); - $this->setLinkIcon('https'); - $this->setLinkIcon('ftp'); - $this->setLinkIcon('mailto'); - //$this->setLinkIcon('interwiki'); - */ $this->setLinkIcon('wikiuser'); - //$this->setLinkIcon('*', 'url'); - // front or after - //$this->setLinkIconAttr('after'); - //$this->setButtonSeparator("\n | "); - /** * WikiWords can automatically be split by inserting spaces between * the words. The default is to leave WordsSmashedTogetherLikeSo. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7961 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7961&view=rev Author: vargenau Date: 2011年03月04日 16:21:08 +0000 (2011年3月04日) Log Message: ----------- Remove unused functions Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2011年03月04日 13:58:21 UTC (rev 7960) +++ trunk/lib/WikiTheme.php 2011年03月04日 16:21:08 UTC (rev 7961) @@ -23,8 +23,6 @@ * and more formatting. */ -//require_once(dirname(__FILE__).'/HtmlElement.php'); - /** * Make a link to a wiki page (in this wiki). * @@ -699,7 +697,6 @@ // //////////////////////////////////////////////////////////////// var $_imageAliases = array(); - var $_imageAlt = array(); /** * @@ -713,13 +710,6 @@ $this->_imageAliases[$alias] = $image_name; } - function addImageAlt ($alias, $alt_text) { - $this->_imageAlt[$alias] = $alt_text; - } - function getImageAlt ($alias) { - return $this->_imageAlt[$alias]; - } - function getImageURL ($image) { $aliases = &$this->_imageAliases; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 7960 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7960&view=rev Author: vargenau Date: 2011年03月04日 13:58:21 +0000 (2011年3月04日) Log Message: ----------- No tabs Modified Paths: -------------- trunk/ImageTile.php trunk/SOAP.php trunk/configurator.php trunk/lib/IniConfig.php trunk/wikiadmin.php Modified: trunk/ImageTile.php =================================================================== --- trunk/ImageTile.php 2011年03月03日 18:02:58 UTC (rev 7959) +++ trunk/ImageTile.php 2011年03月04日 13:58:21 UTC (rev 7960) @@ -13,9 +13,9 @@ if (preg_match('/DATA_PATH/',$config[0])) { list($key,$value) = explode('=', $config[0]); $data_path = trim($value).'/'; - break; - } + break; } + } fclose($fp); @mkdir($data_path."uploads/thumbs",0775); $file = $data_path."uploads/thumbs/image_" . ((float)$usec + (float)$sec); Modified: trunk/SOAP.php =================================================================== --- trunk/SOAP.php 2011年03月03日 18:02:58 UTC (rev 7959) +++ trunk/SOAP.php 2011年03月04日 13:58:21 UTC (rev 7960) @@ -64,7 +64,7 @@ $request->_user = new WikiUser($request, $credentials['username']); } $request->_user->AuthCheck(array('userid' => $credentials['username'], - 'passwd' => $credentials['password'])); + 'passwd' => $credentials['password'])); if (! mayAccessPage ($access, $pagename)) $server->fault(401,'',"no permission"); } @@ -86,12 +86,12 @@ $server->soapaction = $url; // soap_transport_http $actions = array('getPageContent','getPageRevision','getCurrentRevision', - 'getPageMeta','doSavePage','getAllPagenames', - 'getBackLinks','doTitleSearch','doFullTextSearch', - 'getRecentChanges','listLinks','listPlugins', - 'getPluginSynopsis','callPlugin','listRelations', - 'linkSearch' - ); + 'getPageMeta','doSavePage','getAllPagenames', + 'getBackLinks','doTitleSearch','doFullTextSearch', + 'getRecentChanges','listLinks','listPlugins', + 'getPluginSynopsis','callPlugin','listRelations', + 'linkSearch' + ); foreach ($actions as $action) { $server->register($actions); $server->operations[$actions]['soapaction'] = $url; @@ -214,16 +214,16 @@ checkCredentials($server,$credentials,'view',_("RecentChanges")); $dbi = WikiDB::open($GLOBALS['DBParams']); $params = array('limit' => $limit, 'since' => $since, - 'include_minor_revisions' => $include_minor); + 'include_minor_revisions' => $include_minor); $page_iter = $dbi->mostRecent($params); $pages = array(); while ($page = $page_iter->next()) { $pages[] = array('pagename' => $page->getName(), - 'lastModified' => $page->get('mtime'), - 'author' => $page->get('author'), - 'summary' => $page->get('summary'), // added with 1.3.13 - 'version' => $page->getVersion() - ); + 'lastModified' => $page->get('mtime'), + 'author' => $page->get('author'), + 'summary' => $page->get('summary'), // added with 1.3.13 + 'version' => $page->getVersion() + ); } return $pages; } @@ -236,8 +236,8 @@ $linkiterator = $page->getPageLinks(); $links = array(); while ($currentpage = $linkiterator->next()) { - if ($currentpage->exists()) - $links[] = array('pagename' => $currentpage->getName()); + if ($currentpage->exists()) + $links[] = array('pagename' => $currentpage->getName()); } return $links; } @@ -298,8 +298,8 @@ $pagelist = $p->run($dbi, $pluginargs, $request, $basepage); $pages = array(); if (is_object($pagelist) and isa($pagelist, 'PageList')) { - foreach ($pagelist->pageNames() as $name) - $pages[] = array('pagename' => $name); + foreach ($pagelist->pageNames() as $name) + $pages[] = array('pagename' => $name); } return $pages; } @@ -322,8 +322,8 @@ $only_attributes = $option & 2 and !($option & 1); $sorted = !($option & 4); return $dbh->listRelations($also_attributes, - $only_attributes, - $sorted); + $only_attributes, + $sorted); } // some basic semantic search function linkSearch($linktype, $search, $pages="*", $relation="*", $credentials=false) { @@ -334,17 +334,17 @@ $pagequery = new TextSearchQuery($pages); $linkquery = new TextSearchQuery($search); if ($linktype == 'relation') { - $relquery = new TextSearchQuery($relation); - $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery); + $relquery = new TextSearchQuery($relation); + $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery); } elseif ($linktype == 'attribute') { // only numeric search withh attributes! - $relquery = new TextSearchQuery($relation); - require_once("lib/SemanticWeb.php"); - // search: "population > 1 million and area < 200 km^2" relation="*" pages="*" - $linkquery = new SemanticAttributeSearchQuery($search, $relation); - $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery); + $relquery = new TextSearchQuery($relation); + require_once("lib/SemanticWeb.php"); + // search: "population > 1 million and area < 200 km^2" relation="*" pages="*" + $linkquery = new SemanticAttributeSearchQuery($search, $relation); + $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype, $relquery); } else { - // we already do have forward and backlinks as SOAP - $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype); + // we already do have forward and backlinks as SOAP + $links = $dbi->_backend->link_search($pagequery, $linkquery, $linktype); } return $links->asArray(); } @@ -357,5 +357,5 @@ // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil -// End: +// End: ?> Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2011年03月03日 18:02:58 UTC (rev 7959) +++ trunk/configurator.php 2011年03月04日 13:58:21 UTC (rev 7960) @@ -1,7 +1,7 @@ <?php // -*-php-*- $Id$ /* * Copyright 2002,2003,2005,2008-2010 $ThePhpWikiProgrammingTeam - * Copyright 2002 Martin Geisler <gim...@gi...> + * Copyright 2002 Martin Geisler <gim...@gi...> * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent * * This file is part of PhpWiki. @@ -12,19 +12,19 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * PhpWiki is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with PhpWiki; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /** - * Starts automatically the first time by IniConfig("config/config.ini") + * Starts automatically the first time by IniConfig("config/config.ini") * if it doesn't exist. * * DONE: @@ -40,24 +40,24 @@ * o parse_ini_file("config-dist.ini") for the commented vars * o check automatically for commented and optional vars * o fix _optional, to ignore existing config.ini and only use config-default.ini values - * o mixin class for commented + * o mixin class for commented * o fix SQL quotes, AUTH_ORDER quotes and file forward slashes * o posted values validation, extend js validation for sane DB values * o read config-dist.ini into sections, comments, and optional/required settings * * A file config/config.ini will be automatically generated, if writable. * - * NOTE: If you have a starterscript outside PHPWIKI_DIR but no - * config/config.ini yet (very unlikely!), you must define DATA_PATH in the - * starterscript, otherwise the webpath to configurator is unknown, and + * NOTE: If you have a starterscript outside PHPWIKI_DIR but no + * config/config.ini yet (very unlikely!), you must define DATA_PATH in the + * starterscript, otherwise the webpath to configurator is unknown, and * subsequent requests will fail. (POST to save the INI) */ global $HTTP_SERVER_VARS, $HTTP_POST_VARS, $tdwidth; -if (empty($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS']; -if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS']; -if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS']; -if (empty($_POST)) $_POST =& $GLOBALS['HTTP_POST_VARS']; +if (empty($_SERVER)) $_SERVER =& $GLOBALS['HTTP_SERVER_VARS']; +if (empty($_GET)) $_GET =& $GLOBALS['HTTP_GET_VARS']; +if (empty($_ENV)) $_ENV =& $GLOBALS['HTTP_ENV_VARS']; +if (empty($_POST)) $_POST =& $GLOBALS['HTTP_POST_VARS']; if (empty($configurator)) $configurator = "configurator.php"; @@ -66,9 +66,9 @@ $scriptname = str_replace('configurator.php', 'index.php', $_SERVER["SCRIPT_NAME"]); if (strstr($_SERVER["SCRIPT_NAME"],"/php")) { // cgi got this different if (defined('DATA_PATH')) - $scriptname = DATA_PATH . "/index.php"; + $scriptname = DATA_PATH . "/index.php"; else - $scriptname = str_replace('configurator.php', 'index.php', $_SERVER["PHP_SELF"]); + $scriptname = str_replace('configurator.php', 'index.php', $_SERVER["PHP_SELF"]); } $tdwidth = 700; @@ -81,22 +81,22 @@ function _http_user() { if (!isset($_SERVER)) $_SERVER = $GLOBALS['HTTP_SERVER_VARS']; - if (!empty($_SERVER['PHP_AUTH_USER'])) - return array($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']); - if (!empty($_SERVER['REMOTE_USER'])) - return array($_SERVER['REMOTE_USER'], $_SERVER['PHP_AUTH_PW']); + if (!empty($_SERVER['PHP_AUTH_USER'])) + return array($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']); + if (!empty($_SERVER['REMOTE_USER'])) + return array($_SERVER['REMOTE_USER'], $_SERVER['PHP_AUTH_PW']); if (!empty($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER'])) - return array($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER'], - $GLOBALS['HTTP_ENV_VARS']['PHP_AUTH_PW']); - if (!empty($GLOBALS['REMOTE_USER'])) - return array($GLOBALS['REMOTE_USER'], $GLOBALS['PHP_AUTH_PW']); - - // MsWindows IIS: - if (!empty($_SERVER['HTTP_AUTHORIZATION'])) { + return array($GLOBALS['HTTP_ENV_VARS']['REMOTE_USER'], + $GLOBALS['HTTP_ENV_VARS']['PHP_AUTH_PW']); + if (!empty($GLOBALS['REMOTE_USER'])) + return array($GLOBALS['REMOTE_USER'], $GLOBALS['PHP_AUTH_PW']); + + // MsWindows IIS: + if (!empty($_SERVER['HTTP_AUTHORIZATION'])) { list($userid, $passwd) = explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6))); return array($userid, $passwd); - } - return array('',''); + } + return array('',''); } function _http_logout() { if (!isset($_SERVER)) @@ -105,52 +105,52 @@ // better_srand(); $realm = microtime().rand(); header('WWW-Authenticate: Basic realm="'.WIKI_NAME.'"'); if (strstr(php_sapi_name(), 'apache')) - header('HTTP/1.0 401 Unauthorized'); - else + header('HTTP/1.0 401 Unauthorized'); + else header("Status: 401 Access Denied"); //IIS and CGI need that unset($GLOBALS['REMOTE_USER']); unset($_SERVER['PHP_AUTH_USER']); unset($_SERVER['PHP_AUTH_PW']); - trigger_error("Permission denied. Require ADMIN_USER.", E_USER_ERROR); - exit(); + trigger_error("Permission denied. Require ADMIN_USER.", E_USER_ERROR); + exit(); } } -// If config.ini exists, we require ADMIN_USER access by faking HttpAuth. +// If config.ini exists, we require ADMIN_USER access by faking HttpAuth. // So nobody can see or reset the password(s). if (file_exists($fs_config_file)) { // Require admin user if (!defined('ADMIN_USER') or !defined('ADMIN_PASSWD')) { - if (!function_exists("IniConfig")) { - include_once("lib/prepend.php"); - include_once("lib/IniConfig.php"); - } - IniConfig($fs_config_file); + if (!function_exists("IniConfig")) { + include_once("lib/prepend.php"); + include_once("lib/IniConfig.php"); + } + IniConfig($fs_config_file); } if (!defined('ADMIN_USER') or ADMIN_USER == '') { - trigger_error("Configuration problem:\nADMIN_USER not defined in \"$fs_config_file\".\n" - . "Cannot continue: You have to fix that manually.", E_USER_ERROR); - exit(); + trigger_error("Configuration problem:\nADMIN_USER not defined in \"$fs_config_file\".\n" + . "Cannot continue: You have to fix that manually.", E_USER_ERROR); + exit(); } list($admin_user, $admin_pw) = _http_user(); //$required_user = ADMIN_USER; if (empty($admin_user) or $admin_user != ADMIN_USER) { - _http_logout(); + _http_logout(); } // check password if (ENCRYPTED_PASSWD and function_exists('crypt')) { - if (crypt($admin_pw, ADMIN_PASSWD) != ADMIN_PASSWD) - _http_logout(); + if (crypt($admin_pw, ADMIN_PASSWD) != ADMIN_PASSWD) + _http_logout(); } elseif ($admin_pw != ADMIN_PASSWD) { _http_logout(); } } else { if (!function_exists("IniConfig")) { include_once("lib/prepend.php"); - include_once("lib/IniConfig.php"); + include_once("lib/IniConfig.php"); } $def_file = (substr(PHP_OS,0,3) == 'WIN') ? 'config\\config-default.ini' : 'config/config-default.ini'; $fs_def_file = dirname(__FILE__) . (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/') . $def_file; @@ -247,8 +247,8 @@ for (var i = 0; i < rows.length; i++) { var tr = rows[i]; if (tr.className == 'header') - if (!show || tr.id != show) - toggle_group(tr.id); + if (!show || tr.id != show) + toggle_group(tr.id); } // Select text in textarea upon focus @@ -258,7 +258,7 @@ area.addEventListener('focus', listener, false); } } - + --> </script> </head> @@ -282,7 +282,7 @@ * TO CHANGE THE CONFIGURATION OF YOUR PHPWIKI, DO *NOT* MODIFY THIS FILE! * more instructions go here * - * Todo: + * Todo: * * fix include_path * * eval config.ini to get the actual settings. */ @@ -305,8 +305,8 @@ * for the html version of the descriptive text. * * - Double-quotes and dollar signs in the descriptive text must be - * escaped: \" and \$. Instead of escaping double-quotes you can use - * single (') quotes for the enclosing quotes. + * escaped: \" and \$. Instead of escaping double-quotes you can use + * single (') quotes for the enclosing quotes. * * - Special characters like < and > must use html entities, * they will be converted back to characters for the final output. @@ -316,11 +316,11 @@ $preamble = " ; This is the main configuration file for PhpWiki in INI-style format. -; Note that certain characters are used as comment char and therefore +; Note that certain characters are used as comment char and therefore ; these entries must be in double-quotes. Such as \":\", \";\", \",\" and \"|\" ; Take special care for DBAUTH_ sql statements. (Part 3a) ; -; This file is divided into several parts: Each one has different configuration +; This file is divided into several parts: Each one has different configuration ; settings you can change; in all cases the default should work on your system, ; however, we recommend you tailor things to your particular setting. ; Here undefined definitions get defined by config-default.ini settings. @@ -341,7 +341,7 @@ if (substr(PHP_OS,0,3) == 'WIN') { $include_path = dirname(__FILE__) . ';' . ini_get('include_path'); if (strchr(ini_get('include_path'),'/')) - $include_path = strtr($include_path,'\\','/'); + $include_path = strtr($include_path,'\\','/'); } else { $include_path = dirname(__FILE__) . ':' . ini_get('include_path'); } @@ -369,12 +369,12 @@ $properties["WYSIWYG_BACKEND"] = new _define_selection( -'WYSIWYG_BACKEND', +'WYSIWYG_BACKEND', array('Wikiwyg' => 'Wikiwyg', 'tinymce' => 'tinymce', - 'FCKeditor' => 'FCKeditor', - 'spaw' => 'spaw', - 'htmlarea3' => 'htmlarea3', + 'FCKeditor' => 'FCKeditor', + 'spaw' => 'spaw', + 'htmlarea3' => 'htmlarea3', 'htmlarea2' => 'htmlarea2', )); @@ -446,11 +446,11 @@ $properties["Admin Password"] = new _define_password('ADMIN_PASSWD', ADMIN_PASSWD, " -You must set this! +You must set this! For heaven's sake pick a good password. If your version of PHP supports encrypted passwords, your password will be -automatically encrypted within the generated config file. +automatically encrypted within the generated config file. Use the \"Create Random Password\" button to create a good (random) password. ADMIN_PASSWD is ignored on HttpAuth", @@ -469,7 +469,7 @@ 'false' => "false. just record the address as given by the httpd server")); $properties["ZIP Dump Authentication"] = -new boolean_define_optional('ZIPDUMP_AUTH', +new boolean_define_optional('ZIPDUMP_AUTH', array('false' => "false. Everyone may download zip dumps", 'true' => "true. Only admin may download zip dumps")); @@ -502,14 +502,14 @@ $properties["Access Log SQL"] = new _define_selection( -'ACCESS_LOG_SQL', +'ACCESS_LOG_SQL', array('0' => 'disabled', '1' => 'read only', '2' => 'read + write')); $properties["Compress Output"] = new boolean_define_commented_optional -( 'COMPRESS_OUTPUT', +( 'COMPRESS_OUTPUT', array('' => 'undefined - GZIP compress when appropriate.', 'false' => 'Never compress output.', 'true' => 'Always try to compress output.')); @@ -525,7 +525,7 @@ HTTP CACHE_CONTROL This controls how PhpWiki sets the HTTP cache control -headers (Expires: and Cache-Control:) +headers (Expires: and Cache-Control:) Choose one of: <dl> @@ -579,7 +579,7 @@ $properties["Force PHP Database Sessions"] = new boolean_define_commented_optional -('USE_DB_SESSION', +('USE_DB_SESSION', array('false' => 'Disable database sessions, use files', 'true' => 'Enable database sessions')); @@ -663,7 +663,7 @@ <pre> unix(/var/lib/mysql/mysql.sock) </pre> -here. +here. mysql on Windows via named pipes might need 127.0.0.1"); $properties["SQL Database Name"] = @@ -678,7 +678,7 @@ $dsn_sqlstring = $dsn_sqltype."://{$dsn_sqluser}:{$dsn_sqlpass}@{$dsn_sqlhostorsock}/{$dsn_sqldbname}"; $properties["SQL dsn"] = -new unchangeable_define("DATABASE_DSN", +new unchangeable_define("DATABASE_DSN", $dsn_sqlstring, " Calculated from the settings above:"); @@ -698,7 +698,7 @@ $properties["DATABASE_PERSISTENT"] = new boolean_define_commented_optional -('DATABASE_PERSISTENT', +('DATABASE_PERSISTENT', array('false' => "Disabled", 'true' => "Enabled")); @@ -724,7 +724,7 @@ 'db4' => "DB4 - BerkeleyDB (Sleepycat) DB4."), " Use 'gdbm', 'dbm', 'db2', 'db3' or 'db4' depending on your DBA handler methods supported: <br /> " . (function_exists("dba_handlers") ? join(", ",dba_handlers()) : "") - . "\n\nBetter not use other hacks such as inifile, flatfile or cdb"); + . "\n\nBetter not use other hacks such as inifile, flatfile or cdb"); $properties["dba timeout"] = new numeric_define("DATABASE_TIMEOUT", DATABASE_TIMEOUT, " @@ -754,7 +754,7 @@ class a revision belongs in is determined by whether the author checked the \"this is a minor revision\" checkbox when they saved the page. - + There is, additionally, a third class of revisions: author revisions. The most recent non-mergable revision from each distinct author is and author revision. @@ -803,11 +803,11 @@ $properties["Major Edits: keep minimum days"] = new numeric_define('MAJOR_MIN_KEEP', MAJOR_MIN_KEEP, " -Default: Keep for unlimited time. +Default: Keep for unlimited time. Set to 0 to enable archive cleanup"); $properties["Minor Edits: keep minumum days"] = new numeric_define('MINOR_MIN_KEEP', MINOR_MIN_KEEP, " -Default: Keep for unlimited time. +Default: Keep for unlimited time. Set to 0 to enable archive cleanup"); $properties["Major Edits: how many"] = @@ -863,42 +863,42 @@ new boolean_define_optional('ALLOW_BOGO_LOGIN', array('true' => "true. Users may Sign In with any WikiWord, without password. (Default)", 'false' => "false. Require stricter authentication."), " -If ALLOW_BOGO_LOGIN is false, you may not login with any wikiword username and empty password. +If ALLOW_BOGO_LOGIN is false, you may not login with any wikiword username and empty password. If true, users are allowed to create themselves with any WikiWord username. See below."); $properties["Allow User Passwords"] = new boolean_define_optional('ALLOW_USER_PASSWORDS', array('true' => "True user authentication with password checking. (Default)", 'false' => "false. Ignore authentication settings below."), " -If ALLOW_USER_PASSWORDS is true, the authentication settings below define where and how to +If ALLOW_USER_PASSWORDS is true, the authentication settings below define where and how to check against given username/passwords. For completely security disable BOGO_LOGIN and ANON_EDIT above."); $properties["User Authentication Methods"] = new array_define('USER_AUTH_ORDER', array("PersonalPage", "Db"), " -Many different methods can be used to check user's passwords. +Many different methods can be used to check user's passwords. Try any of these in the given order: <dl> <dt>BogoLogin</dt> - <dd>WikiWord username, with no *actual* password checking, + <dd>WikiWord username, with no *actual* password checking, although the user will still have to enter one.</dd> <dt>PersonalPage</dt> - <dd>Store passwords in the users homepage metadata (simple)</dd> + <dd>Store passwords in the users homepage metadata (simple)</dd> <dt>Db</dt> - <dd>Use DBAUTH_AUTH_* (see below) with PearDB or ADODB only.</dd> + <dd>Use DBAUTH_AUTH_* (see below) with PearDB or ADODB only.</dd> <dt>LDAP</dt> - <dd>Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN.</dd> + <dd>Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN.</dd> <dt>IMAP</dt> - <dd>Authenticate against IMAP_AUTH_HOST (email account)</dd> + <dd>Authenticate against IMAP_AUTH_HOST (email account)</dd> <dt>POP3</dt> - <dd>Authenticate against POP3_AUTH_HOST (email account)</dd> + <dd>Authenticate against POP3_AUTH_HOST (email account)</dd> <dt>Session</dt> - <dd>Get username and level from a PHP session variable. (e.g. for FusionForge)</dd> + <dd>Get username and level from a PHP session variable. (e.g. for FusionForge)</dd> <dt>File</dt> - <dd>Store username:crypted-passwords in .htaccess like files. + <dd>Store username:crypted-passwords in .htaccess like files. Use Apache's htpasswd to manage this file.</dd> <dt>HttpAuth</dt> - <dd>Use the protection by the webserver (.htaccess/.htpasswd) (experimental) - Enforcing HTTP Auth not yet. Note that the ADMIN_USER should exist also. + <dd>Use the protection by the webserver (.htaccess/.htpasswd) (experimental) + Enforcing HTTP Auth not yet. Note that the ADMIN_USER should exist also. Using HttpAuth disables all other methods and no userauth sessions are used.</dd> </dl> @@ -919,22 +919,22 @@ $properties["USER_AUTH_POLICY"] = new _define_selection('USER_AUTH_POLICY', array('first-only' => "first-only - use only the first method in USER_AUTH_ORDER", - 'old' => "old - ignore USER_AUTH_ORDER (legacy)", - 'strict' => "strict - check all methods for userid + password (recommended)", - 'stacked' => "stacked - check all methods for userid, and if found for password"), " + 'old' => "old - ignore USER_AUTH_ORDER (legacy)", + 'strict' => "strict - check all methods for userid + password (recommended)", + 'stacked' => "stacked - check all methods for userid, and if found for password"), " The following policies are available for user authentication: <dl> <dt>first-only</dt> - <dd>use only the first method in USER_AUTH_ORDER</dd> + <dd>use only the first method in USER_AUTH_ORDER</dd> <dt>old</dt> - <dd>ignore USER_AUTH_ORDER and try to use all available + <dd>ignore USER_AUTH_ORDER and try to use all available methods as in the previous PhpWiki releases (slow)</dd> <dt>strict</dt> - <dd>check if the user exists for all methods: - on the first existing user, try the password. + <dd>check if the user exists for all methods: + on the first existing user, try the password. dont try the other methods on failure then</dd> <dt>stacked</dt> - <dd>check the given user - password combination for all + <dd>check the given user - password combination for all methods and return true on the first success.</dd></dl>"); $properties["ENABLE_USER_NEW"] = @@ -971,7 +971,7 @@ <dt>FILE</dt> <dd>Flatfile. See AUTH_GROUP_FILE below.</dd> <dt>LDAP</dt> - <dd>LDAP groups. See \"LDAP authentication options\" above and + <dd>LDAP groups. See \"LDAP authentication options\" above and lib/WikiGroup.php. (experimental)</dd></dl>"); $properties["CATEGORY_GROUP_PAGE"] = @@ -1112,12 +1112,12 @@ $properties["LDAP AUTH USER"] = new _define_optional('LDAP_AUTH_USER', "CN=ldapuser,ou=Users,o=Development,dc=mycompany.com", " -DN to initially bind to the LDAP server as. This is needed if the server doesn't +DN to initially bind to the LDAP server as. This is needed if the server doesn't allow anonymous queries. (Windows Active Directory Server)"); $properties["LDAP AUTH PASSWORD"] = new _define_optional('LDAP_AUTH_PASSWORD', "secret", " -Password to use to initially bind to the LDAP server, as the DN +Password to use to initially bind to the LDAP server, as the DN specified in the LDAP_AUTH_USER option (above)."); $properties["LDAP SEARCH FIELD"] = @@ -1145,12 +1145,12 @@ $properties["LDAP Authentication"] = new unchangeable_variable('LDAP Authentication', " ; If USER_AUTH_ORDER contains Ldap: -; +; ; The LDAP server to connect to. Can either be a hostname, or a complete ; URL to the server (useful if you want to use ldaps or specify a different ; port number). ;LDAP_AUTH_HOST = \"ldap://localhost:389\" -; +; ; The organizational or domain BASE DN: e.g. \"dc=mydomain,dc=com\". ; ; Note: ou=Users and ou=Groups are used for GroupLdap Membership @@ -1162,11 +1162,11 @@ ; and their values as NAME=value pairs separated by colons. ; LDAP_SET_OPTION = \"LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0\" -; DN to initially bind to the LDAP server as. This is needed if the server doesn't +; DN to initially bind to the LDAP server as. This is needed if the server doesn't ; allow anonymous queries. (Windows Active Directory Server) ; LDAP_AUTH_USER = \"CN=ldapuser,ou=Users,o=Development,dc=mycompany.com\" -; Password to use to initially bind to the LDAP server, as the DN +; Password to use to initially bind to the LDAP server, as the DN ; specified in the LDAP_AUTH_USER option (above). ; LDAP_AUTH_PASSWORD = secret @@ -1196,7 +1196,7 @@ The IMAP server to check usernames from. Defaults to localhost. Some IMAP_AUTH_HOST samples: - localhost, localhost:143/imap/notls, + localhost, localhost:143/imap/notls, localhost:993/imap/ssl/novalidate-cert (SuSE refuses non-SSL conections)"); } else { // function_exists('imap_open') @@ -1205,9 +1205,9 @@ new unchangeable_variable('IMAP_AUTH_HOST'," ; If USER_AUTH_ORDER contains IMAP: ; The IMAP server to check usernames from. Defaults to localhost. -; +; ; Some IMAP_AUTH_HOST samples: -; localhost, localhost:143/imap/notls, +; localhost, localhost:143/imap/notls, ; localhost:993/imap/ssl/novalidate-cert (SuSE refuses non-SSL conections) ;IMAP_AUTH_HOST = localhost:143/imap/notls", " Ignored. No IMAP support in this php. configure --with-imap"); @@ -1262,7 +1262,7 @@ 'SpaceWiki' => "SpaceWiki", 'Hawaiian' => "Hawaiian", 'MonoBook' => 'MonoBook [experimental]', - 'blog' => 'blog [experimental]', + 'blog' => 'blog [experimental]', ), " THEME @@ -1330,11 +1330,11 @@ WIKI_PGSRC is scanned for files -- one file per page. <pre> // Default (old) behavior: -define('WIKI_PGSRC', 'pgsrc'); +define('WIKI_PGSRC', 'pgsrc'); // New style: -define('WIKI_PGSRC', 'wiki.zip'); -define('WIKI_PGSRC', - '../Logs/Hamwiki/hamwiki-20010830.zip'); +define('WIKI_PGSRC', 'wiki.zip'); +define('WIKI_PGSRC', + '../Logs/Hamwiki/hamwiki-20010830.zip'); </pre>"); $properties["Default Wiki Page Source"] = @@ -1394,7 +1394,7 @@ new _define_optional('KEYWORDS', '\"Category* OR Topic*\"', " Search term used for automatic page classification by keyword extraction. -Any links on a page to pages whose names match this search +Any links on a page to pages whose names match this search will be used keywords in the keywords html meta tag. This is an aid to classification by search engines. The value of the match is used as the keyword. @@ -1438,7 +1438,7 @@ $properties["DISABLE_MARKUP_WIKIWORD"] = new boolean_define_optional('DISABLE_MARKUP_WIKIWORD'); -$properties["ENABLE_MARKUP_DIVSPAN" ] = +$properties["ENABLE_MARKUP_DIVSPAN" ] = new boolean_define_optional('ENABLE_MARKUP_DIVSPAN'); /////////////////// @@ -1461,9 +1461,9 @@ "onchange=\"validate_ereg('Sorry, \'%s\' is no valid port number.', '^[0-9]+$', 'SERVER_PORT', this);\""); $properties["Server Protocol"] = - new _define_selection_optional_commented('SERVER_PROTOCOL', - array('http' => 'http', - 'https' => 'https')); + new _define_selection_optional_commented('SERVER_PROTOCOL', + array('http' => 'http', + 'https' => 'https')); $properties["Script Name"] = new _define_commented_optional('SCRIPT_NAME', $scriptname); @@ -1475,18 +1475,18 @@ new _define_commented_optional('PHPWIKI_DIR', dirname(__FILE__)); $properties["Use PATH_INFO"] = -new _define_selection_optional_commented('USE_PATH_INFO', - array('' => 'automatic', - 'true' => 'use PATH_INFO', - 'false' => 'do not use PATH_INFO'), " -PhpWiki will try to use short urls to pages, eg +new _define_selection_optional_commented('USE_PATH_INFO', + array('' => 'automatic', + 'true' => 'use PATH_INFO', + 'false' => 'do not use PATH_INFO'), " +PhpWiki will try to use short urls to pages, eg http://www.example.com/index.php/HomePage -If you want to use urls like +If you want to use urls like http://www.example.com/index.php?pagename=HomePage then define 'USE_PATH_INFO' as false by uncommenting the line below. NB: If you are using Apache >= 2.0.30, then you may need to to use the directive \"AcceptPathInfo On\" in your Apache configuration file -(or in an appropriate <.htaccess> file) for the short urls to work: +(or in an appropriate <.htaccess> file) for the short urls to work: See http://httpd.apache.org/docs-2.0/mod/core.html#acceptpathinfo See also http://phpwiki.sourceforge.net/phpwiki/PrettyWiki for more ideas @@ -1500,7 +1500,7 @@ new _define_commented_optional('VIRTUAL_PATH', '/SomeWiki', " VIRTUAL_PATH is the canonical URL path under which your your wiki appears. Normally this is the same as dirname(SCRIPT_NAME), however -using e.g. seperate starter scripts, apaches mod_actions (or mod_rewrite), +using e.g. seperate starter scripts, apaches mod_actions (or mod_rewrite), you can make it something different. If you do this, you should set VIRTUAL_PATH here or in the starter scripts. @@ -1542,7 +1542,7 @@ "); $properties["Strict Mailable Pagedumps"] = - new boolean_define_optional('STRICT_MAILABLE_PAGEDUMPS', + new boolean_define_optional('STRICT_MAILABLE_PAGEDUMPS', array('false' => "binary", 'true' => "quoted-printable")); @@ -1556,8 +1556,8 @@ new _define_optional('HTML_DUMP_SUFFIX'); $properties["Pagename of Recent Changes"] = - new _define_optional('RECENT_CHANGES', - "RecentChanges"); + new _define_optional('RECENT_CHANGES', + "RecentChanges"); $properties["Disable HTTP Redirects"] = new boolean_define_commented_optional('DISABLE_HTTP_REDIRECT'); @@ -1637,14 +1637,14 @@ "); $properties["pear Cache USECACHE"] = -new boolean_define_optional('PLUGIN_CACHED_USECACHE', +new boolean_define_optional('PLUGIN_CACHED_USECACHE', array('true' => 'Enabled', - 'false' => 'Disabled'), " + 'false' => 'Disabled'), " Enable or disable pear caching of plugins."); $properties["pear Cache Database Container"] = -new _define_selection_optional('PLUGIN_CACHED_DATABASE', +new _define_selection_optional('PLUGIN_CACHED_DATABASE', array('file' => 'file'), " -Curently only file is supported. +Curently only file is supported. db, trifile and imgfile might be supported, but you must hack that by yourself."); $properties["pear Cache cache directory"] = @@ -1665,9 +1665,9 @@ new numeric_define_optional('PLUGIN_CACHED_MAXARGLEN', "1000", " max. generated url length."); $properties["pear Cache FORCE_SYNCMAP"] = -new boolean_define_optional('PLUGIN_CACHED_FORCE_SYNCMAP', +new boolean_define_optional('PLUGIN_CACHED_FORCE_SYNCMAP', array('true' => 'Enabled', - 'false' => 'Disabled'), ""); + 'false' => 'Disabled'), ""); $properties["pear Cache IMGTYPES"] = new list_define('PLUGIN_CACHED_IMGTYPES', "png|gif|gd|gd2|jpeg|wbmp|xbm|xpm", " Handle those image types via GD handles. Check your GD supported image types."); @@ -1682,7 +1682,7 @@ // begin class definitions /** - * A basic config-dist.ini configuration line in the form of a variable. + * A basic config-dist.ini configuration line in the form of a variable. * (not needed anymore, we have only defines) * * Produces a string in the form "$name = value;" @@ -1699,40 +1699,40 @@ function _variable($config_item_name, $default_value='', $description = '', $jscheck = '') { $this->config_item_name = $config_item_name; - if (!$description) - $description = text_from_dist($config_item_name); + if (!$description) + $description = text_from_dist($config_item_name); $this->description = $description; - if (defined($config_item_name) - and !preg_match("/(selection|boolean)/", get_class($this)) - and !preg_match("/^(SCRIPT_NAME|VIRTUAL_PATH|TEMP_DIR)$/", $config_item_name)) - $this->default_value = constant($config_item_name); // ignore given default value - elseif ($config_item_name == $default_value) - $this->default_value = ''; - else - $this->default_value = $default_value; - $this->jscheck = $jscheck; + if (defined($config_item_name) + and !preg_match("/(selection|boolean)/", get_class($this)) + and !preg_match("/^(SCRIPT_NAME|VIRTUAL_PATH|TEMP_DIR)$/", $config_item_name)) + $this->default_value = constant($config_item_name); // ignore given default value + elseif ($config_item_name == $default_value) + $this->default_value = ''; + else + $this->default_value = $default_value; + $this->jscheck = $jscheck; if (preg_match("/variable/i", get_class($this))) - $this->prefix = "\$"; - elseif (preg_match("/ini_set/i", get_class($this))) + $this->prefix = "\$"; + elseif (preg_match("/ini_set/i", get_class($this))) $this->prefix = "ini_get: "; else - $this->prefix = ""; + $this->prefix = ""; } function _define($config_item_name, $default_value='', $description = '', $jscheck = '') { - $this->_variable($config_item_name, $default_value, $description, $jscheck); + $this->_variable($config_item_name, $default_value, $description, $jscheck); } function value() { global $HTTP_POST_VARS; if (isset($HTTP_POST_VARS[$this->config_item_name])) return $HTTP_POST_VARS[$this->config_item_name]; - else + else return $this->default_value; } function _config_format($value) { - return ''; + return ''; $v = $this->get_config_item_name(); // handle arrays: a|b --> a['b'] if (strpos($v, '|')) { @@ -1755,11 +1755,11 @@ function get_config_item_header() { if (strchr($this->config_item_name,'|')) { list($var,$param) = explode('|',$this->config_item_name); - return "<b>" . $this->prefix . $var . "['" . $param . "']</b><br />"; + return "<b>" . $this->prefix . $var . "['" . $param . "']</b><br />"; } elseif ($this->config_item_name[0] != '_') - return "<b>" . $this->prefix . $this->config_item_name . "</b><br />"; - else + return "<b>" . $this->prefix . $this->config_item_name . "</b><br />"; + else return ''; } @@ -1784,10 +1784,10 @@ } function get_html() { - $size = strlen($this->default_value) > 45 ? 90 : 50; - return $this->get_config_item_header() . - "<input type=\"text\" size=\"50ドル\" name=\"" . $this->get_config_item_name() . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " . - $this->jscheck . " />" . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; + $size = strlen($this->default_value) > 45 ? 90 : 50; + return $this->get_config_item_header() . + "<input type=\"text\" size=\"50ドル\" name=\"" . $this->get_config_item_name() . "\" value=\"" . htmlspecialchars($this->default_value) . "\" " . + $this->jscheck . " />" . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; } } @@ -1798,9 +1798,9 @@ } // function get_html() { return false; } function get_html() { - return $this->get_config_item_header() . - "<em>Not editable.</em>" . - "<pre>" . $this->default_value."</pre>"; + return $this->get_config_item_header() . + "<em>Not editable.</em>" . + "<pre>" . $this->default_value."</pre>"; } function _get_config_line($posted_value) { if ($this->description) @@ -1808,11 +1808,11 @@ return "${n}".$this->default_value; } function get_instructions($title) { - global $tdwidth; + global $tdwidth; $i = "<h3>" . $title . "</h3>\n " . nl2p($this->_get_description()) . "\n"; // $i .= "<em>Not editable.</em><br />\n<pre>" . $this->default_value."</pre>"; - return '<tr><td width="100%" class="unchangeable-variable-top" colspan="2">'."\n".$i."</td></tr>\n" - . '<tr style="border-top: none;"><td class="unchangeable-variable-left" width="'.$tdwidth.'"> </td>'; + return '<tr><td width="100%" class="unchangeable-variable-top" colspan="2">'."\n".$i."</td></tr>\n" + . '<tr style="border-top: none;"><td class="unchangeable-variable-left" width="'.$tdwidth.'"> </td>'; } } @@ -1843,25 +1843,25 @@ if (!empty($HTTP_POST_VARS[$this->config_item_name])) return $HTTP_POST_VARS[$this->config_item_name]; else { - list($option, $label) = each($this->default_value); + list($option, $label) = each($this->default_value); return $option; } } function get_html() { - $output = $this->get_config_item_header(); + $output = $this->get_config_item_header(); $output .= '<select name="' . $this->get_config_item_name() . "\">\n"; /* The first option is the default */ - $values = $this->default_value; - if (defined($this->get_config_item_name())) - $this->default_value = constant($this->get_config_item_name()); - else - $this->default_value = null; + $values = $this->default_value; + if (defined($this->get_config_item_name())) + $this->default_value = constant($this->get_config_item_name()); + else + $this->default_value = null; foreach ($values as $option => $label) { - if (!is_null($this->default_value) && $this->default_value === $option) - $output .= " <option value=\"$option\" selected=\"selected\">$label</option>\n"; - else - $output .= " <option value=\"$option\">$label</option>\n"; + if (!is_null($this->default_value) && $this->default_value === $option) + $output .= " <option value=\"$option\" selected=\"selected\">$label</option>\n"; + else + $output .= " <option value=\"$option\">$label</option>\n"; } $output .= "</select>\n"; return $output; @@ -1883,10 +1883,10 @@ return "${n}" . $this->_config_format($posted_value); } function get_html() { - $size = strlen($this->default_value) > 45 ? 90 : 50; - return $this->get_config_item_header() - . "<input type=\"text\" size=\"$size\" name=\"" . htmlentities($this->get_config_item_name()) - . "\" value=\"" . htmlentities($this->default_value) . "\" {$this->jscheck} />" + $size = strlen($this->default_value) > 45 ? 90 : 50; + return $this->get_config_item_header() + . "<input type=\"text\" size=\"$size\" name=\"" . htmlentities($this->get_config_item_name()) + . "\" value=\"" . htmlentities($this->default_value) . "\" {$this->jscheck} />" . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; } } @@ -1905,8 +1905,8 @@ } } -/** - * We don't use _optional anymore, because INI-style config's don't need that. +/** + * We don't use _optional anymore, because INI-style config's don't need that. * IniConfig.php does the optional logic now. * But we use _optional for config-default.ini options */ @@ -1919,13 +1919,13 @@ class _define_notempty extends _define { function get_html() { - $s = $this->get_config_item_header() - . "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name() + $s = $this->get_config_item_header() + . "<input type=\"text\" size=\"50\" name=\"" . $this->get_config_item_name() . "\" value=\"" . $this->default_value . "\" {$this->jscheck} />"; if (empty($this->default_value)) - return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>"; - else - return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; + return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>"; + else + return $s . "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; } } @@ -2002,7 +2002,7 @@ extends _variable_selection { } class _define_selection_optional_commented -extends _define_selection_optional { +extends _define_selection_optional { function _get_config_line($posted_value) { if ($this->description) $n = "\n"; @@ -2019,11 +2019,11 @@ extends _define { function _define_password($config_item_name, $default_value='', $description = '', $jscheck = '') { - if ($config_item_name == $default_value) $default_value = ''; + if ($config_item_name == $default_value) $default_value = ''; $this->_define($config_item_name, $default_value, $description, $jscheck); if (!$jscheck) - $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '" - . $this->get_config_item_name() . "', this);\""; + $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '" + . $this->get_config_item_name() . "', this);\""; } function _get_config_line($posted_value) { if ($this->description) @@ -2060,10 +2060,10 @@ } class _define_password_optional -extends _define_password { +extends _define_password { function _define_password_optional($config_item_name, $default_value='', $description = '', $jscheck = '') { - if ($config_item_name == $default_value) $default_value = ''; + if ($config_item_name == $default_value) $default_value = ''; if (!$jscheck) $this->jscheck = " "; $this->_define($config_item_name, $default_value, $description, $jscheck); } @@ -2074,20 +2074,20 @@ if ($posted_value == '') { return "${n};" . $this->_config_format(""); } else { - return "${n}" . $this->_config_format($posted_value); + return "${n}" . $this->_config_format($posted_value); } } function get_html() { - $s = $this->get_config_item_header(); - // dont re-encrypt already encrypted passwords - $value = $this->value(); - $encrypted = !empty($GLOBALS['properties']["Encrypted Passwords"]) and - $GLOBALS['properties']["Encrypted Passwords"]->value(); - if (empty($value)) - $encrypted = false; + $s = $this->get_config_item_header(); + // dont re-encrypt already encrypted passwords + $value = $this->value(); + $encrypted = !empty($GLOBALS['properties']["Encrypted Passwords"]) and + $GLOBALS['properties']["Encrypted Passwords"]->value(); + if (empty($value)) + $encrypted = false; $s .= "<input type=\"". ($encrypted ? "text" : "password") . "\" name=\"" . $this->get_config_item_name() . "\" value=\"" . $value . "\" {$this->jscheck} />"; - return $s; + return $s; } } @@ -2097,35 +2097,35 @@ class _variable_password extends _variable { function _variable_password($config_item_name, $default_value='', $description = '', $jscheck = '') { - if ($config_item_name == $default_value) $default_value = ''; + if ($config_item_name == $default_value) $default_value = ''; $this->_define($config_item_name, $default_value, $description, $jscheck); if (!$jscheck) $this->jscheck = "onchange=\"validate_ereg('Sorry, \'%s\' cannot be empty.', '^.+$', '" . $this->get_config_item_name() . "', this);\""; } function get_html() { - global $HTTP_POST_VARS, $HTTP_GET_VARS; - $s = $this->get_config_item_header(); + global $HTTP_POST_VARS, $HTTP_GET_VARS; + $s = $this->get_config_item_header(); if (isset($HTTP_POST_VARS['create']) or isset($HTTP_GET_VARS['create'])) { - $new_password = random_good_password(); - $this->default_value = $new_password; - $s .= "Created password: <strong>$new_password</strong><br /> <br />"; - } - // dont re-encrypt already encrypted passwords - $value = $this->value(); - $encrypted = !empty($GLOBALS['properties']["Encrypted Passwords"]) and - $GLOBALS['properties']["Encrypted Passwords"]->value(); - if (empty($value)) - $encrypted = false; + $new_password = random_good_password(); + $this->default_value = $new_password; + $s .= "Created password: <strong>$new_password</strong><br /> <br />"; + } + // dont re-encrypt already encrypted passwords + $value = $this->value(); + $encrypted = !empty($GLOBALS['properties']["Encrypted Passwords"]) and + $GLOBALS['properties']["Encrypted Passwords"]->value(); + if (empty($value)) + $encrypted = false; $s .= "<input type=\"". ($encrypted ? "text" : "password") . "\" name=\"" . $this->get_config_item_name() - . "\" value=\"" . $value . "\" {$this->jscheck} />" + . "\" value=\"" . $value . "\" {$this->jscheck} />" . " <input type=\"submit\" name=\"create\" value=\"Create Random Password\" />"; - if (empty($value)) - $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>"; - elseif (strlen($this->default_value) < 4) - $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Must be longer than 4 chars.</p>"; - else - $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; - return $s; + if (empty($value)) + $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Cannot be empty.</p>"; + elseif (strlen($this->default_value) < 4) + $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: red\">Must be longer than 4 chars.</p>"; + else + $s .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; + return $s; } } @@ -2144,9 +2144,9 @@ $rows = max(3, count($list_values) +1); $list_values = join("\n", $list_values); $ta = $this->get_config_item_header(); - $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>"; + $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>"; $ta .= $list_values . "</textarea>"; - $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; + $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; return $ta; } } @@ -2165,9 +2165,9 @@ if ($list_values) $list_values = join("\n", $list_values); $ta = $this->get_config_item_header(); - $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>"; + $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>"; $ta .= $list_values . "</textarea>"; - $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; + $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; return $ta; } } @@ -2175,7 +2175,7 @@ class array_variable extends _variable { function _config_format($value) { - return sprintf("%s = \"%s\"", $this->get_config_item_name(), + return sprintf("%s = \"%s\"", $this->get_config_item_name(), is_array($value) ? join(':', $value) : $value); } function _get_config_line($posted_value) { @@ -2189,15 +2189,15 @@ return "\n;" . $this->_config_format(''); } function get_html() { - if (is_array($this->default_value)) + if (is_array($this->default_value)) $list_values = join("\n", $this->default_value); - else + else $list_values = $this->default_value; $rows = max(3, count($this->default_value) +1); $ta = $this->get_config_item_header(); $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>"; $ta .= $list_values . "</textarea>"; - $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; + $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; return $ta; } } @@ -2205,7 +2205,7 @@ class array_define extends _define { function _config_format($value) { - return sprintf("%s = \"%s\"", $this->get_config_item_name(), + return sprintf("%s = \"%s\"", $this->get_config_item_name(), is_array($value) ? join(' : ', $value) : $value); } function _get_config_line($posted_value) { @@ -2219,16 +2219,16 @@ return "\n;" . $this->_config_format(''); } function get_html () { - if (!$this->default_value) - $this->default_value = array(); - elseif (is_string($this->default_value)) - $this->default_value = preg_split("/[\s,:]+/", $this->default_value, -1, PREG_SPLIT_NO_EMPTY); - $list_values = join(" : \n", $this->default_value); + if (!$this->default_value) + $this->default_value = array(); + elseif (is_string($this->default_value)) + $this->default_value = preg_split("/[\s,:]+/", $this->default_value, -1, PREG_SPLIT_NO_EMPTY); + $list_values = join(" : \n", $this->default_value); $rows = max(3, count($this->default_value) + 1); $ta = $this->get_config_item_header(); $ta .= "<textarea cols=\"18\" rows=\"". $rows ."\" name=\"".$this->get_config_item_name()."\" {$this->jscheck}>"; $ta .= $list_values . "</textarea>"; - $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; + $ta .= "<p id=\"" . $this->get_config_item_id() . "\" style=\"color: green\">Input accepted.</p>"; return $ta; } } @@ -2241,7 +2241,7 @@ if ($v = $HTTP_POST_VARS[$this->config_item_name]) return $v; else { - return ini_get($this->get_config_item_name); + return ini_get($this->get_config_item_name); } } function _config_format($value) { @@ -2262,20 +2262,20 @@ // adds ->values property, instead of ->default_value function boolean_define($config_item_name, $values = false, $description = '', $jscheck = '') { $this->config_item_name = $config_item_name; - if (!$description) - $description = text_from_dist($config_item_name); + if (!$description) + $description = text_from_dist($config_item_name); $this->description = $description; - // TESTME: get boolean default value from config-default.ini - if (defined($config_item_name)) - $this->default_value = constant($config_item_name); // ignore given default value + // TESTME: get boolean default value from config-default.ini + if (defined($config_item_name)) + $this->default_value = constant($config_item_name); // ignore given default value elseif (is_array($values)) - list($this->default_value,$dummy) = $values[0]; - if (!$values) + list($this->default_value,$dummy) = $values[0]; + if (!$values) $values = array('false' => "Disabled", 'true' => "Enabled"); - $this->values = $values; - $this->jscheck = $jscheck; - $this->prefix = ""; + $this->values = $values; + $this->jscheck = $jscheck; + $this->prefix = ""; } function _get_config_line($posted_value) { if ($this->description) @@ -2291,18 +2291,18 @@ //TODO: radiobuttons, no list function get_html() { $output = $this->get_config_item_header(); - $name = $this->get_config_item_name(); + $name = $this->get_config_item_name(); $output .= '<select name="' . $name . "\" {$this->jscheck}>\n"; - $values = $this->values; - $default_value = $this->default_value ? 'true' : 'false'; + $values = $this->values; + $default_value = $this->default_value ? 'true' : 'false'; /* There can usually only be two options, there can be * three options in the case of a boolean_define_commented_optional */ while (list($option, $label) = each($values)) { - if (!is_null($this->default_value) and $option === $default_value) - $output .= " <option value=\"$option\" selected=\"selected\">$label</option>\n"; - else - $output .= " <option value=\"$option\">$label</option>\n"; - } + if (!is_null($this->default_value) and $option === $default_value) + $output .= " <option value=\"$option\" selected=\"selected\">$label</option>\n"; + else + $output .= " <option value=\"$option\">$label</option>\n"; + } $output .= "</select>\n"; return $output; } @@ -2338,11 +2338,11 @@ return "\n".$SEPARATOR . str_replace("\n", "\n; ", $d) ."\n".$this->default_value; } function get_instructions($title) { - $id = preg_replace("/\W/","",$this->config_item_name); - $group_name = preg_replace("/\W/","",$title); - $i = "<tr class=\"header\" id=\"$id\">\n<td class=\"part\" width=\"100%\" colspan=\"2\" bgcolor=\"#eeeeee\">\n"; + $id = preg_replace("/\W/","",$this->config_item_name); + $group_name = preg_replace("/\W/","",$title); + $i = "<tr class=\"header\" id=\"$id\">\n<td class=\"part\" width=\"100%\" colspan=\"2\" bgcolor=\"#eeeeee\">\n"; $i .= "<h2>" . $title . "</h2>\n " . nl2p($this->_get_description()) ."\n"; - $i .= "<p><a href=\"javascript:toggle_group('$id')\" id=\"{$id}_text\">Hide options.</a></p>"; + $i .= "<p><a href=\"javascript:toggle_group('$id')\" id=\"{$id}_text\">Hide options.</a></p>"; return $i ."</td>\n"; } function get_html() { @@ -2369,30 +2369,30 @@ function text_from_dist($var) { static $distfile = 0; static $f; - + if (!$distfile) { - $sep = (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/'); - $distfile = dirname(__FILE__) . $sep . "config" . $sep . "config-dist.ini"; - $f = fopen($distfile, "r"); + $sep = (substr(PHP_OS,0,3) == 'WIN' ? '\\' : '/'); + $distfile = dirname(__FILE__) . $sep . "config" . $sep . "config-dist.ini"; + $f = fopen($distfile, "r"); } if ($var == '_MAGIC_CLOSE_FILE') { - fclose($f); - return; + fclose($f); + return; } // if all vars would be in natural order as in the config-dist this would not be needed. - fseek($f, 0); + fseek($f, 0); $par = "\n"; while (!feof($f)) { - $s = fgets($f); - if (preg_match("/^; \w/", $s)) { - $par .= (substr($s,2) . " "); - } elseif (preg_match("/^;\s*$/", $s)) { - $par .= "\n\n"; - } - if (preg_match("/^;?".preg_quote($var)."\s*=/", $s)) - return $par; - if (preg_match("/^\s*$/", $s)) // new paragraph - $par = "\n"; + $s = fgets($f); + if (preg_match("/^; \w/", $s)) { + $par .= (substr($s,2) . " "); + } elseif (preg_match("/^;\s*$/", $s)) { + $par .= "\n\n"; + } + if (preg_match("/^;?".preg_quote($var)."\s*=/", $s)) + return $par; + if (preg_match("/^\s*$/", $s)) // new paragraph + $par = "\n"; } return ''; } @@ -2432,13 +2432,13 @@ better_srand(); if (function_exists('mt_rand')) // mersenne twister $length = mt_rand($minlength, $maxlength); - else // the usually bad glibc rand() + else // the usually bad glibc rand() $length = rand($minlength, $maxlength); while ($length > 0) { if (function_exists('mt_rand')) - $newchar = mt_rand($start, $end); + $newchar = mt_rand($start, $end); else - $newchar = rand($start, $end); + $newchar = rand($start, $end); if (! strrpos($valid_chars,$newchar) ) continue; // skip holes $newpass .= sprintf("%c", $newchar); $length--; @@ -2465,7 +2465,7 @@ } -if (!empty($HTTP_POST_VARS['action']) +if (!empty($HTTP_POST_VARS['action']) and $HTTP_POST_VARS['action'] == 'make_config' and !empty($HTTP_POST_VARS['ADMIN_USER']) and !empty($HTTP_POST_VARS['ADMIN_PASSWD']) @@ -2508,7 +2508,7 @@ else { $fp = false; } - + if ($fp) { fputs($fp, utf8_encode($config)); fclose($fp); @@ -2520,8 +2520,8 @@ } } ... [truncated message content]
Revision: 7959 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7959&view=rev Author: vargenau Date: 2011年03月03日 18:02:58 +0000 (2011年3月03日) Log Message: ----------- No tabs Modified Paths: -------------- trunk/lib/plugin/RateIt.php Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2011年03月03日 17:52:53 UTC (rev 7958) +++ trunk/lib/plugin/RateIt.php 2011年03月03日 18:02:58 UTC (rev 7959) @@ -177,7 +177,7 @@ } else { header('Content-type: image/png'); echo base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAQMAAABIeJ9nAAAAA1BMVEX///' - .'+nxBvIAAAAAXRSTlMAQObYZgAAABNJREFUeF4NwAEBAAAAgJD+r5YGAAQAAXHhfPAAAAAASUVORK5CYII='); + .'+nxBvIAAAAAXRSTlMAQObYZgAAABNJREFUeF4NwAEBAAAAgJD+r5YGAAQAAXHhfPAAAAAASUVORK5CYII='); } exit; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.