| Index: trunk/phpwiki/newcodebase/LocalSettings.php |
| — | — | @@ -6,22 +6,23 @@ |
| 7 | 7 | |
| 8 | 8 | # URLs for the wiki site |
| 9 | 9 | # |
| 10 | | -$wgServer = "http://www.myhost.com"; |
| 11 | | -$wgStyleSheetPath = "$wgServer/style"; |
| | 10 | +$wgServer = "http://chesoo.fokus.gmd.de/cvswp"; |
| | 11 | +$wgStyleSheetPath = "$wgServer/stylesheets"; |
| 12 | 12 | $wgScript = "/wiki.phtml"; |
| 13 | 13 | $wgRedirectScript = "/redirect.phtml"; |
| 14 | 14 | $wgArticlePath = "$wgServer$wgScript?title=$1"; |
| 15 | | -$wgUploadPath = "http://www.myhost.com/upload"; |
| 16 | | -$wgUploadDirectory = "/usr/local/apache/htdocs/upload"; |
| | 15 | +$wgUploadPath = "$wgServer/images"; |
| | 16 | +$wgUploadDirectory = "/var/www/htdocs/cvswp/images"; |
| 17 | 17 | $wgLogo = "$wgUploadPath/wiki.png"; |
| | 18 | +$wgLanguageCode = "en"; |
| 18 | 19 | |
| 19 | 20 | # MySQL settings |
| 20 | 21 | # |
| 21 | | -$wgDBserver = "127.0.0.1"; |
| | 22 | +$wgDBserver = "localhost"; |
| 22 | 23 | $wgDBname = "wikidb"; |
| 23 | | -$wgDBuser = "wikiuser"; |
| 24 | | -$wgDBpassword = "userpass"; |
| 25 | | -$wgDBadminpassword = "adminpass"; |
| | 24 | +$wgDBuser = "nobody"; |
| | 25 | +$wgDBpassword = "suppball"; |
| | 26 | +$wgDBadminpassword = "suppball"; |
| 26 | 27 | $wgDBminWordLen = 3; |
| 27 | 28 | |
| 28 | 29 | # Turn this on during database maintenance |
| — | — | @@ -31,7 +32,7 @@ |
| 32 | 33 | # Turn this on to get HTML debug comments |
| 33 | 34 | # |
| 34 | 35 | # $wgDebugComments = true; |
| 35 | | -$wgDebugLogFile = "/usr/local/apache/htdocs/upload/logfile"; |
| | 36 | +# $wgDebugLogFile = "/usr/local/apache/htdocs/upload/logfile"; |
| 36 | 37 | |
| 37 | 38 | # Which interwiki prefix represents _this_ wiki? This |
| 38 | 39 | # only needs to be set when installing the software on |
| Index: trunk/phpwiki/newcodebase/Skin.php |
| — | — | @@ -457,16 +457,16 @@ |
| 458 | 458 | $sep = "\n<br>"; |
| 459 | 459 | $s .= $this->mainPageLink() |
| 460 | 460 | . $sep . $this->specialLink( "recentchanges" ) |
| 461 | | - . $sep . $this->specialLink( "randompage" ) |
| 462 | | - . $sep . $this->specialLink( "watchlist" ) ; |
| | 461 | + . $sep . $this->specialLink( "randompage" ); |
| | 462 | + if ($wgUser->getID()) $s.= $sep . $this->specialLink( "watchlist" ) ; // only show watchlist link if logged in |
| 463 | 463 | if ( wfMsg ( "currentevents" ) != "-" ) $s .= $sep . $this->makeKnownLink( wfMsg( "currentevents" ), "" ) ; |
| 464 | 464 | $s .= "\n<hr>"; |
| 465 | 465 | |
| 466 | 466 | if ( $wgOut->isArticle() ) { |
| 467 | 467 | $s .= "<strong>" . $this->editThisPage() . "</strong>"; |
| 468 | 468 | if ( 0 != $wgUser->getID() ) { |
| 469 | | - $s .= $sep . $this->watchThisPage() |
| 470 | | - . $sep . $this->moveThisPage(); |
| | 469 | + $s .= $sep . $this->watchThisPage(); |
| | 470 | + if ( $wgTitle->userCanEdit() ) $s .= $sep . $this->moveThisPage(); |
| 471 | 471 | } |
| 472 | 472 | if ( $wgUser->isSysop() ) { |
| 473 | 473 | $s .= $sep . $this->deleteThisPage() . |
| — | — | @@ -488,8 +488,8 @@ |
| 489 | 489 | if ( 0 != $wgUser->getID() ) { |
| 490 | 490 | $s .= $this->specialLink( "upload" ) . $sep; |
| 491 | 491 | } |
| 492 | | - $s .= $this->bugReportsLink() |
| 493 | | - . $sep . $this->specialLink( "specialpages" ); |
| | 492 | + $s .= $this->specialLink( "specialpages" ) |
| | 493 | + . $sep . $this->bugReportsLink(); |
| 494 | 494 | |
| 495 | 495 | $s .= "\n</div>\n"; |
| 496 | 496 | return $s; |
| — | — | @@ -650,9 +650,7 @@ |
| 651 | 651 | if ( $wgTitle->userCanEdit() ) { |
| 652 | 652 | $s = $this->makeKnownLink( $wgLang->specialPage( "Movepage" ), |
| 653 | 653 | wfMsg( "movethispage" ), "target=" . $wgTitle->getPrefixedURL() ); |
| 654 | | - } else { |
| 655 | | - $s = wfMsg( "protectedpage" ); |
| 656 | | - } |
| | 654 | + } // no message if page is protected - would be redundant |
| 657 | 655 | return $s; |
| 658 | 656 | } |
| 659 | 657 | |
| Index: trunk/phpwiki/newcodebase/Language.php |
| — | — | @@ -294,14 +294,14 @@ |
| 295 | 295 | "whatlinkshere" => "Pages that link here", |
| 296 | 296 | "help" => "Help", |
| 297 | 297 | "search" => "Search", |
| 298 | | -"history" => "History", |
| | 298 | +"history" => "Older versions", |
| 299 | 299 | "printableversion" => "Printable version", |
| 300 | 300 | "editthispage" => "Edit this page", |
| 301 | 301 | "deletethispage" => "Delete this page", |
| 302 | 302 | "protectthispage" => "Protect this page", |
| 303 | 303 | "unprotectthispage" => "Unprotect this page", |
| 304 | | -"talkpage" => "Talk page", |
| 305 | | -"subjectpage" => "Subject page", |
| | 304 | +"talkpage" => "Discuss this page", |
| | 305 | +"subjectpage" => "View article", |
| 306 | 306 | "otherlanguages" => "Other languages", |
| 307 | 307 | "redirectedfrom" => "(Redirected from $1)", |
| 308 | 308 | "lastmodified" => "The page was last modified $1.", |
| — | — | @@ -593,7 +593,7 @@ |
| 594 | 594 | |
| 595 | 595 | # Upload |
| 596 | 596 | # |
| 597 | | -"upload" => "Upload", |
| | 597 | +"upload" => "Upload file", |
| 598 | 598 | "uploadbtn" => "Upload file", |
| 599 | 599 | "uploadlink" => "Upload images", |
| 600 | 600 | "reupload" => "Re-upload", |
| — | — | @@ -743,7 +743,7 @@ |
| 744 | 744 | "sysopspheading" => "Special pages for sysop use", |
| 745 | 745 | "developerspheading" => "Special pages for developer use", |
| 746 | 746 | "protectpage" => "Protect page", |
| 747 | | -"recentchangeslinked" => "Watch links", |
| | 747 | +"recentchangeslinked" => "Related changes", |
| 748 | 748 | "rclsub" => "(to pages linked from \"$1\")", |
| 749 | 749 | "debug" => "Debug", |
| 750 | 750 | "newpages" => "New pages", |
| — | — | @@ -787,7 +787,7 @@ |
| 788 | 788 | |
| 789 | 789 | # Watchlist |
| 790 | 790 | # |
| 791 | | -"watchlist" => "Watch list", |
| | 791 | +"watchlist" => "My watchlist", |
| 792 | 792 | "watchlistsub" => "(for user \"$1\")", |
| 793 | 793 | "nowatchlist" => "You have no items on your watchlist.", |
| 794 | 794 | "watchnologin" => "Not logged in", |