From: <var...@us...> - 2014-07-25 14:49:23
|
Revision: 9007 http://sourceforge.net/p/phpwiki/code/9007 Author: vargenau Date: 2014-07-25 14:49:17 +0000 (Fri, 25 Jul 2014) Log Message: ----------- phpwiki.org --> phpwiki.fr Modified Paths: -------------- trunk/config/config-default.ini trunk/config/config-dist.ini trunk/configurator.php trunk/lib/IniConfig.php trunk/lib/SemanticWeb.php trunk/lib/plugin/LdapSearch.php trunk/lib/plugin/ModeratedPage.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/RssFeed.php trunk/locale/README trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre trunk/pgsrc/Help%2FFrameIncludePlugin trunk/themes/MonoBook/templates/browse-footer.tmpl trunk/themes/shamino_com/templates/browse-footer.tmpl Modified: trunk/config/config-default.ini =================================================================== --- trunk/config/config-default.ini 2014-07-25 14:06:38 UTC (rev 9006) +++ trunk/config/config-default.ini 2014-07-25 14:49:17 UTC (rev 9007) @@ -147,7 +147,7 @@ ; COPYRIGHTPAGE_TITLE = Creative Commons License 1.0 ; COPYRIGHTPAGE_URL = http://creativecommons.org/licenses/by/1.0/ AUTHORPAGE_TITLE = "The PhpWiki Programming Team" -AUTHORPAGE_URL = "http://phpwiki.org/ThePhpWikiProgrammingTeam" +AUTHORPAGE_URL = "http://phpwiki.fr/ThePhpWikiProgrammingTeam" TOC_FULL_SYNTAX = true ENABLE_MARKUP_COLOR = true Modified: trunk/config/config-dist.ini =================================================================== --- trunk/config/config-dist.ini 2014-07-25 14:06:38 UTC (rev 9006) +++ trunk/config/config-dist.ini 2014-07-25 14:49:17 UTC (rev 9007) @@ -89,7 +89,7 @@ ; Needed for FacebookLike plugin ;ENABLE_OPEN_GRAPH = true -; Needs babycart installed. See http://phpwiki.org/SpamAssassinIntegration +; Needs babycart installed. See http://phpwiki.fr/SpamAssassinIntegration ; Optionally define BABYCART_PATH. Default: /usr/local/bin/babycart ;ENABLE_SPAMASSASSIN = true @@ -1006,7 +1006,7 @@ ; COPYRIGHTPAGE_URL = "http://creativecommons.org/licenses/by/2.0/" ; see http://creativecommons.org/learn/licenses/ for variations ;AUTHORPAGE_TITLE = The PhpWiki Programming Team -;AUTHORPAGE_URL = http://phpwiki.org/ThePhpWikiProgrammingTeam +;AUTHORPAGE_URL = http://phpwiki.fr/ThePhpWikiProgrammingTeam ; Allow full markup in headers to be parsed by the CreateToc plugin. ; Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2014-07-25 14:06:38 UTC (rev 9006) +++ trunk/configurator.php 2014-07-25 14:49:17 UTC (rev 9007) @@ -1464,7 +1464,7 @@ new _define_commented_optional('AUTHORPAGE_TITLE', "The PhpWiki Programming Team", " Default Author Names"); $properties["AUTHORPAGE_URL"] = - new _define_commented_optional('AUTHORPAGE_URL', "http://phpwiki.org/ThePhpWikiProgrammingTeam", " + new _define_commented_optional('AUTHORPAGE_URL', "http://phpwiki.fr/ThePhpWikiProgrammingTeam", " Default Author URL"); $properties["TOC_FULL_SYNTAX"] = Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2014-07-25 14:06:38 UTC (rev 9006) +++ trunk/lib/IniConfig.php 2014-07-25 14:49:17 UTC (rev 9007) @@ -779,7 +779,7 @@ // If user has not defined DATA_PATH, we want to use relative URLs. if (!defined('DATA_PATH')) { // fix similar to the one suggested by jkalmbach for - // installations in the webrootdir, like "http://phpwiki.org/HomePage" + // installations in the webrootdir, like "http://phpwiki.fr/HomePage" if (!defined('SCRIPT_NAME')) define('SCRIPT_NAME', deduce_script_name()); $temp = dirname(SCRIPT_NAME); Modified: trunk/lib/SemanticWeb.php =================================================================== --- trunk/lib/SemanticWeb.php 2014-07-25 14:06:38 UTC (rev 9006) +++ trunk/lib/SemanticWeb.php 2014-07-25 14:49:17 UTC (rev 9007) @@ -72,7 +72,7 @@ ... (facts and rules described in XML) * * Links: - * http://phpwiki.org/SemanticWeb, + * http://phpwiki.fr/SemanticWeb, * http://en.wikipedia.org/wiki/Knowledge_representation * http://www.ontoweb.org/ * http://www.semwebcentral.org/ (OWL on top of FusionForge) Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2014-07-25 14:06:38 UTC (rev 9006) +++ trunk/lib/plugin/LdapSearch.php 2014-07-25 14:49:17 UTC (rev 9007) @@ -24,7 +24,7 @@ * WikiPlugin which searches an LDAP directory. * * Uses the config.ini constants as defaults. - * See http://phpwiki.org/LdapSearchPlugin + * See http://phpwiki.fr/LdapSearchPlugin * TODO: Return a pagelist on certain attributes * * Usage Samples: Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2014-07-25 14:06:38 UTC (rev 9006) +++ trunk/lib/plugin/ModeratedPage.php 2014-07-25 14:49:17 UTC (rev 9007) @@ -29,7 +29,7 @@ * * Not yet ready! part 3/3 is missing: The moderator approve/reject methods. * - * See http://phpwiki.org/PageModeration + * See http://phpwiki.fr/PageModeration * Author: ReiniUrban */ Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2014-07-25 14:06:38 UTC (rev 9006) +++ trunk/lib/plugin/RecentChanges.php 2014-07-25 14:49:17 UTC (rev 9007) @@ -749,7 +749,7 @@ printf("<body class=\"sidebar\">\n"); $html->PrintXML(); - echo '<a href="http://www.feedvalidator.org/check.cgi?url=http://phpwiki.org/RecentChanges?format=rss"><img src="themes/default/buttons/valid-rss.png" alt="[Valid RSS]" title="Validate the RSS feed" width="44" height="15" /></a>'; + echo '<a href="http://www.feedvalidator.org/check.cgi?url=http://phpwiki.fr/RecentChanges?format=rss"><img src="themes/default/buttons/valid-rss.png" alt="[Valid RSS]" title="Validate the RSS feed" width="44" height="15" /></a>'; printf("\n</body>\n"); printf("</html>\n"); Modified: trunk/lib/plugin/RssFeed.php =================================================================== --- trunk/lib/plugin/RssFeed.php 2014-07-25 14:06:38 UTC (rev 9006) +++ trunk/lib/plugin/RssFeed.php 2014-07-25 14:49:17 UTC (rev 9007) @@ -37,7 +37,7 @@ { return array('feed' => "", 'description' => "", - 'url' => "", //"http://phpwiki.org/RecentChanges?format=rss", + 'url' => "", //"http://phpwiki.fr/RecentChanges?format=rss", 'maxitem' => 0, 'titleonly' => false, 'debug' => false, Modified: trunk/locale/README =================================================================== --- trunk/locale/README 2014-07-25 14:06:38 UTC (rev 9006) +++ trunk/locale/README 2014-07-25 14:49:17 UTC (rev 9007) @@ -22,7 +22,7 @@ Phpwiki uses the DEFAULT_LANGUAGE internally, when no $GLOBALS['LANG'] is given. With certain starter script which set $LANG you can easily provide a multi-lingual wiki. For convenience provide some InterWikiMap entries for easier switching to the other -languages then. See http://phpwiki.org/MultiLingualWiki +languages then. See http://phpwiki.fr/MultiLingualWiki Phpwiki uses GNU gettext tools to provide and maintain multi-lingual messages for different languages. Even if you are already familiar Modified: trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre 2014-07-25 14:06:38 UTC (rev 9006) +++ trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre 2014-07-25 14:49:17 UTC (rev 9007) @@ -17,7 +17,7 @@ Exemples: pour inclure une page depuis un autre site, utilisez l'argument <b>src</b> : {{{ -<<FrameInclude src="http://phpwiki.org/">> +<<FrameInclude src="http://phpwiki.fr/">> }}} Pour inclure une page depuis ce wiki, utilisez l'argument <b>page</b> : Modified: trunk/pgsrc/Help%2FFrameIncludePlugin =================================================================== --- trunk/pgsrc/Help%2FFrameIncludePlugin 2014-07-25 14:06:38 UTC (rev 9006) +++ trunk/pgsrc/Help%2FFrameIncludePlugin 2014-07-25 14:49:17 UTC (rev 9007) @@ -15,7 +15,7 @@ To include a page from another site, use the **src** attribute: {{{ -<<FrameInclude src="http://phpwiki.org/">> +<<FrameInclude src="http://phpwiki.fr/">> }}} To include a page from within this wiki, use the **page** attribute: Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl =================================================================== --- trunk/themes/MonoBook/templates/browse-footer.tmpl 2014-07-25 14:06:38 UTC (rev 9006) +++ trunk/themes/MonoBook/templates/browse-footer.tmpl 2014-07-25 14:49:17 UTC (rev 9007) @@ -1,6 +1,6 @@ <?php // <hr class="printer" /> ?> <div class="visualClear"></div> - <div id="f-poweredbyico"><a href="http://www.phpwiki.org/"><img src="<?php echo $WikiTheme->getImageURL("poweredby_phpwiki_51x31.png") ?>" alt="Powered by PhpWiki" /></a></div> + <div id="f-poweredbyico"><a href="http://www.phpwiki.fr/"><img src="<?php echo $WikiTheme->getImageURL("poweredby_phpwiki_51x31.png") ?>" alt="Powered by PhpWiki" /></a></div> <ul id="f-list"> <li id="f-lastmod"> <?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?> </li> @@ -8,19 +8,19 @@ <?php if ($request->_dbi->isWikiPage(_("Copyrights"))) { ?> <?php echo WikiLink(_("Copyrights")) ?> <?php } else { ?> - <a class="internal" href="http://www.phpwiki.org/Copyrights" title ="PhpWiki:Copyrights">Copyrights</a> + <a class="internal" href="http://www.phpwiki.fr/Copyrights" title ="PhpWiki:Copyrights">Copyrights</a> <?php } ?> </b> for details).<br /></li> <?php if ($request->_dbi->isWikiPage(_("About".WIKI_NAME))) { ?> <?php echo WikiLink(_("About".WIKI_NAME)) ?> <?php } else { ?> - <li id="f-about"><a href="http://www.phpwiki.org/PhpWiki" title ="PhpWiki:About">About PhpWiki</a></li> + <li id="f-about"><a href="http://www.phpwiki.fr/PhpWiki" title ="PhpWiki:About">About PhpWiki</a></li> <?php } ?> <li id="f-disclaimer"> <?php if ($request->_dbi->isWikiPage(_("GeneralDisclaimer"))) { ?> <?php echo WikiLink(_("GeneralDisclaimer")) ?> <?php } else { ?> - <a href="http://www.phpwiki.org/GeneralDisclaimer" title ="PhpWiki:Disclaimer">Disclaimer</a> + <a href="http://www.phpwiki.fr/GeneralDisclaimer" title ="PhpWiki:Disclaimer">Disclaimer</a> <?php } ?> </li> </ul> Modified: trunk/themes/shamino_com/templates/browse-footer.tmpl =================================================================== --- trunk/themes/shamino_com/templates/browse-footer.tmpl 2014-07-25 14:06:38 UTC (rev 9006) +++ trunk/themes/shamino_com/templates/browse-footer.tmpl 2014-07-25 14:49:17 UTC (rev 9007) @@ -5,5 +5,5 @@ <?php } ?> <span class="editdate"><?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?></span> <br /> -<a href="<?php echo PHPWIKI_BASE_URL ?>"><?php echo WIKI_NAME?></a> created with <a href="http://phpwiki.org/">PhpWiki</a> © 1998-2007 | <?php echo WikiLink(_("TermsOfUse")) ?> +<a href="<?php echo PHPWIKI_BASE_URL ?>"><?php echo WIKI_NAME?></a> created with <a href="http://phpwiki.fr/">PhpWiki</a> © 1998-2007 | <?php echo WikiLink(_("TermsOfUse")) ?> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-07-28 16:09:00
|
Revision: 9020 http://sourceforge.net/p/phpwiki/code/9020 Author: vargenau Date: 2014-07-28 16:08:56 +0000 (Mon, 28 Jul 2014) Log Message: ----------- Remove links to nonexisting pages Modified Paths: -------------- trunk/config/config-default.ini trunk/config/config-dist.ini trunk/configurator.php trunk/locale/de/pgsrc/G%C3%A4steBuch trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin trunk/locale/de/pgsrc/PhpWikiSystemverwalten trunk/locale/fr/pgsrc/AdministrationDePhpWiki trunk/locale/fr/pgsrc/Aide%2FInterWiki trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki trunk/locale/nl/pgsrc/PhpWikiBeheer trunk/locale/zh/pgsrc/Help%2FInterWiki trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin trunk/pgsrc/Help%2FCalendarListPlugin trunk/pgsrc/Help%2FCalendarPlugin trunk/pgsrc/Help%2FCreatePagePlugin trunk/pgsrc/Help%2FDebugGroupInfoPlugin trunk/pgsrc/Help%2FInterWiki trunk/pgsrc/Help%2FListPagesPlugin trunk/pgsrc/Help%2FPluginManagerPlugin trunk/pgsrc/Help%2FUpLoadPlugin trunk/pgsrc/Help%2FWikiPlugin trunk/pgsrc/PhpWikiAdministration Modified: trunk/config/config-default.ini =================================================================== --- trunk/config/config-default.ini 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/config/config-default.ini 2014-07-28 16:08:56 UTC (rev 9020) @@ -147,7 +147,7 @@ ; COPYRIGHTPAGE_TITLE = Creative Commons License 1.0 ; COPYRIGHTPAGE_URL = http://creativecommons.org/licenses/by/1.0/ AUTHORPAGE_TITLE = "The PhpWiki Programming Team" -AUTHORPAGE_URL = "http://phpwiki.fr/ThePhpWikiProgrammingTeam" +AUTHORPAGE_URL = "http://phpwiki.fr/The%20PhpWiki%20programming%20team" TOC_FULL_SYNTAX = true ENABLE_MARKUP_COLOR = true Modified: trunk/config/config-dist.ini =================================================================== --- trunk/config/config-dist.ini 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/config/config-dist.ini 2014-07-28 16:08:56 UTC (rev 9020) @@ -1006,7 +1006,7 @@ ; COPYRIGHTPAGE_URL = "http://creativecommons.org/licenses/by/2.0/" ; see http://creativecommons.org/learn/licenses/ for variations ;AUTHORPAGE_TITLE = The PhpWiki Programming Team -;AUTHORPAGE_URL = http://phpwiki.fr/ThePhpWikiProgrammingTeam +;AUTHORPAGE_URL = http://phpwiki.fr/The%20PhpWiki%20programming%20team ; Allow full markup in headers to be parsed by the CreateToc plugin. ; Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/configurator.php 2014-07-28 16:08:56 UTC (rev 9020) @@ -1464,7 +1464,7 @@ new _define_commented_optional('AUTHORPAGE_TITLE', "The PhpWiki Programming Team", " Default Author Names"); $properties["AUTHORPAGE_URL"] = - new _define_commented_optional('AUTHORPAGE_URL', "http://phpwiki.fr/ThePhpWikiProgrammingTeam", " + new _define_commented_optional('AUTHORPAGE_URL', "http://phpwiki.fr/The%20PhpWiki%20programming%20team", " Default Author URL"); $properties["TOC_FULL_SYNTAX"] = Modified: trunk/locale/de/pgsrc/G%C3%A4steBuch =================================================================== --- trunk/locale/de/pgsrc/G%C3%A4steBuch 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/locale/de/pgsrc/G%C3%A4steBuch 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Mon, 28 Jul 2014 18:07:17 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=G%C3%A4steBuch; @@ -9,5 +9,5 @@ Tragen Sie sich einfach mit Namen und Datum auf dieser Seite ein! Jeff Dairiki, Arno Hollosi, Steve Wainstead, Reini Urban, und alle weiteren -[PhpWiki Autoren|PhpWiki:ThePhpWikiProgrammingTeam]. +[[The PhpWiki programming team|PhpWiki Autoren]]. ---- Modified: trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Mon, 28 Jul 2014 18:07:17 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FHochLadenPlugin; @@ -14,7 +14,7 @@ Server hoch. Der Inhalt dieses Verzeichnis ist geheim, jede Datei dort kann mit dem "Upload~:" [InterWikiKarte]n Prefix zum Dateinamen verwendet werden. -So können Sie z.B. leicht hochgeladene Bilder anzeigen. Siehe PhpWiki:InlineUploadedImages +So können Sie z.B. leicht hochgeladene Bilder anzeigen. ==== Benutzung: {{{ Modified: trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Mon, 28 Jul 2014 18:07:17 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FNeueSeitePlugin; @@ -45,7 +45,5 @@ <?plugin-form CreatePage s=MyHomePage ?> -Siehe auch PhpWiki:EasilyCreateNewPages - ---- [[PhpWikiDokumentation]] [[KategorieWikiPlugin]] Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Mon, 28 Jul 2014 18:07:17 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FPhotoAlbumPlugin; @@ -125,9 +125,9 @@ [ /Diashow ] == Plugin Autoren -* [Ted Vinke|mailto:te...@jo...] Originaler Autor -* [ReiniUrban|PhpWiki:ReiniUrban] Lokales Dateisystem -* [ThomasHarding|PhpWiki:ThomasHarding] Diashow und thumbs +* [[mailto:te...@jo...|Ted Vinke]]: Originaler Autor +* [[Help:Reini Urban|Reini Urban]]: Lokales Dateisystem +* Thomas Harding: Diashow und thumbs ---- [[PhpWikiDokumentation]] [[KategorieWikiPlugin]] Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Mon, 28 Jul 2014 18:07:17 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten; @@ -30,7 +30,7 @@ Email Verification: - Die PhpWiki:EmailVerification ist momentan nicht strikt, d.h. einige mögliche falsche Ergebnisse der + Die EmailVerification ist momentan nicht strikt, d.h. einige mögliche falsche Ergebnisse der automatischen Überprüfung auf gültige E-Mail Addressen kann hier verwaltet werden. Manche Domains oder Email server können nicht automatisch überprüft werden. Modified: trunk/locale/fr/pgsrc/AdministrationDePhpWiki =================================================================== --- trunk/locale/fr/pgsrc/AdministrationDePhpWiki 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/locale/fr/pgsrc/AdministrationDePhpWiki 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Mon, 28 Jul 2014 18:07:17 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=AdministrationDePhpWiki; @@ -25,7 +25,7 @@ == Gestionnaire d'utilisateur -PhpWiki:EmailVerification est habituellement non-strict laissant ainsi des trous possibles qui peuvent être administrés ci-dessous. +EmailVerification est habituellement non-strict laissant ainsi des trous possibles qui peuvent être administrés ci-dessous. Ce bouton affichera la liste de tous les utilisateurs qui ont une adresse reconnue et les boutons pour effectuer une vérification manuelle. Modified: trunk/locale/fr/pgsrc/Aide%2FInterWiki =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FInterWiki 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/locale/fr/pgsrc/Aide%2FInterWiki 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Mon, 28 Jul 2014 18:07:17 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Aide%2FInterWiki; @@ -39,7 +39,7 @@ CategoryCategory. Le terme "~InterWiki" se réfère aussi à un concept plus large. Voir -[[PhpWiki:InterWikiSearch]] pour plus de liens. +[[InterWikiSearch]] pour plus de liens. <noinclude> ---- Modified: trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Mon, 28 Jul 2014 18:07:17 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Aide%2FPluginCr%C3%A9erUnePage; @@ -46,8 +46,6 @@ <?plugin-form CreatePage s=MaPagePersonnelle ?> -Voir aussi PhpWiki:EasilyCreateNewPages - <noinclude> ---- [[DocumentationDePhpWiki]] [[CatégoriePluginWiki]] Modified: trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki =================================================================== --- trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:06 +0000 +Date: Mon, 28 Jul 2014 18:07:17 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=AmministrazioneDiPhpWiki; @@ -24,7 +24,7 @@ == User Management -PhpWiki:EmailVerification is currently non-strict, leaving some possible holes, which can be administrated below. +EmailVerification is currently non-strict, leaving some possible holes, which can be administrated below. This button will show a list of all users with registered emails and buttons to set the verification status manually. Modified: trunk/locale/nl/pgsrc/PhpWikiBeheer =================================================================== --- trunk/locale/nl/pgsrc/PhpWikiBeheer 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/locale/nl/pgsrc/PhpWikiBeheer 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:07 +0000 +Date: Mon, 28 Jul 2014 18:07:17 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=PhpWikiBeheer; @@ -24,7 +24,7 @@ == User Management -PhpWiki:EmailVerification is currently non-strict, leaving some possible holes, which can be +EmailVerification is currently non-strict, leaving some possible holes, which can be administrated below. This button will show a list of all users with registered emails and buttons to set the Modified: trunk/locale/zh/pgsrc/Help%2FInterWiki =================================================================== --- trunk/locale/zh/pgsrc/Help%2FInterWiki 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/locale/zh/pgsrc/Help%2FInterWiki 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:07 +0000 +Date: Mon, 28 Jul 2014 18:07:17 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Help%2FInterWiki; @@ -29,7 +29,7 @@ 而無須建立 back-reference(向後參考).因此, Category:Category 連結到 CategoryCategory 頁面,此頁面將不顯示 CategoryCategory 的 back-links(向後連結). -這個字眼 "InterWiki" 也涉及了廣義的觀念. 參閱 PhpWiki:InterWikiSearch 取得 +這個字眼 "InterWiki" 也涉及了廣義的觀念. 參閱 InterWikiSearch 取得 更多連結. <noinclude> Modified: trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin =================================================================== --- trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Fri, 7 Dec 2012 14:58:45 +0000 +Date: Mon, 28 Jul 2014 18:06:50 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Help%2FAnalyseAccessLogSqlPlugin; @@ -118,7 +118,7 @@ - strings enclosed in double quotes will evaluate and replace variable names so that, for example, *"FROM $accesslog "* might be evaluated to *"FROM phpwiki_accesslog "*. == Authors == -* [[PhpWiki:CharlesCorrigan|Charles Corrigan]] +* Charles Corrigan * Changes by [[Help:Reini Urban|Reini Urban]] <noinclude> Modified: trunk/pgsrc/Help%2FCalendarListPlugin =================================================================== --- trunk/pgsrc/Help%2FCalendarListPlugin 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/pgsrc/Help%2FCalendarListPlugin 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:46:13 +0000 +Date: Mon, 28 Jul 2014 18:06:50 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Help%2FCalendarListPlugin; @@ -7,7 +7,7 @@ Content-Transfer-Encoding: binary The **~CalendarList** [[Help:WikiPlugin|plugin]] is used in conjunction with the [[Help:CalendarPlugin|Calendar]] plugin. -It was written for those who use a wiki as a [[PhpWiki:PersonalWiki|personal information manager]]. +It was written for those who use a wiki as a personal information manager. Just click any date in the calendar, edit the for that date, then come back to this page. The event should be listed below the calendar. Modified: trunk/pgsrc/Help%2FCalendarPlugin =================================================================== --- trunk/pgsrc/Help%2FCalendarPlugin 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/pgsrc/Help%2FCalendarPlugin 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Thu, 12 Jun 2014 17:57:14 +0000 +Date: Mon, 28 Jul 2014 18:06:50 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Help%2FCalendarPlugin; @@ -7,7 +7,7 @@ Content-Transfer-Encoding: binary The **Calendar** [[Help:WikiPlugin|plugin]] can be used to generate a monthly calendar in a -wiki page. It's handy for [[PhpWiki:PersonalWiki|personal wikis]]. +wiki page. It's handy for personal wikis. Individual dates in the calendar link to specially named wiki pages. The names for the "day pages" are by default formed by appending the Modified: trunk/pgsrc/Help%2FCreatePagePlugin =================================================================== --- trunk/pgsrc/Help%2FCreatePagePlugin 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/pgsrc/Help%2FCreatePagePlugin 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Fri, 7 Dec 2012 14:58:45 +0000 +Date: Mon, 28 Jul 2014 18:06:50 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Help%2FCreatePagePlugin; @@ -84,7 +84,6 @@ <?plugin-form CreatePage s=MyHomePage ?> == See Also == -* [[PhpWiki:EasilyCreateNewPages]] * [[Help:WikiFormRichPlugin]] * [[Help:SqlResultPlugin]] Modified: trunk/pgsrc/Help%2FDebugGroupInfoPlugin =================================================================== --- trunk/pgsrc/Help%2FDebugGroupInfoPlugin 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/pgsrc/Help%2FDebugGroupInfoPlugin 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Thu, 26 Jun 2014 12:01:34 +0000 +Date: Mon, 28 Jul 2014 18:06:50 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Help%2FDebugGroupInfoPlugin; @@ -28,7 +28,7 @@ See [[DebugGroupInfo]] == Author == -* [[PhpWiki:CharlesCorrigan|Charles Corrigan]] +* Charles Corrigan == See Also == Modified: trunk/pgsrc/Help%2FInterWiki =================================================================== --- trunk/pgsrc/Help%2FInterWiki 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/pgsrc/Help%2FInterWiki 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:46:13 +0000 +Date: Mon, 28 Jul 2014 18:06:50 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Help%2FInterWiki; @@ -37,7 +37,7 @@ won't show up in the back-links listing of [[:CategoryCategory|CategoryCategory]]. The term "~InterWiki" also refers to a broader concept. See -[[PhpWiki:InterWikiSearch]] for more links. +[[InterWikiSearch]] for more links. ---- [[PhpWikiDocumentation]] Modified: trunk/pgsrc/Help%2FListPagesPlugin =================================================================== --- trunk/pgsrc/Help%2FListPagesPlugin 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/pgsrc/Help%2FListPagesPlugin 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Tue, 27 Nov 2012 11:38:57 +0000 +Date: Mon, 28 Jul 2014 18:06:50 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Help%2FListPagesPlugin; @@ -10,7 +10,7 @@ [[Help:PageList|PageList]] options, mainly used for a wikilens theme to display ratings info and recommendations. -It can also be used with the [[PhpWiki:PluginList]] method to list a set of pages generated by +It can also be used with the [[PluginList]] method to list a set of pages generated by another plugin, and/or to exclude a set of pages generated by another plugin. See the [[Help:PageList|PageList]] options. Modified: trunk/pgsrc/Help%2FPluginManagerPlugin =================================================================== --- trunk/pgsrc/Help%2FPluginManagerPlugin 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/pgsrc/Help%2FPluginManagerPlugin 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Fri, 7 Dec 2012 19:05:42 +0000 +Date: Mon, 28 Jul 2014 18:06:50 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Help%2FPluginManagerPlugin; @@ -59,7 +59,7 @@ * [[http://phpweather.sf.net | phpweather]] for the [[Help:PhpWeatherPlugin|PhpWeather]] plugin, * USE_DB_SESSION = true (default for the peardb, adodb or dba backends) for the [[Help:WhoIsOnlinePlugin|WhoIsOnline]] plugin, * --with-xml support (with expat or libxml2) for the [[Help:RssFeedPlugin|RssFeed]] plugin (~ProjectSummary, ~RecentReleases) and ~HtmlParser support (~ImportHtml, ~HtmlAreaEditing), -* PHP Mail functionality (php.ini: SMTP + sendmail_from on Windows or sendmail_path) for email PhpWiki:PageChangeNotifications and ModeratedPage's, +* PHP Mail functionality (php.ini: SMTP + sendmail_from on Windows or sendmail_path) for email PageChangeNotifications and ModeratedPage's, * a [[http://www.google.com/apis/ | Google license key]] for the [[Help:GooglePluginPlugin|GooglePlugin]] plugin, * optionally apache/mod_log_{my}sql for fast, external log analysis if ACCESS_LOG_SQL=1 (Referer, Abuse Prevention). See ##lib/Request.php## and http://www.outoforder.cc/projects/apache/mod_log_sql/ Modified: trunk/pgsrc/Help%2FUpLoadPlugin =================================================================== --- trunk/pgsrc/Help%2FUpLoadPlugin 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/pgsrc/Help%2FUpLoadPlugin 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Fri, 7 Jan 2011 17:32:57 +0000 +Date: Mon, 28 Jul 2014 18:06:50 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Help%2FUpLoadPlugin; @@ -64,8 +64,6 @@ == See Also == -* [[PhpWiki:InlineUploadedImages]] - <noinclude> ---- [[PhpWikiDocumentation]] [[CategoryWikiPlugin]] Modified: trunk/pgsrc/Help%2FWikiPlugin =================================================================== --- trunk/pgsrc/Help%2FWikiPlugin 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/pgsrc/Help%2FWikiPlugin 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Fri, 11 Jan 2013 11:16:51 +0000 +Date: Mon, 28 Jul 2014 18:06:50 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Help%2FWikiPlugin; @@ -92,7 +92,7 @@ *exclude* and *pages* accept a list of pages. Either as comma-separated list, supporting glob-style wildcards, or via the ##<!plugin-list pluginname ~[args~] !>## invocation syntax, where pluginname might be any plugin returning a [[Help:PageList|PageList]]. -See PhpWiki:PluginList. +See PluginList. Since most plugins return a ~PageList, this ~PageList is also a common input parameter for other plugins, actions or formats. @@ -150,7 +150,7 @@ getAlt(), getImageType(), embedMap(), embedImg(), embedObject() -See the config.ini PLUGIN_CACHED_* settings and PhpWiki:WikiPluginCached +See the config.ini PLUGIN_CACHED_* settings and WikiPluginCached === Action Pages === @@ -161,7 +161,7 @@ It can both be GET or POST actions. Actions are untranslated, always English, pagenames can be localized. Basic (and old) actions are all lowercase, like edit, browse, remove, ... -Newer actions in [[PhpWiki:CamelCase]] are invoked via plugins on their +Newer actions in ~CamelCase are invoked via plugins on their specific action page. We decoupled actions from plugins via action pages for the following Modified: trunk/pgsrc/PhpWikiAdministration =================================================================== --- trunk/pgsrc/PhpWikiAdministration 2014-07-28 15:28:17 UTC (rev 9019) +++ trunk/pgsrc/PhpWikiAdministration 2014-07-28 16:08:56 UTC (rev 9020) @@ -1,4 +1,4 @@ -Date: Fri, 28 Jun 2013 15:51:27 +0000 +Date: Mon, 28 Jul 2014 18:06:50 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=PhpWikiAdministration; @@ -37,7 +37,7 @@ === Email Verification === This is currently non-strict, leaving some possible holes in not being able to -connect to certain mail hosts, which can be overridden below. See [[PhpWiki:EmailVerification]]. +connect to certain mail hosts, which can be overridden below. This button will show a list of all users with registered emails and buttons to set the verification status manually. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-07-29 08:52:05
|
Revision: 9024 http://sourceforge.net/p/phpwiki/code/9024 Author: vargenau Date: 2014-07-29 08:51:58 +0000 (Tue, 29 Jul 2014) Log Message: ----------- Update doc for PhpWiki 1.5.0 Modified Paths: -------------- trunk/INSTALL trunk/README trunk/TODO trunk/pgsrc/ReleaseNotes Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2014-07-29 08:40:35 UTC (rev 9023) +++ trunk/INSTALL 2014-07-29 08:51:58 UTC (rev 9024) @@ -1,10 +1,9 @@ REQUIREMENTS -PhpWiki 1.4.0 requires a web server with at least PHP version 5.2. +PhpWiki 1.5.0 requires a web server with at least PHP version 5.3. All users of PHP are strongly encouraged to upgrade to -PHP 5.3.18 (Current stable) this is the supported version -or if not possible to PHP 5.2.17 (Old stable). +PHP 5.3.28 or to PHP 5.4 or 5.5. Visit <http://www.php.net> and <http://php.net/downloads.php> for downloads and information. @@ -15,8 +14,7 @@ PHP must also be compiled with support for the type of database you want to use, i.e. --with-gdbm, --with-db2, --with-db3, --with-msql, ---with-pgsql. (With PHP4 MySQL support is always enabled. With PHP5 -sqlite instead). Consult the PHP installation manual for specific +--with-pgsql. Consult the PHP installation manual for specific installation and configure options. <http://www.php.net/manual/en/installation.php> @@ -61,11 +59,9 @@ 0. INSTALLATION -Untar / gzip this file into the directory where you want it to -live. That's it. +Unzip this file into the directory where you want it to live. That's it. -bash$ gzip -d phpwiki-X.XX.tar.gz -bash$ tar -xvf phpwiki-X.XX.tar +bash$ unzip phpwiki-1.5.0.zip In the config subdirectory copy 'config-dist.ini' to 'config.ini' and edit the settings in 'config.ini' to your liking. Modified: trunk/README =================================================================== --- trunk/README 2014-07-29 08:40:35 UTC (rev 9023) +++ trunk/README 2014-07-29 08:51:58 UTC (rev 9024) @@ -13,7 +13,7 @@ * Opera >= 8 * Chrome >= 6 * Konqueror >= 3.5 -* Internet Explorer >= 6 (so no Internet Explorer for Macintosh) +* Internet Explorer >= 8 Additional docs: Modified: trunk/TODO =================================================================== --- trunk/TODO 2014-07-29 08:40:35 UTC (rev 9023) +++ trunk/TODO 2014-07-29 08:51:58 UTC (rev 9024) @@ -42,7 +42,6 @@ * ATOM (experimentally done), TrackBack, PingBack services (take it from DokuWiki) * finish Blog theme * lang: mapping -* fix ENABLE_MARKUP_DIVSPAN * WikiUser/EMailConfirm (?) * ImportMediaWiki, ImportRdf, ImportOwl, ExportMediaWiki, ExportRdf, ExportOwl * WikiUser/OpenID (from DokuWiki) - Status::in_work @@ -94,8 +93,6 @@ defer header logic * don't print php notices and warnings as red errors. just green or grey -* rewrite OldTextFormattingRules, AnciennesR%E8glesDeFormatage - for proper importing * PageChangeNotification other actions also (rename, remove). better subject on create. * do all unit tests: @@ -170,4 +167,3 @@ * finalize editpage javascript toolbar (80%) fix search/replace bug (100%) * finalize SOAP support (0%) - * better utf-8 support (50%) Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2014-07-29 08:40:35 UTC (rev 9023) +++ trunk/pgsrc/ReleaseNotes 2014-07-29 08:51:58 UTC (rev 9024) @@ -1,4 +1,4 @@ -Date: Mon, 28 Jul 2014 18:24:03 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -8,7 +8,7 @@ <<CreateToc with_toclink||=1 headers||=1,2,3>> -== 1.5.0 2014-??-?? Marc-Etienne Vargenau == +== 1.5.0 2014-07-29 Marc-Etienne Vargenau == === Main Changes === * ~PhpWiki 1.5.0 needs at least PHP 5.3. It is compatible with PHP 5.3, 5.4 and 5.5. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-07-29 08:56:58
|
Revision: 9025 http://sourceforge.net/p/phpwiki/code/9025 Author: vargenau Date: 2014-07-29 08:56:48 +0000 (Tue, 29 Jul 2014) Log Message: ----------- Update date Modified Paths: -------------- trunk/locale/de/pgsrc/%C3%84hnlicheSeiten trunk/locale/de/pgsrc/AlleBenutzer trunk/locale/de/pgsrc/AlleSeiten trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir trunk/locale/de/pgsrc/BackLinks trunk/locale/de/pgsrc/BenutzerEinstellungen trunk/locale/de/pgsrc/DebugAuthInfo trunk/locale/de/pgsrc/DebugGruppenInfo trunk/locale/de/pgsrc/DebugInfo trunk/locale/de/pgsrc/EditiereText trunk/locale/de/pgsrc/Einstellungen trunk/locale/de/pgsrc/FuzzySuche trunk/locale/de/pgsrc/G%C3%A4steBuch trunk/locale/de/pgsrc/GaesteBuch trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen trunk/locale/de/pgsrc/GleicheSeiten trunk/locale/de/pgsrc/Hilfe trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin trunk/locale/de/pgsrc/Hilfe%2FGuterStil trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow trunk/locale/de/pgsrc/Hilfe%2FPhpWiki trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin trunk/locale/de/pgsrc/Hilfe%2FWabiSabi trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb trunk/locale/de/pgsrc/HochLaden trunk/locale/de/pgsrc/InterWikiListe trunk/locale/de/pgsrc/KategorieAktionSeite trunk/locale/de/pgsrc/KategorieKategorie trunk/locale/de/pgsrc/KategorieWikiPlugin trunk/locale/de/pgsrc/LinkSuche trunk/locale/de/pgsrc/ListeRelationen trunk/locale/de/pgsrc/ListeSeiten trunk/locale/de/pgsrc/MeistBesucht trunk/locale/de/pgsrc/ModerierteSeite trunk/locale/de/pgsrc/NeueSeite trunk/locale/de/pgsrc/Neueste%C3%84nderungen trunk/locale/de/pgsrc/NeuesteSeiten trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen trunk/locale/de/pgsrc/PhpWikiDokumentation trunk/locale/de/pgsrc/PhpWikiSystemverwalten trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen trunk/locale/de/pgsrc/PhpWikiUmfrage trunk/locale/de/pgsrc/SandKasten trunk/locale/de/pgsrc/SandKiste trunk/locale/de/pgsrc/SeiteBeobarten trunk/locale/de/pgsrc/SeiteFinden trunk/locale/de/pgsrc/SeiteSpeichern trunk/locale/de/pgsrc/SeitenErzeugen trunk/locale/de/pgsrc/SeitenInfo trunk/locale/de/pgsrc/SeitenProtokoll trunk/locale/de/pgsrc/SemantischeRelationen trunk/locale/de/pgsrc/SemantischeSuche trunk/locale/de/pgsrc/StartSeite trunk/locale/de/pgsrc/StartSeiteAlias trunk/locale/de/pgsrc/TitelSuche trunk/locale/de/pgsrc/UpLoad trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen trunk/locale/de/pgsrc/VerwaisteSeiten trunk/locale/de/pgsrc/VolltextSuche trunk/locale/de/pgsrc/Vorlage%2FBeispiel trunk/locale/de/pgsrc/WerIstOnline trunk/locale/de/pgsrc/WikiAdminAuswahl trunk/locale/de/pgsrc/WunschZettelSeiten trunk/locale/de/pgsrc/ZufallsSeite trunk/locale/es/pgsrc/Ayuda trunk/locale/es/pgsrc/Ayuda%2FAgregarPaginas trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto trunk/locale/es/pgsrc/Ayuda%2FKBrown trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica trunk/locale/es/pgsrc/Ayuda%2FPhpWiki trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto trunk/locale/es/pgsrc/Ayuda%2FWabiSabi trunk/locale/es/pgsrc/Ayuda%2FWikiWikiWeb trunk/locale/es/pgsrc/BuscarP%C3%A1gina trunk/locale/es/pgsrc/CajaDeArena trunk/locale/es/pgsrc/CambiosRecientes trunk/locale/es/pgsrc/MasPopulares trunk/locale/es/pgsrc/P%C3%A1ginaPrincipal trunk/locale/es/pgsrc/TodasLasPaginas trunk/locale/es/pgsrc/VisitantesRecientes trunk/locale/fr/pgsrc/%C3%89diterLesMetaDonn%C3%A9es trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes trunk/locale/fr/pgsrc/AdministrationDePhpWiki trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FChown trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRechercherRemplacer trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRenommer trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimer trunk/locale/fr/pgsrc/Aide trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages trunk/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien trunk/locale/fr/pgsrc/Aide%2FInterWiki trunk/locale/fr/pgsrc/Aide%2FLienGoogle trunk/locale/fr/pgsrc/Aide%2FPhpWiki trunk/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData trunk/locale/fr/pgsrc/Aide%2FPluginAjouterDesCommentaires trunk/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde trunk/locale/fr/pgsrc/Aide%2FPluginCalendrier trunk/locale/fr/pgsrc/Aide%2FPluginColorationPhp trunk/locale/fr/pgsrc/Aide%2FPluginCommenter trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm trunk/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur trunk/locale/fr/pgsrc/Aide%2FPluginHtmlPur trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnePage trunk/locale/fr/pgsrc/Aide%2FPluginInfosSyst%C3%A8me trunk/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer trunk/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages trunk/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier trunk/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp trunk/locale/fr/pgsrc/Aide%2FPluginRechercheExterne trunk/locale/fr/pgsrc/Aide%2FPluginRedirection trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss trunk/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle trunk/locale/fr/pgsrc/Aide%2FPluginTeX2png trunk/locale/fr/pgsrc/Aide%2FPluginTestDeCache trunk/locale/fr/pgsrc/Aide%2FPluginWiki trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes trunk/locale/fr/pgsrc/Aide%2FSteve%20Wainstead trunk/locale/fr/pgsrc/Aide%2FStyleCorrect trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki trunk/locale/fr/pgsrc/Aide%2FWabiSabi trunk/locale/fr/pgsrc/Aide%2FWikiWikiWeb trunk/locale/fr/pgsrc/AliasAccueil trunk/locale/fr/pgsrc/Bac%C3%80Sable trunk/locale/fr/pgsrc/CarteInterWiki trunk/locale/fr/pgsrc/Cat%C3%A9gorieCat%C3%A9gorie trunk/locale/fr/pgsrc/Cat%C3%A9gorieGroupes trunk/locale/fr/pgsrc/Cat%C3%A9goriePageDAction trunk/locale/fr/pgsrc/Cat%C3%A9goriePagesAccueil trunk/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki trunk/locale/fr/pgsrc/ChangementsLi%C3%A9s trunk/locale/fr/pgsrc/ChercherUnePage trunk/locale/fr/pgsrc/ClassezLa trunk/locale/fr/pgsrc/CommentairesR%C3%A9cents trunk/locale/fr/pgsrc/Cr%C3%A9erUnePage trunk/locale/fr/pgsrc/D%C3%A9poserUnFichier trunk/locale/fr/pgsrc/Derni%C3%A8resModifs trunk/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes trunk/locale/fr/pgsrc/DerniersVisiteurs trunk/locale/fr/pgsrc/DocumentationDePhpWiki trunk/locale/fr/pgsrc/GestionDesPlugins trunk/locale/fr/pgsrc/HistoriqueDeLaPage trunk/locale/fr/pgsrc/InfosAuthentification trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage trunk/locale/fr/pgsrc/InfosSurLaPage trunk/locale/fr/pgsrc/LesPlusVisit%C3%A9es trunk/locale/fr/pgsrc/ListeDePages trunk/locale/fr/pgsrc/ManuelPhpWiki trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki trunk/locale/fr/pgsrc/NotesDeVersion trunk/locale/fr/pgsrc/PageAccueil trunk/locale/fr/pgsrc/PageAl%C3%A9atoire trunk/locale/fr/pgsrc/PagesFloues trunk/locale/fr/pgsrc/PagesOrphelines trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es trunk/locale/fr/pgsrc/PagesSemblables trunk/locale/fr/pgsrc/PierrickMeignen trunk/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs trunk/locale/fr/pgsrc/QuiEstEnLigne trunk/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage trunk/locale/fr/pgsrc/R%C3%A9troLiens trunk/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral trunk/locale/fr/pgsrc/RechercheInterWiki trunk/locale/fr/pgsrc/RechercheParTitre trunk/locale/fr/pgsrc/SommaireDuProjet trunk/locale/fr/pgsrc/SondagePhpWiki trunk/locale/fr/pgsrc/Suivre trunk/locale/fr/pgsrc/TousLesUtilisateurs trunk/locale/fr/pgsrc/ToutesLesPages trunk/locale/fr/pgsrc/TraduireUnTexte trunk/locale/fr/pgsrc/VersionsR%C3%A9centes trunk/locale/fr/pgsrc/VisiteursR%C3%A9cents trunk/locale/it/pgsrc/Aiuto trunk/locale/it/pgsrc/Aiuto%2FAggiungerePagine trunk/locale/it/pgsrc/Aiuto%2FBuonStile trunk/locale/it/pgsrc/Aiuto%2FComeUsareWiki trunk/locale/it/pgsrc/Aiuto%2FMagicPhpWikiURLs trunk/locale/it/pgsrc/Aiuto%2FModificaIlTesto trunk/locale/it/pgsrc/Aiuto%2FPhpWiki trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto trunk/locale/it/pgsrc/Aiuto%2FVarieSulFunzionamento trunk/locale/it/pgsrc/Aiuto%2FWabiSabi trunk/locale/it/pgsrc/Aiuto%2FWikiWikiWeb trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki%2FRimuovi trunk/locale/it/pgsrc/CambiamentiRecenti trunk/locale/it/pgsrc/FuzzyPages trunk/locale/it/pgsrc/NoteDiRilascio trunk/locale/it/pgsrc/PaginaDiProva trunk/locale/it/pgsrc/PaginaPrincipale trunk/locale/it/pgsrc/PiuPopolari trunk/locale/it/pgsrc/RicercaDelTesto trunk/locale/it/pgsrc/RicercaSuTutto trunk/locale/it/pgsrc/ScatolaDiSabbia trunk/locale/it/pgsrc/SteveWainstead trunk/locale/it/pgsrc/TrovaPagina trunk/locale/it/pgsrc/TutteLePagine trunk/locale/it/pgsrc/VisitatoriRecenti trunk/locale/ja/pgsrc/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2 trunk/locale/ja/pgsrc/%E3%83%9B%E3%83%BC%E3%83%A0%E3%83%9A%E3%83%BC%E3%82%B8 trunk/locale/nl/pgsrc/Help trunk/locale/nl/pgsrc/Help%2FGebruikersVoorkeuren trunk/locale/nl/pgsrc/Help%2FGoedeStijl trunk/locale/nl/pgsrc/Help%2FHoeWikiTeGebruiken trunk/locale/nl/pgsrc/Help%2FJanNieuwenhuizen trunk/locale/nl/pgsrc/Help%2FMeerOverTechnieken trunk/locale/nl/pgsrc/Help%2FPaginasToevoegen trunk/locale/nl/pgsrc/Help%2FPhpWiki trunk/locale/nl/pgsrc/Help%2FRecenteBezoekers trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs trunk/locale/nl/pgsrc/Help%2FVeranderTekst trunk/locale/nl/pgsrc/Help%2FWabiSabi trunk/locale/nl/pgsrc/Help%2FWikiWikiWeb trunk/locale/nl/pgsrc/MeestBezocht trunk/locale/nl/pgsrc/PhpWikiBeheer trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVervangt trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVerwijder trunk/locale/nl/pgsrc/RecenteVeranderingen trunk/locale/nl/pgsrc/ThuisPagina trunk/locale/nl/pgsrc/UitgaveNoten trunk/locale/nl/pgsrc/ZandBak trunk/locale/nl/pgsrc/ZoekPagina trunk/locale/sv/pgsrc/Framsida trunk/locale/sv/pgsrc/Hj%C3%A4lp trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FG%C3%A4stboken trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FHurManAnv%C3%A4nderWiki trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FL%C3%A4ggaTillSidor trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FMerOmMekanismerna trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FRedigeraText trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FWikiWikiWeb trunk/locale/sv/pgsrc/MestPopul%C3%A4r trunk/locale/sv/pgsrc/PhpWikiAdministration trunk/locale/sv/pgsrc/S%C3%B6kEfterSida trunk/locale/sv/pgsrc/Sandl%C3%A5dan trunk/locale/sv/pgsrc/Senaste%C3%84ndringar trunk/locale/zh/pgsrc/%E9%A6%96%E9%A0%81 trunk/locale/zh/pgsrc/AllPages trunk/locale/zh/pgsrc/AllUsers trunk/locale/zh/pgsrc/BackLinks trunk/locale/zh/pgsrc/DebugInfo trunk/locale/zh/pgsrc/FindPage trunk/locale/zh/pgsrc/FullRecentChanges trunk/locale/zh/pgsrc/FullTextSearch trunk/locale/zh/pgsrc/FuzzyPages trunk/locale/zh/pgsrc/Help trunk/locale/zh/pgsrc/Help%2FAddingPages trunk/locale/zh/pgsrc/Help%2FCalendarPlugin trunk/locale/zh/pgsrc/Help%2FCommentPlugin trunk/locale/zh/pgsrc/Help%2FEditText trunk/locale/zh/pgsrc/Help%2FExternalSearchPlugin trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin trunk/locale/zh/pgsrc/Help%2FHowToUseWiki trunk/locale/zh/pgsrc/Help%2FInterWiki trunk/locale/zh/pgsrc/Help%2FLinkIcons trunk/locale/zh/pgsrc/Help%2FMagicPhpWikiURLs trunk/locale/zh/pgsrc/Help%2FMoreAboutMechanics trunk/locale/zh/pgsrc/Help%2FOldStyleTablePlugin trunk/locale/zh/pgsrc/Help%2FPhotoAlbumPlugin trunk/locale/zh/pgsrc/Help%2FPhpHighlightPlugin trunk/locale/zh/pgsrc/Help%2FPhpWeatherPlugin trunk/locale/zh/pgsrc/Help%2FPhpWiki trunk/locale/zh/pgsrc/Help%2FRedirectToPlugin trunk/locale/zh/pgsrc/Help%2FSystemInfoPlugin trunk/locale/zh/pgsrc/Help%2FTranscludePlugin trunk/locale/zh/pgsrc/Help%2FWikiPlugin trunk/locale/zh/pgsrc/Help%2FWikiWikiWeb trunk/locale/zh/pgsrc/HomePage trunk/locale/zh/pgsrc/HomePageAlias trunk/locale/zh/pgsrc/InterWikiMap trunk/locale/zh/pgsrc/InterWikiSearch trunk/locale/zh/pgsrc/LikePages trunk/locale/zh/pgsrc/OrphanedPages trunk/locale/zh/pgsrc/PageDump trunk/locale/zh/pgsrc/PhpWikiAdministration trunk/locale/zh/pgsrc/RandomPage trunk/locale/zh/pgsrc/RecentChanges trunk/locale/zh/pgsrc/RecentEdits trunk/locale/zh/pgsrc/RecentVisitors trunk/locale/zh/pgsrc/SandBox trunk/locale/zh/pgsrc/TitleSearch trunk/locale/zh/pgsrc/UpLoad trunk/locale/zh/pgsrc/UserPreferences trunk/locale/zh/pgsrc/WantedPages trunk/pgsrc/AllPages trunk/pgsrc/AllPagesByAcl trunk/pgsrc/AllPagesCreatedByMe trunk/pgsrc/AllPagesLastEditedByMe trunk/pgsrc/AllPagesOwnedByMe trunk/pgsrc/AllUserPages trunk/pgsrc/AllUsers trunk/pgsrc/AppendText trunk/pgsrc/AuthorHistory trunk/pgsrc/BackLinks trunk/pgsrc/BlogArchives trunk/pgsrc/BlogJournal trunk/pgsrc/CategoryActionPage trunk/pgsrc/CategoryCategory trunk/pgsrc/CategoryGroup trunk/pgsrc/CategoryHomePages trunk/pgsrc/CategoryWikiPlugin trunk/pgsrc/CreatePage trunk/pgsrc/DebugAuthInfo trunk/pgsrc/DebugBackendInfo trunk/pgsrc/DebugGroupInfo trunk/pgsrc/DebugInfo trunk/pgsrc/EditMetaData trunk/pgsrc/FindPage trunk/pgsrc/FullRecentChanges trunk/pgsrc/FullTextSearch trunk/pgsrc/FuzzyPages trunk/pgsrc/Help trunk/pgsrc/Help%2FActionPage trunk/pgsrc/Help%2FAddCommentPlugin trunk/pgsrc/Help%2FAddingPages trunk/pgsrc/Help%2FAdobe%20Flash trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users trunk/pgsrc/Help%2FAllPagesPlugin trunk/pgsrc/Help%2FAllUsersPlugin trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin trunk/pgsrc/Help%2FAppendTextPlugin trunk/pgsrc/Help%2FAsciiMathPlugin trunk/pgsrc/Help%2FAsciiSVGPlugin trunk/pgsrc/Help%2FAtomFeedPlugin trunk/pgsrc/Help%2FAuthorHistoryPlugin trunk/pgsrc/Help%2FBackLinksPlugin trunk/pgsrc/Help%2FBlogArchivesPlugin trunk/pgsrc/Help%2FBlogJournalPlugin trunk/pgsrc/Help%2FBoxRightPlugin trunk/pgsrc/Help%2FCacheTestPlugin trunk/pgsrc/Help%2FCalendarListPlugin trunk/pgsrc/Help%2FCalendarPlugin trunk/pgsrc/Help%2FCategories trunk/pgsrc/Help%2FCategoryPagePlugin trunk/pgsrc/Help%2FChartPlugin trunk/pgsrc/Help%2FCommentPlugin trunk/pgsrc/Help%2FCreateBibPlugin trunk/pgsrc/Help%2FCreatePagePlugin trunk/pgsrc/Help%2FCreateTocPlugin trunk/pgsrc/Help%2FCurrentTimePlugin trunk/pgsrc/Help%2FDeadEndPagesPlugin trunk/pgsrc/Help%2FDebugAuthInfoPlugin trunk/pgsrc/Help%2FDebugBackendInfoPlugin trunk/pgsrc/Help%2FDebugGroupInfoPlugin trunk/pgsrc/Help%2FDiffPlugin trunk/pgsrc/Help%2FDynamicIncludePagePlugin trunk/pgsrc/Help%2FEditMetaDataPlugin trunk/pgsrc/Help%2FEditText trunk/pgsrc/Help%2FExternalSearchPlugin trunk/pgsrc/Help%2FFacebookLikePlugin trunk/pgsrc/Help%2FFileInfoPlugin trunk/pgsrc/Help%2FFoafViewerPlugin trunk/pgsrc/Help%2FFrameIncludePlugin trunk/pgsrc/Help%2FFullTextSearchPlugin trunk/pgsrc/Help%2FFuzzyPagesPlugin trunk/pgsrc/Help%2FGoToPlugin trunk/pgsrc/Help%2FGoodStyle trunk/pgsrc/Help%2FGoogleLink trunk/pgsrc/Help%2FGoogleMapsPlugin trunk/pgsrc/Help%2FGooglePluginPlugin trunk/pgsrc/Help%2FGraphVizPlugin trunk/pgsrc/Help%2FHelloWorldPlugin trunk/pgsrc/Help%2FHowToUseWiki trunk/pgsrc/Help%2FHtmlConverterPlugin trunk/pgsrc/Help%2FImages trunk/pgsrc/Help%2FIncludePagePlugin trunk/pgsrc/Help%2FIncludePagesPlugin trunk/pgsrc/Help%2FIncludeSiteMapPlugin trunk/pgsrc/Help%2FIncludeTreePlugin trunk/pgsrc/Help%2FInterWiki trunk/pgsrc/Help%2FInterWikiSearchPlugin trunk/pgsrc/Help%2FJabberPresencePlugin trunk/pgsrc/Help%2FJeff%20Dairiki trunk/pgsrc/Help%2FLdapSearchPlugin trunk/pgsrc/Help%2FLikePagesPlugin trunk/pgsrc/Help%2FLinkDatabasePlugin trunk/pgsrc/Help%2FLinkIcons trunk/pgsrc/Help%2FListPagesPlugin trunk/pgsrc/Help%2FListSubpagesPlugin trunk/pgsrc/Help%2FMagicPhpWikiURLs trunk/pgsrc/Help%2FMediawikiTablePlugin trunk/pgsrc/Help%2FModeratedPagePlugin trunk/pgsrc/Help%2FMoreAboutMechanics trunk/pgsrc/Help%2FMostPopularPlugin trunk/pgsrc/Help%2FNewPagesPerUserPlugin trunk/pgsrc/Help%2FNoCachePlugin trunk/pgsrc/Help%2FOldStyleTablePlugin trunk/pgsrc/Help%2FOrphanedPagesPlugin trunk/pgsrc/Help%2FPageDumpPlugin trunk/pgsrc/Help%2FPageGroupPlugin trunk/pgsrc/Help%2FPageHistoryPlugin trunk/pgsrc/Help%2FPageInfoPlugin trunk/pgsrc/Help%2FPageList trunk/pgsrc/Help%2FPagePermissions trunk/pgsrc/Help%2FPageTrailPlugin trunk/pgsrc/Help%2FPasswordResetPlugin trunk/pgsrc/Help%2FPhotoAlbumPlugin trunk/pgsrc/Help%2FPhotoAlbumPlugin%2FSlides trunk/pgsrc/Help%2FPhpHighlightPlugin trunk/pgsrc/Help%2FPhpWeatherPlugin trunk/pgsrc/Help%2FPhpWiki trunk/pgsrc/Help%2FPloticusPlugin trunk/pgsrc/Help%2FPluginManagerPlugin trunk/pgsrc/Help%2FPopUpPlugin trunk/pgsrc/Help%2FPopularNearbyPlugin trunk/pgsrc/Help%2FPredefinedIcons trunk/pgsrc/Help%2FPreferenceAppPlugin trunk/pgsrc/Help%2FPreferencesInfoPlugin trunk/pgsrc/Help%2FPrevNextPlugin trunk/pgsrc/Help%2FRandomPagePlugin trunk/pgsrc/Help%2FRateItPlugin trunk/pgsrc/Help%2FRawHtmlPlugin trunk/pgsrc/Help%2FRecentChangesCachedPlugin trunk/pgsrc/Help%2FRecentChangesPlugin trunk/pgsrc/Help%2FRecentCommentsPlugin trunk/pgsrc/Help%2FRecentEditsPlugin trunk/pgsrc/Help%2FRecentReferrersPlugin trunk/pgsrc/Help%2FRedirectToPlugin trunk/pgsrc/Help%2FReini%20Urban trunk/pgsrc/Help%2FRelatedChangesPlugin trunk/pgsrc/Help%2FRichTablePlugin trunk/pgsrc/Help%2FRssFeedPlugin trunk/pgsrc/Help%2FSearchHighlightPlugin trunk/pgsrc/Help%2FSemanticRelations trunk/pgsrc/Help%2FSemanticRelationsPlugin trunk/pgsrc/Help%2FSemanticSearchPlugin trunk/pgsrc/Help%2FSiteMapPlugin trunk/pgsrc/Help%2FSpreadsheet trunk/pgsrc/Help%2FSqlResultPlugin trunk/pgsrc/Help%2FSteve%20Wainstead trunk/pgsrc/Help%2FSyncWikiPlugin trunk/pgsrc/Help%2FSyntaxHighlighterPlugin trunk/pgsrc/Help%2FSystemInfoPlugin trunk/pgsrc/Help%2FTeX2pngPlugin trunk/pgsrc/Help%2FTemplatePlugin trunk/pgsrc/Help%2FTexToPngPlugin trunk/pgsrc/Help%2FTextFormattingRules trunk/pgsrc/Help%2FTitleSearchPlugin trunk/pgsrc/Help%2FTranscludePlugin trunk/pgsrc/Help%2FTranslateTextPlugin trunk/pgsrc/Help%2FUnfoldSubpagesPlugin trunk/pgsrc/Help%2FUpLoadPlugin trunk/pgsrc/Help%2FUserPreferencesPlugin trunk/pgsrc/Help%2FUserRatingsPlugin trunk/pgsrc/Help%2FVideoPlugin trunk/pgsrc/Help%2FVisualWikiPlugin trunk/pgsrc/Help%2FWabiSabi trunk/pgsrc/Help%2FWantedPagesOldPlugin trunk/pgsrc/Help%2FWantedPagesPlugin trunk/pgsrc/Help%2FWatchPagePlugin trunk/pgsrc/Help%2FWhoIsOnlinePlugin trunk/pgsrc/Help%2FWikiAdminChownPlugin trunk/pgsrc/Help%2FWikiAdminPurgePlugin trunk/pgsrc/Help%2FWikiAdminRemovePlugin trunk/pgsrc/Help%2FWikiAdminRenamePlugin trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin trunk/pgsrc/Help%2FWikiAdminSelectPlugin trunk/pgsrc/Help%2FWikiAdminSetAclPlugin trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin trunk/pgsrc/Help%2FWikiAdminUtilsPlugin trunk/pgsrc/Help%2FWikiBlogPlugin trunk/pgsrc/Help%2FWikiFormPlugin trunk/pgsrc/Help%2FWikiFormRichPlugin trunk/pgsrc/Help%2FWikiForumPlugin trunk/pgsrc/Help%2FWikiPlugin trunk/pgsrc/Help%2FWikiPollPlugin trunk/pgsrc/Help%2FWikiTranslationPlugin trunk/pgsrc/Help%2FWikiWikiWeb trunk/pgsrc/Help%2FWikicreole trunk/pgsrc/Help%2FYouTubePlugin trunk/pgsrc/Help%2Ftext2pngPlugin trunk/pgsrc/HomePage trunk/pgsrc/HomePageAlias trunk/pgsrc/InterWikiMap trunk/pgsrc/InterWikiSearch trunk/pgsrc/LdapSearch trunk/pgsrc/LeastPopular trunk/pgsrc/LikePages trunk/pgsrc/LinkDatabase trunk/pgsrc/LinkSearch trunk/pgsrc/ListRelations trunk/pgsrc/LockedPages trunk/pgsrc/ModeratedPage trunk/pgsrc/MostPopular trunk/pgsrc/MyRatings trunk/pgsrc/MyRecentChanges trunk/pgsrc/MyRecentEdits trunk/pgsrc/NewPagesPerUser trunk/pgsrc/OrphanedPages trunk/pgsrc/PageDump trunk/pgsrc/PageHistory trunk/pgsrc/PageInfo trunk/pgsrc/PasswordReset trunk/pgsrc/PhpWikiAdministration trunk/pgsrc/PhpWikiAdministration%2FChown trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl trunk/pgsrc/PhpWikiAdministration%2FPurge trunk/pgsrc/PhpWikiAdministration%2FRemove trunk/pgsrc/PhpWikiAdministration%2FRename trunk/pgsrc/PhpWikiAdministration%2FSearchReplace trunk/pgsrc/PhpWikiAdministration%2FSetAcl trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple trunk/pgsrc/PhpWikiDebug trunk/pgsrc/PhpWikiDocumentation trunk/pgsrc/PhpWikiManual trunk/pgsrc/PhpWikiPoll trunk/pgsrc/PhpWikiRecentChanges trunk/pgsrc/PluginManager trunk/pgsrc/ProjectSummary trunk/pgsrc/RandomPage trunk/pgsrc/RateIt trunk/pgsrc/RecentChanges trunk/pgsrc/RecentChangesMyPages trunk/pgsrc/RecentComments trunk/pgsrc/RecentEdits trunk/pgsrc/RecentNewPages trunk/pgsrc/RecentReleases trunk/pgsrc/RecentVisitors trunk/pgsrc/RelatedChanges trunk/pgsrc/San%20Diego trunk/pgsrc/SandBox trunk/pgsrc/SearchHighlight trunk/pgsrc/SemanticRelations trunk/pgsrc/SemanticSearch trunk/pgsrc/SetGlobalAccessRights trunk/pgsrc/SetGlobalAccessRightsSimple trunk/pgsrc/SpecialPages trunk/pgsrc/SpellCheck trunk/pgsrc/SystemInfo trunk/pgsrc/Template%2FAttribute trunk/pgsrc/Template%2FCategory trunk/pgsrc/Template%2FExample trunk/pgsrc/Template%2FLinkto trunk/pgsrc/Template%2FNewPlugin trunk/pgsrc/Template%2FRelation trunk/pgsrc/Template%2FTalk trunk/pgsrc/Template%2FUserPage trunk/pgsrc/The%20PhpWiki%20programming%20team trunk/pgsrc/TitleSearch trunk/pgsrc/TranslateText trunk/pgsrc/UpLoad trunk/pgsrc/UriResolver trunk/pgsrc/UserContribs trunk/pgsrc/UserPreferences trunk/pgsrc/UserRatings trunk/pgsrc/WantedPages trunk/pgsrc/WatchPage trunk/pgsrc/WhoIsOnline trunk/pgsrc/WikiAdminSelect trunk/pgsrc/WikiBlog trunk/pgsrc/area trunk/pgsrc/is_a trunk/pgsrc/located_in trunk/pgsrc/population trunk/themes/blog/pgsrc/About trunk/themes/blog/pgsrc/Blog trunk/themes/blog/pgsrc/BlogArchives trunk/themes/blog/pgsrc/CategoryHowTo trunk/themes/blog/pgsrc/HomePage trunk/themes/blog/pgsrc/HowTo trunk/themes/blog/pgsrc/PhotoAlbum trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates trunk/themes/fusionforge/pgsrc/CategoryWiki%20user trunk/themes/fusionforge/pgsrc/ExternalPages trunk/themes/fusionforge/pgsrc/FindPage trunk/themes/fusionforge/pgsrc/HomePage trunk/themes/fusionforge/pgsrc/InterWikiMap trunk/themes/fusionforge/pgsrc/PhpWikiAdministration trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple trunk/themes/fusionforge/pgsrc/SpecialPages trunk/themes/fusionforge/pgsrc/TextFormattingRules trunk/themes/fusionforge/pgsrc/UpLoad trunk/themes/fusionforge/pgsrc/colorbox trunk/themes/fusionforge/pgsrc/titlebar trunk/themes/wikilens/pgsrc/LeftbarContent Modified: trunk/locale/de/pgsrc/%C3%84hnlicheSeiten =================================================================== --- trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=%C3%84hnlicheSeiten; Modified: trunk/locale/de/pgsrc/AlleBenutzer =================================================================== --- trunk/locale/de/pgsrc/AlleBenutzer 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/AlleBenutzer 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=AlleBenutzer; Modified: trunk/locale/de/pgsrc/AlleSeiten =================================================================== --- trunk/locale/de/pgsrc/AlleSeiten 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/AlleSeiten 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 4 Feb 2011 17:33:12 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=AlleSeiten; Modified: trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 4 Feb 2011 17:33:12 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=AlleSeitenEditiertVonMir; Modified: trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 4 Feb 2011 17:33:12 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=AlleSeitenErzeugtVonMir; Modified: trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 4 Feb 2011 17:33:12 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=AlleSeitenImBesitzVonMir; Modified: trunk/locale/de/pgsrc/BackLinks =================================================================== --- trunk/locale/de/pgsrc/BackLinks 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/BackLinks 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=BackLinks; Modified: trunk/locale/de/pgsrc/BenutzerEinstellungen =================================================================== --- trunk/locale/de/pgsrc/BenutzerEinstellungen 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/BenutzerEinstellungen 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Tue, 4 Jan 2011 11:59:41 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=BenutzerEinstellungen; Modified: trunk/locale/de/pgsrc/DebugAuthInfo =================================================================== --- trunk/locale/de/pgsrc/DebugAuthInfo 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/DebugAuthInfo 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=DebugAuthInfo; Modified: trunk/locale/de/pgsrc/DebugGruppenInfo =================================================================== --- trunk/locale/de/pgsrc/DebugGruppenInfo 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/DebugGruppenInfo 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=DebugGruppenInfo; Modified: trunk/locale/de/pgsrc/DebugInfo =================================================================== --- trunk/locale/de/pgsrc/DebugInfo 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/DebugInfo 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=DebugInfo; Modified: trunk/locale/de/pgsrc/EditiereText =================================================================== --- trunk/locale/de/pgsrc/EditiereText 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/EditiereText 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 4 Feb 2011 17:14:41 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=EditiereText; Modified: trunk/locale/de/pgsrc/Einstellungen =================================================================== --- trunk/locale/de/pgsrc/Einstellungen 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Einstellungen 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 4 Feb 2011 17:33:12 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Einstellungen; Modified: trunk/locale/de/pgsrc/FuzzySuche =================================================================== --- trunk/locale/de/pgsrc/FuzzySuche 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/FuzzySuche 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=FuzzySuche; Modified: trunk/locale/de/pgsrc/G%C3%A4steBuch =================================================================== --- trunk/locale/de/pgsrc/G%C3%A4steBuch 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/G%C3%A4steBuch 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 28 Jul 2014 18:07:17 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=G%C3%A4steBuch; Modified: trunk/locale/de/pgsrc/GaesteBuch =================================================================== --- trunk/locale/de/pgsrc/GaesteBuch 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/GaesteBuch 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=GaesteBuch; Modified: trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen =================================================================== --- trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Geringf%C3%BCgige%C3%84nderungen; Modified: trunk/locale/de/pgsrc/GleicheSeiten =================================================================== --- trunk/locale/de/pgsrc/GleicheSeiten 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/GleicheSeiten 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=GleicheSeiten; Modified: trunk/locale/de/pgsrc/Hilfe =================================================================== --- trunk/locale/de/pgsrc/Hilfe 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe; Modified: trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FAktionsSeite; Modified: trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FAutorenProtokollPlugin; Modified: trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FGraphVizPlugin; Modified: trunk/locale/de/pgsrc/Hilfe%2FGuterStil =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FGuterStil; Modified: trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Thu, 12 Jun 2014 17:38:19 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FHalloWeltPlugin; Modified: trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 28 Jul 2014 18:07:17 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FHochLadenPlugin; Modified: trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Tue, 4 Jan 2011 11:59:41 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FInhaltsVerzeichnisPlugin; Modified: trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 28 Jul 2014 18:07:17 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FNeueSeitePlugin; Modified: trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Tue, 4 Jan 2011 11:59:41 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FNeuerKommentarPlugin; Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 28 Jul 2014 18:07:17 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FPhotoAlbumPlugin; Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FPhotoAlbumPlugin%2FDiashow; Modified: trunk/locale/de/pgsrc/Hilfe%2FPhpWiki =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FPhpWiki; Modified: trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Tue, 4 Jan 2011 11:59:41 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FTextBearbeiten; Modified: trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FTextFormatierungsRegeln; Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FVorlagePlugin; Modified: trunk/locale/de/pgsrc/Hilfe%2FWabiSabi =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWabiSabi; Modified: trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Tue, 4 Jan 2011 11:59:41 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWieManWikiBenutzt; Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWikiTechnik; Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWikiWikiWeb; Modified: trunk/locale/de/pgsrc/HochLaden =================================================================== --- trunk/locale/de/pgsrc/HochLaden 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/HochLaden 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=HochLaden; Modified: trunk/locale/de/pgsrc/InterWikiListe =================================================================== --- trunk/locale/de/pgsrc/InterWikiListe 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/InterWikiListe 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=InterWikiListe; Modified: trunk/locale/de/pgsrc/KategorieAktionSeite =================================================================== --- trunk/locale/de/pgsrc/KategorieAktionSeite 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/KategorieAktionSeite 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=KategorieAktionSeite; Modified: trunk/locale/de/pgsrc/KategorieKategorie =================================================================== --- trunk/locale/de/pgsrc/KategorieKategorie 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/KategorieKategorie 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=KategorieKategorie; Modified: trunk/locale/de/pgsrc/KategorieWikiPlugin =================================================================== --- trunk/locale/de/pgsrc/KategorieWikiPlugin 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/KategorieWikiPlugin 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=KategorieWikiPlugin; Modified: trunk/locale/de/pgsrc/LinkSuche =================================================================== --- trunk/locale/de/pgsrc/LinkSuche 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/LinkSuche 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=LinkSuche; Modified: trunk/locale/de/pgsrc/ListeRelationen =================================================================== --- trunk/locale/de/pgsrc/ListeRelationen 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/ListeRelationen 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=ListeRelationen; Modified: trunk/locale/de/pgsrc/ListeSeiten =================================================================== --- trunk/locale/de/pgsrc/ListeSeiten 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/ListeSeiten 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=ListeSeiten; Modified: trunk/locale/de/pgsrc/MeistBesucht =================================================================== --- trunk/locale/de/pgsrc/MeistBesucht 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/MeistBesucht 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=MeistBesucht; Modified: trunk/locale/de/pgsrc/ModerierteSeite =================================================================== --- trunk/locale/de/pgsrc/ModerierteSeite 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/ModerierteSeite 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=ModerierteSeite; Modified: trunk/locale/de/pgsrc/NeueSeite =================================================================== --- trunk/locale/de/pgsrc/NeueSeite 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/NeueSeite 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=NeueSeite; Modified: trunk/locale/de/pgsrc/Neueste%C3%84nderungen =================================================================== --- trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Neueste%C3%84nderungen; Modified: trunk/locale/de/pgsrc/NeuesteSeiten =================================================================== --- trunk/locale/de/pgsrc/NeuesteSeiten 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/NeuesteSeiten 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=NeuesteSeiten; Modified: trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen =================================================================== --- trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=PasswortZur%C3%BCcksetzen; Modified: trunk/locale/de/pgsrc/PhpWikiDokumentation =================================================================== --- trunk/locale/de/pgsrc/PhpWikiDokumentation 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/PhpWikiDokumentation 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=PhpWikiDokumentation; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 28 Jul 2014 18:07:17 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten%2FAclSetzen; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten%2FChown; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten%2FL%C3%B6schen; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten%2FSuchenErsetzen; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten%2FUmbenennen; Modified: trunk/locale/de/pgsrc/PhpWikiUmfrage =================================================================== --- trunk/locale/de/pgsrc/PhpWikiUmfrage 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/PhpWikiUmfrage 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=PhpWikiUmfrage; Modified: trunk/locale/de/pgsrc/SandKasten =================================================================== --- trunk/locale/de/pgsrc/SandKasten 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/SandKasten 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=SandKasten; Modified: trunk/locale/de/pgsrc/SandKiste =================================================================== --- trunk/locale/de/pgsrc/SandKiste 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/SandKiste 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=SandKiste; Modified: trunk/locale/de/pgsrc/SeiteBeobarten =================================================================== --- trunk/locale/de/pgsrc/SeiteBeobarten 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/SeiteBeobarten 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=SeiteBeobarten; Modified: trunk/locale/de/pgsrc/SeiteFinden =================================================================== --- trunk/locale/de/pgsrc/SeiteFinden 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/SeiteFinden 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=SeiteFinden; Modified: trunk/locale/de/pgsrc/SeiteSpeichern =================================================================== --- trunk/locale/de/pgsrc/SeiteSpeichern 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/SeiteSpeichern 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 4 Feb 2011 17:33:12 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=SeiteSpeichern; Modified: trunk/locale/de/pgsrc/SeitenErzeugen =================================================================== --- trunk/locale/de/pgsrc/SeitenErzeugen 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/SeitenErzeugen 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Tue, 4 Jan 2011 11:59:41 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=SeitenErzeugen; Modified: trunk/locale/de/pgsrc/SeitenInfo =================================================================== --- trunk/locale/de/pgsrc/SeitenInfo 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/SeitenInfo 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=SeitenInfo; Modified: trunk/locale/de/pgsrc/SeitenProtokoll =================================================================== --- trunk/locale/de/pgsrc/SeitenProtokoll 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/SeitenProtokoll 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=SeitenProtokoll; Modified: trunk/locale/de/pgsrc/SemantischeRelationen =================================================================== --- trunk/locale/de/pgsrc/SemantischeRelationen 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/SemantischeRelationen 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=SemantischeRelationen; Modified: trunk/locale/de/pgsrc/SemantischeSuche =================================================================== --- trunk/locale/de/pgsrc/SemantischeSuche 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/SemantischeSuche 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:48:42 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=SemantischeSuche; Modified: trunk/locale/de/pgsrc/StartSeite =================================================================== --- trunk/locale/de/pgsrc/StartSeite 2014-07-29 08:51:58 UTC (rev 9024) +++ trunk/locale/de/pgsrc/StartSeite 2014-07-29 08:56:48 UTC (rev 9025) @@ -1,4 +1,4 @@ -Date: Wed, 26 Jan 2011 17:26:56 +0000 +Date: Tue, 29 Jul 2014 10:42:12 +0000 Mime-Version: 1.0... [truncated message content] |
From: <var...@us...> - 2014-07-31 14:40:34
|
Revision: 9045 http://sourceforge.net/p/phpwiki/code/9045 Author: vargenau Date: 2014-07-31 14:40:26 +0000 (Thu, 31 Jul 2014) Log Message: ----------- Remove unused template nochanges.tmpl Modified Paths: -------------- trunk/lib/editpage.php trunk/themes/default/templates/categorypage.tmpl trunk/themes/wikilens/templates/categorypage.tmpl Removed Paths: ------------- trunk/themes/default/templates/nochanges.tmpl Modified: trunk/lib/editpage.php =================================================================== --- trunk/lib/editpage.php 2014-07-31 14:20:18 UTC (rev 9044) +++ trunk/lib/editpage.php 2014-07-31 14:40:26 UTC (rev 9045) @@ -118,7 +118,6 @@ elseif ($this->editaction == 'keep_old') { // keep old page and do nothing $this->_redirectToBrowsePage(); - //$r->redirect(WikiURL($r->getArg('save_and_redirect_to'))); return true; } elseif ($this->editaction == 'overwrite') { // take the new content without diff @@ -129,7 +128,6 @@ $this->request->setArg('merge', 0); LoadFileOrDir($this->request); $this->_redirectToBrowsePage(); - //$r->redirect(WikiURL($r->getArg('save_and_redirect_to'))); return true; } elseif ($this->editaction == 'upload') { // run plugin UpLoad @@ -280,28 +278,12 @@ } // Save failed. No changes made. $this->_redirectToBrowsePage(); - // user will probably not see the rest of this... - require_once 'lib/display.php'; - // force browse of current version: - $request->setArg('action', false); - $request->setArg('version', false); - displayPage($request, 'nochanges'); return true; } if (!$this->user->isAdmin() and $this->isSpam()) { $this->_isSpam = true; return false; - /* - // Save failed. No changes made. - $this->_redirectToBrowsePage(); - // user will probably not see the rest of this... - require_once 'lib/display.php'; - // force browse of current version: - $request->setArg('version', false); - displayPage($request, 'nochanges'); - return true; - */ } $page = &$this->page; @@ -351,6 +333,7 @@ // (below). $request->setArg('action', false); $this->_redirectToBrowsePage(); + return true; } // Force browse of current page version. @@ -733,7 +716,7 @@ return $el; } - function _redirectToBrowsePage() + private function _redirectToBrowsePage() { $this->request->redirect(WikiURL($this->page, false, 'absolute_url')); } Modified: trunk/themes/default/templates/categorypage.tmpl =================================================================== --- trunk/themes/default/templates/categorypage.tmpl 2014-07-31 14:20:18 UTC (rev 9044) +++ trunk/themes/default/templates/categorypage.tmpl 2014-07-31 14:40:26 UTC (rev 9045) @@ -31,11 +31,7 @@ $initial_content = "\"This page is in the $bpage category. You must leave in at least one reference to $bpage in order for this page to be in the $bpage category. Otherwise, edit this text to describe your page.\""; $adder = ""; - - //if($SELF_ON_CREATE == true){ - //$adder = "save_and_redirect_to=\"" . $PAGENAME . "\""; - //} - + $this->_printPlugin("<" . "?plugin-form CreatePage " . $adder . " initial_content=" . $initial_content . " ?" . ">"); ?> Deleted: trunk/themes/default/templates/nochanges.tmpl =================================================================== --- trunk/themes/default/templates/nochanges.tmpl 2014-07-31 14:20:18 UTC (rev 9044) +++ trunk/themes/default/templates/nochanges.tmpl 2014-07-31 14:40:26 UTC (rev 9045) @@ -1,6 +0,0 @@ -<p><strong><?php echo _("Edit aborted.")?></strong> -<?php echo _("You have not made any changes so no new version has been saved.")?></p> -<?php if (!empty($LOCK_CHANGED_MSG)) { ?> - <p><?php echo $LOCK_CHANGED_MSG?></p> -<?php } ?> -<?php echo Template('browse') ?> Modified: trunk/themes/wikilens/templates/categorypage.tmpl =================================================================== --- trunk/themes/wikilens/templates/categorypage.tmpl 2014-07-31 14:20:18 UTC (rev 9044) +++ trunk/themes/wikilens/templates/categorypage.tmpl 2014-07-31 14:40:26 UTC (rev 9045) @@ -12,21 +12,21 @@ $this->_printPlugin("<" . "?plugin UserRatings nobuds=" . ($SHOWBUDS ? 0 : 1) . " category=\"" . $PAGENAME . "\" ?" . ">"); ?> <br/> -<?php +<?php if ($SHOWBUDS){ - $btn = Button(array('exclude' => "$EXCLUDE", + $btn = Button(array('exclude' => "$EXCLUDE", 'category' => "$PAGENAME", 'showbuds' => false), - _("Hide Buddy Ratings in the $SINGULAR category"), - $PAGENAME); + _("Hide Buddy Ratings in the $SINGULAR category"), + $PAGENAME); } else { -$btn = Button(array('exclude' => "$EXCLUDE", +$btn = Button(array('exclude' => "$EXCLUDE", 'category' => "$PAGENAME", 'showbuds' => true), - _("Show Buddy Ratings in the $SINGULAR category"), - $PAGENAME); + _("Show Buddy Ratings in the $SINGULAR category"), + $PAGENAME); } ?> <?php echo $btn ?> @@ -56,11 +56,7 @@ $initial_content = "\"This page is in the $bpage category. You must leave in at least one reference to $bpage in order for this page to be in the $bpage category. Otherwise, edit this text to describe your page.\""; $adder = ""; - - //if($SELF_ON_CREATE == true){ - //$adder = "save_and_redirect_to=\"" . $PAGENAME . "\""; - //} - + $this->_printPlugin("<" . "?plugin-form CreatePage " . $adder . " initial_content=" . $initial_content . " ?" . ">"); ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-04 15:38:54
|
Revision: 9061 http://sourceforge.net/p/phpwiki/code/9061 Author: vargenau Date: 2014-09-04 15:38:45 +0000 (Thu, 04 Sep 2014) Log Message: ----------- fix Bug#456 'Optimizing Database' message sometimes printed on page Modified Paths: -------------- trunk/lib/WikiDB.php trunk/lib/main.php trunk/pgsrc/ReleaseNotes Modified: trunk/lib/WikiDB.php =================================================================== --- trunk/lib/WikiDB.php 2014-09-01 10:14:55 UTC (rev 9060) +++ trunk/lib/WikiDB.php 2014-09-04 15:38:45 UTC (rev 9061) @@ -1034,8 +1034,9 @@ (time() % DATABASE_OPTIMISE_FREQUENCY == 0)) ) { if ($backend->optimize()) { - if ((int)DEBUG) + if ((int)DEBUG) { trigger_error(_("Optimizing database"), E_USER_NOTICE); + } } } Modified: trunk/lib/main.php =================================================================== --- trunk/lib/main.php 2014-09-01 10:14:55 UTC (rev 9060) +++ trunk/lib/main.php 2014-09-04 15:38:45 UTC (rev 9061) @@ -107,8 +107,11 @@ or (DATABASE_OPTIMISE_FREQUENCY > 0 and (time() % DATABASE_OPTIMISE_FREQUENCY == 0)) ) { - if ($this->_dbi->_backend->optimize()) - trigger_error(_("Optimizing database"), E_USER_NOTICE); + if ($this->_dbi->_backend->optimize()) { + if ((int)DEBUG) { + trigger_error(_("Optimizing database"), E_USER_NOTICE); + } + } } // Restore auth state. This doesn't check for proper authorization! Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2014-09-01 10:14:55 UTC (rev 9060) +++ trunk/pgsrc/ReleaseNotes 2014-09-04 15:38:45 UTC (rev 9061) @@ -1,4 +1,4 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 +Date: Thu, 4 Sep 2014 17:37:27 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -8,6 +8,10 @@ <<CreateToc with_toclink||=1 headers||=1,2,3>> +== 1.5.1 2014-09-xx Marc-Etienne Vargenau == + +* fix Bug#456 'Optimizing Database' message sometimes printed on page + == 1.5.0 2014-07-29 Marc-Etienne Vargenau == === Main Changes === This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-04 16:17:37
|
Revision: 9062 http://sourceforge.net/p/phpwiki/code/9062 Author: vargenau Date: 2014-09-04 16:17:25 +0000 (Thu, 04 Sep 2014) Log Message: ----------- remove FrameInclude plugin (frames are not supported in HTML 5) Modified Paths: -------------- trunk/admin/mkfuncs trunk/lib/HtmlElement.php trunk/lib/IniConfig.php trunk/lib/WikiTheme.php trunk/lib/display.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/WikiTranslation.php trunk/locale/Makefile trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo 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/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo trunk/pgsrc/Help%2FIncludePagePlugin trunk/pgsrc/ReleaseNotes Removed Paths: ------------- trunk/lib/plugin/FrameInclude.php trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre trunk/pgsrc/Help%2FFrameIncludePlugin trunk/themes/Sidebar/templates/frame-left.tmpl trunk/themes/Sidebar/templates/frameset.tmpl trunk/themes/default/templates/frameset.tmpl Modified: trunk/admin/mkfuncs =================================================================== --- trunk/admin/mkfuncs 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/admin/mkfuncs 2014-09-04 16:17:25 UTC (rev 9062) @@ -40,6 +40,6 @@ echo "$d" mkfuncs form input option select textarea label fieldset legend echo "$d" -mkfuncs area map frame frameset iframe nobody object embed param +mkfuncs area map frame iframe nobody object embed param echo "$d" mkfuncs video Modified: trunk/lib/HtmlElement.php =================================================================== --- trunk/lib/HtmlElement.php 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/lib/HtmlElement.php 2014-09-04 16:17:25 UTC (rev 9062) @@ -518,18 +518,6 @@ return $el->_init2(func_get_args()); } - public static function frame( /*...*/) - { - $el = new HtmlElement('frame'); - return $el->_init2(func_get_args()); - } - - public static function frameset( /*...*/) - { - $el = new HtmlElement('frameset'); - return $el->_init2(func_get_args()); - } - public static function iframe( /*...*/) { $el = new HtmlElement('iframe'); @@ -585,7 +573,7 @@ define('HTMLTAG_ACCEPTS_INLINE', 4); HTML::_setTagProperty(HTMLTAG_EMPTY, - 'area base basefont br col embed frame hr img input isindex link meta param'); + 'area base basefont br col embed hr img input isindex link meta param'); HTML::_setTagProperty(HTMLTAG_ACCEPTS_INLINE, // %inline elements: 'b big i small tt ' // %fontstyle @@ -597,7 +585,7 @@ // %block elements which contain inline content . 'address h1 h2 h3 h4 h5 h6 p pre ' // %block elements which contain either block or inline content - . 'div fieldset frameset' + . 'div fieldset ' // other with inline content . 'caption dt label legend video ' Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/lib/IniConfig.php 2014-09-04 16:17:25 UTC (rev 9062) @@ -708,7 +708,6 @@ $AllAllowedPlugins[] = 'CacheTest'; $AllAllowedPlugins[] = 'CategoryPage'; $AllAllowedPlugins[] = 'FoafViewer'; - $AllAllowedPlugins[] = 'FrameInclude'; $AllAllowedPlugins[] = 'GraphViz'; $AllAllowedPlugins[] = 'HtmlConverter'; $AllAllowedPlugins[] = 'JabberPresence'; Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/lib/WikiTheme.php 2014-09-04 16:17:25 UTC (rev 9062) @@ -621,8 +621,6 @@ $link->pushContent($this->maybeSplitWikiWord($default_text)); $link->setAttr('class', 'wiki'); } - if ($request->getArg('frame')) - $link->setAttr('target', '_top'); return $link; } @@ -679,9 +677,6 @@ $gbutton->addTooltip(sprintf(_("Google:%s"), $wikiword)); $link->pushContent($gbutton); } - if ($request->getArg('frame')) - $link->setAttr('target', '_top'); - return $link; } @@ -1693,8 +1688,6 @@ $this->_init('a', array('href' => $url)); if ($class) $this->setAttr('class', $class); - if ($request->getArg('frame')) - $this->setAttr('target', '_top'); if (!empty($options) and is_array($options)) { foreach ($options as $key => $val) $this->setAttr($key, $val); Modified: trunk/lib/display.php =================================================================== --- trunk/lib/display.php 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/lib/display.php 2014-09-04 16:17:25 UTC (rev 9062) @@ -286,8 +286,6 @@ 'class' => 'backlinks'), $WikiTheme->maybeSplitWikiWord($pagename)); $pageheader->addTooltip(sprintf(_("BackLinks for %s"), $pagename)); - if ($request->getArg('frame')) - $pageheader->setAttr('target', '_top'); } $pagetitle = SplitPagename($pagename); Deleted: trunk/lib/plugin/FrameInclude.php =================================================================== --- trunk/lib/plugin/FrameInclude.php 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/lib/plugin/FrameInclude.php 2014-09-04 16:17:25 UTC (rev 9062) @@ -1,153 +0,0 @@ -<?php - -/* - * Copyright 2002 $ThePhpWikiProgrammingTeam - * - * 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., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/** - * FrameInclude: Display a url or page in a separate frame inside our body. - * - * Usage: - * <<FrameInclude src=http://www.internet-technology.de/fourwins_de.htm >> - * <<FrameInclude page=OtherPage >> - * at the VERY BEGINNING in the content! - * - * Author: Reini Urban <ru...@x-...>, rewrite by Jeff Dairiki <da...@da...> - * - * KNOWN ISSUES: - * - * This is a dirty hack into the whole system. To display the page as - * frameset we: - * - * 1. Discard any output buffered so far. - * 2. Recursively call displayPage with magic arguments to generate - * the frameset (or individual frame contents.) - * 3. Exit early. (So this plugin is usually a no-return.) - * - * In any cases we can now serve only specific templates with the new - * frame argument. The whole page is now ?frame=html (before it was - * named "top") For the Sidebar theme (or derived from it) we provide - * a left frame also, otherwise only top, content and bottom. - */ -class WikiPlugin_FrameInclude - extends WikiPlugin -{ - function getDescription() - { - return _("Display a url in a separate frame inside our body. Only one frame allowed."); - } - - function getDefaultArguments() - { - return array('src' => false, // the src url to include - 'page' => false, - 'name' => 'content', // name of our frame - 'title' => false, - 'rows' => '18%,*,15%', // names: top, $name, bottom - 'cols' => '20%,*', // names: left, $name - // only useful on WikiTheme "Sidebar" - 'frameborder' => 1, - 'marginwidth' => false, - 'marginheight' => false, - 'noresize' => false, - 'scrolling' => 'auto', // '[ yes | no | auto ]' - ); - } - - function run($dbi, $argstr, &$request, $basepage) - { - - $args = ($this->getArgs($argstr, $request)); - extract($args); - - if ($request->getArg('action') != 'browse') { - return $this->disabled(_("Plugin not run: not in browse mode")); - } - if (!$request->isGetOrHead()) { - return $this->disabled("(method != 'GET')"); - } - - if (!$src and $page) { - if ($page == $request->get('pagename')) { - return $this->error(sprintf(_("Recursive inclusion of page %s"), - $page)); - } - $src = WikiURL($page); - } - if (!$src) { - return $this->error(sprintf(_("%s or %s parameter missing"), - 'src', 'page')); - } - - // FIXME: How to normalize url's to compare against recursion? - if ($src == $request->getURLtoSelf()) { - return $this->error(sprintf(_("Recursive inclusion of url %s"), - $src)); - } - - static $noframes = false; - if ($noframes) { - // Content for noframes version of page. - return HTML::p(fmt("See %s", - HTML::a(array('href' => $src), $src))); - } - $noframes = true; - - if (($which = $request->getArg('frame'))) { - // Generate specialized frame output (header, footer, etc...) - $request->discardOutput(); - displayPage($request, new Template("frame-$which", $request)); - $request->finish(); //noreturn - } - - // Generate the outer frameset - $frame = HTML::frame(array('name' => $name, - 'src' => $src, - 'title' => $title, - 'frameborder' => (int)$frameborder, - 'scrolling' => (string)$scrolling, - 'noresize' => (bool)$noresize, - )); - - if ($marginwidth) - $frame->setArg('marginwidth', $marginwidth); - if ($marginheight) - $frame->setArg('marginheight', $marginheight); - - $tokens = array('CONTENT_FRAME' => $frame, - 'ROWS' => $rows, - 'COLS' => $cols, - 'FRAMEARGS' => sprintf('frameborder="%d"', $frameborder), - ); - - // Produce the frameset. - $request->discardOutput(); - displayPage($request, new Template('frameset', $request, $tokens)); - $request->finish(); //noreturn - return ''; - } -} - -// Local Variables: -// mode: php -// tab-width: 8 -// c-basic-offset: 4 -// c-hanging-comment-ender-p: nil -// indent-tabs-mode: nil -// End: Modified: trunk/lib/plugin/MediawikiTable.php =================================================================== --- trunk/lib/plugin/MediawikiTable.php 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/lib/plugin/MediawikiTable.php 2014-09-04 16:17:25 UTC (rev 9062) @@ -100,7 +100,7 @@ $attrs = parse_attributes($line); foreach ($attrs as $key => $value) { if (in_array($key, array("id", "class", "title", "style", - "bgcolor", "frame", "rules", "border", + "bgcolor", "rules", "border", "cellspacing", "cellpadding", "align", "width")) ) { Modified: trunk/lib/plugin/RichTable.php =================================================================== --- trunk/lib/plugin/RichTable.php 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/lib/plugin/RichTable.php 2014-09-04 16:17:25 UTC (rev 9062) @@ -52,7 +52,7 @@ $attrs = parse_attributes($line); foreach ($attrs as $key => $value) { if (in_array($key, array("id", "class", "title", "style", - "bgcolor", "frame", "rules", "border", + "bgcolor", "rules", "border", "cellspacing", "cellpadding", "align", "width")) ) { Modified: trunk/lib/plugin/WikiTranslation.php =================================================================== --- trunk/lib/plugin/WikiTranslation.php 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/lib/plugin/WikiTranslation.php 2014-09-04 16:17:25 UTC (rev 9062) @@ -95,8 +95,6 @@ _("FindPage") . ',' . _("FoafViewer") . ',' . _("FoafViewerPlugin") . ',' . - _("FrameInclude") . ',' . - _("FrameIncludePlugin") . ',' . _("FullRecentChanges") . ',' . _("FullTextSearch") . ',' . _("FuzzyPages") . ',' . Modified: trunk/locale/Makefile =================================================================== --- trunk/locale/Makefile 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/locale/Makefile 2014-09-04 16:17:25 UTC (rev 9062) @@ -160,7 +160,6 @@ ${POT_FILE}: ../lib/plugin/FacebookLike.php ${POT_FILE}: ../lib/plugin/FileInfo.php ${POT_FILE}: ../lib/plugin/FoafViewer.php -${POT_FILE}: ../lib/plugin/FrameInclude.php ${POT_FILE}: ../lib/plugin/FullTextSearch.php ${POT_FILE}: ../lib/plugin/FuzzyPages.php ${POT_FILE}: ../lib/plugin/GoogleMaps.php @@ -405,7 +404,6 @@ ${POT_FILE}: ../themes/default/templates/dialog.tmpl ${POT_FILE}: ../themes/default/templates/editpage.tmpl ${POT_FILE}: ../themes/default/templates/forumadd.tmpl -${POT_FILE}: ../themes/default/templates/frameset.tmpl ${POT_FILE}: ../themes/default/templates/head.tmpl ${POT_FILE}: ../themes/default/templates/homepage.tmpl ${POT_FILE}: ../themes/default/templates/htmldump.tmpl @@ -486,8 +484,6 @@ ${POT_FILE}: ../themes/Sidebar/templates/content.tmpl ${POT_FILE}: ../themes/Sidebar/templates/debug.tmpl ${POT_FILE}: ../themes/Sidebar/templates/dump-footer.tmpl -${POT_FILE}: ../themes/Sidebar/templates/frame-left.tmpl -${POT_FILE}: ../themes/Sidebar/templates/frameset.tmpl ${POT_FILE}: ../themes/Sidebar/templates/htmldump.tmpl ${POT_FILE}: ../themes/Sidebar/templates/html.tmpl ${POT_FILE}: ../themes/Sidebar/templates/logo.tmpl Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Deleted: trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre 2014-09-04 16:17:25 UTC (rev 9062) @@ -1,36 +0,0 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) -Content-Type: application/x-phpwiki; - pagename=Aide%2FPluginInclureUnCadre; - flags=""; - charset=UTF-8 -Content-Transfer-Encoding: binary - -Ce plugin créera un cadre HTML qui remplira complètement la surface de la -page (c'est-à-dire toute la surface que l'utilisateur peut éditer). Tout -autre texte sera rejeté quand la page est affichée (tout ce qui est en -dehors de l'appel du plugin). Dans le langage de l'hypertexte, ça s'appelle -la <i>transclusion</i>. - -Vous pouvez être intéressé également par PluginInclureUnePage. - -Exemples: pour inclure une page depuis un autre site, utilisez l'argument <b>src</b> : - -{{{ -<<FrameInclude src="http://phpwiki.fr/">> -}}} - -Pour inclure une page depuis ce wiki, utilisez l'argument <b>page</b> : - -{{{ -<<FrameInclude page=PageAccueil>> -}}} - -Pour plus d'informations sur ce plugin, lisez s'il vous plaît, la source -PHP dans le répertoire /lib/plugin. - -<noinclude> ----- -[[DocumentationDePhpWiki]] [[CatégoriePluginWiki]] -</noinclude> - Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/locale/po/de.po 2014-09-04 16:17:25 UTC (rev 9062) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-27 16:33+0200\n" +"POT-Creation-Date: 2014-09-04 18:09+0200\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp " "<car...@us...>, Helmer Pardun <pardunpress@t-online." @@ -1688,32 +1688,6 @@ msgid "Title" msgstr "Titel" -msgid "" -"Display a url in a separate frame inside our body. Only one frame allowed." -msgstr "" -"Zeigt eine URL in einem eigenen (oder gesonderten) Frame innerhalb der " -"Seite. Nur ein Frame ist erlaubt." - -msgid "Plugin not run: not in browse mode" -msgstr "" - -#, php-format -msgid "Recursive inclusion of page %s" -msgstr "Rekursiver Selbstaufruf der Seite %s" - -# (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!) -#, php-format -msgid "%s or %s parameter missing" -msgstr "%s oder %s Argument fehlt" - -#, php-format -msgid "Recursive inclusion of url %s" -msgstr "Rekursiver Selbstaufruf der URL %s" - -#, php-format -msgid "See %s" -msgstr "Siehe %s" - msgid "Search the content of all pages in this wiki." msgstr "Den Text aller Seiten dieses Wikis durchsuchen." @@ -2403,6 +2377,9 @@ "Eine liste der zufälliger ausgewählter Seiten zeigen oder nach einer " "zufälliger ausgewählter Seite weiterleiten." +msgid "Plugin not run: not in browse mode" +msgstr "" + msgid "RandomPage" msgstr "ZufallsSeite" @@ -2802,6 +2779,10 @@ msgstr "" #, php-format +msgid "See %s" +msgstr "Siehe %s" + +#, php-format msgid "Illegal operator: %s" msgstr "" @@ -3061,6 +3042,10 @@ msgid "Parametrized page inclusion." msgstr "" +#, php-format +msgid "Recursive inclusion of page %s" +msgstr "Rekursiver Selbstaufruf der Seite %s" + msgid "" "Convert Tex mathematicals expressions to cached PNG files. This is for small " "text." @@ -3124,6 +3109,10 @@ msgstr "%s Argument fehlt" #, php-format +msgid "Recursive inclusion of url %s" +msgstr "Rekursiver Selbstaufruf der URL %s" + +#, php-format msgid "See: %s" msgstr "Siehe: %s" @@ -4052,16 +4041,6 @@ msgid "FoafViewerPlugin" msgstr "FoafViewerPlugin" -# (??? Frame=Rahmen; FrameInclude=InnenRahmenSeite; Seite mit -# eingeschlossenem Rahmen) -msgid "FrameInclude" -msgstr "FrameEinbetten" - -# (??? Frame=Rahmen; FrameInclude=InnenRahmenSeite; Seite mit -# eingeschlossenem Rahmen) -msgid "FrameIncludePlugin" -msgstr "FrameEinbettenPlugin" - # (Im Wortsinne heißt das eigentlich: "jüngste = eben gemachte # Änderungen"; in terms of newspapers or journalism it's traditionally # "NeuesteNachrichten" or much more better "DasNeueste"). @@ -6083,6 +6062,10 @@ msgid "Edit this page" msgstr "Diese Seite bearbeiten" +# (??? Parameter = Hilfsgröße!!!Bezugseinheit!!! Bezugsgröße!!!) +#~ msgid "%s or %s parameter missing" +#~ msgstr "%s oder %s Argument fehlt" + #~ msgid "Edit aborted." #~ msgstr "Bearbeiten abgebrochen." Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/locale/po/es.po 2014-09-04 16:17:25 UTC (rev 9062) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-27 16:33+0200\n" +"POT-Creation-Date: 2014-09-04 18:09+0200\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -1657,29 +1657,6 @@ msgid "Title" msgstr "" -msgid "" -"Display a url in a separate frame inside our body. Only one frame allowed." -msgstr "" - -msgid "Plugin not run: not in browse mode" -msgstr "" - -#, php-format -msgid "Recursive inclusion of page %s" -msgstr "" - -#, php-format -msgid "%s or %s parameter missing" -msgstr "" - -#, php-format -msgid "Recursive inclusion of url %s" -msgstr "" - -#, php-format -msgid "See %s" -msgstr "" - msgid "Search the content of all pages in this wiki." msgstr "" @@ -2337,6 +2314,9 @@ msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "" +msgid "Plugin not run: not in browse mode" +msgstr "" + msgid "RandomPage" msgstr "PáginaAlAzar" @@ -2719,6 +2699,10 @@ msgstr "" #, php-format +msgid "See %s" +msgstr "" + +#, php-format msgid "Illegal operator: %s" msgstr "" @@ -2972,6 +2956,10 @@ msgid "Parametrized page inclusion." msgstr "" +#, php-format +msgid "Recursive inclusion of page %s" +msgstr "" + msgid "" "Convert Tex mathematicals expressions to cached PNG files. This is for small " "text." @@ -3030,6 +3018,10 @@ msgstr "" #, php-format +msgid "Recursive inclusion of url %s" +msgstr "" + +#, php-format msgid "See: %s" msgstr "" @@ -3942,12 +3934,6 @@ msgid "FoafViewerPlugin" msgstr "" -msgid "FrameInclude" -msgstr "" - -msgid "FrameIncludePlugin" -msgstr "" - msgid "FullRecentChanges" msgstr "" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/locale/po/fr.po 2014-09-04 16:17:25 UTC (rev 9062) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-27 16:33+0200\n" +"POT-Creation-Date: 2014-09-04 18:09+0200\n" "PO-Revision-Date: 2004-06-22 21:10+0200\n" "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland " "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6." @@ -1659,30 +1659,6 @@ msgid "Title" msgstr "Titre" -msgid "" -"Display a url in a separate frame inside our body. Only one frame allowed." -msgstr "" -"Affiche une URL dans une cadre interne à la page. Un seul cadre autorisé." - -msgid "Plugin not run: not in browse mode" -msgstr "Greffon non exécuté (hors navigation)" - -#, php-format -msgid "Recursive inclusion of page %s" -msgstr "Insertion récursive de la page %s" - -#, php-format -msgid "%s or %s parameter missing" -msgstr "%s ou %s paramètre manquant" - -#, php-format -msgid "Recursive inclusion of url %s" -msgstr "Insertion récursive de l'URL %s" - -#, php-format -msgid "See %s" -msgstr "Voir %s" - msgid "Search the content of all pages in this wiki." msgstr "Rechercher le contenu de toutes les pages de ce wiki." @@ -2353,6 +2329,9 @@ msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "Affiche une liste de pages prises au hasard sur ce wiki." +msgid "Plugin not run: not in browse mode" +msgstr "Greffon non exécuté (hors navigation)" + msgid "RandomPage" msgstr "PageAléatoire" @@ -2739,6 +2718,10 @@ msgstr "" #, php-format +msgid "See %s" +msgstr "Voir %s" + +#, php-format msgid "Illegal operator: %s" msgstr "Opérateur interdit : %s" @@ -2996,6 +2979,10 @@ msgid "Parametrized page inclusion." msgstr "" +#, php-format +msgid "Recursive inclusion of page %s" +msgstr "Insertion récursive de la page %s" + msgid "" "Convert Tex mathematicals expressions to cached PNG files. This is for small " "text." @@ -3060,6 +3047,10 @@ msgstr "%s paramètre manquant" #, php-format +msgid "Recursive inclusion of url %s" +msgstr "Insertion récursive de l'URL %s" + +#, php-format msgid "See: %s" msgstr "Voir : %s" @@ -3992,12 +3983,6 @@ msgid "FoafViewerPlugin" msgstr "GreffonFoafViewer" -msgid "FrameInclude" -msgstr "InclureUnCadre" - -msgid "FrameIncludePlugin" -msgstr "GreffonInclureUnCadre" - msgid "FullRecentChanges" msgstr "DernièresModifs" @@ -5976,6 +5961,9 @@ msgid "Edit this page" msgstr "Modifier cette page" +#~ msgid "%s or %s parameter missing" +#~ msgstr "%s ou %s paramètre manquant" + #~ msgid "Edit aborted." #~ msgstr "Modification annulée." Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/locale/po/it.po 2014-09-04 16:17:25 UTC (rev 9062) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-27 16:33+0200\n" +"POT-Creation-Date: 2014-09-04 18:09+0200\n" "PO-Revision-Date: 2005-02-12 16:23+0100\n" "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n" "Language-Team: \n" @@ -1639,29 +1639,6 @@ msgid "Title" msgstr "" -msgid "" -"Display a url in a separate frame inside our body. Only one frame allowed." -msgstr "" - -msgid "Plugin not run: not in browse mode" -msgstr "" - -#, php-format -msgid "Recursive inclusion of page %s" -msgstr "" - -#, php-format -msgid "%s or %s parameter missing" -msgstr "" - -#, php-format -msgid "Recursive inclusion of url %s" -msgstr "" - -#, php-format -msgid "See %s" -msgstr "" - msgid "Search the content of all pages in this wiki." msgstr "" @@ -2315,6 +2292,9 @@ msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "" +msgid "Plugin not run: not in browse mode" +msgstr "" + msgid "RandomPage" msgstr "" @@ -2692,6 +2672,10 @@ msgstr "" #, php-format +msgid "See %s" +msgstr "" + +#, php-format msgid "Illegal operator: %s" msgstr "" @@ -2945,6 +2929,10 @@ msgid "Parametrized page inclusion." msgstr "" +#, php-format +msgid "Recursive inclusion of page %s" +msgstr "" + msgid "" "Convert Tex mathematicals expressions to cached PNG files. This is for small " "text." @@ -3003,6 +2991,10 @@ msgstr "" #, php-format +msgid "Recursive inclusion of url %s" +msgstr "" + +#, php-format msgid "See: %s" msgstr "" @@ -3908,12 +3900,6 @@ msgid "FoafViewerPlugin" msgstr "" -msgid "FrameInclude" -msgstr "" - -msgid "FrameIncludePlugin" -msgstr "" - msgid "FullRecentChanges" msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/locale/po/ja.po 2014-09-04 16:17:25 UTC (rev 9062) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-27 16:33+0200\n" +"POT-Creation-Date: 2014-09-04 18:09+0200\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -1656,29 +1656,6 @@ msgid "Title" msgstr "タイトル" -msgid "" -"Display a url in a separate frame inside our body. Only one frame allowed." -msgstr "" - -msgid "Plugin not run: not in browse mode" -msgstr "" - -#, php-format -msgid "Recursive inclusion of page %s" -msgstr "" - -#, php-format -msgid "%s or %s parameter missing" -msgstr "" - -#, php-format -msgid "Recursive inclusion of url %s" -msgstr "" - -#, php-format -msgid "See %s" -msgstr "%s を参照" - msgid "Search the content of all pages in this wiki." msgstr "" @@ -2339,6 +2316,9 @@ msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "" +msgid "Plugin not run: not in browse mode" +msgstr "" + msgid "RandomPage" msgstr "ランダムページ" @@ -2730,6 +2710,10 @@ msgstr "" #, php-format +msgid "See %s" +msgstr "%s を参照" + +#, php-format msgid "Illegal operator: %s" msgstr "" @@ -2985,6 +2969,10 @@ msgid "Parametrized page inclusion." msgstr "" +#, php-format +msgid "Recursive inclusion of page %s" +msgstr "" + msgid "" "Convert Tex mathematicals expressions to cached PNG files. This is for small " "text." @@ -3043,6 +3031,10 @@ msgstr "" #, php-format +msgid "Recursive inclusion of url %s" +msgstr "" + +#, php-format msgid "See: %s" msgstr "参照: %s" @@ -3993,14 +3985,6 @@ msgid "FoafViewerPlugin" msgstr "カレンダー" -#, fuzzy -msgid "FrameInclude" -msgstr "インライン画像一覧" - -#, fuzzy -msgid "FrameIncludePlugin" -msgstr "インライン画像一覧" - msgid "FullRecentChanges" msgstr "" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/locale/po/nl.po 2014-09-04 16:17:25 UTC (rev 9062) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-27 16:33+0200\n" +"POT-Creation-Date: 2014-09-04 18:09+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -1630,29 +1630,6 @@ msgid "Title" msgstr "" -msgid "" -"Display a url in a separate frame inside our body. Only one frame allowed." -msgstr "" - -msgid "Plugin not run: not in browse mode" -msgstr "" - -#, php-format -msgid "Recursive inclusion of page %s" -msgstr "" - -#, php-format -msgid "%s or %s parameter missing" -msgstr "" - -#, php-format -msgid "Recursive inclusion of url %s" -msgstr "" - -#, php-format -msgid "See %s" -msgstr "Zie %s" - msgid "Search the content of all pages in this wiki." msgstr "" @@ -2306,6 +2283,9 @@ msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "" +msgid "Plugin not run: not in browse mode" +msgstr "" + msgid "RandomPage" msgstr "" @@ -2683,6 +2663,10 @@ msgstr "" #, php-format +msgid "See %s" +msgstr "Zie %s" + +#, php-format msgid "Illegal operator: %s" msgstr "" @@ -2936,6 +2920,10 @@ msgid "Parametrized page inclusion." msgstr "" +#, php-format +msgid "Recursive inclusion of page %s" +msgstr "" + msgid "" "Convert Tex mathematicals expressions to cached PNG files. This is for small " "text." @@ -2994,6 +2982,10 @@ msgstr "" #, php-format +msgid "Recursive inclusion of url %s" +msgstr "" + +#, php-format msgid "See: %s" msgstr "" @@ -3899,12 +3891,6 @@ msgid "FoafViewerPlugin" msgstr "" -msgid "FrameInclude" -msgstr "" - -msgid "FrameIncludePlugin" -msgstr "" - msgid "FullRecentChanges" msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/locale/po/phpwiki.pot 2014-09-04 16:17:25 UTC (rev 9062) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-27 16:33+0200\n" +"POT-Creation-Date: 2014-09-04 18:09+0200\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -1624,29 +1624,6 @@ msgid "Title" msgstr "" -msgid "" -"Display a url in a separate frame inside our body. Only one frame allowed." -msgstr "" - -msgid "Plugin not run: not in browse mode" -msgstr "" - -#, php-format -msgid "Recursive inclusion of page %s" -msgstr "" - -#, php-format -msgid "%s or %s parameter missing" -msgstr "" - -#, php-format -msgid "Recursive inclusion of url %s" -msgstr "" - -#, php-format -msgid "See %s" -msgstr "" - msgid "Search the content of all pages in this wiki." msgstr "" @@ -2300,6 +2277,9 @@ msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "" +msgid "Plugin not run: not in browse mode" +msgstr "" + msgid "RandomPage" msgstr "" @@ -2677,6 +2657,10 @@ msgstr "" #, php-format +msgid "See %s" +msgstr "" + +#, php-format msgid "Illegal operator: %s" msgstr "" @@ -2930,6 +2914,10 @@ msgid "Parametrized page inclusion." msgstr "" +#, php-format +msgid "Recursive inclusion of page %s" +msgstr "" + msgid "" "Convert Tex mathematicals expressions to cached PNG files. This is for small " "text." @@ -2988,6 +2976,10 @@ msgstr "" #, php-format +msgid "Recursive inclusion of url %s" +msgstr "" + +#, php-format msgid "See: %s" msgstr "" @@ -3893,12 +3885,6 @@ msgid "FoafViewerPlugin" msgstr "" -msgid "FrameInclude" -msgstr "" - -msgid "FrameIncludePlugin" -msgstr "" - msgid "FullRecentChanges" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/locale/po/sv.po 2014-09-04 16:17:25 UTC (rev 9062) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-27 16:33+0200\n" +"POT-Creation-Date: 2014-09-04 18:09+0200\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -1625,29 +1625,6 @@ msgid "Title" msgstr "" -msgid "" -"Display a url in a separate frame inside our body. Only one frame allowed." -msgstr "" - -msgid "Plugin not run: not in browse mode" -msgstr "" - -#, php-format -msgid "Recursive inclusion of page %s" -msgstr "" - -#, php-format -msgid "%s or %s parameter missing" -msgstr "" - -#, php-format -msgid "Recursive inclusion of url %s" -msgstr "" - -#, php-format -msgid "See %s" -msgstr "" - msgid "Search the content of all pages in this wiki." msgstr "" @@ -2301,6 +2278,9 @@ msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "" +msgid "Plugin not run: not in browse mode" +msgstr "" + msgid "RandomPage" msgstr "" @@ -2678,6 +2658,10 @@ msgstr "" #, php-format +msgid "See %s" +msgstr "" + +#, php-format msgid "Illegal operator: %s" msgstr "" @@ -2931,6 +2915,10 @@ msgid "Parametrized page inclusion." msgstr "" +#, php-format +msgid "Recursive inclusion of page %s" +msgstr "" + msgid "" "Convert Tex mathematicals expressions to cached PNG files. This is for small " "text." @@ -2989,6 +2977,10 @@ msgstr "" #, php-format +msgid "Recursive inclusion of url %s" +msgstr "" + +#, php-format msgid "See: %s" msgstr "" @@ -3894,12 +3886,6 @@ msgid "FoafViewerPlugin" msgstr "" -msgid "FrameInclude" -msgstr "" - -msgid "FrameIncludePlugin" -msgstr "" - msgid "FullRecentChanges" msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/locale/po/zh.po 2014-09-04 16:17:25 UTC (rev 9062) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-27 16:33+0200\n" +"POT-Creation-Date: 2014-09-04 18:09+0200\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -1698,29 +1698,6 @@ msgid "Title" msgstr "標題搜索" -msgid "" -"Display a url in a separate frame inside our body. Only one frame allowed." -msgstr "在內容的分離框架中顯示 url. 只能放一個框架." - -msgid "Plugin not run: not in browse mode" -msgstr "" - -#, fuzzy, php-format -msgid "Recursive inclusion of page %s" -msgstr "遞迴含括頁面 %s" - -#, php-format -msgid "%s or %s parameter missing" -msgstr "%s 或 %s 參數遺漏" - -#, fuzzy, php-format -msgid "Recursive inclusion of url %s" -msgstr "遞迴含括 url %s" - -#, php-format -msgid "See %s" -msgstr "參照 %s" - msgid "Search the content of all pages in this wiki." msgstr "在此 wiki 所有頁面中搜尋內容." @@ -2400,6 +2377,9 @@ msgid "Display a list of randomly chosen pages or redirects to a random page." msgstr "顯示隨機選出的頁面列表或重導向到隨機選取的頁面." +msgid "Plugin not run: not in browse mode" +msgstr "" + msgid "RandomPage" msgstr "" @@ -2801,6 +2781,10 @@ msgstr "" #, php-format +msgid "See %s" +msgstr "參照 %s" + +#, php-format msgid "Illegal operator: %s" msgstr "" @@ -3060,6 +3044,10 @@ msgid "Parametrized page inclusion." msgstr "" +#, fuzzy, php-format +msgid "Recursive inclusion of page %s" +msgstr "遞迴含括頁面 %s" + msgid "" "Convert Tex mathematicals expressions to cached PNG files. This is for small " "text." @@ -3118,6 +3106,10 @@ msgid "%s parameter missing" msgstr "%s 參數遺漏" +#, fuzzy, php-format +msgid "Recursive inclusion of url %s" +msgstr "遞迴含括 url %s" + #, php-format msgid "See: %s" msgstr "參閱: %s" @@ -4080,14 +4072,6 @@ msgid "FoafViewerPlugin" msgstr "" -#, fuzzy -msgid "FrameInclude" -msgstr "含括頁面" - -#, fuzzy -msgid "FrameIncludePlugin" -msgstr "含括頁面" - msgid "FullRecentChanges" msgstr "" @@ -6135,6 +6119,9 @@ msgid "Edit this page" msgstr "編輯此頁面" +#~ msgid "%s or %s parameter missing" +#~ msgstr "%s 或 %s 參數遺漏" + #~ msgid "Edit aborted." #~ msgstr "編輯中止." Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Deleted: trunk/pgsrc/Help%2FFrameIncludePlugin =================================================================== --- trunk/pgsrc/Help%2FFrameIncludePlugin 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/pgsrc/Help%2FFrameIncludePlugin 2014-09-04 16:17:25 UTC (rev 9062) @@ -1,32 +0,0 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) -Content-Type: application/x-phpwiki; - pagename=Help%2FFrameIncludePlugin; - flags=PAGE_LOCKED; - charset=UTF-8 -Content-Transfer-Encoding: binary - -The **~FrameInclude** [[Help:WikiPlugin|plugin]] will create an HTML frame that will fill the entire display area of the page (that is, the whole area the user is allowed to edit). All other text will be discarded when the page is rendered (anything outside the call to plugin, that is). In the language of hypertext this is called //transclusion//. - -You might also be interested in the [[Help:IncludePagePlugin|IncludePage]] plugin. - -== Examples == - -To include a page from another site, use the **src** attribute: - -{{{ -<<FrameInclude src="http://phpwiki.fr/">> -}}} - -To include a page from within this wiki, use the **page** attribute: - -{{{ -<<FrameInclude page=HomePage>> -}}} - -For more information on this plugin please read the PHP source code in the /lib/plugin directory. - -<noinclude> ----- -[[PhpWikiDocumentation]] [[CategoryWikiPlugin]] -</noinclude> Modified: trunk/pgsrc/Help%2FIncludePagePlugin =================================================================== --- trunk/pgsrc/Help%2FIncludePagePlugin 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/pgsrc/Help%2FIncludePagePlugin 2014-09-04 16:17:25 UTC (rev 9062) @@ -1,4 +1,4 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 +Date: Thu, 4 Sep 2014 18:14:45 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Help%2FIncludePagePlugin; @@ -7,7 +7,7 @@ Content-Transfer-Encoding: binary The **~IncludePage** [[Help:WikiPlugin|plugin]] will "include" other pages in this wiki. In the language of hypertext this is called //transclusion//. -The pages will render in distinct tables. You can also load external pages in a more limited fashion with the [[Help:FrameIncludePlugin|FrameInclude]] plugin. +The pages will render in distinct tables. == Usage == @@ -95,7 +95,6 @@ * [[Help:IncludePagesPlugin]] (to include multiple pages) * [[Help:TemplatePlugin]] (to include a page with parameters) -* [[Help:FrameIncludePlugin]] (to include an external page) <noinclude> ---- Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/pgsrc/ReleaseNotes 2014-09-04 16:17:25 UTC (rev 9062) @@ -1,4 +1,4 @@ -Date: Thu, 4 Sep 2014 17:37:27 +0000 +Date: Thu, 4 Sep 2014 18:14:45 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -11,6 +11,7 @@ == 1.5.1 2014-09-xx Marc-Etienne Vargenau == * fix Bug#456 'Optimizing Database' message sometimes printed on page +* remove FrameInclude plugin (frames are not supported in HTML 5) == 1.5.0 2014-07-29 Marc-Etienne Vargenau == Deleted: trunk/themes/Sidebar/templates/frame-left.tmpl =================================================================== --- trunk/themes/Sidebar/templates/frame-left.tmpl 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/themes/Sidebar/templates/frame-left.tmpl 2014-09-04 16:17:25 UTC (rev 9062) @@ -1,14 +0,0 @@ -<?php -/* - * This template is responsible mainly for the outer level <html> stuff. - */ -?> -<!DOCTYPE html> -<head> -<meta charset="UTF-8" /> -<?php echo Template('head') ?> -<body> -<div class="toolbar"><?php echo Template('navbar') ?></div> -<div class="toolbar"><?php echo Template('actionbar') ?></div> -</body> -</html> Deleted: trunk/themes/Sidebar/templates/frameset.tmpl =================================================================== --- trunk/themes/Sidebar/templates/frameset.tmpl 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/themes/Sidebar/templates/frameset.tmpl 2014-09-04 16:17:25 UTC (rev 9062) @@ -1,26 +0,0 @@ -<?php -/* - * This template is used for the FrameInclude plugin. - */ - -$topurl = $request->getURLtoSelf(array('frame' => 'header')); -$boturl = $request->getURLtoSelf(array('frame' => 'footer')); -$lefturl = $request->getURLtoSelf(array('frame' => 'left')); - -printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET); -?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<?php echo Template('head') ?> - -<frameset rows="<?php echo $ROWS?>"> - <frame name="header" src="<?php echo $topurl?>" <?php echo $FRAMEARGS ?> /> - <frameset cols="<?php echo $COLS?>"> - <frame name="left" src="<?php echo $lefturl?>" <?php echo $FRAMEARGS ?> /> - <?php echo $CONTENT_FRAME ?> - </frameset> - <frame name="footer" src="<?php echo $boturl?>" <?php echo $FRAMEARGS ?> /> - <noframes><?php echo Template('body') ?></noframes> -</frameset> -</html> Deleted: trunk/themes/default/templates/frameset.tmpl =================================================================== --- trunk/themes/default/templates/frameset.tmpl 2014-09-04 15:38:45 UTC (rev 9061) +++ trunk/themes/default/templates/frameset.tmpl 2014-09-04 16:17:25 UTC (rev 9062) @@ -1,22 +0,0 @@ -<?php -/* - * This template is used for the FrameInclude plugin. - */ - -$topurl = $request->getURLtoSelf(array('frame' => 'header')); -$boturl = $request->getURLtoSelf(array('frame' => 'footer')); - -printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n", CHARSET); -?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<?php echo Template('head') ?> - -<frameset rows="<?php echo $ROWS?>"> - <frame name="header" src="<?php echo $topurl?>" <?php echo $FRAMEARGS ?> /> - <?php echo $CONTENT_FRAME ?> - <frame name="footer" src="<?php echo $boturl?>" <?php echo $FRAMEARGS ?> /> - <noframes><?php echo Template('body') ?></noframes> -</frameset> -</html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-11 09:27:23
|
Revision: 9067 http://sourceforge.net/p/phpwiki/code/9067 Author: vargenau Date: 2014-09-11 09:27:18 +0000 (Thu, 11 Sep 2014) Log Message: ----------- Use jquery tablesorter to sort tables Modified Paths: -------------- trunk/lib/WikiTheme.php trunk/themes/Crao/crao.css trunk/themes/Crao/templates/bottom.tmpl trunk/themes/Hawaiian/Hawaiian.css trunk/themes/MacOSX/MacOSX-topbottombars.css trunk/themes/MacOSX/MacOSX.css trunk/themes/MonoBook/monobook.css trunk/themes/Portland/portland.css trunk/themes/Sidebar/sidebar.css trunk/themes/SpaceWiki/SpaceWiki.css trunk/themes/Wordpress/Wordpress.css trunk/themes/blog/Kubrick.css trunk/themes/blog/templates/bottom.tmpl trunk/themes/default/phpwiki-modern.css trunk/themes/default/phpwiki-printer.css trunk/themes/default/phpwiki-topbottombars.css trunk/themes/default/phpwiki.css trunk/themes/default/templates/bottom.tmpl trunk/themes/fusionforge/fusionforge.css trunk/themes/fusionforge/templates/bottom.tmpl trunk/themes/shamino_com/shamino_com.css trunk/themes/smaller/phpwiki.css trunk/themes/wikilens/wikilens.css Added Paths: ----------- trunk/themes/default/images/sort_down.gif trunk/themes/default/images/sort_none.gif trunk/themes/default/images/sort_up.gif trunk/themes/default/jquery-1.11.1.min.js trunk/themes/default/jquery.tablesorter.min.js Removed Paths: ------------- trunk/themes/default/sortable.js Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/lib/WikiTheme.php 2014-09-11 09:27:18 UTC (rev 9067) @@ -220,7 +220,8 @@ $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("wikicommon.js")))); if (!(defined('FUSIONFORGE') and FUSIONFORGE)) { // FusionForge already loads this - $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("sortable.js")))); + $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery-1.11.1.min.js")))); + $this->addMoreHeaders(JavaScript('', array('src' => $this->_findData("jquery.tablesorter.min.js")))); } // by pixels if ((is_object($GLOBALS['request']) // guard against unittests Modified: trunk/themes/Crao/crao.css =================================================================== --- trunk/themes/Crao/crao.css 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/Crao/crao.css 2014-09-11 09:27:18 UTC (rev 9067) @@ -1304,13 +1304,26 @@ background-color: #d8d8d8; } -/* For emacs users - * - * Local Variables: - * mode: c - * c-file-style: cc-mode - * tab-width: 8 - * c-hanging-comment-ender-p: nil - * indent-tabs-mode: nil - * End: - */ +table.tablesorter th.header { + background-image: url(../default/images/sort_none.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortUp { + background-image: url(../default/images/sort_up.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortDown { + background-image: url(../default/images/sort_down.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} Modified: trunk/themes/Crao/templates/bottom.tmpl =================================================================== --- trunk/themes/Crao/templates/bottom.tmpl 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/Crao/templates/bottom.tmpl 2014-09-11 09:27:18 UTC (rev 9067) @@ -6,3 +6,12 @@ hljs.tabReplace = ' '; hljs.initHighlightingOnLoad(); </script> +<script> +jQuery(document).ready(function() + { + // Compatibility: allow class "sortable" to make table sortable + jQuery(".sortable").addClass("tablesorter"); + jQuery(".tablesorter").tablesorter(); + } +); +</script> Modified: trunk/themes/Hawaiian/Hawaiian.css =================================================================== --- trunk/themes/Hawaiian/Hawaiian.css 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/Hawaiian/Hawaiian.css 2014-09-11 09:27:18 UTC (rev 9067) @@ -678,10 +678,26 @@ background-color: #d8d8d8; } -/* For emacs users - * - * Local Variables: - * mode: c - * c-file-style: cc-mode - * End: - */ +table.tablesorter th.header { + background-image: url(../default/images/sort_none.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortUp { + background-image: url(../default/images/sort_up.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortDown { + background-image: url(../default/images/sort_down.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} Modified: trunk/themes/MacOSX/MacOSX-topbottombars.css =================================================================== --- trunk/themes/MacOSX/MacOSX-topbottombars.css 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/MacOSX/MacOSX-topbottombars.css 2014-09-11 09:27:18 UTC (rev 9067) @@ -57,11 +57,3 @@ margin-top: 0.75ex; margin-bottom: 0.5ex; } - -/* For emacs users - * - * Local Variables: - * mode: c - * c-file-style: cc-mode - * End: - */ Modified: trunk/themes/MacOSX/MacOSX.css =================================================================== --- trunk/themes/MacOSX/MacOSX.css 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/MacOSX/MacOSX.css 2014-09-11 09:27:18 UTC (rev 9067) @@ -1200,10 +1200,26 @@ background-color: #d8d8d8; } -/* For emacs users - * - * Local Variables: - * mode: c - * c-file-style: cc-mode - * End: - */ +table.tablesorter th.header { + background-image: url(../default/images/sort_none.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortUp { + background-image: url(../default/images/sort_up.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortDown { + background-image: url(../default/images/sort_down.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} Modified: trunk/themes/MonoBook/monobook.css =================================================================== --- trunk/themes/MonoBook/monobook.css 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/MonoBook/monobook.css 2014-09-11 09:27:18 UTC (rev 9067) @@ -2250,3 +2250,27 @@ margin-top: 1ex; margin-bottom: 1ex; } + +table.tablesorter th.header { + background-image: url(../default/images/sort_none.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortUp { + background-image: url(../default/images/sort_up.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortDown { + background-image: url(../default/images/sort_down.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} Modified: trunk/themes/Portland/portland.css =================================================================== --- trunk/themes/Portland/portland.css 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/Portland/portland.css 2014-09-11 09:27:18 UTC (rev 9067) @@ -185,3 +185,26 @@ background-color: #d8d8d8; } +table.tablesorter th.header { + background-image: url(../default/images/sort_none.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortUp { + background-image: url(../default/images/sort_up.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortDown { + background-image: url(../default/images/sort_down.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} Modified: trunk/themes/Sidebar/sidebar.css =================================================================== --- trunk/themes/Sidebar/sidebar.css 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/Sidebar/sidebar.css 2014-09-11 09:27:18 UTC (rev 9067) @@ -2304,3 +2304,51 @@ border-color: green; padding: 0.5em; } + +table.tablesorter th.header { + background-image: url(../default/images/sort_none.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortUp { + background-image: url(../default/images/sort_up.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortDown { + background-image: url(../default/images/sort_down.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.header { + background-image: url(../default/images/sort_none.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortUp { + background-image: url(../default/images/sort_up.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortDown { + background-image: url(../default/images/sort_down.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} Modified: trunk/themes/SpaceWiki/SpaceWiki.css =================================================================== --- trunk/themes/SpaceWiki/SpaceWiki.css 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/SpaceWiki/SpaceWiki.css 2014-09-11 09:27:18 UTC (rev 9067) @@ -1038,10 +1038,26 @@ background-color: #d8d8d8; } -/* For emacs users - * - * Local Variables: - * mode: c - * c-file-style: cc-mode - * End: - */ +table.tablesorter th.header { + background-image: url(../default/images/sort_none.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortUp { + background-image: url(../default/images/sort_up.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortDown { + background-image: url(../default/images/sort_down.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} Modified: trunk/themes/Wordpress/Wordpress.css =================================================================== --- trunk/themes/Wordpress/Wordpress.css 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/Wordpress/Wordpress.css 2014-09-11 09:27:18 UTC (rev 9067) @@ -1117,10 +1117,26 @@ background-color: #d8d8d8; } -/* For emacs users - * - * Local Variables: - * mode: c - * c-file-style: cc-mode - * End: - */ +table.tablesorter th.header { + background-image: url(../default/images/sort_none.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortUp { + background-image: url(../default/images/sort_up.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortDown { + background-image: url(../default/images/sort_down.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} Modified: trunk/themes/blog/Kubrick.css =================================================================== --- trunk/themes/blog/Kubrick.css 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/blog/Kubrick.css 2014-09-11 09:27:18 UTC (rev 9067) @@ -1022,3 +1022,27 @@ font-weight: bold; background-color: #d8d8d8; } + +table.tablesorter th.header { + background-image: url(../default/images/sort_none.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortUp { + background-image: url(../default/images/sort_up.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} + +table.tablesorter th.headerSortDown { + background-image: url(../default/images/sort_down.gif); + cursor: pointer; + background-repeat: no-repeat; + background-position: center right; + padding-right: 20px; +} Modified: trunk/themes/blog/templates/bottom.tmpl =================================================================== --- trunk/themes/blog/templates/bottom.tmpl 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/blog/templates/bottom.tmpl 2014-09-11 09:27:18 UTC (rev 9067) @@ -9,3 +9,12 @@ hljs.tabReplace = ' '; hljs.initHighlightingOnLoad(); </script> +<script> +jQuery(document).ready(function() + { + // Compatibility: allow class "sortable" to make table sortable + jQuery(".sortable").addClass("tablesorter"); + jQuery(".tablesorter").tablesorter(); + } +); +</script> Added: trunk/themes/default/images/sort_down.gif =================================================================== (Binary files differ) Index: trunk/themes/default/images/sort_down.gif =================================================================== --- trunk/themes/default/images/sort_down.gif 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/default/images/sort_down.gif 2014-09-11 09:27:18 UTC (rev 9067) Property changes on: trunk/themes/default/images/sort_down.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/themes/default/images/sort_none.gif =================================================================== (Binary files differ) Index: trunk/themes/default/images/sort_none.gif =================================================================== --- trunk/themes/default/images/sort_none.gif 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/default/images/sort_none.gif 2014-09-11 09:27:18 UTC (rev 9067) Property changes on: trunk/themes/default/images/sort_none.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/themes/default/images/sort_up.gif =================================================================== (Binary files differ) Index: trunk/themes/default/images/sort_up.gif =================================================================== --- trunk/themes/default/images/sort_up.gif 2014-09-11 09:06:46 UTC (rev 9066) +++ trunk/themes/default/images/sort_up.gif 2014-09-11 09:27:18 UTC (rev 9067) Property changes on: trunk/themes/default/images/sort_up.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/themes/default/jquery-1.11.1.min.js =================================================================== --- trunk/themes/default/jquery-1.11.1.min.js (rev 0) +++ trunk/themes/default/jquery-1.11.1.min.js 2014-09-11 09:27:18 UTC (rev 9067) @@ -0,0 +1,4 @@ +/*! jQuery v1.11.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ +!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l="1.11.1",m=function(a,b){return new m.fn.init(a,b)},n=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,o=/^-ms-/,p=/-([\da-z])/gi,q=function(a,b){return b.toUpperCase()};m.fn=m.prototype={jquery:l,constructor:m,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=m.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return m.each(this,a,b)},map:function(a){return this.pushStack(m.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},m.extend=m.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||m.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(m.isPlainObject(c)||(b=m.isArray(c)))?(b?(b=!1,f=a&&m.isArray(a)?a:[]):f=a&&m.isPlainObject(a)?a:{},g[d]=m.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},m.extend({expando:"jQuery"+(l+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===m.type(a)},isArray:Array.isArray||function(a){return"array"===m.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return!m.isArray(a)&&a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==m.type(a)||a.nodeType||m.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(k.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&m.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(o,"ms-").replace(p,q)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=r(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(n,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(r(Object(a))?m.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=r(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),m.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||m.guid++,e):void 0},now:function(){return+new Date},support:k}),m.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function r(a){var b=a.length,c=m.type(a);return"function"===c||m.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var s=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="<div class='a'></div><div class='a i'></div>",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="<select msallowclip=''><option selected=''></option></select>",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=lb(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=mb(b);function pb(){}pb.prototype=d.filters=d.pseudos,d.setFilters=new pb,g=fb.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){(!c||(e=S.exec(h)))&&(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=T.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(R," ")}),h=h.slice(c.length));for(g in d.filter)!(e=X[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fb.error(a):z(a,i).slice(0)};function qb(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);m.find=s,m.expr=s.selectors,m.expr[":"]=m.expr.pseudos,m.unique=s.uniqueSort,m.text=s.getText,m.isXMLDoc=s.isXML,m.contains=s.contains;var t=m.expr.match.needsContext,u=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,v=/^.[^:#\[\.,]*$/;function w(a,b,c){if(m.isFunction(b))return m.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return m.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(v.test(b))return m.filter(b,a,c);b=m.filter(b,a)}return m.grep(a,function(a){return m.inArray(a,b)>=0!==c})}m.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?m.find.matchesSelector(d,a)?[d]:[]:m.find.matches(a,m.grep(b,function(a){return 1===a.nodeType}))},m.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(m(a).filter(function(){for(b=0;e>b;b++)if(m.contains(d[b],this))return!0}));for(b=0;e>b;b++)m.find(a,d[b],c);return c=this.pushStack(e>1?m.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(w(this,a||[],!1))},not:function(a){return this.pushStack(w(this,a||[],!0))},is:function(a){return!!w(this,"string"==typeof a&&t.test(a)?m(a):a||[],!1).length}});var x,y=a.document,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=m.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||x).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof m?b[0]:b,m.merge(this,m.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:y,!0)),u.test(c[1])&&m.isPlainObject(b))for(c in b)m.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=y.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return x.find(a);this.length=1,this[0]=d}return this.context=y,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):m.isFunction(a)?"undefined"!=typeof x.ready?x.ready(a):a(m):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),m.makeArray(a,this))};A.prototype=m.fn,x=m(y);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};m.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!m(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),m.fn.extend({has:function(a){var b,c=m(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(m.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=t.test(a)||"string"!=typeof a?m(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&m.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?m.unique(f):f)},index:function(a){return a?"string"==typeof a?m.inArray(this[0],m(a)):m.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(m.unique(m.merge(this.get(),m(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}m.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return m.dir(a,"parentNode")},parentsUntil:function(a,b,c){return m.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return m.dir(a,"nextSibling")},prevAll:function(a){return m.dir(a,"previousSibling")},nextUntil:function(a,b,c){return m.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return m.dir(a,"previousSibling",c)},siblings:function(a){return m.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return m.sibling(a.firstChild)},contents:function(a){return m.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:m.merge([],a.childNodes)}},function(a,b){m.fn[a]=function(c,d){var e=m.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=m.filter(d,e)),this.length>1&&(C[a]||(e=m.unique(e)),B.test(a)&&(e=e.reverse())),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return m.each(a.match(E)||[],function(a,c){b[c]=!0}),b}m.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):m.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){m.each(b,function(b,c){var d=m.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&m.each(arguments,function(a,c){var d;while((d=m.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?m.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},m.extend({Deferred:function(a){var b=[["resolve","done",m.Callbacks("once memory"),"resolved"],["reject","fail",m.Callbacks("once memory"),"rejected"],["notify","progress",m.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return m.Deferred(function(c){m.each(b,function(b,f){var g=m.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&m.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?m.extend(a,d):d}},e={};return d.pipe=d.then,m.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&m.isFunction(a.promise)?e:0,g=1===f?a:m.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&m.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;m.fn.ready=function(a){return m.ready.promise().done(a),this},m.extend({isReady:!1,readyWait:1,holdReady:function(a){a?m.readyWait++:m.ready(!0)},ready:function(a){if(a===!0?!--m.readyWait:!m.isReady){if(!y.body)return setTimeout(m.ready);m.isReady=!0,a!==!0&&--m.readyWait>0||(H.resolveWith(y,[m]),m.fn.triggerHandler&&(m(y).triggerHandler("ready"),m(y).off("ready")))}}});function I(){y.addEventListener?(y.removeEventListener("DOMContentLoaded",J,!1),a.removeEventListener("load",J,!1)):(y.detachEvent("onreadystatechange",J),a.detachEvent("onload",J))}function J(){(y.addEventListener||"load"===event.type||"complete"===y.readyState)&&(I(),m.ready())}m.ready.promise=function(b){if(!H)if(H=m.Deferred(),"complete"===y.readyState)setTimeout(m.ready);else if(y.addEventListener)y.addEventListener("DOMContentLoaded",J,!1),a.addEventListener("load",J,!1);else{y.attachEvent("onreadystatechange",J),a.attachEvent("onload",J);var c=!1;try{c=null==a.frameElement&&y.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!m.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}I(),m.ready()}}()}return H.promise(b)};var K="undefined",L;for(L in m(k))break;k.ownLast="0"!==L,k.inlineBlockNeedsLayout=!1,m(function(){var a,b,c,d;c=y.getElementsByTagName("body")[0],c&&c.style&&(b=y.createElement("div"),d=y.createElement("div"),d.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(d).appendChild(b),typeof b.style.zoom!==K&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",k.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(d))}),function(){var a=y.createElement("div");if(null==k.deleteExpando){k.deleteExpando=!0;try{delete a.test}catch(b){k.deleteExpando=!1}}a=null}(),m.acceptData=function(a){var b=m.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var M=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,N=/([A-Z])/g;function O(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(N,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:M.test(c)?m.parseJSON(c):c}catch(e){}m.data(a,b,c)}else c=void 0}return c}function P(a){var b;for(b in a)if(("data"!==b||!m.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function Q(a,b,d,e){if(m.acceptData(a)){var f,g,h=m.expando,i=a.nodeType,j=i?m.cache:a,k=i?a[h]:a[h]&&h; +if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||m.guid++:h),j[k]||(j[k]=i?{}:{toJSON:m.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=m.extend(j[k],b):j[k].data=m.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[m.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[m.camelCase(b)])):f=g,f}}function R(a,b,c){if(m.acceptData(a)){var d,e,f=a.nodeType,g=f?m.cache:a,h=f?a[m.expando]:m.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){m.isArray(b)?b=b.concat(m.map(b,m.camelCase)):b in d?b=[b]:(b=m.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!P(d):!m.isEmptyObject(d))return}(c||(delete g[h].data,P(g[h])))&&(f?m.cleanData([a],!0):k.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}m.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?m.cache[a[m.expando]]:a[m.expando],!!a&&!P(a)},data:function(a,b,c){return Q(a,b,c)},removeData:function(a,b){return R(a,b)},_data:function(a,b,c){return Q(a,b,c,!0)},_removeData:function(a,b){return R(a,b,!0)}}),m.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=m.data(f),1===f.nodeType&&!m._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=m.camelCase(d.slice(5)),O(f,d,e[d])));m._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){m.data(this,a)}):arguments.length>1?this.each(function(){m.data(this,a,b)}):f?O(f,a,m.data(f,a)):void 0},removeData:function(a){return this.each(function(){m.removeData(this,a)})}}),m.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=m._data(a,b),c&&(!d||m.isArray(c)?d=m._data(a,b,m.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=m.queue(a,b),d=c.length,e=c.shift(),f=m._queueHooks(a,b),g=function(){m.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return m._data(a,c)||m._data(a,c,{empty:m.Callbacks("once memory").add(function(){m._removeData(a,b+"queue"),m._removeData(a,c)})})}}),m.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?m.queue(this[0],a):void 0===b?this:this.each(function(){var c=m.queue(this,a,b);m._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&m.dequeue(this,a)})},dequeue:function(a){return this.each(function(){m.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=m.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=m._data(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=["Top","Right","Bottom","Left"],U=function(a,b){return a=b||a,"none"===m.css(a,"display")||!m.contains(a.ownerDocument,a)},V=m.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===m.type(c)){e=!0;for(h in c)m.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,m.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(m(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},W=/^(?:checkbox|radio)$/i;!function(){var a=y.createElement("input"),b=y.createElement("div"),c=y.createDocumentFragment();if(b.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",k.leadingWhitespace=3===b.firstChild.nodeType,k.tbody=!b.getElementsByTagName("tbody").length,k.htmlSerialize=!!b.getElementsByTagName("link").length,k.html5Clone="<:nav></:nav>"!==y.createElement("nav").cloneNode(!0).outerHTML,a.type="checkbox",a.checked=!0,c.appendChild(a),k.appendChecked=a.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,c.appendChild(b),b.innerHTML="<input type='radio' checked='checked' name='t'/>",k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,k.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){k.noCloneEvent=!1}),b.cloneNode(!0).click()),null==k.deleteExpando){k.deleteExpando=!0;try{delete b.test}catch(d){k.deleteExpando=!1}}}(),function(){var b,c,d=y.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(k[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),k[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var X=/^(?:input|select|textarea)$/i,Y=/^key/,Z=/^(?:mouse|pointer|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=/^([^.]*)(?:\.(.+)|)$/;function ab(){return!0}function bb(){return!1}function cb(){try{return y.activeElement}catch(a){}}m.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=m.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof m===K||a&&m.event.triggered===a.type?void 0:m.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(E)||[""],h=b.length;while(h--)f=_.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=m.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=m.event.special[o]||{},l=m.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&m.expr.match.needsContext.test(e),namespace:p.join(".")},i),(n=g[o])||(n=g[o]=[],n.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?n.splice(n.delegateCount++,0,l):n.push(l),m.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,n,o,p,q,r=m.hasData(a)&&m._data(a);if(r&&(k=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=_.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=m.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,n=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=n.length;while(f--)g=n[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(n.splice(f,1),g.selector&&n.delegateCount--,l.remove&&l.remove.call(a,g));i&&!n.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||m.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)m.event.remove(a,o+b[j],c,d,!0);m.isEmptyObject(k)&&(delete r.handle,m._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,n,o=[d||y],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||y,3!==d.nodeType&&8!==d.nodeType&&!$.test(p+m.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[m.expando]?b:new m.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:m.makeArray(c,[b]),k=m.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!m.isWindow(d)){for(i=k.delegateType||p,$.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||y)&&o.push(l.defaultView||l.parentWindow||a)}n=0;while((h=o[n++])&&!b.isPropagationStopped())b.type=n>1?i:k.bindType||p,f=(m._data(h,"events")||{})[b.type]&&m._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&m.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&m.acceptData(d)&&g&&d[p]&&!m.isWindow(d)){l=d[g],l&&(d[g]=null),m.event.triggered=p;try{d[p]()}catch(r){}m.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=m.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(m._data(this,"events")||{})[a.type]||[],k=m.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=m.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((m.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?m(c,this).index(i)>=0:m.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},fix:function(a){if(a[m.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=Z.test(e)?this.mouseHooks:Y.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new m.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=f.srcElement||y),3===a.target.nodeType&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,g.filter?g.filter(a,f):a},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button,g=b.fromElement;return null==a.pageX&&null!=b.clientX&&(d=a.target.ownerDocument||y,e=d.documentElement,c=d.body,a.pageX=b.clientX+(e&&e.scrollLeft||c&&c.scrollLeft||0)-(e&&e.clientLeft||c&&c.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||c&&c.scrollTop||0)-(e&&e.clientTop||c&&c.clientTop||0)),!a.relatedTarget&&g&&(a.relatedTarget=g===a.target?b.toElement:g),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==cb()&&this.focus)try{return this.focus(),!1}catch(a){}},delegateType:"focusin"},blur:{trigger:function(){return this===cb()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return m.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):void 0},_default:function(a){return m.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}},simulate:function(a,b,c,d){var e=m.extend(new m.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?m.event.trigger(e,null,b):m.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},m.removeEvent=y.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]===K&&(a[d]=null),a.detachEvent(d,c))},m.Event=function(a,b){return this instanceof m.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ab:bb):this.type=a,b&&m.extend(this,b),this.timeStamp=a&&a.timeStamp||m.now(),void(this[m.expando]=!0)):new m.Event(a,b)},m.Event.prototype={isDefaultPrevented:bb,isPropagationStopped:bb,isImmediatePropagationStopped:bb,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ab,a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ab,a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagatio... [truncated message content] |
From: <var...@us...> - 2014-09-18 14:28:29
|
Revision: 9094 http://sourceforge.net/p/phpwiki/code/9094 Author: vargenau Date: 2014-09-18 14:28:21 +0000 (Thu, 18 Sep 2014) Log Message: ----------- No tabs Modified Paths: -------------- trunk/lib/WysiwygEdit/FCKeditor.php trunk/lib/plugin/WikicreoleTable.php trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki trunk/locale/it/pgsrc/PaginaDiProva Modified: trunk/lib/WysiwygEdit/FCKeditor.php =================================================================== --- trunk/lib/WysiwygEdit/FCKeditor.php 2014-09-18 14:21:42 UTC (rev 9093) +++ trunk/lib/WysiwygEdit/FCKeditor.php 2014-09-18 14:28:21 UTC (rev 9094) @@ -26,9 +26,9 @@ $this->_htmltextid = "edit-content"; // FCKEditor1; $this->_wikitextid = "editareawiki"; $this->_jsdefault = " -oFCKeditor.BasePath = '$this->BasePath'; -oFCKeditor.Height = 300; -// oFCKeditor.ToolbarSet = 'Basic' ; +oFCKeditor.BasePath = '$this->BasePath'; +oFCKeditor.Height = 300; +// oFCKeditor.ToolbarSet = 'Basic' ; oFCKeditor.Config.DefaultLanguage = '$LANG'; oFCKeditor.Config.LinkBrowserURL = oFCKeditor.BasePath + 'editor/filemanager/browser/default/browser.html?Connector=connectors/php/connector.php'; oFCKeditor.Config.ImageBrowserURL = oFCKeditor.BasePath + 'editor/filemanager/browser/default/browser.html?Type=Image&Connector=connectors/php/connector.php'; @@ -66,7 +66,7 @@ $out = HTML( JavaScript(" var oFCKeditor = new FCKeditor( '$htmltextid' ) ; -oFCKeditor.Value = '" . $textarea->_content[0]->asXML() . "';" +oFCKeditor.Value = '" . $textarea->_content[0]->asXML() . "';" . $this->_jsdefault . " oFCKeditor.Create();"), HTML::div(array("id" => $this->_wikitextid, Modified: trunk/lib/plugin/WikicreoleTable.php =================================================================== --- trunk/lib/plugin/WikicreoleTable.php 2014-09-18 14:21:42 UTC (rev 9093) +++ trunk/lib/plugin/WikicreoleTable.php 2014-09-18 14:28:21 UTC (rev 9094) @@ -158,11 +158,11 @@ /** * Compute cell in spreadsheet table * @param array $table: two-dimensional table - * @param int $i: first index of cell to compute - * @param int $j: second index of cell to compute - * @param int $imax: first table dimension - * @param int $jmax: second table dimension - * @return int + * @param int $i: first index of cell to compute + * @param int $j: second index of cell to compute + * @param int $imax: first table dimension + * @param int $jmax: second table dimension + * @return int */ private function compute_table_cell($table, $i, $j, $imax, $jmax) { Modified: trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss 2014-09-18 14:21:42 UTC (rev 9093) +++ trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss 2014-09-18 14:28:21 UTC (rev 9094) @@ -52,7 +52,7 @@ * sources ~PhpWikiRss pour PhpWiki:RecentChanges : {{{ <<RssFeed feed=PhpWikiRss description="PhpWiki:RecentChanges" - url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>> + url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>> }}} * [PhpWikiDemo:sidebar/] _Exemple barre verticale_ Modified: trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki =================================================================== --- trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki 2014-09-18 14:21:42 UTC (rev 9093) +++ trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki 2014-09-18 14:28:21 UTC (rev 9094) @@ -7,4 +7,4 @@ Content-Transfer-Encoding: binary <<RssFeed feed=PhpWikiRecentChanges description="PhpWiki:RecentChanges" - url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>> + url=http://phpwiki.sourceforge.net/phpwiki/RecentChanges?format=rss>> Modified: trunk/locale/it/pgsrc/PaginaDiProva =================================================================== --- trunk/locale/it/pgsrc/PaginaDiProva 2014-09-18 14:21:42 UTC (rev 9093) +++ trunk/locale/it/pgsrc/PaginaDiProva 2014-09-18 14:28:21 UTC (rev 9094) @@ -37,39 +37,39 @@ ** l2 ---- old lists - * level 1 - * l1 - *l2 - *l2 - *l3 - *l3 - *l4 - *l3 - *l5 - *l3 - #one - #two - #one - #two - *l1 - #three - #four - *l1 - *l2 - # one - # two + * level 1 + * l1 + *l2 + *l2 + *l3 + *l3 + *l4 + *l3 + *l5 + *l3 + #one + #two + #one + #two + *l1 + #three + #four + *l1 + *l2 + # one + # two preformatted text some more text - *l1 - *l4 - # number - # number + *l1 + *l4 + # number + # number this is a plain paragraph - * bullet + * bullet this is a plain paragraph again - # number + # number ---- **Link tests** # normal: FrontPage This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-18 14:32:23
|
Revision: 9095 http://sourceforge.net/p/phpwiki/code/9095 Author: vargenau Date: 2014-09-18 14:32:14 +0000 (Thu, 18 Sep 2014) Log Message: ----------- correct total number of pages for AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastEditedByMe; remove brackets in message Modified Paths: -------------- trunk/lib/plugin/AllPages.php trunk/lib/plugin/LinkDatabase.php trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo 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/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo Modified: trunk/lib/plugin/AllPages.php =================================================================== --- trunk/lib/plugin/AllPages.php 2014-09-18 14:28:21 UTC (rev 9094) +++ trunk/lib/plugin/AllPages.php 2014-09-18 14:32:14 UTC (rev 9095) @@ -62,70 +62,55 @@ $caption = _("All pages in this wiki (%d total):"); if (!empty($args['userpages'])) { - $pages = PageList::allUserPages($args['include_empty'], - $args['sortby'], '' - ); + $pages = PageList::allUserPages($args['include_empty'], $args['sortby'], ''); $caption = _("List of user-created pages (%d total):"); - $args['count'] = $request->getArg('count'); + $args['count'] = count($pages); } elseif (!empty($args['owner'])) { - $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'], - $args['sortby'], '' - ); - $args['count'] = $request->getArg('count'); - if (!$args['count']) - $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); - $caption = fmt("List of pages owned by [%s] (%d total):", + $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'], $args['sortby'], ''); + $args['count'] = count($pages); + $caption = fmt("List of pages owned by %s (%d total):", WikiLink($args['owner'] == '[]' ? $request->_user->getAuthenticatedId() : $args['owner'], 'if_known'), $args['count']); } elseif (!empty($args['author'])) { - $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'], - $args['sortby'], '' - ); - $args['count'] = $request->getArg('count'); - if (!$args['count']) - $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); - $caption = fmt("List of pages last edited by [%s] (%d total):", + $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'], $args['sortby'], ''); + $args['count'] = count($pages); + $caption = fmt("List of pages last edited by %s (%d total):", WikiLink($args['author'] == '[]' ? $request->_user->getAuthenticatedId() : $args['author'], 'if_known'), $args['count']); } elseif (!empty($args['creator'])) { - $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'], - $args['sortby'], '' - ); - $args['count'] = $request->getArg('count'); - if (!$args['count']) - $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); - $caption = fmt("List of pages created by [%s] (%d total):", + $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'], $args['sortby'], ''); + $args['count'] = count($pages); + $caption = fmt("List of pages created by %s (%d total):", WikiLink($args['creator'] == '[]' ? $request->_user->getAuthenticatedId() : $args['creator'], 'if_known'), $args['count']); - //} elseif ($pages) { - // $args['count'] = count($pages); + } elseif ($pages) { + $args['count'] = count($pages); } else { if (!$request->getArg('count')) $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']); else $args['count'] = $request->getArg('count'); } - if (empty($args['count']) and !empty($pages)) + if (empty($args['count']) and !empty($pages)) { $args['count'] = count($pages); + } $pagelist = new PageList($args['info'], $args['exclude'], $args); - if (!$args['noheader']) $pagelist->setCaption($caption); + if (!$args['noheader']) { + $pagelist->setCaption($caption); + } - // deleted pages show up as version 0. - //if ($args['include_empty']) - // $pagelist->_addColumn('version'); - if ($pages !== false) $pagelist->addPageList($pages); else $pagelist->addPages($dbi->getAllPages($args['include_empty'], $args['sortby'], $args['limit'])); - return $pagelist; + return $pagelist; } } Modified: trunk/lib/plugin/LinkDatabase.php =================================================================== --- trunk/lib/plugin/LinkDatabase.php 2014-09-18 14:28:21 UTC (rev 9094) +++ trunk/lib/plugin/LinkDatabase.php 2014-09-18 14:32:14 UTC (rev 9095) @@ -83,21 +83,21 @@ $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'], $args['sortby'], $args['limit']); if ($args['owner']) - $caption = fmt("List of pages owned by [%s] (%d total):", + $caption = fmt("List of pages owned by %s (%d total):", WikiLink($args['owner'], 'if_known'), count($pages)); } elseif (!empty($args['author'])) { $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'], $args['sortby'], $args['limit']); if ($args['author']) - $caption = fmt("List of pages last edited by [%s] (%d total):", + $caption = fmt("List of pages last edited by %s (%d total):", WikiLink($args['author'], 'if_known'), count($pages)); } elseif (!empty($args['creator'])) { $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'], $args['sortby'], $args['limit']); if ($args['creator']) - $caption = fmt("List of pages created by [%s] (%d total):", + $caption = fmt("List of pages created by %s (%d total):", WikiLink($args['creator'], 'if_known'), count($pages)); } else { Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2014-09-18 14:28:21 UTC (rev 9094) +++ trunk/locale/po/de.po 2014-09-18 14:32:14 UTC (rev 9095) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-16 10:25+0200\n" +"POT-Creation-Date: 2014-09-18 16:30+0200\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp " "<car...@us...>, Helmer Pardun <pardunpress@t-online." @@ -1231,21 +1231,17 @@ msgstr "Liste der Benutzer erzeugten Seiten (%d insgesamt):" #, php-format -msgid "List of pages owned by [%s] (%d total):" -msgstr "Liste der Seiten owned by [%s] (%d insgesamt):" +msgid "List of pages owned by %s (%d total):" +msgstr "Liste der Seiten owned by %s (%d insgesamt):" #, php-format -msgid "List of pages last edited by [%s] (%d total):" -msgstr "Liste der Seiten last edited by [%s] (%d insgesamt):" +msgid "List of pages last edited by %s (%d total):" +msgstr "Liste der Seiten last edited by %s (%d insgesamt):" #, php-format -msgid "List of pages created by [%s] (%d total):" -msgstr "Liste der Seiten erzeugt von [%s] (%d insgesamt):" +msgid "List of pages created by %s (%d total):" +msgstr "Liste der Seiten erzeugt von %s (%d insgesamt):" -#, php-format -msgid "Elapsed time: %s s" -msgstr "Dauer: %s s" - msgid "List all once authenticated users." msgstr "Liste alle eingetragenen Benutzer." @@ -6050,6 +6046,9 @@ msgid "Edit this page" msgstr "Diese Seite bearbeiten" +#~ msgid "Elapsed time: %s s" +#~ msgstr "Dauer: %s s" + #~ msgid "The current page has no subpages defined." #~ msgstr "Diese Seite hat keine zugewiesenen Unterseiten." Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2014-09-18 14:28:21 UTC (rev 9094) +++ trunk/locale/po/es.po 2014-09-18 14:32:14 UTC (rev 9095) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-16 10:25+0200\n" +"POT-Creation-Date: 2014-09-18 16:30+0200\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -1213,21 +1213,17 @@ msgstr "" #, php-format -msgid "List of pages owned by [%s] (%d total):" +msgid "List of pages owned by %s (%d total):" msgstr "" #, php-format -msgid "List of pages last edited by [%s] (%d total):" +msgid "List of pages last edited by %s (%d total):" msgstr "" #, php-format -msgid "List of pages created by [%s] (%d total):" +msgid "List of pages created by %s (%d total):" msgstr "" -#, php-format -msgid "Elapsed time: %s s" -msgstr "" - msgid "List all once authenticated users." msgstr "" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2014-09-18 14:28:21 UTC (rev 9094) +++ trunk/locale/po/fr.po 2014-09-18 14:32:14 UTC (rev 9095) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-16 10:25+0200\n" +"POT-Creation-Date: 2014-09-18 16:30+0200\n" "PO-Revision-Date: 2004-06-22 21:10+0200\n" "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland " "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6." @@ -1208,21 +1208,17 @@ msgstr "Liste des pages créées par les utilisateurs (%d au total) :" #, php-format -msgid "List of pages owned by [%s] (%d total):" -msgstr "Liste des pages possédées par [%s] (%d au total) :" +msgid "List of pages owned by %s (%d total):" +msgstr "Liste des pages possédées par %s (%d au total) :" #, php-format -msgid "List of pages last edited by [%s] (%d total):" -msgstr "Liste des pages modifiées en dernier par [%s] (%d au total) :" +msgid "List of pages last edited by %s (%d total):" +msgstr "Liste des pages modifiées en dernier par %s (%d au total) :" #, php-format -msgid "List of pages created by [%s] (%d total):" -msgstr "Liste des pages créées par [%s] (%d au total) :" +msgid "List of pages created by %s (%d total):" +msgstr "Liste des pages créées par %s (%d au total) :" -#, php-format -msgid "Elapsed time: %s s" -msgstr "Temps écoulé : %s s" - msgid "List all once authenticated users." msgstr "Énumérez tous les utilisateurs une fois authentifiés." @@ -3273,7 +3269,7 @@ #, php-format msgid "Wanted Pages for %s (%d total):" -msgstr "Pages recherchées pour %s dans ce wiki (%d au total) :" +msgstr "Pages recherchées pour %s dans ce wiki (%d au total) :" #, php-format msgid "Wanted Pages in this wiki (%d total):" @@ -5952,6 +5948,9 @@ msgid "Edit this page" msgstr "Modifier cette page" +#~ msgid "Elapsed time: %s s" +#~ msgstr "Temps écoulé : %s s" + #~ msgid "The current page has no subpages defined." #~ msgstr "La page actuelle n'a aucune sous-page définie." Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2014-09-18 14:28:21 UTC (rev 9094) +++ trunk/locale/po/it.po 2014-09-18 14:32:14 UTC (rev 9095) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-16 10:25+0200\n" +"POT-Creation-Date: 2014-09-18 16:30+0200\n" "PO-Revision-Date: 2005-02-12 16:23+0100\n" "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n" "Language-Team: \n" @@ -1195,21 +1195,17 @@ msgstr "" #, php-format -msgid "List of pages owned by [%s] (%d total):" +msgid "List of pages owned by %s (%d total):" msgstr "" #, php-format -msgid "List of pages last edited by [%s] (%d total):" +msgid "List of pages last edited by %s (%d total):" msgstr "" #, php-format -msgid "List of pages created by [%s] (%d total):" +msgid "List of pages created by %s (%d total):" msgstr "" -#, php-format -msgid "Elapsed time: %s s" -msgstr "" - msgid "List all once authenticated users." msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2014-09-18 14:28:21 UTC (rev 9094) +++ trunk/locale/po/ja.po 2014-09-18 14:32:14 UTC (rev 9095) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-16 10:25+0200\n" +"POT-Creation-Date: 2014-09-18 16:30+0200\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -1199,21 +1199,17 @@ msgstr "" #, php-format -msgid "List of pages owned by [%s] (%d total):" +msgid "List of pages owned by %s (%d total):" msgstr "" #, php-format -msgid "List of pages last edited by [%s] (%d total):" +msgid "List of pages last edited by %s (%d total):" msgstr "" #, php-format -msgid "List of pages created by [%s] (%d total):" +msgid "List of pages created by %s (%d total):" msgstr "" -#, php-format -msgid "Elapsed time: %s s" -msgstr "" - #, fuzzy msgid "List all once authenticated users." msgstr "%sでソートします。" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2014-09-18 14:28:21 UTC (rev 9094) +++ trunk/locale/po/nl.po 2014-09-18 14:32:14 UTC (rev 9095) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-16 10:25+0200\n" +"POT-Creation-Date: 2014-09-18 16:30+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -1186,21 +1186,17 @@ msgstr "" #, php-format -msgid "List of pages owned by [%s] (%d total):" +msgid "List of pages owned by %s (%d total):" msgstr "" #, php-format -msgid "List of pages last edited by [%s] (%d total):" +msgid "List of pages last edited by %s (%d total):" msgstr "" #, php-format -msgid "List of pages created by [%s] (%d total):" +msgid "List of pages created by %s (%d total):" msgstr "" -#, php-format -msgid "Elapsed time: %s s" -msgstr "" - msgid "List all once authenticated users." msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2014-09-18 14:28:21 UTC (rev 9094) +++ trunk/locale/po/phpwiki.pot 2014-09-18 14:32:14 UTC (rev 9095) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-16 10:25+0200\n" +"POT-Creation-Date: 2014-09-18 16:30+0200\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -1180,21 +1180,17 @@ msgstr "" #, php-format -msgid "List of pages owned by [%s] (%d total):" +msgid "List of pages owned by %s (%d total):" msgstr "" #, php-format -msgid "List of pages last edited by [%s] (%d total):" +msgid "List of pages last edited by %s (%d total):" msgstr "" #, php-format -msgid "List of pages created by [%s] (%d total):" +msgid "List of pages created by %s (%d total):" msgstr "" -#, php-format -msgid "Elapsed time: %s s" -msgstr "" - msgid "List all once authenticated users." msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2014-09-18 14:28:21 UTC (rev 9094) +++ trunk/locale/po/sv.po 2014-09-18 14:32:14 UTC (rev 9095) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-16 10:25+0200\n" +"POT-Creation-Date: 2014-09-18 16:30+0200\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -1181,21 +1181,17 @@ msgstr "" #, php-format -msgid "List of pages owned by [%s] (%d total):" +msgid "List of pages owned by %s (%d total):" msgstr "" #, php-format -msgid "List of pages last edited by [%s] (%d total):" +msgid "List of pages last edited by %s (%d total):" msgstr "" #, php-format -msgid "List of pages created by [%s] (%d total):" +msgid "List of pages created by %s (%d total):" msgstr "" -#, php-format -msgid "Elapsed time: %s s" -msgstr "" - msgid "List all once authenticated users." msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2014-09-18 14:28:21 UTC (rev 9094) +++ trunk/locale/po/zh.po 2014-09-18 14:32:14 UTC (rev 9095) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-16 10:25+0200\n" +"POT-Creation-Date: 2014-09-18 16:30+0200\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -1233,21 +1233,17 @@ msgstr "%s 所需要的頁面 (共 %d):" #, fuzzy, php-format -msgid "List of pages owned by [%s] (%d total):" +msgid "List of pages owned by %s (%d total):" msgstr "%s 所需要的頁面 (共 %d):" #, php-format -msgid "List of pages last edited by [%s] (%d total):" +msgid "List of pages last edited by %s (%d total):" msgstr "" #, fuzzy, php-format -msgid "List of pages created by [%s] (%d total):" +msgid "List of pages created by %s (%d total):" msgstr "%s 所需要的頁面 (共 %d):" -#, php-format -msgid "Elapsed time: %s s" -msgstr "經過時間: %s s" - msgid "List all once authenticated users." msgstr "" @@ -6112,6 +6108,9 @@ msgid "Edit this page" msgstr "編輯此頁面" +#~ msgid "Elapsed time: %s s" +#~ msgstr "經過時間: %s s" + #~ msgid "The current page has no subpages defined." #~ msgstr "目前頁面沒有定義任何子頁面." Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-19 13:02:25
|
Revision: 9100 http://sourceforge.net/p/phpwiki/code/9100 Author: vargenau Date: 2014-09-19 13:02:16 +0000 (Fri, 19 Sep 2014) Log Message: ----------- "<no matches>" --> "No matches" Modified Paths: -------------- trunk/lib/PageList.php trunk/lib/plugin/FullTextSearch.php trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo 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/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2014-09-19 12:57:02 UTC (rev 9099) +++ trunk/lib/PageList.php 2014-09-19 13:02:16 UTC (rev 9100) @@ -696,7 +696,7 @@ $this->_options['limit']); $this->_excluded_pages = $exclude; } - $this->_messageIfEmpty = _("<no matches>"); + $this->_messageIfEmpty = _("No matches"); } // Currently PageList takes these arguments: Modified: trunk/lib/plugin/FullTextSearch.php =================================================================== --- trunk/lib/plugin/FullTextSearch.php 2014-09-19 12:57:02 UTC (rev 9099) +++ trunk/lib/plugin/FullTextSearch.php 2014-09-19 13:02:16 UTC (rev 9100) @@ -112,7 +112,7 @@ if ($limit and $count >= $limit) //todo: pager link to list of next matches $list->pushContent(HTML::dd(fmt("only %d pages displayed", $limit))); if (!$list->getContent()) - $list->pushContent(HTML::dd(_("<no matches>"))); + $list->pushContent(HTML::dd(_("No matches"))); if (!empty($pages->stoplisted)) $list = HTML(HTML::p(fmt(_("Ignored stoplist words “%s”"), Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2014-09-19 12:57:02 UTC (rev 9099) +++ trunk/locale/po/de.po 2014-09-19 13:02:16 UTC (rev 9100) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-18 16:30+0200\n" +"POT-Creation-Date: 2014-09-19 15:01+0200\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp " "<car...@us...>, Helmer Pardun <pardunpress@t-online." @@ -1062,8 +1062,8 @@ msgid "default page permission" msgstr "Vorgabe Zugriffsrecht" -msgid "<no matches>" -msgstr "<nichts gefunden>" +msgid "No matches" +msgstr "Nichts gefunden" msgid "Content" msgstr "Inhalt" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2014-09-19 12:57:02 UTC (rev 9099) +++ trunk/locale/po/es.po 2014-09-19 13:02:16 UTC (rev 9100) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-18 16:30+0200\n" +"POT-Creation-Date: 2014-09-19 15:01+0200\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -1043,8 +1043,8 @@ msgid "default page permission" msgstr "" -msgid "<no matches>" -msgstr "<ningunos fósforos>" +msgid "No matches" +msgstr "Ningunos fósforos" msgid "Content" msgstr "Contenido" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2014-09-19 12:57:02 UTC (rev 9099) +++ trunk/locale/po/fr.po 2014-09-19 13:02:16 UTC (rev 9100) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-18 16:30+0200\n" +"POT-Creation-Date: 2014-09-19 15:01+0200\n" "PO-Revision-Date: 2004-06-22 21:10+0200\n" "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland " "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6." @@ -1040,8 +1040,8 @@ msgid "default page permission" msgstr "permission de page par défaut" -msgid "<no matches>" -msgstr "<aucun résultat>" +msgid "No matches" +msgstr "Aucun résultat" msgid "Content" msgstr "Contenu" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2014-09-19 12:57:02 UTC (rev 9099) +++ trunk/locale/po/it.po 2014-09-19 13:02:16 UTC (rev 9100) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-18 16:30+0200\n" +"POT-Creation-Date: 2014-09-19 15:01+0200\n" "PO-Revision-Date: 2005-02-12 16:23+0100\n" "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n" "Language-Team: \n" @@ -1027,8 +1027,8 @@ msgid "default page permission" msgstr "" -msgid "<no matches>" -msgstr "<nessuna corrispondenza>" +msgid "No matches" +msgstr "Nessuna corrispondenza" msgid "Content" msgstr "Indice" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2014-09-19 12:57:02 UTC (rev 9099) +++ trunk/locale/po/ja.po 2014-09-19 13:02:16 UTC (rev 9100) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-18 16:30+0200\n" +"POT-Creation-Date: 2014-09-19 15:01+0200\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -1025,8 +1025,8 @@ msgid "default page permission" msgstr "" -msgid "<no matches>" -msgstr "<一致しません>" +msgid "No matches" +msgstr "一致しません" msgid "Content" msgstr "コンテンツ" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2014-09-19 12:57:02 UTC (rev 9099) +++ trunk/locale/po/nl.po 2014-09-19 13:02:16 UTC (rev 9100) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-18 16:30+0200\n" +"POT-Creation-Date: 2014-09-19 15:01+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -1018,7 +1018,7 @@ msgid "default page permission" msgstr "" -msgid "<no matches>" +msgid "No matches" msgstr "" msgid "Content" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2014-09-19 12:57:02 UTC (rev 9099) +++ trunk/locale/po/phpwiki.pot 2014-09-19 13:02:16 UTC (rev 9100) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-18 16:30+0200\n" +"POT-Creation-Date: 2014-09-19 15:01+0200\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -1012,7 +1012,7 @@ msgid "default page permission" msgstr "" -msgid "<no matches>" +msgid "No matches" msgstr "" msgid "Content" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2014-09-19 12:57:02 UTC (rev 9099) +++ trunk/locale/po/sv.po 2014-09-19 13:02:16 UTC (rev 9100) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-18 16:30+0200\n" +"POT-Creation-Date: 2014-09-19 15:01+0200\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -1013,8 +1013,8 @@ msgid "default page permission" msgstr "" -msgid "<no matches>" -msgstr "<ingen matchar>" +msgid "No matches" +msgstr "Ingen matchar" msgid "Content" msgstr "Innehåll" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2014-09-19 12:57:02 UTC (rev 9099) +++ trunk/locale/po/zh.po 2014-09-19 13:02:16 UTC (rev 9100) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-18 16:30+0200\n" +"POT-Creation-Date: 2014-09-19 15:01+0200\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -1057,8 +1057,8 @@ msgid "default page permission" msgstr "預設頁面權限" -msgid "<no matches>" -msgstr "<沒有相符>" +msgid "No matches" +msgstr "沒有相符" msgid "Content" msgstr "內容" Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-19 16:54:48
|
Revision: 9101 http://sourceforge.net/p/phpwiki/code/9101 Author: vargenau Date: 2014-09-19 16:54:44 +0000 (Fri, 19 Sep 2014) Log Message: ----------- Harmonize sort buttons Modified Paths: -------------- trunk/lib/PageList.php trunk/themes/Crao/crao.css trunk/themes/Hawaiian/Hawaiian.css trunk/themes/MacOSX/MacOSX.css trunk/themes/MonoBook/monobook.css trunk/themes/Portland/portland.css trunk/themes/Sidebar/sidebar.css trunk/themes/SpaceWiki/SpaceWiki.css trunk/themes/Wordpress/Wordpress.css trunk/themes/blog/Kubrick.css trunk/themes/default/phpwiki.css trunk/themes/fusionforge/fusionforge.css trunk/themes/shamino_com/shamino_com.css trunk/themes/wikilens/wikilens.css Added Paths: ----------- trunk/themes/default/buttons/sort_down.gif trunk/themes/default/buttons/sort_none.gif trunk/themes/default/buttons/sort_up.gif Removed Paths: ------------- trunk/themes/default/buttons/asc_order.png trunk/themes/default/buttons/desc_order.png trunk/themes/default/buttons/no_order.png trunk/themes/default/images/sort_down.gif trunk/themes/default/images/sort_none.gif trunk/themes/default/images/sort_up.gif trunk/themes/fusionforge/buttons/asc_order.png trunk/themes/fusionforge/buttons/desc_order.png trunk/themes/fusionforge/buttons/no_order.png Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/lib/PageList.php 2014-09-19 16:54:44 UTC (rev 9101) @@ -108,7 +108,7 @@ if (!$WikiTheme->DUMP_MODE /* or in_array($this->_field, PageList::sortable_columns()) */) { // TODO: add to multiple comma-delimited sortby args: "+hits,+pagename" $src = false; - $noimg_src = $WikiTheme->getButtonURL('no_order'); + $noimg_src = $WikiTheme->getButtonURL('sort_none'); if ($noimg_src) $noimg = HTML::img(array('src' => $noimg_src, 'alt' => '.')); @@ -117,7 +117,7 @@ if ($pagelist->sortby($colNum, 'check')) { // show icon? request or plugin arg $sortby = $pagelist->sortby($colNum, 'flip_order'); $desc = (substr($sortby, 0, 1) == '-'); // +pagename or -pagename - $src = $WikiTheme->getButtonURL($desc ? 'asc_order' : 'desc_order'); + $src = $WikiTheme->getButtonURL($desc ? 'sort_up' : 'sort_down'); $reverse = $desc ? _("reverse") . " " : ""; } else { // initially unsorted Modified: trunk/themes/Crao/crao.css =================================================================== --- trunk/themes/Crao/crao.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/Crao/crao.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -1305,7 +1305,7 @@ } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1313,7 +1313,7 @@ } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1321,7 +1321,7 @@ } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; Modified: trunk/themes/Hawaiian/Hawaiian.css =================================================================== --- trunk/themes/Hawaiian/Hawaiian.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/Hawaiian/Hawaiian.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -677,7 +677,7 @@ } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -685,7 +685,7 @@ } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -693,7 +693,7 @@ } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; Modified: trunk/themes/MacOSX/MacOSX.css =================================================================== --- trunk/themes/MacOSX/MacOSX.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/MacOSX/MacOSX.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -1201,7 +1201,7 @@ } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1209,7 +1209,7 @@ } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1217,7 +1217,7 @@ } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; Modified: trunk/themes/MonoBook/monobook.css =================================================================== --- trunk/themes/MonoBook/monobook.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/MonoBook/monobook.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -2252,7 +2252,7 @@ } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -2260,7 +2260,7 @@ } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -2268,7 +2268,7 @@ } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; Modified: trunk/themes/Portland/portland.css =================================================================== --- trunk/themes/Portland/portland.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/Portland/portland.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -186,7 +186,7 @@ } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -194,7 +194,7 @@ } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -202,7 +202,7 @@ } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; Modified: trunk/themes/Sidebar/sidebar.css =================================================================== --- trunk/themes/Sidebar/sidebar.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/Sidebar/sidebar.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -2306,7 +2306,7 @@ } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -2314,7 +2314,7 @@ } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -2322,7 +2322,7 @@ } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; Modified: trunk/themes/SpaceWiki/SpaceWiki.css =================================================================== --- trunk/themes/SpaceWiki/SpaceWiki.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/SpaceWiki/SpaceWiki.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -1037,7 +1037,7 @@ } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1045,7 +1045,7 @@ } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1053,7 +1053,7 @@ } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; Modified: trunk/themes/Wordpress/Wordpress.css =================================================================== --- trunk/themes/Wordpress/Wordpress.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/Wordpress/Wordpress.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -1118,7 +1118,7 @@ } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1126,7 +1126,7 @@ } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1134,7 +1134,7 @@ } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; Modified: trunk/themes/blog/Kubrick.css =================================================================== --- trunk/themes/blog/Kubrick.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/blog/Kubrick.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -1024,7 +1024,7 @@ } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1032,7 +1032,7 @@ } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1040,7 +1040,7 @@ } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; Deleted: trunk/themes/default/buttons/asc_order.png =================================================================== (Binary files differ) Deleted: trunk/themes/default/buttons/desc_order.png =================================================================== (Binary files differ) Deleted: trunk/themes/default/buttons/no_order.png =================================================================== (Binary files differ) Copied: trunk/themes/default/buttons/sort_down.gif (from rev 9100, trunk/themes/default/images/sort_down.gif) =================================================================== (Binary files differ) Copied: trunk/themes/default/buttons/sort_none.gif (from rev 9100, trunk/themes/default/images/sort_none.gif) =================================================================== (Binary files differ) Copied: trunk/themes/default/buttons/sort_up.gif (from rev 9100, trunk/themes/default/images/sort_up.gif) =================================================================== (Binary files differ) Deleted: trunk/themes/default/images/sort_down.gif =================================================================== (Binary files differ) Deleted: trunk/themes/default/images/sort_none.gif =================================================================== (Binary files differ) Deleted: trunk/themes/default/images/sort_up.gif =================================================================== (Binary files differ) Modified: trunk/themes/default/phpwiki.css =================================================================== --- trunk/themes/default/phpwiki.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/default/phpwiki.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -1291,7 +1291,7 @@ } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1299,7 +1299,7 @@ } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -1307,7 +1307,7 @@ } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; Deleted: trunk/themes/fusionforge/buttons/asc_order.png =================================================================== (Binary files differ) Deleted: trunk/themes/fusionforge/buttons/desc_order.png =================================================================== (Binary files differ) Deleted: trunk/themes/fusionforge/buttons/no_order.png =================================================================== (Binary files differ) Modified: trunk/themes/fusionforge/fusionforge.css =================================================================== --- trunk/themes/fusionforge/fusionforge.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/fusionforge/fusionforge.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -154,7 +154,7 @@ } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -162,7 +162,7 @@ } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -170,7 +170,7 @@ } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; Modified: trunk/themes/shamino_com/shamino_com.css =================================================================== --- trunk/themes/shamino_com/shamino_com.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/shamino_com/shamino_com.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -395,7 +395,7 @@ } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -403,7 +403,7 @@ } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -411,7 +411,7 @@ } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; Modified: trunk/themes/wikilens/wikilens.css =================================================================== --- trunk/themes/wikilens/wikilens.css 2014-09-19 13:02:16 UTC (rev 9100) +++ trunk/themes/wikilens/wikilens.css 2014-09-19 16:54:44 UTC (rev 9101) @@ -43,7 +43,7 @@ } table.sortable th.header { - background-image: url(../default/images/sort_none.gif); + background-image: url(../default/buttons/sort_none.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -51,7 +51,7 @@ } table.sortable th.headerSortUp { - background-image: url(../default/images/sort_up.gif); + background-image: url(../default/buttons/sort_up.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; @@ -59,7 +59,7 @@ } table.sortable th.headerSortDown { - background-image: url(../default/images/sort_down.gif); + background-image: url(../default/buttons/sort_down.gif); cursor: pointer; background-repeat: no-repeat; background-position: center right; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-19 16:57:56
|
Revision: 9102 http://sourceforge.net/p/phpwiki/code/9102 Author: vargenau Date: 2014-09-19 16:57:47 +0000 (Fri, 19 Sep 2014) Log Message: ----------- Initial RPM for phpwiki (RHEL6 with mysql) Modified Paths: -------------- trunk/Makefile trunk/config/config-dist.ini trunk/config/phpwiki.spec Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2014-09-19 16:54:44 UTC (rev 9101) +++ trunk/Makefile 2014-09-19 16:57:47 UTC (rev 9102) @@ -1,151 +1,16 @@ -# gnu make only +VERSION=1.5.0 +RPMBUILD=rpmbuild -# user-definable settings: -# for mysqladmin -DBADMIN_USER=root -DBADMIN_PASS=secret +clean: + rm -fr /tmp/phpwiki-$(VERSION) /tmp/phpwiki-$(VERSION).tar.gz -# etags (GNU Emacs 21.4.x) -ETAGS_21_5=$(shell etags --version|egrep "Ctags 5.[6789]") -ifeq ("$(ETAGS_21_5)", "") - ETAGS_STDIN = /usr/bin/etags - -else - # new etags (GNU Emacs 21.5.x) - ETAGS_STDIN = /usr/bin/etags -L - -endif +/tmp/phpwiki-$(VERSION).tar.gz: + rm -fr /tmp/phpwiki-$(VERSION) + cp -a . /tmp/phpwiki-$(VERSION) + cd /tmp; tar zcf /tmp/phpwiki-$(VERSION).tar.gz phpwiki-$(VERSION) + rm -fr /tmp/phpwiki-$(VERSION) -VERSION=$(shell admin/dump-version.pl) - -ifeq ("$(VERSION)", "") - TARDIST = phpwiki.tar.bz2 -else - TARDIST = phpwiki-$(VERSION).tar.bz2 -endif -DB_SQLITE_DBFILE = /tmp/phpwiki-sqlite.db - -# **************************************************************************** -# get db params from config/config.ini - -#DATABASE_TYPE=SQL -DATABASE_TYPE := $(shell config/make-dbhelper.pl -v=DATABASE_TYPE config/config.ini) -PROCESS_DSN=0 -ifeq (${DATABASE_TYPE},SQL) - PROCESS_DSN=1 -else - ifeq (${DATABASE_TYPE},ADODB) - PROCESS_DSN=1 - endif -endif - -ifeq (${PROCESS_DSN},1) - # get db params from config/config.ini DATABASE_DSN setting (only if SQL or ADODB) - DATABASE_DSN := $(shell config/make-dbhelper.pl -v=DATABASE_DSN config/config.ini) - #DB_DBTYPE=mysql - DB_DBTYPE := $(word 1,${DATABASE_DSN}) - #DB_DB=phpwiki - DB_DB := $(word 2,${DATABASE_DSN}) - #DB_USER=wikiuser - DB_USER := $(word 3,${DATABASE_DSN}) - #DB_PASS= - DB_PASS := $(word 4,${DATABASE_DSN}) - #Todo: read optional DBADMIN_USER and DBADMIN_PASS settings from config.ini - DBADMIN_OPTS=-u$(DBADMIN_USER) -p$(DBADMIN_PASS) -else - DB_DBTYPE=${DATABASE_TYPE} -endif - -# **************************************************************************** -PHP_SRC := $(wildcard *.php ./lib/*.php ./lib/WikiDB/*.php ./lib/plugin/*.php) - -.PHONY: all install locale mysql pqsql sqlite dbtest install-config dist - -all: TAGS - -TAGS: $(PHP_SRC) - if [ -f $@ ]; then /bin/mv -f $@ $@~; fi -# etags $(PHP_SRC) - /usr/bin/find . \( -type d -regex '\(^\./lib/pear\)\|\(^\./lib/WikiDB/adodb\)\|\(^\./lib/nusoap\)\|\(^\./lib/fpdf\)\|\(^\./locale/.*/LC_MESSAGES\)' \) -prune -o -type f -name \*.php | grep .php | $(ETAGS_STDIN) - -TAGS.full: $(PHP_SRC) - if [ -f $@ ]; then /usr/bin/mv -f $@ $@~; fi - /usr/bin/find . -name \*.php -o -name \*.tmpl | $(ETAGS_STDIN) --langmap="HTML:.tmpl" -f $@ -# older etags needed this: -# /usr/bin/find . -type f -name \*.php -o -name \*.tmpl | etags - -o $@ - -locale: - cd locale - make - -install: install-config install-database - -install-config: config/config.ini - -config/config.ini: config/config-dist.ini - cp config/config-dist.ini $@ - echo "You must edit config/config.ini, at least set the ADMIN_PASSWD" - ${EDITOR} $@ - -# helpers for database installation -install-database: ${DB_DBTYPE} - -dba: - -cvs: - -# maybe setup permissions -file: - -dbtest: - echo DATABASE_TYPE=${DATABASE_TYPE} DB_DBTYPE=${DB_DBTYPE} DB_DB=$(DB_DB) DB_USER=${DB_USER} DB_PASS=${DB_PASS} DBADMIN_OPTS=$(DBADMIN_OPTS) - -# initialize the database -# TODO: compare /var/mysql/data/$(DB_DB) timestamp against schemas/mysql.sql -mysql: - mysqladmin $(DB_OPTS) create $(DB_DB) - mysql $(DB_OPTS) -e "GRANT select,insert,update,delete,lock tables ON $(DB_DB).* \ -TO $(DB_USER)@localhost IDENTIFIED BY '$(DB_PASS)';" - mysql $(DB_OPTS) $(DB_DB) < schemas/mysql-initialize.sql - -# initialize the database -pqsql: - su postmaster - createdb $(DB_DB) - ifeq ($(DB_PASS),"") - createuser -D -A -P $(DB_USER) - else - createuser -D -A $(DB_USER) - endif - psql $(DB_DB) -f schemas/psql-initialize.sql - logout - -# initialize the database -sqlite: $(DB_SQLITE_DBFILE) - sqlite $(DB_SQLITE_DBFILE) < schemas/sqlite-initialize.sql - -# update the database -${DB_SQLITE_DBFILE}: schemas/sqlite.sql - echo ".dump" | sqlite ${DB_SQLITE_DBFILE} > dump.sql - mv ${DB_SQLITE_DBFILE} ${DB_SQLITE_DBFILE}.old - sqlite $(DB_SQLITE_DBFILE) < dump.sql - -dist: $(TARDIST) - -cvstar: ../$(TARDIST) - -# --exclude='\.*' -../$(TARDIST) : $(PHP_SRC) - tar cfj $(TARDIST) --exclude=CVS \ - --exclude=config.ini \ - --exclude='*~' \ - --exclude='*.bak' \ - --exclude='*.orig' \ - --exclude='*.rej' \ - --exclude=uploads \ - --exclude=.patches \ - --exclude=TAGS \ - --exclude=TAGS.full \ - --exclude='*.tar.bz2' \ - . - -$(TARDIST) : $(PHP_SRC) - svn list -R | egrep -v "/\$" | tar cfj $(TARDIST) +rpm: /tmp/phpwiki-$(VERSION).tar.gz + mkdir -p ~/rpmbuild/SOURCES/ + cp /tmp/phpwiki-$(VERSION).tar.gz ~/rpmbuild/SOURCES/ + $(RPMBUILD) -bb config/phpwiki.spec Modified: trunk/config/config-dist.ini =================================================================== --- trunk/config/config-dist.ini 2014-09-19 16:54:44 UTC (rev 9101) +++ trunk/config/config-dist.ini 2014-09-19 16:57:47 UTC (rev 9102) @@ -237,7 +237,7 @@ ; You might have to set it to false, if your PHP doesn't support crypt(). ; To use plain text passwords, in particular for the ADMIN_PASSWD, set ; ENCRYPTED_PASSWD to false. -ENCRYPTED_PASSWD = true +ENCRYPTED_PASSWD = false ; Visitor Hostname Lookup ; @@ -918,7 +918,7 @@ ; ; If you set DEFAULT_LANGUAGE to the empty string, the users ; preferred language as determined by the browser setting will be used. -;DEFAULT_LANGUAGE = en +DEFAULT_LANGUAGE = en ; WIKI_PGSRC -- specifies the source for the initial page contents of ; the Wiki. The setting of WIKI_PGSRC only has effect when the wiki is Modified: trunk/config/phpwiki.spec =================================================================== --- trunk/config/phpwiki.spec 2014-09-19 16:54:44 UTC (rev 9101) +++ trunk/config/phpwiki.spec 2014-09-19 16:57:47 UTC (rev 9102) @@ -1,28 +1,25 @@ +# +# RPM spec file for FusionForge +# +# Initial work by Jesse Becker <jb...@no...> +# Reworked for 1.5.x by Alain Peyrat <al...@fr...> +# +# Copyright (C) 2014 Alain Peyrat +# -Summary: PHP-based Wiki webapplication -Name: phpwiki -Version: 1.3.11 -Release: 1 +# Global Definitions +%define WIKI_NAME PhpWiki +%define ADMIN_USER admin +%define ADMIN_PASSWD myadmin +%define DB_NAME phpwiki +%define DB_USER phpwiki +%define DB_PASSWD phpwikipw -############################################# -# User options here -############################################# +%define httpduser apache +%define httpdgroup apache -#These are setup mostly for my local config. -#Edit to taste, add salt, and boil for 3 minutes. - -%define WIKI_NAME NU-Wiki -%define ADMIN_USER <PHPWiki admin account name here> -%define ADMIN_PASSWD <encrypted admin account PW here, see passencrypt.php> - -%define DB_NAME <database name> -%define DB_USER <database user account> -%define DB_PASSWD <database account password> - -%define HTTPD_UID apache - -%define ACCESS_LOG /var/log/httpd/phpwiki_access.log +%define ACCESS_LOG %{_var}/log/%{name}/%{name}_access.log %define DATABASE_TYPE SQL %define DATABASE_DSN mysql://%{admin_user}:%{admin_passwd} %define DEBUG 0 @@ -37,29 +34,27 @@ %define AUTH_SESS_LEVEL "" %define AUTH_GROUP_FILE "" +# Disable debug binary detection & generation to speed up process. +%global debug_package %{nil} - +# RPM spec preamble +Summary: PHP-based Wiki webapplication +Name: phpwiki +Version: 1.5.0 +Release: 1 +BuildArch: noarch +License: GPL Group: Applications/Internet -License: GPL +Source: http://easynews.dl.sourceforge.net/sourceforge/phpwiki/%{name}-%{version}.tar.gz URL: http://sourceforge.net/projects/phpwiki/ - -Packager: Jesse Becker <jb...@no...> -Vendor: Northwestern University - -Source: http://easynews.dl.sourceforge.net/sourceforge/phpwiki/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Packager: Alain Peyrat <al...@fr...> - #Relocation! Prefix: /var/www -Requires: php php-mysql +Requires: httpd, php, php-pear, php-mysql -# For some systems (like older RH) -Requires: apache -#For newer systems -#Requires: httpd, php-pear - Autoreq: 0 %define dest %{buildroot}/%{prefix}/%{name} @@ -71,13 +66,16 @@ authentication, ACL's. %prep -%setup +%setup %install %{__rm} -rf %{buildroot} + +%{__install} -m 755 -d %{buildroot}%{_var}/log/phpwiki + %{__mkdir} -p %{dest} %{__cp} -r config lib locale pgsrc themes schemas uploads %{dest} -%{__cp} favicon.ico *.php *.wsdl *.wdsl wiki %{dest} +%{__cp} favicon.ico *.php wiki %{dest} cd %{dest}/config perl -p \ @@ -107,11 +105,6 @@ %{__rm} -rf %{buildroot} %post -touch %{ACCESS_LOG} -if [ -f %{ACCESS_LOG} ]; then - chown %{HTTPD_UID} %{ACCESS_LOG} - chmod 644 %{ACCESS_LOG} -fi cd %{prefix}/%{name} mysqladmin create %{DB_NAME} @@ -123,30 +116,17 @@ mysqladmin reload -cat schemas/mysql.sql | mysql %{DB_NAME} +cat schemas/mysql-initialize.sql | mysql %{DB_NAME} - %files -%defattr(-, root, root, 0755) -%doc README UPGRADING LICENSE INSTALL doc Makefile tests +%defattr(-, root, root) +%doc README UPGRADING LICENSE INSTALL doc Makefile +%attr(0775, %{httpduser}, %{httpdgroup}) %dir %{_var}/log/%{name} +%{prefix}/%{name} -%{prefix}/%{name}/*.php -%{prefix}/%{name}/*.wsdl -%{prefix}/%{name}/wiki +%changelog +* Fri Sep 19 2014 - Alain Peyrat <al...@fr...> - 1.5.0-1 +- Reworked for 1.5.0 -%{prefix}/%{name}/lib -%{prefix}/%{name}/locale -%{prefix}/%{name}/pgsrc -%{prefix}/%{name}/themes -%{prefix}/%{name}/schemas -%{prefix}/%{name}/config/config-default.ini -%dir %{prefix}/%{name}/uploads - -%config %{prefix}/%{name}/uploads/.htaccess -%config %{prefix}/%{name}/config/config.ini - - - -%changelog * Tue May 19 2005 Jesse Becker <jb...@no...> - Initial build This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-24 15:27:00
|
Revision: 9107 http://sourceforge.net/p/phpwiki/code/9107 Author: vargenau Date: 2014-09-24 15:26:51 +0000 (Wed, 24 Sep 2014) Log Message: ----------- Use smart quotes Modified Paths: -------------- trunk/lib/EditToolbar.php trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo 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/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo Modified: trunk/lib/EditToolbar.php =================================================================== --- trunk/lib/EditToolbar.php 2014-09-24 14:55:21 UTC (rev 9106) +++ trunk/lib/EditToolbar.php 2014-09-24 15:26:51 UTC (rev 9107) @@ -50,8 +50,8 @@ uri_undo_d_btn = '" . $undo_d_btn . "' msg_undo_d_alt = '" . _("Undo disabled") . "' msg_do_undo = '" . _("Operation undone") . "' -msg_replfound = '" . _("Substring \"\\1\" found \\2 times. Replace with \"\\3\"?") . "' -msg_replnot = '" . _("String \"%s\" not found.") . "' +msg_replfound = '" . _("Substring “\\1” found \\2 times. Replace with “\\3”?") . "' +msg_replnot = '" . _("String “%s” not found.") . "' msg_repl_title = '" . _("Search & Replace") . "' msg_repl_search = '" . _("Search for") . "' msg_repl_replace_with = '" . _("Replace with") . "' Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/po/de.po =================================================================== --- trunk/locale/po/de.po 2014-09-24 14:55:21 UTC (rev 9106) +++ trunk/locale/po/de.po 2014-09-24 15:26:51 UTC (rev 9107) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-24 16:51+0200\n" +"POT-Creation-Date: 2014-09-24 17:25+0200\n" "PO-Revision-Date: 2000-10-31 02:23+0200\n" "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp " "<car...@us...>, Helmer Pardun <pardunpress@t-online." @@ -354,12 +354,12 @@ msgid "Operation undone" msgstr "Aktion rückgängig gemacht" -msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?" -msgstr "Substring \"\\1\" \\2 mal gefunden. Ersetze mit \"\\3\"?" +msgid "Substring “\\1” found \\2 times. Replace with “\\3”?" +msgstr "Substring »\\1« \\2 mal gefunden. Ersetze mit »\\3«?" #, php-format -msgid "String \"%s\" not found." -msgstr "Zeichenkette \"%s\" nicht gefunden." +msgid "String “%s” not found." +msgstr "Zeichenkette »%s« nicht gefunden." msgid "Search & Replace" msgstr "Suchen & Ersetzen" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2014-09-24 14:55:21 UTC (rev 9106) +++ trunk/locale/po/es.po 2014-09-24 15:26:51 UTC (rev 9107) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-24 16:51+0200\n" +"POT-Creation-Date: 2014-09-24 17:25+0200\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -349,12 +349,12 @@ msgid "Operation undone" msgstr "Operación deshecha" -msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?" +msgid "Substring “\\1” found \\2 times. Replace with “\\3”?" msgstr "" #, php-format -msgid "String \"%s\" not found." -msgstr "Secuencia \"%s\" no encontrado." +msgid "String “%s” not found." +msgstr "Secuencia «%s» no encontrado." msgid "Search & Replace" msgstr "Busque Y Substituya" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2014-09-24 14:55:21 UTC (rev 9106) +++ trunk/locale/po/fr.po 2014-09-24 15:26:51 UTC (rev 9107) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-24 16:51+0200\n" +"POT-Creation-Date: 2014-09-24 17:25+0200\n" "PO-Revision-Date: 2004-06-22 21:10+0200\n" "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland " "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6." @@ -348,14 +348,14 @@ msgid "Operation undone" msgstr "Opération annulée" -msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?" +msgid "Substring “\\1” found \\2 times. Replace with “\\3”?" msgstr "" -"La sous-chaîne \"\\1\" a été trouvée \\2 fois. Faut-il la remplacer par " -"\"\\3\" ?" +"La sous-chaîne « \\1 » a été trouvée \\2 fois. Faut-il la remplacer par « " +"\\3 » ?" #, php-format -msgid "String \"%s\" not found." -msgstr "Chaîne \"%s\" non trouvée." +msgid "String “%s” not found." +msgstr "Chaîne « %s » non trouvée." msgid "Search & Replace" msgstr "Rechercher & Remplacer" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2014-09-24 14:55:21 UTC (rev 9106) +++ trunk/locale/po/it.po 2014-09-24 15:26:51 UTC (rev 9107) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-24 16:51+0200\n" +"POT-Creation-Date: 2014-09-24 17:25+0200\n" "PO-Revision-Date: 2005-02-12 16:23+0100\n" "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n" "Language-Team: \n" @@ -339,12 +339,12 @@ msgid "Operation undone" msgstr "" -msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?" +msgid "Substring “\\1” found \\2 times. Replace with “\\3”?" msgstr "" #, php-format -msgid "String \"%s\" not found." -msgstr "\"%s\" non trovato." +msgid "String “%s” not found." +msgstr "«%s» non trovato." msgid "Search & Replace" msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2014-09-24 14:55:21 UTC (rev 9106) +++ trunk/locale/po/ja.po 2014-09-24 15:26:51 UTC (rev 9107) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-24 16:51+0200\n" +"POT-Creation-Date: 2014-09-24 17:25+0200\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -327,11 +327,11 @@ msgid "Operation undone" msgstr "" -msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?" +msgid "Substring “\\1” found \\2 times. Replace with “\\3”?" msgstr "" #, php-format -msgid "String \"%s\" not found." +msgid "String “%s” not found." msgstr "" msgid "Search & Replace" @@ -1011,9 +1011,9 @@ msgid " ... around “%s”" msgstr "" -#, fuzzy, php-format +#, php-format msgid "“%s” not found" -msgstr "%s: ファイルが見つかりません。" +msgstr "" #, php-format msgid "page permission inherited from %s" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2014-09-24 14:55:21 UTC (rev 9106) +++ trunk/locale/po/nl.po 2014-09-24 15:26:51 UTC (rev 9107) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-24 16:51+0200\n" +"POT-Creation-Date: 2014-09-24 17:25+0200\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -332,11 +332,11 @@ msgid "Operation undone" msgstr "" -msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?" +msgid "Substring “\\1” found \\2 times. Replace with “\\3”?" msgstr "" #, php-format -msgid "String \"%s\" not found." +msgid "String “%s” not found." msgstr "" msgid "Search & Replace" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2014-09-24 14:55:21 UTC (rev 9106) +++ trunk/locale/po/phpwiki.pot 2014-09-24 15:26:51 UTC (rev 9107) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-24 16:51+0200\n" +"POT-Creation-Date: 2014-09-24 17:25+0200\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -326,11 +326,11 @@ msgid "Operation undone" msgstr "" -msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?" +msgid "Substring “\\1” found \\2 times. Replace with “\\3”?" msgstr "" #, php-format -msgid "String \"%s\" not found." +msgid "String “%s” not found." msgstr "" msgid "Search & Replace" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2014-09-24 14:55:21 UTC (rev 9106) +++ trunk/locale/po/sv.po 2014-09-24 15:26:51 UTC (rev 9107) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-24 16:51+0200\n" +"POT-Creation-Date: 2014-09-24 17:25+0200\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -327,12 +327,12 @@ msgid "Operation undone" msgstr "" -msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?" +msgid "Substring “\\1” found \\2 times. Replace with “\\3”?" msgstr "" #, php-format -msgid "String \"%s\" not found." -msgstr "\"%s\" ingen funna." +msgid "String “%s” not found." +msgstr "”%s” ingen funna." msgid "Search & Replace" msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2014-09-24 14:55:21 UTC (rev 9106) +++ trunk/locale/po/zh.po 2014-09-24 15:26:51 UTC (rev 9107) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-24 16:51+0200\n" +"POT-Creation-Date: 2014-09-24 17:25+0200\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -340,12 +340,12 @@ msgid "Operation undone" msgstr "" -msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?" +msgid "Substring “\\1” found \\2 times. Replace with “\\3”?" msgstr "" -#, fuzzy, php-format -msgid "String \"%s\" not found." -msgstr "未找到頁面 %s." +#, php-format +msgid "String “%s” not found." +msgstr "" msgid "Search & Replace" msgstr "搜尋與取代" Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-24 16:13:42
|
Revision: 9111 http://sourceforge.net/p/phpwiki/code/9111 Author: vargenau Date: 2014-09-24 16:13:38 +0000 (Wed, 24 Sep 2014) Log Message: ----------- Fix #607 BackLinks do not work inside a RichTable; fix Bug#636 Recursive include is not trapped Modified Paths: -------------- trunk/lib/InlineParser.php trunk/lib/WikiDB/backend/PearDB.php trunk/lib/plugin/IncludePage.php trunk/lib/plugin/MediawikiTable.php trunk/lib/plugin/OldStyleTable.php trunk/lib/plugin/RichTable.php trunk/lib/plugin/Template.php trunk/lib/plugin/WikicreoleTable.php trunk/pgsrc/ReleaseNotes Modified: trunk/lib/InlineParser.php =================================================================== --- trunk/lib/InlineParser.php 2014-09-24 15:56:32 UTC (rev 9110) +++ trunk/lib/InlineParser.php 2014-09-24 16:13:38 UTC (rev 9111) @@ -513,6 +513,10 @@ $pagename = $link; $anchor = false; } + + global $backlinks; + $backlinks[] = array('linkto' => $pagename, 'relation' => 0); + return new Cached_WikiLink($pagename, $label, $anchor); } } Modified: trunk/lib/WikiDB/backend/PearDB.php =================================================================== --- trunk/lib/WikiDB/backend/PearDB.php 2014-09-24 15:56:32 UTC (rev 9110) +++ trunk/lib/WikiDB/backend/PearDB.php 2014-09-24 16:13:38 UTC (rev 9111) @@ -1161,7 +1161,7 @@ * ErrorManager which will filter out those spurious messages.) * @see _is_false_error, ErrorManager */ - private function _pear_notice_filter($err) + function _pear_notice_filter($err) { return ($err->isNotice() && preg_match('|DB[/\\\\]common.php$|', $err->errfile) Modified: trunk/lib/plugin/IncludePage.php =================================================================== --- trunk/lib/plugin/IncludePage.php 2014-09-24 15:56:32 UTC (rev 9110) +++ trunk/lib/plugin/IncludePage.php 2014-09-24 16:13:38 UTC (rev 9111) @@ -61,7 +61,15 @@ } if (!$page or !$page->name) return false; - return array(array('linkto' => $page->name, 'relation' => 0)); + + global $backlinks; + if (empty($backlinks)) { + global $request; + $this->run($request->_dbi, $argstr, $request, $basepage); + } + + $backlinks[] = array('linkto' => $page->name, 'relation' => 0); + return $backlinks; } // Avoid warning in: Modified: trunk/lib/plugin/MediawikiTable.php =================================================================== --- trunk/lib/plugin/MediawikiTable.php 2014-09-24 15:56:32 UTC (rev 9110) +++ trunk/lib/plugin/MediawikiTable.php 2014-09-24 16:13:38 UTC (rev 9111) @@ -62,8 +62,22 @@ return array(); } + function getWikiPageLinks($argstr, $basepage) + { + global $backlinks; + if (empty($backlinks)) { + global $request; + $this->run($request->_dbi, $argstr, $request, $basepage); + } + return $backlinks; + } + function run($dbi, $argstr, &$request, $basepage) { + global $backlinks; + + $backlinks = array(); + include_once 'lib/BlockParser.php'; // We allow the compact Mediawiki syntax with: Modified: trunk/lib/plugin/OldStyleTable.php =================================================================== --- trunk/lib/plugin/OldStyleTable.php 2014-09-24 15:56:32 UTC (rev 9110) +++ trunk/lib/plugin/OldStyleTable.php 2014-09-24 16:13:38 UTC (rev 9111) @@ -66,8 +66,22 @@ return; } + function getWikiPageLinks($argstr, $basepage) + { + global $backlinks; + if (empty($backlinks)) { + global $request; + $this->run($request->_dbi, $argstr, $request, $basepage); + } + return $backlinks; + } + function run($dbi, $argstr, &$request, $basepage) { + global $backlinks; + + $backlinks = array(); + include_once 'lib/InlineParser.php'; $args = $this->getArgs($argstr, $request); Modified: trunk/lib/plugin/RichTable.php =================================================================== --- trunk/lib/plugin/RichTable.php 2014-09-24 15:56:32 UTC (rev 9110) +++ trunk/lib/plugin/RichTable.php 2014-09-24 16:13:38 UTC (rev 9111) @@ -40,8 +40,22 @@ return array(); } + function getWikiPageLinks($argstr, $basepage) + { + global $backlinks; + if (empty($backlinks)) { + global $request; + $this->run($request->_dbi, $argstr, $request, $basepage); + } + return $backlinks; + } + function run($dbi, $argstr, &$request, $basepage) { + global $backlinks; + + $backlinks = array(); + include_once 'lib/BlockParser.php'; $lines = preg_split('/\n/', $argstr); Modified: trunk/lib/plugin/Template.php =================================================================== --- trunk/lib/plugin/Template.php 2014-09-24 15:56:32 UTC (rev 9110) +++ trunk/lib/plugin/Template.php 2014-09-24 16:13:38 UTC (rev 9111) @@ -91,7 +91,15 @@ } if (!$page or !$page->name) return false; - return array(array('linkto' => $page->name, 'relation' => 0)); + + global $backlinks; + if (empty($backlinks)) { + global $request; + $this->run($request->_dbi, $argstr, $request, $basepage); + } + + $backlinks[] = array('linkto' => $page->name, 'relation' => 0); + return $backlinks; } function run($dbi, $argstr, &$request, $basepage) Modified: trunk/lib/plugin/WikicreoleTable.php =================================================================== --- trunk/lib/plugin/WikicreoleTable.php 2014-09-24 15:56:32 UTC (rev 9110) +++ trunk/lib/plugin/WikicreoleTable.php 2014-09-24 16:13:38 UTC (rev 9111) @@ -66,8 +66,22 @@ return; } + function getWikiPageLinks($argstr, $basepage) + { + global $backlinks; + if (empty($backlinks)) { + global $request; + $this->run($request->_dbi, $argstr, $request, $basepage); + } + return $backlinks; + } + function run($dbi, $argstr, &$request, $basepage) { + global $backlinks; + + $backlinks = array(); + include_once 'lib/InlineParser.php'; $table = array(); Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2014-09-24 15:56:32 UTC (rev 9110) +++ trunk/pgsrc/ReleaseNotes 2014-09-24 16:13:38 UTC (rev 9111) @@ -1,4 +1,4 @@ -Date: Thu, 18 Sep 2014 15:38:21 +0000 +Date: Wed, 24 Sep 2014 18:11:57 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -16,6 +16,7 @@ * fix Bug#636 Recursive include is not trapped * fix Bug#647 undefined method WikiDB_backend_dba::WikiDB_backend_dbaBase * correct total number of pages for AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastEditedByMe +* fix Bug#607 BackLinks do not work inside a RichTable == 1.5.0 2014-07-29 Marc-Etienne Vargenau == This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-25 08:48:06
|
Revision: 9112 http://sourceforge.net/p/phpwiki/code/9112 Author: vargenau Date: 2014-09-25 08:47:58 +0000 (Thu, 25 Sep 2014) Log Message: ----------- Fix Bug#646 Wrong number of links in BackLinks Modified Paths: -------------- trunk/lib/PageList.php trunk/pgsrc/ReleaseNotes Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2014-09-24 16:13:38 UTC (rev 9111) +++ trunk/lib/PageList.php 2014-09-25 08:47:58 UTC (rev 9112) @@ -809,10 +809,12 @@ function addPage($page_handle) { + $pagename = is_string($page_handle) ? $page_handle : $page_handle->getName(); + if (in_array($pagename, $this->pageNames())) { + return; + } if (!empty($this->_excluded_pages)) { - if (!in_array((is_string($page_handle) ? $page_handle : $page_handle->getName()), - $this->_excluded_pages) - ) + if (!in_array($pagename, $this->_excluded_pages)) $this->_pages[] = $page_handle; } else { $this->_pages[] = $page_handle; Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2014-09-24 16:13:38 UTC (rev 9111) +++ trunk/pgsrc/ReleaseNotes 2014-09-25 08:47:58 UTC (rev 9112) @@ -1,4 +1,4 @@ -Date: Wed, 24 Sep 2014 18:11:57 +0000 +Date: Thu, 25 Sep 2014 10:11:57 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -17,6 +17,7 @@ * fix Bug#647 undefined method WikiDB_backend_dba::WikiDB_backend_dbaBase * correct total number of pages for AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastEditedByMe * fix Bug#607 BackLinks do not work inside a RichTable +* fix Bug#646 Wrong number of links in BackLinks == 1.5.0 2014-07-29 Marc-Etienne Vargenau == This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-25 12:51:59
|
Revision: 9116 http://sourceforge.net/p/phpwiki/code/9116 Author: vargenau Date: 2014-09-25 12:51:51 +0000 (Thu, 25 Sep 2014) Log Message: ----------- Make <includeonly> work Modified Paths: -------------- trunk/lib/BlockParser.php trunk/pgsrc/Help%2FIncludePagePlugin trunk/pgsrc/ReleaseNotes Modified: trunk/lib/BlockParser.php =================================================================== --- trunk/lib/BlockParser.php 2014-09-25 10:38:58 UTC (rev 9115) +++ trunk/lib/BlockParser.php 2014-09-25 12:51:51 UTC (rev 9116) @@ -909,7 +909,7 @@ class Block_pre extends BlockMarkup { - public $_re = '<(?:pre|verbatim|nowiki|noinclude)>'; + public $_re = '<(?:pre|verbatim|nowiki|noinclude|includeonly)>'; function _match(&$input, $m) { @@ -927,6 +927,11 @@ } $input->advance(); + if ($m->match == '<includeonly>') { + $this->_element = new Block_HtmlElement('div', false, ''); + return true; + } + if ($m->match == '<nowiki>') $text = join("<br>\n", $text); else Modified: trunk/pgsrc/Help%2FIncludePagePlugin =================================================================== --- trunk/pgsrc/Help%2FIncludePagePlugin 2014-09-25 10:38:58 UTC (rev 9115) +++ trunk/pgsrc/Help%2FIncludePagePlugin 2014-09-25 12:51:51 UTC (rev 9116) @@ -1,4 +1,4 @@ -Date: Thu, 4 Sep 2014 18:14:45 +0000 +Date: Thu, 25 Sep 2014 14:11:57 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=Help%2FIncludePagePlugin; @@ -60,6 +60,12 @@ | false |} +== Inclusion == + +~<noinclude> .. ~</noinclude> is stripped. + +~<includeonly> .. ~</includeonly> is only expanded in included pages. + == Examples == === ~IncludePage page=Help/~AllPagesPlugin === Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2014-09-25 10:38:58 UTC (rev 9115) +++ trunk/pgsrc/ReleaseNotes 2014-09-25 12:51:51 UTC (rev 9116) @@ -1,4 +1,4 @@ -Date: Thu, 25 Sep 2014 10:11:57 +0000 +Date: Thu, 25 Sep 2014 14:11:57 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -18,6 +18,7 @@ * correct total number of pages for AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastEditedByMe * fix Bug#607 BackLinks do not work inside a RichTable * fix Bug#646 Wrong number of links in BackLinks +* make <includeonly> work == 1.5.0 2014-07-29 Marc-Etienne Vargenau == This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-26 12:37:51
|
Revision: 9123 http://sourceforge.net/p/phpwiki/code/9123 Author: vargenau Date: 2014-09-26 12:37:47 +0000 (Fri, 26 Sep 2014) Log Message: ----------- You need PHP >= 5.3 Modified Paths: -------------- trunk/INSTALL trunk/lib/main.php Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2014-09-26 12:29:57 UTC (rev 9122) +++ trunk/INSTALL 2014-09-26 12:37:47 UTC (rev 9123) @@ -3,7 +3,7 @@ PhpWiki 1.5.0 requires a web server with at least PHP version 5.3. All users of PHP are strongly encouraged to upgrade to -PHP 5.3.28 or to PHP 5.4 or 5.5. +PHP 5.3.29 or to PHP 5.4 or 5.5. Visit <http://www.php.net> and <http://php.net/downloads.php> for downloads and information. Modified: trunk/lib/main.php =================================================================== --- trunk/lib/main.php 2014-09-26 12:29:57 UTC (rev 9122) +++ trunk/lib/main.php 2014-09-26 12:37:47 UTC (rev 9123) @@ -1405,8 +1405,8 @@ function main() { - if (version_compare(PHP_VERSION, '5.2', '<')) { - exit(_("Your PHP version is too old. You must have at least PHP 5.2.")); + if (version_compare(PHP_VERSION, '5.3', '<')) { + exit(_("Your PHP version is too old. You must have at least PHP 5.3.")); } if (!USE_DB_SESSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-26 16:39:57
|
Revision: 9126 http://sourceforge.net/p/phpwiki/code/9126 Author: vargenau Date: 2014-09-26 16:39:46 +0000 (Fri, 26 Sep 2014) Log Message: ----------- Remove ENABLE_USER_NEW (always true), remove lib/WikiUser.php Modified Paths: -------------- trunk/SOAP.php trunk/config/config-default.ini trunk/config/config-dist.ini trunk/configurator.php trunk/doc/README.phpwiki-auth trunk/doc/README.security trunk/lib/IniConfig.php trunk/lib/MailNotify.php trunk/lib/PagePerm.php trunk/lib/Request.php trunk/lib/WikiGroup.php trunk/lib/WikiUserNew.php trunk/lib/XmlRpcServer.php trunk/lib/imagecache.php trunk/lib/loadsave.php trunk/lib/main.php trunk/lib/plugin/DebugAuthInfo.php trunk/lib/plugin/UserRatings.php trunk/lib/plugin/WikiAdminUtils.php trunk/themes/default/templates/userprefs.tmpl Removed Paths: ------------- trunk/lib/WikiUser.php Modified: trunk/SOAP.php =================================================================== --- trunk/SOAP.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/SOAP.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -58,11 +58,7 @@ if (!isset($credentials['password'])) $credentials['password'] = ''; global $request; - if (ENABLE_USER_NEW) { - $request->_user = WikiUser($credentials['username']); - } else { - $request->_user = new WikiUser($request, $credentials['username']); - } + $request->_user = WikiUser($credentials['username']); $request->_user->AuthCheck(array('userid' => $credentials['username'], 'passwd' => $credentials['password'])); if (!mayAccessPage($access, $pagename)) Modified: trunk/config/config-default.ini =================================================================== --- trunk/config/config-default.ini 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/config/config-default.ini 2014-09-26 16:39:46 UTC (rev 9126) @@ -2,7 +2,6 @@ ; recent development and debugging features: DEBUG = 0 -ENABLE_USER_NEW = true ENABLE_PAGEPERM = true ENABLE_EDIT_TOOLBAR = true JS_SEARCHREPLACE = true Modified: trunk/config/config-dist.ini =================================================================== --- trunk/config/config-dist.ini 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/config/config-dist.ini 2014-09-26 16:39:46 UTC (rev 9126) @@ -666,11 +666,6 @@ ; Note: May result in crashes on endless recursion USER_AUTH_POLICY = first-only -; Enable the new extended method of handling WikiUsers to support external auth and PAGEPERM. -; Servers with memory-limit problems might want to turn it off. It costs ~300KB -; Default: true -;ENABLE_USER_NEW = false - ; Use access control lists (as in Solaris and Windows NTFS) per page and group, ; not per user for the whole wiki. ; Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/configurator.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -981,9 +981,6 @@ <dd>check the given user - password combination for all methods and return true on the first success.</dd></dl>"); -$properties["ENABLE_USER_NEW"] = - new boolean_define_commented_optional('ENABLE_USER_NEW'); - $properties["ENABLE_PAGEPERM"] = new boolean_define_commented_optional('ENABLE_PAGEPERM'); Modified: trunk/doc/README.phpwiki-auth =================================================================== --- trunk/doc/README.phpwiki-auth 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/doc/README.phpwiki-auth 2014-09-26 16:39:46 UTC (rev 9126) @@ -36,10 +36,6 @@ * USER_AUTH_POLICY default: "old" * $DBAuthParams~[~] see below -Temporarily: -; ENABLE_USER_NEW : This will be removed with the 1.3.9 release. -;: It's just to decide if ~WikiUserNew.php should be loaded instead of the old ~WikiUser.php - ! ALLOW_ANON_USER To establish a COMPLETELY private wiki, such as an internal corporate one Modified: trunk/doc/README.security =================================================================== --- trunk/doc/README.security 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/doc/README.security 2014-09-26 16:39:46 UTC (rev 9126) @@ -25,9 +25,6 @@ webserver. ---- <pre> -; require the new login code - the default -;ENABLE_USER_NEW = true - ; allow ACL based permissions on pages - the default ;ENABLE_PAGEPERM = true Modified: trunk/lib/IniConfig.php =================================================================== --- trunk/lib/IniConfig.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/lib/IniConfig.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -184,7 +184,7 @@ // List of all valid config options to be define()d which take booleans. $_IC_VALID_BOOL = array - ('ENABLE_USER_NEW', 'ENABLE_PAGEPERM', 'ENABLE_EDIT_TOOLBAR', 'JS_SEARCHREPLACE', + ('ENABLE_PAGEPERM', 'ENABLE_EDIT_TOOLBAR', 'JS_SEARCHREPLACE', 'ENABLE_XHTML_XML', 'ENABLE_DOUBLECLICKEDIT', 'ENABLE_LIVESEARCH', 'ENABLE_ACDROPDOWN', 'USECACHE', 'WIKIDB_NOCACHE_MARKUP', 'ENABLE_REVERSE_DNS', 'ENCRYPTED_PASSWD', 'ZIPDUMP_AUTH', @@ -856,22 +856,12 @@ } } // legacy: - if (!defined('ENABLE_USER_NEW')) define('ENABLE_USER_NEW', true); if (!defined('ALLOW_USER_LOGIN')) define('ALLOW_USER_LOGIN', defined('ALLOW_USER_PASSWORDS') && ALLOW_USER_PASSWORDS); if (!defined('ALLOW_ANON_USER')) define('ALLOW_ANON_USER', true); if (!defined('ALLOW_ANON_EDIT')) define('ALLOW_ANON_EDIT', false); if (!defined('REQUIRE_SIGNIN_BEFORE_EDIT')) define('REQUIRE_SIGNIN_BEFORE_EDIT', !ALLOW_ANON_EDIT); if (!defined('ALLOW_BOGO_LOGIN')) define('ALLOW_BOGO_LOGIN', true); - if (!ENABLE_USER_NEW) { - if (!defined('ALLOW_HTTP_AUTH_LOGIN')) - define('ALLOW_HTTP_AUTH_LOGIN', false); - if (!defined('ALLOW_LDAP_LOGIN')) - define('ALLOW_LDAP_LOGIN', function_exists('ldap_connect') and defined('LDAP_AUTH_HOST')); - if (!defined('ALLOW_IMAP_LOGIN')) - define('ALLOW_IMAP_LOGIN', function_exists('imap_open') and defined('IMAP_AUTH_HOST')); - } - if (ALLOW_USER_LOGIN and !empty($DBAuthParams) and empty($DBAuthParams['auth_dsn'])) { if (isset($DBParams['dsn'])) $DBAuthParams['auth_dsn'] = $DBParams['dsn']; Modified: trunk/lib/MailNotify.php =================================================================== --- trunk/lib/MailNotify.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/lib/MailNotify.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -97,14 +97,9 @@ $email = ''; } } else { // not current user - if (ENABLE_USER_NEW) { - $u = WikiUser($userid); - $u->getPreferences(); - $prefs = &$u->_prefs; - } else { - $u = new WikiUser($request, $userid); - $prefs = $u->getPreferences(); - } + $u = WikiUser($userid); + $u->getPreferences(); + $prefs = &$u->_prefs; $email = $prefs->get('email'); if ($doverify and !$prefs->get('emailVerified')) { $email = ''; @@ -431,12 +426,8 @@ $request->_user->_level = WIKIAUTH_USER; $request->_prefs->set('emailVerified', true); } else { // not current user - if (ENABLE_USER_NEW) { - $u = WikiUser($userid); - $u->getPreferences(); - } else { - $u = new WikiUser($request, $userid); - } + $u = WikiUser($userid); + $u->getPreferences(); $u->_level = WIKIAUTH_USER; $request->setUser($u); $request->_prefs->set('emailVerified', true); Modified: trunk/lib/PagePerm.php =================================================================== --- trunk/lib/PagePerm.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/lib/PagePerm.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -412,10 +412,8 @@ if ($group === ACL_ANONYMOUS) return !$user->isSignedIn(); if ($group === ACL_BOGOUSER) - if (ENABLE_USER_NEW) - return isa($user, '_BogoUser') or + return isa($user, '_BogoUser') or (isWikiWord($user->_userid) and $user->_level >= WIKIAUTH_BOGO); - else return isWikiWord($user->UserName()); if ($group === ACL_HASHOMEPAGE) return $user->hasHomePage(); if ($group === ACL_SIGNED) Modified: trunk/lib/Request.php =================================================================== --- trunk/lib/Request.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/lib/Request.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -506,15 +506,8 @@ unset($val->_group->_request); unset($val->_group->user); } - if (ENABLE_USER_NEW) { - unset($val->_HomePagehandle); - unset($val->_auth_dbi); - } else { - unset($val->_dbi); - unset($val->_authdbi); - unset($val->_homepage); - unset($val->_request); - } + unset($val->_HomePagehandle); + unset($val->_auth_dbi); } return $this->session->set($key, $val); } Modified: trunk/lib/WikiGroup.php =================================================================== --- trunk/lib/WikiGroup.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/lib/WikiGroup.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -267,10 +267,7 @@ } /* WikiDB users from prefs (not from users): */ - if (ENABLE_USER_NEW) - $dbi = _PassUser::getAuthDbh(); - else - $dbi = false; + $dbi = _PassUser::getAuthDbh(); if ($dbi and $dbh->getAuthParam('pref_select')) { //get prefs table @@ -632,7 +629,6 @@ E_USER_WARNING); return new GroupNone(); } - // FIXME: This only works with ENABLE_USER_NEW if (empty($this->user)) { // use _PassUser::prepare instead if (isa($request->getUser(), '_PassUser')) Deleted: trunk/lib/WikiUser.php =================================================================== --- trunk/lib/WikiUser.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/lib/WikiUser.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -1,813 +0,0 @@ -<?php - -// It is anticipated that when userid support is added to phpwiki, -// this object will hold much more information (e-mail, -// home(wiki)page, etc.) about the user. - -// There seems to be no clean way to "log out" a user when using HTTP -// authentication. So we'll hack around this by storing the currently -// logged in username and other state information in a cookie. - -// 2002-09-08 11:44:04 rurban -// Todo: Fix prefs cookie/session handling: -// _userid and _homepage cookie/session vars still hold the -// serialized string. -// If no homepage, fallback to prefs in cookie as in 1.3.3. - -define('WIKIAUTH_FORBIDDEN', -1); // Completely not allowed. -define('WIKIAUTH_ANON', 0); -define('WIKIAUTH_BOGO', 1); // any valid WikiWord is enough -define('WIKIAUTH_USER', 2); // real auth from a database/file/server. - -define('WIKIAUTH_ADMIN', 10); // Wiki Admin -define('WIKIAUTH_UNOBTAINABLE', 100); // Permissions that no user can achieve - -if (!defined('COOKIE_EXPIRATION_DAYS')) define('COOKIE_EXPIRATION_DAYS', 365); -if (!defined('COOKIE_DOMAIN')) define('COOKIE_DOMAIN', '/'); - -$UserPreferences = array( - 'userid' => new _UserPreference(''), // really store this also? - 'passwd' => new _UserPreference(''), - 'email' => new _UserPreference(''), - 'emailVerified' => new _UserPreference_bool(), - 'notifyPages' => new _UserPreference(''), - 'theme' => new _UserPreference_theme(THEME), - 'lang' => new _UserPreference_language(DEFAULT_LANGUAGE), - 'editWidth' => new _UserPreference_int(80, 30, 150), - 'noLinkIcons' => new _UserPreference_bool(), - 'editHeight' => new _UserPreference_int(22, 5, 80), - 'timeOffset' => new _UserPreference_numeric(0, -26, 26), - 'relativeDates' => new _UserPreference_bool(), - 'googleLink' => new _UserPreference_bool(), // 1.3.10 - 'doubleClickEdit' => new _UserPreference_bool(), // 1.3.11 -); - -function WikiUserClassname() -{ - return 'WikiUser'; -} - -function UpgradeUser($olduser, $user) -{ - if (isa($user, 'WikiUser') and isa($olduser, 'WikiUser')) { - // populate the upgraded class with the values from the old object - foreach (get_object_vars($olduser) as $k => $v) { - $user->$k = $v; - } - $GLOBALS['request']->_user = $user; - return $user; - } else { - return false; - } -} - -class WikiUser -{ - public $_userid = false; - public $_level = false; - public $_request, $_dbi, $_authdbi, $_homepage; - public $_authmethod = '', $_authhow = ''; - - /** - * Populates the instance variables and calls $this->_ok() - * to ensure that the parameters are valid. - * @param Request $request - * @param mixed $userid String of username or WikiUser object. - * @param int|bool $authlevel Authorization level. - */ - function __construct(&$request, $userid = false, $authlevel = false) - { - $this->_request =& $request; - $this->_dbi =& $this->_request->getDbh(); - - if (isa($userid, 'WikiUser')) { - $this->_userid = $userid->_userid; - $this->_level = $userid->_level; - } else { - $this->_userid = $userid; - $this->_level = $authlevel; - } - if (!$this->_ok()) { - // Paranoia: if state is at all inconsistent, log out... - $this->_userid = false; - $this->_level = false; - $this->_homepage = false; - $this->_authhow .= ' paranoia logout'; - } - if ($this->_userid) { - $this->_homepage = $this->_dbi->getPage($this->_userid); - } - } - - /** - * Get the string indicating how the user was authenticated. - * - * Get the string indicating how the user was authenticated. - * Does not seem to be set - jbw - * @return string The method of authentication. - */ - function auth_how() - { - return $this->_authhow; - } - - /** - * Invariant - * - * If the WikiUser object has a valid authorization level and the - * userid is a string returns true, else false. - * @return boolean If valid level and username string true, else false - */ - function _ok() - { - if ((in_array($this->_level, array(WIKIAUTH_BOGO, - WIKIAUTH_USER, - WIKIAUTH_ADMIN)) - && - (is_string($this->_userid))) - ) { - return true; - } - return false; - } - - function UserName() - { - return $this->_userid; - } - - function getId() - { - if ($this->_userid) - return $this->_userid; - if (!empty($this->_request)) - return $this->_request->get('REMOTE_ADDR'); - if (empty($this->_request)) - return Request::get('REMOTE_ADDR'); - return ($this->isSignedIn() - ? $this->_userid - : $this->_request->get('REMOTE_ADDR')); // FIXME: globals - } - - function getAuthenticatedId() - { - //assert($this->_request); - return ($this->isAuthenticated() - ? $this->_userid - : $this->_request->get('REMOTE_ADDR')); // FIXME: globals - } - - function isSignedIn() - { - return $this->_level >= WIKIAUTH_BOGO; - } - - function isAuthenticated() - { - return $this->_level >= WIKIAUTH_BOGO; - } - - function isAdmin() - { - return $this->_level == WIKIAUTH_ADMIN; - } - - function hasAuthority($require_level) - { - return $this->_level >= $require_level; - } - - function isValidName($userid = false) - { - if (!$userid) - $userid = $this->_userid; - return preg_match("/^[\w\.@\-]+$/", $userid) and strlen($userid) < 32; - } - - function AuthCheck($postargs) - { - // Normalize args, and extract. - $keys = array('userid', 'passwd', 'require_level', 'login', 'logout', - 'cancel'); - foreach ($keys as $key) - $args[$key] = isset($postargs[$key]) ? $postargs[$key] : false; - extract($args); - $require_level = max(0, min(WIKIAUTH_ADMIN, (int)$require_level)); - - if ($logout) - return new WikiUser($this->_request); // Log out - elseif ($cancel) - return false; // User hit cancel button. - elseif (!$login && !$userid) - return false; // Nothing to do? - - if (!$this->isValidName($userid)) - return _("Invalid username."); - - $authlevel = $this->_pwcheck($userid, $passwd); - if (!$authlevel) - return _("Invalid password or userid."); - elseif ($authlevel < $require_level) - return _("Insufficient permissions."); - - // Successful login. - $user = new WikiUser($this->_request, $userid, $authlevel); - return $user; - } - - function PrintLoginForm(&$request, $args, $fail_message = false, - $separate_page = true) - { - include_once 'lib/Template.php'; - // Call update_locale in case the system's default language is not 'en'. - // (We have no user pref for lang at this point yet, no one is logged in.) - update_locale(DEFAULT_LANGUAGE); - $userid = ''; - $require_level = 0; - extract($args); // fixme - - $require_level = max(0, min(WIKIAUTH_ADMIN, (int)$require_level)); - - $pagename = $request->getArg('pagename'); - $login = new Template('login', $request, - compact('pagename', 'userid', 'require_level', - 'fail_message', 'pass_required')); - if ($separate_page) { - $request->discardOutput(); - $page = $request->getPage($pagename); - $revision = $page->getCurrentRevision(); - return GeneratePage($login, _("Sign In"), $revision); - } else { - return $login; - } - } - - /** - * Check password. - */ - function _pwcheck($userid, $passwd) - { - global $WikiNameRegexp; - - if (!empty($userid) && $userid == ADMIN_USER) { - // $this->_authmethod = 'pagedata'; - if (defined('ENCRYPTED_PASSWD') && ENCRYPTED_PASSWD) - if (!empty($passwd) - && crypt($passwd, ADMIN_PASSWD) == ADMIN_PASSWD - ) - return WIKIAUTH_ADMIN; - else - return false; - if (!empty($passwd)) { - if ($passwd == ADMIN_PASSWD) - return WIKIAUTH_ADMIN; - else { - // maybe we forgot to enable ENCRYPTED_PASSWD? - if (function_exists('crypt') - && crypt($passwd, ADMIN_PASSWD) == ADMIN_PASSWD - ) { - trigger_error(_("You forgot to set ENCRYPTED_PASSWD to true. Please update your config/config.ini"), - E_USER_WARNING); - return WIKIAUTH_ADMIN; - } - } - } - return false; - } // HTTP Authentication - elseif (ALLOW_HTTP_AUTH_LOGIN && !empty($PHP_AUTH_USER)) { - // if he ignored the password field, because he is already - // authenticated try the previously given password. - if (empty($passwd)) - $passwd = $PHP_AUTH_PW; - } - - // WikiDB_User DB/File Authentication from $DBAuthParams - // Check if we have the user. If not try other methods. - if (ALLOW_USER_LOGIN) { // && !empty($passwd)) { - if (!$this->isValidName($userid)) { - trigger_error(_("Invalid username."), E_USER_WARNING); - return false; - } - $request = $this->_request; - // first check if the user is known - if ($this->exists($userid)) { - $this->_authmethod = 'pagedata'; - return ($this->checkPassword($passwd)) ? WIKIAUTH_USER : false; - } else { - // else try others such as LDAP authentication: - if (ALLOW_LDAP_LOGIN && defined(LDAP_AUTH_HOST) && !empty($passwd) && !strstr($userid, '*')) { - if ($ldap = ldap_connect(LDAP_AUTH_HOST)) { // must be a valid LDAP server! - $r = @ldap_bind($ldap); // this is an anonymous bind - $st_search = "uid=$userid"; - // Need to set the right root search information. see ../index.php - $sr = ldap_search($ldap, LDAP_BASE_DN, - "$st_search"); - $info = ldap_get_entries($ldap, $sr); // there may be more hits with this userid. try every - for ($i = 0; $i < $info["count"]; $i++) { - $dn = $info[$i]["dn"]; - // The password is still plain text. - if ($r = @ldap_bind($ldap, $dn, $passwd)) { - // ldap_bind will return TRUE if everything matches - ldap_close($ldap); - $this->_authmethod = 'LDAP'; - return WIKIAUTH_USER; - } - } - } else { - trigger_error("Unable to connect to LDAP server " - . LDAP_AUTH_HOST, E_USER_WARNING); - } - } - // imap authentication. added by limako - if (ALLOW_IMAP_LOGIN && !empty($passwd)) { - $mbox = @imap_open("{" . IMAP_AUTH_HOST . "}INBOX", - $userid, $passwd, OP_HALFOPEN); - if ($mbox) { - imap_close($mbox); - $this->_authmethod = 'IMAP'; - return WIKIAUTH_USER; - } - } - } - } - if (ALLOW_BOGO_LOGIN - && preg_match('/\A' . $WikiNameRegexp . '\z/', $userid) - ) { - $this->_authmethod = 'BOGO'; - return WIKIAUTH_BOGO; - } - return false; - } - - // Todo: try our WikiDB backends. - function getPreferences() - { - // Restore saved preferences. - - // I'd rather prefer only to store the UserId in the cookie or - // session, and get the preferences from the db or page. - if (isset($this->_request)) { - if (!($prefs = $this->_request->getCookieVar('WIKI_PREFS2'))) - $prefs = $this->_request->getSessionVar('wiki_prefs'); - } - - //if (!$this->_userid && !empty($GLOBALS['HTTP_COOKIE_VARS']['WIKI_ID'])) { - // $this->_userid = $GLOBALS['HTTP_COOKIE_VARS']['WIKI_ID']; - //} - - // before we get his prefs we should check if he is signed in - if (USE_PREFS_IN_PAGE && $this->homePage()) { // in page metadata - // old array - if ($pref = $this->_homepage->get('pref')) { - //trigger_error("pref=".$pref);//debugging - $prefs = unserialize($pref); - } - } - return new UserPreferences($prefs); - } - - // No cookies anymore for all prefs, only the userid. PHP creates - // a session cookie in memory, which is much more efficient, - // but not persistent. Get persistency with a homepage or DB Prefs - // - // Return the number of changed entries - function setPreferences($prefs, $id_only = false) - { - if (!is_object($prefs)) { - $prefs = new UserPreferences($prefs); - } - // update the session and id - $this->_request->setSessionVar('wiki_prefs', $prefs); - // $this->_request->setCookieVar('WIKI_PREFS2', $this->_prefs, 365); - // simple unpacked cookie - if ($this->_userid) setcookie(getCookieName(), $this->_userid, 365, '/'); - - // We must ensure that any password is encrypted. - // We don't need any plaintext password. - if (!$id_only) { - if ($this->isSignedIn()) { - if ($this->isAdmin()) - $prefs->set('passwd', ''); - // already stored in config/config.ini, and it might be - // plaintext! well oh well - if ($homepage = $this->homePage()) { - // check for page revision 0 - if (!$this->_dbi->isWikiPage($this->_userid)) { - trigger_error(_("Your home page has not been created yet so your preferences cannot not be saved."), - E_USER_WARNING); - } else { - if ($this->isAdmin() || !$homepage->get('locked')) { - $homepage->set('pref', serialize($prefs->_prefs)); - return sizeof($prefs->_prefs); - } else { - // An "empty" page could still be - // intentionally locked by admin to - // prevent its creation. - // - // FIXME: This permission situation should - // probably be handled by the DB backend, - // once the new WikiUser code has been - // implemented. - trigger_error(_("Your home page is locked so your preferences cannot not be saved.") - . " " . _("Please contact your PhpWiki administrator for assistance."), - E_USER_WARNING); - } - } - } else { - trigger_error("No homepage for user found. Creating one...", - E_USER_WARNING); - $this->createHomepage($prefs); - //$homepage->set('pref', serialize($prefs->_prefs)); - return sizeof($prefs->_prefs); - } - } else { - trigger_error("you must be signed in", E_USER_WARNING); - } - } - return 0; - } - - // check for homepage with user flag. - // can be overriden from the auth backends - function exists() - { - $homepage = $this->homePage(); - return ($this->_userid && $homepage && $homepage->get('pref')); - } - - // doesn't check for existance!!! hmm. - // how to store metadata in not existing pages? how about versions? - function homePage() - { - if (!$this->_userid) - return false; - if (!empty($this->_homepage)) { - return $this->_homepage; - } else { - if (empty($this->_dbi)) { - if (DEBUG) printSimpleTrace(debug_backtrace()); - } else { - $this->_homepage = $this->_dbi->getPage($this->_userid); - } - return $this->_homepage; - } - } - - function hasHomePage() - { - return !$this->homePage(); - } - - // create user by checking his homepage - function createUser($pref, $createDefaultHomepage = true) - { - if ($this->exists()) - return; - if ($createDefaultHomepage) { - $this->createHomepage($pref); - } else { - // empty page - include 'lib/loadsave.php'; - $pageinfo = array('pagedata' => array('pref' => serialize($pref->_pref)), - 'versiondata' => array('author' => $this->_userid), - 'pagename' => $this->_userid, - 'content' => _('CategoryHomepage')); - SavePage($this->_request, $pageinfo, false, false); - } - $this->setPreferences($pref); - } - - // create user and default user homepage - function createHomepage($pref) - { - $pagename = $this->_userid; - include 'lib/loadsave.php'; - - // create default homepage: - // properly expanded template and the pref metadata - $template = Template('homepage.tmpl', $this->_request); - $text = $template->getExpansion(); - $pageinfo = array('pagedata' => array('pref' => serialize($pref->_pref)), - 'versiondata' => array('author' => $this->_userid), - 'pagename' => $pagename, - 'content' => $text); - SavePage($this->_request, $pageinfo, false, false); - - // create Calendar - $pagename = $this->_userid . SUBPAGE_SEPARATOR . _('Calendar'); - if (!isWikiPage($pagename)) { - $pageinfo = array('pagedata' => array(), - 'versiondata' => array('author' => $this->_userid), - 'pagename' => $pagename, - 'content' => "<?plugin Calendar ?>\n"); - SavePage($this->_request, $pageinfo, false, false); - } - - // create Preferences - $pagename = $this->_userid . SUBPAGE_SEPARATOR . _('Preferences'); - if (!isWikiPage($pagename)) { - $pageinfo = array('pagedata' => array(), - 'versiondata' => array('author' => $this->_userid), - 'pagename' => $pagename, - 'content' => "<?plugin UserPreferences ?>\n"); - SavePage($this->_request, $pageinfo, false, false); - } - } - - function tryAuthBackends() - { - return ''; // crypt('') will never be '' - } - - // Auth backends must store the crypted password where? - // Not in the preferences. - function checkPassword($passwd) - { - $prefs = $this->getPreferences(); - $stored_passwd = $prefs->get('passwd'); // crypted - if (empty($prefs->_prefs['passwd'])) // not stored in the page - // allow empty passwords? At least store a '*' then. - // try other backend. hmm. - $stored_passwd = $this->tryAuthBackends($this->_userid); - if (empty($stored_passwd)) { - trigger_error(sprintf(_("Old UserPage %s without stored password updated with empty password. Set a password in your UserPreferences."), - $this->_userid), E_USER_NOTICE); - $prefs->set('passwd', '*'); - return true; - } - if ($stored_passwd == '*') - return true; - if (!empty($passwd) - && crypt($passwd, $stored_passwd) == $stored_passwd - ) - return true; - else - return false; - } - - function changePassword($newpasswd, $passwd2 = false) - { - if (!$this->mayChangePass()) { - trigger_error(sprintf("Attempt to change an external password for “%s”. Not allowed!", - $this->_userid), E_USER_ERROR); - return false; - } - if ($passwd2 && $passwd2 != $newpasswd) { - trigger_error("The second password must be the same as the first to change it", - E_USER_ERROR); - return false; - } - if (!$this->isAuthenticated()) return false; - - $prefs = $this->getPreferences(); - if (ENCRYPTED_PASSWD) - $prefs->set('passwd', crypt($newpasswd)); - else - $prefs->set('passwd', $newpasswd); - $this->setPreferences($prefs); - return true; - } - - function mayChangePass() - { - // on external DBAuth maybe. on IMAP or LDAP not - // on internal DBAuth yes - if (in_array($this->_authmethod, array('IMAP', 'LDAP'))) - return false; - if ($this->isAdmin()) - return false; - if ($this->_authmethod == 'pagedata') - return true; - if ($this->_authmethod == 'authdb') - return true; - } -} - -// create user and default user homepage -// FIXME: delete this, not used? -/* -function createUser ($userid, $pref) { - global $request; - $user = new WikiUser ($request, $userid); - $user->createUser($pref); -} -*/ - -class _UserPreference -{ - function _UserPreference($default_value) - { - $this->default_value = $default_value; - } - - function sanify($value) - { - return (string)$value; - } - - function update($value) - { - } -} - -class _UserPreference_numeric - extends _UserPreference -{ - function __construct($default, $minval = false, $maxval = false) - { - parent::__construct((double)$default); - $this->_minval = (double)$minval; - $this->_maxval = (double)$maxval; - } - - function sanify($value) - { - $value = (double)$value; - if ($this->_minval !== false && $value < $this->_minval) - $value = $this->_minval; - if ($this->_maxval !== false && $value > $this->_maxval) - $value = $this->_maxval; - return $value; - } -} - -class _UserPreference_int - extends _UserPreference_numeric -{ - function __construct($default, $minval = false, $maxval = false) - { - parent::__construct((int)$default, (int)$minval, (int)$maxval); - } - - function sanify($value) - { - return (int)parent::sanify((int)$value); - } -} - -class _UserPreference_bool - extends _UserPreference -{ - function __construct($default = false) - { - parent::__construct((bool)$default); - } - - function sanify($value) - { - if (is_array($value)) { - /* This allows for constructs like: - * - * <input type="hidden" name="pref[boolPref][]" value="0" /> - * <input type="checkbox" name="pref[boolPref][]" value="1" /> - * - * (If the checkbox is not checked, only the hidden input - * gets sent. If the checkbox is sent, both inputs get - * sent.) - */ - foreach ($value as $val) { - if ($val) - return true; - } - return false; - } - return (bool)$value; - } -} - -class _UserPreference_language - extends _UserPreference -{ - function __construct($default = DEFAULT_LANGUAGE) - { - parent::__construct($default); - } - - // FIXME: check for valid locale - function sanify($value) - { - // Revert to DEFAULT_LANGUAGE if user does not specify - // language in UserPreferences or chooses <system language>. - if ($value == '' or empty($value)) - $value = DEFAULT_LANGUAGE; - - return (string)$value; - } -} - -class _UserPreference_theme - extends _UserPreference -{ - function __construct($default = THEME) - { - parent::__construct($default); - } - - function sanify($value) - { - if (findFile($this->_themefile($value), true)) - return $value; - return $this->default_value; - } - - function update($newvalue) - { - global $WikiTheme; - include_once($this->_themefile($newvalue)); - if (empty($WikiTheme)) - include_once($this->_themefile(THEME)); - } - - function _themefile($theme) - { - return "themes/$theme/themeinfo.php"; - } -} - -// don't save default preferences for efficiency. -class UserPreferences -{ - function UserPreferences($saved_prefs = false) - { - $this->_prefs = array(); - - if (isa($saved_prefs, 'UserPreferences') && $saved_prefs->_prefs) { - foreach ($saved_prefs->_prefs as $name => $value) - $this->set($name, $value); - } elseif (is_array($saved_prefs)) { - foreach ($saved_prefs as $name => $value) - $this->set($name, $value); - } - } - - function _getPref($name) - { - global $UserPreferences; - if (!isset($UserPreferences[$name])) { - if ($name == 'passwd2') return false; - trigger_error("$name: unknown preference", E_USER_NOTICE); - return false; - } - return $UserPreferences[$name]; - } - - function get($name) - { - if (isset($this->_prefs[$name])) - return $this->_prefs[$name]; - if (!($pref = $this->_getPref($name))) - return false; - return $pref->default_value; - } - - function set($name, $value) - { - if (!($pref = $this->_getPref($name))) - return false; - - $newvalue = $pref->sanify($value); - $oldvalue = $this->get($name); - - // update on changes - if ($newvalue != $oldvalue) - $pref->update($newvalue); - - // don't set default values to save space (in cookies, db and - // sesssion) - if ($value == $pref->default_value) - unset($this->_prefs[$name]); - else - $this->_prefs[$name] = $newvalue; - } - - function pack($nonpacked) - { - return serialize($nonpacked); - } - - function unpack($packed) - { - if (!$packed) - return false; - if (substr($packed, 0, 2) == "O:") { - // Looks like a serialized object - return unserialize($packed); - } - //trigger_error("DEBUG: Can't unpack bad UserPreferences", - //E_USER_WARNING); - return false; - } - - function hash() - { - return wikihash($this->_prefs); - } -} - -// Local Variables: -// mode: php -// tab-width: 8 -// c-basic-offset: 4 -// c-hanging-comment-ender-p: nil -// indent-tabs-mode: nil -// End: Modified: trunk/lib/WikiUserNew.php =================================================================== --- trunk/lib/WikiUserNew.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/lib/WikiUserNew.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -60,7 +60,6 @@ * * Random architectural notes, sorted by date: * 2004-01-25 rurban - * Test it by defining ENABLE_USER_NEW in config/config.ini * 1) Now a ForbiddenUser is returned instead of false. * 2) Previously ALLOW_ANON_USER = false meant that anon users cannot edit, * but may browse. Now with ALLOW_ANON_USER = false he may not browse, Modified: trunk/lib/XmlRpcServer.php =================================================================== --- trunk/lib/XmlRpcServer.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/lib/XmlRpcServer.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -445,12 +445,7 @@ $userid = $_ENV['REMOTE_ADDR']; elseif (isset($GLOBALS['REMOTE_ADDR'])) $userid = $GLOBALS['REMOTE_ADDR']; } - - if (ENABLE_USER_NEW) { - return WikiUser($userid); - } else { - return new WikiUser($request, $userid); - } + return WikiUser($userid); } function putPage($params) Modified: trunk/lib/imagecache.php =================================================================== --- trunk/lib/imagecache.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/lib/imagecache.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -29,10 +29,8 @@ include_once 'lib/config.php'; require_once(dirname(__FILE__) . "/stdlib.php"); require_once 'lib/Request.php'; -if (ENABLE_USER_NEW) require_once("lib/WikiUserNew.php"); -else require_once("lib/WikiUser.php"); +require_once("lib/WikiUserNew.php"); require_once 'lib/WikiDB.php'; - require_once 'lib/WikiPluginCached.php'; // ----------------------------------------------------------------------- @@ -75,7 +73,7 @@ if ($user = $request->getSessionVar('wiki_user')) { $request->_user = $user; $request->_user->_authhow = 'session'; - return ENABLE_USER_NEW ? $user->UserName() : $request->_user; + return $user->UserName(); } if ($userid = $request->getCookieVar(getCookieName())) { if (!empty($userid) and substr($userid, 0, 2) != 's:') { @@ -100,13 +98,8 @@ $request->setArg('pagename', deducePagename($request)); $pagename = $request->getArg('pagename'); $request->_dbi = WikiDB::open($GLOBALS['DBParams']); - if (ENABLE_USER_NEW) { - $request->_user = new _AnonUser(); - $request->_prefs =& $request->_user->_prefs; - } else { - $request->_user = new WikiUser($request); - $request->_prefs = new UserPreferences(); - } + $request->_user = new _AnonUser(); + $request->_prefs =& $request->_user->_prefs; // Enable the output of most of the warning messages. // The warnings will screw up zip files and setpref though. Modified: trunk/lib/loadsave.php =================================================================== --- trunk/lib/loadsave.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/lib/loadsave.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -1484,12 +1484,8 @@ // This really needs to be cleaned up... // (I'm working on it.) $real_user = $request->_user; - if (ENABLE_USER_NEW) - $request->_user = new _BogoUser(ADMIN_USER); + $request->_user = new _BogoUser(ADMIN_USER); - else - $request->_user = new WikiUser($request, ADMIN_USER, WIKIAUTH_BOGO); - StartLoadDump($request, _("Loading up virgin wiki")); $pgsrc = FindLocalizedFile(WIKI_PGSRC); Modified: trunk/lib/main.php =================================================================== --- trunk/lib/main.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/lib/main.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -28,10 +28,7 @@ require_once(dirname(__FILE__) . "/stdlib.php"); require_once 'lib/Request.php'; require_once 'lib/WikiDB.php'; -if (ENABLE_USER_NEW) - require_once 'lib/WikiUserNew.php'; -else - require_once 'lib/WikiUser.php'; +require_once 'lib/WikiUserNew.php'; require_once 'lib/WikiGroup.php'; if (ENABLE_PAGEPERM) require_once 'lib/PagePerm.php'; @@ -61,30 +58,28 @@ // force our local copy, until the pear version is fixed. include_once(dirname(__FILE__) . "/pear/File_Passwd.php"); } - if (ENABLE_USER_NEW) { - // Preload all necessary userclasses. Otherwise session => __PHP_Incomplete_Class_Name - // There's no way to demand-load it later. This way it's much slower, but needs slightly - // less memory than loading all. - if (ALLOW_BOGO_LOGIN) - include_once 'lib/WikiUser/BogoLogin.php'; - // UserPreferences POST Update doesn't reach this. - foreach ($GLOBALS['USER_AUTH_ORDER'] as $method) { - include_once("lib/WikiUser/$method.php"); - if ($method == 'Db') - switch (DATABASE_TYPE) { - case 'SQL' : - include_once 'lib/WikiUser/PearDb.php'; - break; - case 'ADODB': - include_once 'lib/WikiUser/AdoDb.php'; - break; - case 'PDO' : - include_once 'lib/WikiUser/PdoDb.php'; - break; - } - } - unset($method); + // Preload all necessary userclasses. Otherwise session => __PHP_Incomplete_Class_Name + // There's no way to demand-load it later. This way it's much slower, but needs slightly + // less memory than loading all. + if (ALLOW_BOGO_LOGIN) + include_once 'lib/WikiUser/BogoLogin.php'; + // UserPreferences POST Update doesn't reach this. + foreach ($GLOBALS['USER_AUTH_ORDER'] as $method) { + include_once("lib/WikiUser/$method.php"); + if ($method == 'Db') + switch (DATABASE_TYPE) { + case 'SQL' : + include_once 'lib/WikiUser/PearDb.php'; + break; + case 'ADODB': + include_once 'lib/WikiUser/AdoDb.php'; + break; + case 'PDO' : + include_once 'lib/WikiUser/PdoDb.php'; + break; + } } + unset($method); if (USE_DB_SESSION) { include_once 'lib/DbSession.php'; $dbi =& $this->_dbi; @@ -116,52 +111,47 @@ // Restore auth state. This doesn't check for proper authorization! $userid = $this->_deduceUsername(); - if (ENABLE_USER_NEW) { - if (isset($this->_user) and - !empty($this->_user->_authhow) and + if (isset($this->_user) and + !empty($this->_user->_authhow) and $this->_user->_authhow == 'session' ) { - // users might switch in a session between the two objects. - // restore old auth level here or in updateAuthAndPrefs? - //$user = $this->getSessionVar('wiki_user'); - // revive db handle, because these don't survive sessions - if (isset($this->_user) and - (!isa($this->_user, WikiUserClassname()) - or (strtolower(get_class($this->_user)) == '_passuser') - or (strtolower(get_class($this->_user)) == '_fusionforgepassuser')) - ) { - $this->_user = WikiUser($userid, $this->_user->_prefs); - } - // revive other db handle - if (isset($this->_user->_prefs->_method) - and ($this->_user->_prefs->_method == 'SQL' - or $this->_user->_prefs->_method == 'ADODB' - or $this->_user->_prefs->_method == 'PDO' - or $this->_user->_prefs->_method == 'HomePage') - ) { - $this->_user->_HomePagehandle = $this->getPage($userid); - } - // need to update the lockfile filehandle - if (isa($this->_user, '_FilePassUser') - and $this->_user->_file->lockfile - and !$this->_user->_file->fplock - ) { - //$level = $this->_user->_level; - $this->_user = UpgradeUser($this->_user, - new _FilePassUser($userid, - $this->_user->_prefs, - $this->_user->_file->filename)); - //$this->_user->_level = $level; - } - $this->_prefs = & $this->_user->_prefs; - } else { - $user = WikiUser($userid); - $this->_user = & $user; - $this->_prefs = & $this->_user->_prefs; + // users might switch in a session between the two objects. + // restore old auth level here or in updateAuthAndPrefs? + //$user = $this->getSessionVar('wiki_user'); + // revive db handle, because these don't survive sessions + if (isset($this->_user) and + (!isa($this->_user, WikiUserClassname()) + or (strtolower(get_class($this->_user)) == '_passuser') + or (strtolower(get_class($this->_user)) == '_fusionforgepassuser')) + ) { + $this->_user = WikiUser($userid, $this->_user->_prefs); } + // revive other db handle + if (isset($this->_user->_prefs->_method) + and ($this->_user->_prefs->_method == 'SQL' + or $this->_user->_prefs->_method == 'ADODB' + or $this->_user->_prefs->_method == 'PDO' + or $this->_user->_prefs->_method == 'HomePage') + ) { + $this->_user->_HomePagehandle = $this->getPage($userid); + } + // need to update the lockfile filehandle + if (isa($this->_user, '_FilePassUser') + and $this->_user->_file->lockfile + and !$this->_user->_file->fplock + ) { + //$level = $this->_user->_level; + $this->_user = UpgradeUser($this->_user, + new _FilePassUser($userid, + $this->_user->_prefs, + $this->_user->_file->filename)); + //$this->_user->_level = $level; + } + $this->_prefs = & $this->_user->_prefs; } else { - $this->_user = new WikiUser($this, $userid); - $this->_prefs = $this->_user->getPreferences(); + $user = WikiUser($userid); + $this->_user = & $user; + $this->_prefs = & $this->_user->_prefs; } } @@ -440,16 +430,11 @@ */ private function _signIn($userid) { - if (ENABLE_USER_NEW) { - if (!$this->_user) - $this->_user = new _BogoUser($userid); - // FIXME: is this always false? shouldn't we try passuser first? - if (!$this->_user) - $this->_user = new _PassUser($userid); - } else { - if (!$this->_user) - $this->_user = new WikiUser($this, $userid); - } + if (!$this->_user) + $this->_user = new _BogoUser($userid); + // FIXME: is this always false? shouldn't we try passuser first? + if (!$this->_user) + $this->_user = new _PassUser($userid); $user = $this->_user->AuthCheck(array('userid' => $userid)); if (isa($user, WikiUserClassname())) { $this->_setUser($user); // success! @@ -477,12 +462,6 @@ $this->setSessionVar('wiki_user', $user); $this->_prefs->set('userid', $isSignedIn ? $user->getId() : ''); - if (!ENABLE_USER_NEW) { - if (empty($this->_user->_request)) - $this->_user->_request =& $this; - if (empty($this->_user->_dbi)) - $this->_user->_dbi =& $this->_dbi; - } $this->initializeTheme($isSignedIn ? 'login' : 'logout'); define('MAIN_setUser', true); } @@ -1002,7 +981,7 @@ } elseif (isa($user, WikiUserClassname())) { $this->_user = $user; $this->_user->_authhow = 'session'; - return ENABLE_USER_NEW ? $user->UserName() : $this->_user; + return $user->UserName(); } } Modified: trunk/lib/plugin/DebugAuthInfo.php =================================================================== --- trunk/lib/plugin/DebugAuthInfo.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/lib/plugin/DebugAuthInfo.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -60,7 +60,7 @@ $table = HTML::table(array('class' => 'bordered')); $table->pushContent($this->show_hash("AUTH DEFINES", $this->buildConstHash( - array("ENABLE_USER_NEW", "ALLOW_ANON_USER", + array("ALLOW_ANON_USER", "ALLOW_ANON_EDIT", "ALLOW_BOGO_LOGIN", "REQUIRE_SIGNIN_BEFORE_EDIT", "ALLOW_USER_PASSWORDS", "PASSWORD_LENGTH_MINIMUM", "USE_DB_SESSION")))); @@ -102,20 +102,18 @@ } } $table->pushContent($this->show_hash("User: Object of " . get_class($user), $userdata)); - if (ENABLE_USER_NEW) { - $group = &$request->getGroup(); - $groups = $group->getAllGroupsIn(); - $groupdata = obj2hash($group, array('_dbi', '_request', 'password', 'passwd')); - unset($groupdata['request']); - $table->pushContent($this->show_hash("Group: Object of " . get_class($group), $groupdata)); - $groups = $group->getAllGroupsIn(); - $groupdata = array('getAllGroupsIn' => $groups); - foreach ($groups as $g) { - $groupdata["getMembersOf($g)"] = $group->getMembersOf($g); - $groupdata["isMember($g)"] = $group->isMember($g); - } - $table->pushContent($this->show_hash("Group Methods: ", $groupdata)); + $group = &$request->getGroup(); + $groups = $group->getAllGroupsIn(); + $groupdata = obj2hash($group, array('_dbi', '_request', 'password', 'passwd')); + unset($groupdata['request']); + $table->pushContent($this->show_hash("Group: Object of " . get_class($group), $groupdata)); + $groups = $group->getAllGroupsIn(); + $groupdata = array('getAllGroupsIn' => $groups); + foreach ($groups as $g) { + $groupdata["getMembersOf($g)"] = $group->getMembersOf($g); + $groupdata["isMember($g)"] = $group->isMember($g); } + $table->pushContent($this->show_hash("Group Methods: ", $groupdata)); $html->pushContent($table); } return $html; Modified: trunk/lib/plugin/UserRatings.php =================================================================== --- trunk/lib/plugin/UserRatings.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/lib/plugin/UserRatings.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -23,12 +23,8 @@ require_once 'lib/PageList.php'; require_once 'lib/wikilens/Buddy.php'; require_once 'lib/wikilens/PageListColumns.php'; +require_once 'lib/WikiUserNew.php'; -if (ENABLE_USER_NEW) - require_once 'lib/WikiUserNew.php'; -else - require_once 'lib/WikiUser.php'; - /** * Show a user's ratings in a table, using PageList. * Usage: Modified: trunk/lib/plugin/WikiAdminUtils.php =================================================================== --- trunk/lib/plugin/WikiAdminUtils.php 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/lib/plugin/WikiAdminUtils.php 2014-09-26 16:39:46 UTC (rev 9126) @@ -249,10 +249,7 @@ $allusers = array(); } foreach ($allusers as $username) { - if (ENABLE_USER_NEW) - $user = WikiUser($username); - else - $user = new WikiUser($request, $username); + $user = WikiUser($username); $prefs = $user->getPreferences(); if ($prefs->get('email')) { if (!$prefs->get('userid')) Modified: trunk/themes/default/templates/userprefs.tmpl =================================================================== --- trunk/themes/default/templates/userprefs.tmpl 2014-09-26 14:39:38 UTC (rev 9125) +++ trunk/themes/default/templates/userprefs.tmpl 2014-09-26 16:39:46 UTC (rev 9126) @@ -123,14 +123,14 @@ <?php } else { $fill = " "; // See also plugin DebugAuthInfo - $authmethod = ENABLE_USER_NEW ? @$user->_authmethod : @$user->auth_how; + $authmethod = @$user->_authmethod; ?> <?php echo HTML::pre(sprintf("%12s: [% 10s] %s\n",_("UserId"),$pref->get('userid'), " from " . $authmethod), sprintf("%12s: [% 10s] %16s: [% 10s] | %8s: [%2s]\n","getId",$user->getId(),"getAuthenticatedId",$user->getAuthenticatedId(),"isSignedIn", $user->isSignedIn()), //sprintf("%12s: [% 10s]\n",_("Password"),empty($pref->get('passwd')) ? _("<empty>") : _("<not empty>")), sprintf("%12s: [% 10s] %15s: [% 8s]\n", _("Auth Level"),$user->_level,_("Auth Method"),$authmethod), - sprintf("%12s: [% 10s]\n",_("HomePage"),$user->hasHomePage() ? (ENABLE_USER_NEW ? $user->_HomePagehandle->_pagename : $user->_homepage->_pagename ) : ''), + sprintf("%12s: [% 10s]\n",_("HomePage"),$user->hasHomePage() ? $user->_HomePagehandle->_pagename : ''), sprintf("%12s: [% 10s]\n",_("E-mail"),$pref->get('email')), //sprintf("%12s: [% 10s]\n",_("Notify"),$pref->get('notifyPages')), sprintf("%12s: [% 10s] %16s: [% 10s] \n",_("Theme"), $pref->get('theme'), _("Current theme"),$WikiTheme->_name), @@ -150,7 +150,6 @@ <td></td></tr> <?php } ?> -<?php if (ENABLE_USER_NEW) { ?> <tr><td colspan="2"><h2><?php echo _("E-mail")?></h2></td></tr> <tr><td> @@ -210,8 +209,6 @@ </td> </tr> -<?php } ?> - <tr><td colspan="2"><h2><?php echo _("Appearance")?></h2></td></tr> <tr><td colspan="2"><?php echo _("Here you can override site-specific default values.") ?></td></tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-09-26 17:03:06
|
Revision: 9128 http://sourceforge.net/p/phpwiki/code/9128 Author: vargenau Date: 2014-09-26 17:02:59 +0000 (Fri, 26 Sep 2014) Log Message: ----------- Rename lib/WikiUserNew.php --> lib/WikiUser.php Modified Paths: -------------- trunk/SOAP.php trunk/lib/PagePerm.php trunk/lib/imagecache.php trunk/lib/main.php trunk/lib/plugin/UserRatings.php trunk/locale/Makefile trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/nl/LC_MESSAGES/phpwiki.mo 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/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/zh/LC_MESSAGES/phpwiki.mo trunk/pgsrc/Help%2FPagePermissions trunk/pgsrc/ReleaseNotes Added Paths: ----------- trunk/lib/WikiUser.php Removed Paths: ------------- trunk/lib/WikiUserNew.php Modified: trunk/SOAP.php =================================================================== --- trunk/SOAP.php 2014-09-26 16:44:55 UTC (rev 9127) +++ trunk/SOAP.php 2014-09-26 17:02:59 UTC (rev 9128) @@ -33,7 +33,7 @@ class WikiRequest extends Request {} $request = new WikiRequest(); require_once 'lib/PagePerm.php'; -require_once 'lib/WikiUserNew.php'; +require_once 'lib/WikiUser.php'; require_once 'lib/WikiGroup.php'; */ Modified: trunk/lib/PagePerm.php =================================================================== --- trunk/lib/PagePerm.php 2014-09-26 16:44:55 UTC (rev 9127) +++ trunk/lib/PagePerm.php 2014-09-26 17:02:59 UTC (rev 9128) @@ -31,7 +31,7 @@ * optional master page ("."), and predefined default permissions, if "." * is not defined. * Pagenames starting with "." have special default permissions. - * For Authentication see WikiUserNew.php, WikiGroup.php and main.php + * For Authentication see WikiUser.php, WikiGroup.php and main.php * Page Permissions are in PhpWiki since v1.3.9 and enabled since v1.4.0 * * This file might replace the following functions from main.php: Copied: trunk/lib/WikiUser.php (from rev 9127, trunk/lib/WikiUserNew.php) =================================================================== --- trunk/lib/WikiUser.php (rev 0) +++ trunk/lib/WikiUser.php 2014-09-26 17:02:59 UTC (rev 9128) @@ -0,0 +1,2290 @@ +<?php +/* Copyright (C) 2004,2005,2006,2007,2009,2010 $ThePhpWikiProgrammingTeam + * Copyright (C) 2009-2010 Marc-Etienne Vargenau, Alcatel-Lucent + * Copyright (C) 2009-2010 Roger Guignard, Alcatel-Lucent + * + * 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., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/** + * This is a complete OOP rewrite of the old WikiUser code with various + * configurable external authentication methods. + * + * There's only one entry point, the function WikiUser which returns + * a WikiUser object, which contains the name, authlevel and user's preferences. + * This object might get upgraded during the login step and later also. + * There exist three preferences storage methods: cookie, homepage and db, + * and multiple password checking methods. + * See index.php for $USER_AUTH_ORDER[] and USER_AUTH_POLICY if + * ALLOW_USER_PASSWORDS is defined. + * + * Each user object must define the two preferences methods + * getPreferences(), setPreferences(), + * and the following 1-4 auth methods + * checkPass() must be defined by all classes, + * userExists() only if USER_AUTH_POLICY'=='strict' + * mayChangePass() only if the password is storable. + * storePass() only if the password is storable. + * + * WikiUser() given no name, returns an _AnonUser (anonymous user) + * object, who may or may not have a cookie. + * However, if the there's a cookie with the userid or a session, + * the user is upgraded to the matching user object. + * Given a user name, returns a _BogoUser object, who may or may not + * have a cookie and/or PersonalPage, one of the various _PassUser objects + * or an _AdminUser object. + * BTW: A BogoUser is a userid (loginname) as valid WikiWord, who might + * have stored a password or not. If so, his account is secure, if not + * anybody can use it, because the username is visible e.g. in RecentChanges. + * + * Takes care of passwords, all preference loading/storing in the + * user's page and any cookies. lib/main.php will query the user object to + * verify the password as appropriate. + * + * @author: Reini Urban (the tricky parts), + * Carsten Klapp (started rolling the ball) + * + * Random architectural notes, sorted by date: + * 2004-01-25 rurban + * 1) Now a ForbiddenUser is returned instead of false. + * 2) Previously ALLOW_ANON_USER = false meant that anon users cannot edit, + * but may browse. Now with ALLOW_ANON_USER = false he may not browse, + * which is needed to disable browse PagePermissions. + * I added now ALLOW_ANON_EDIT = true to makes things clear. + * (which replaces REQUIRE_SIGNIN_BEFORE_EDIT) + * 2004-02-27 rurban: + * 3) Removed pear prepare. Performance hog, and using integers as + * handler doesn't help. Do simple sprintf as with adodb. And a prepare + * in the object init is no advantage, because in the init loop a lot of + * objects are tried, but not used. + * 4) Already gotten prefs are passed to the next object to avoid + * duplicate getPreferences() calls. + * 2004-03-18 rurban + * 5) Major php-5 problem: $this re-assignment is disallowed by the parser + * So we cannot just discrimate with + * if (!check_php_version(5)) + * $this = $user; + * A /php5-patch.php is provided, which patches the src automatically + * for php4 and php5. Default is php4. + * Update: not needed anymore. we use eval to fool the load-time syntax checker. + * 2004-03-24 rurban + * 6) enforced new cookie policy: prefs don't get stored in cookies + * anymore, only in homepage and/or database, but always in the + * current session. old pref cookies will get deleted. + * 2004-04-04 rurban + * 7) Certain themes should be able to extend the predefined list + * of preferences. Display/editing is done in the theme specific userprefs.tmpl, + * but storage must be extended to the Get/SetPreferences methods. + * <theme>/themeinfo.php must provide CustomUserPreferences: + * A list of name => _UserPreference class pairs. + * 2010-06-07 rurban + * Fixed a nasty recursion bug (i.e. php crash), when user = new class + * which returned false, did not return false on php-4.4.7. Check for + * a object member now. + */ + +define('WIKIAUTH_FORBIDDEN', -1); // Completely not allowed. +define('WIKIAUTH_ANON', 0); // Not signed in. +define('WIKIAUTH_BOGO', 1); // Any valid WikiWord is enough. +define('WIKIAUTH_USER', 2); // Bogo user with a password. +define('WIKIAUTH_ADMIN', 10); // UserName == ADMIN_USER. +define('WIKIAUTH_UNOBTAINABLE', 100); // Permissions that no user can achieve + +//if (!defined('COOKIE_EXPIRATION_DAYS')) define('COOKIE_EXPIRATION_DAYS', 365); +//if (!defined('COOKIE_DOMAIN')) define('COOKIE_DOMAIN', '/'); +if (!defined('EDITWIDTH_MIN_COLS')) define('EDITWIDTH_MIN_COLS', 30); +if (!defined('EDITWIDTH_MAX_COLS')) define('EDITWIDTH_MAX_COLS', 150); +if (!defined('EDITWIDTH_DEFAULT_COLS')) define('EDITWIDTH_DEFAULT_COLS', 80); + +if (!defined('EDITHEIGHT_MIN_ROWS')) define('EDITHEIGHT_MIN_ROWS', 5); +if (!defined('EDITHEIGHT_MAX_ROWS')) define('EDITHEIGHT_MAX_ROWS', 80); +if (!defined('EDITHEIGHT_DEFAULT_ROWS')) define('EDITHEIGHT_DEFAULT_ROWS', 22); + +define('TIMEOFFSET_MIN_HOURS', -26); +define('TIMEOFFSET_MAX_HOURS', 26); +if (!defined('TIMEOFFSET_DEFAULT_HOURS')) define('TIMEOFFSET_DEFAULT_HOURS', 0); + +/* EMAIL VERIFICATION + * On certain nets or hosts the email domain cannot be determined automatically from the DNS. + * Provide some overrides here. + * ( username @ ) domain => mail-domain + */ +$EMailHosts = array('avl.com' => 'mail.avl.com'); + +/** + * There are be the following constants in config/config.ini to + * establish login parameters: + * + * ALLOW_ANON_USER default true + * ALLOW_ANON_EDIT default true + * ALLOW_BOGO_LOGIN default true + * ALLOW_USER_PASSWORDS default true + * PASSWORD_LENGTH_MINIMUM default 0 + * + * To require user passwords for editing: + * ALLOW_ANON_USER = true + * ALLOW_ANON_EDIT = false (before named REQUIRE_SIGNIN_BEFORE_EDIT) + * ALLOW_BOGO_LOGIN = false + * ALLOW_USER_PASSWORDS = true + * + * To establish a COMPLETELY private wiki, such as an internal + * corporate one: + * ALLOW_ANON_USER = false + * (and probably require user passwords as described above). In this + * case the user will be prompted to login immediately upon accessing + * any page. + * + * There are other possible combinations, but the typical wiki (such + * as http://PhpWiki.sf.net/phpwiki) would usually just leave all four + * enabled. + * + */ + +// The last object in the row is the bad guy... +if (!is_array($USER_AUTH_ORDER)) + $USER_AUTH_ORDER = array("Forbidden"); +else + $USER_AUTH_ORDER[] = "Forbidden"; + +// Local convenience functions. +function _isAnonUserAllowed() +{ + return (defined('ALLOW_ANON_USER') && ALLOW_ANON_USER); +} + +function _isBogoUserAllowed() +{ + return (defined('ALLOW_BOGO_LOGIN') && ALLOW_BOGO_LOGIN); +} + +function _isUserPasswordsAllowed() +{ + return (defined('ALLOW_USER_PASSWORDS') && ALLOW_USER_PASSWORDS); +} + +// Possibly upgrade userobject functions. +function _determineAdminUserOrOtherUser($UserName) +{ + // Sanity check. User name is a condition of the definition of the + // _AdminUser, _BogoUser and _passuser. + if (!$UserName) + return $GLOBALS['ForbiddenUser']; + + //FIXME: check admin membership later at checkPass. Now we cannot raise the level. + //$group = &WikiGroup::getGroup($GLOBALS['request']); + if ($UserName == ADMIN_USER) + return new _AdminUser($UserName); + /* elseif ($group->isMember(GROUP_ADMIN)) { // unneeded code + return _determineBogoUserOrPassUser($UserName); + } + */ + else + return _determineBogoUserOrPassUser($UserName); +} + +function _determineBogoUserOrPassUser($UserName) +{ + global $ForbiddenUser; + + // Sanity check. User name is a condition of the definition of + // _BogoUser and _PassUser. + if (!$UserName) + return $ForbiddenUser; + + // Check for password and possibly upgrade user object. + // $_BogoUser = new _BogoUser($UserName); + if (_isBogoUserAllowed() and isWikiWord($UserName)) { + include_once 'lib/WikiUser/BogoLogin.php'; + $_BogoUser = new _BogoLoginPassUser($UserName); + if ($_BogoUser->userExists() or $GLOBALS['request']->getArg('auth')) + return $_BogoUser; + } + if (_isUserPasswordsAllowed()) { + // PassUsers override BogoUsers if a password is stored + if (isset($_BogoUser) and isset($_BogoUser->_prefs) + and $_BogoUser->_prefs->get('passwd') + ) + return new _PassUser($UserName, $_BogoUser->_prefs); + else { + $_PassUser = new _PassUser($UserName, + isset($_BogoUser) ? $_BogoUser->_prefs : false); + if ($_PassUser->userExists() or $GLOBALS['request']->getArg('auth')) { + if (isset($GLOBALS['request']->_user_class)) + $class = $GLOBALS['request']->_user_class; + elseif (strtolower(get_class($_PassUser)) == "_passuser") + $class = $_PassUser->nextClass(); else + $class = get_class($_PassUser); + if ($user = new $class($UserName, $_PassUser->_prefs) + and $user->_userid + ) { + return $user; + } else { + return $_PassUser; + } + } + } + } + // No Bogo- or PassUser exists, or + // passwords are not allowed, and bogo is disallowed too. + // (Only the admin can sign in). + return $ForbiddenUser; +} + +/** + * Primary WikiUser function, called by lib/main.php. + * + * This determines the user's type and returns an appropriate user + * object. lib/main.php then querys the resultant object for password + * validity as necessary. + * + * If an _AnonUser object is returned, the user may only browse pages + * (and save prefs in a cookie). + * + * To disable access but provide prefs the global $ForbiddenUser class + * is returned. (was previously false) + * + */ +function WikiUser($UserName = '') +{ + global $ForbiddenUser, $HTTP_SESSION_VARS; + + //Maybe: Check sessionvar for username & save username into + //sessionvar (may be more appropriate to do this in lib/main.php). + if ($UserName) { + $ForbiddenUser = new _ForbiddenUser($UserName); + // Found a user name. + return _determineAdminUserOrOtherUser($UserName); + } elseif (!empty($HTTP_SESSION_VARS['userid'])) { + // Found a user name. + $ForbiddenUser = new _ForbiddenUser($_SESSION['userid']); + return _determineAdminUserOrOtherUser($_SESSION['userid']); + } else { + // Check for autologin pref in cookie and possibly upgrade + // user object to another type. + $_AnonUser = new _AnonUser(); + if ($UserName = $_AnonUser->_userid && $_AnonUser->_prefs->get('autologin')) { + // Found a user name. + $ForbiddenUser = new _ForbiddenUser($UserName); + return _determineAdminUserOrOtherUser($UserName); + } else { + $ForbiddenUser = new _ForbiddenUser(); + if (_isAnonUserAllowed()) + return $_AnonUser; + return $ForbiddenUser; // User must sign in to browse pages. + } + } +} + +/** + * WikiUser.php use the name 'WikiUser' + */ +function WikiUserClassname() +{ + return '_WikiUser'; +} + +/** + * Upgrade olduser by copying properties from user to olduser. + * We are not sure yet, for which php's a simple $this = $user works reliably, + * (on php4 it works ok, on php5 it's currently disallowed on the parser level) + * that's why try it the hard way. + */ +function UpgradeUser($user, $newuser) +{ + if (isa($user, '_WikiUser') and isa($newuser, '_WikiUser')) { + // populate the upgraded class $newuser with the values from the current user object + //only _auth_level, _current_method, _current_index, + if (!empty($user->_level) and + $user->_level > $newuser->_level + ) + $newuser->_level = $user->_level; + if (!empty($user->_current_index) and + $user->_current_index > $newuser->_current_index + ) { + $newuser->_current_index = $user->_current_index; + $newuser->_current_method = $user->_current_method; + } + if (!empty($user->_authmethod)) + $newuser->_authmethod = $user->_authmethod; + $GLOBALS['request']->_user_class = get_class($newuser); + /* + foreach (get_object_vars($user) as $k => $v) { + if (!empty($v)) $olduser->$k = $v; + } + */ + $newuser->hasHomePage(); // revive db handle, because these don't survive sessions + //$GLOBALS['request']->_user = $olduser; + return $newuser; + } else { + return false; + } +} + +/** + * Probably not needed, since we use the various user objects methods so far. + * Anyway, here it is, looping through all available objects. + */ +function UserExists($UserName) +{ + global $request; + if (!($user = $request->getUser())) + $user = WikiUser($UserName); + if (!$user) + return false; + if ($user->userExists($UserName)) { + $request->_user = $user; + return true; + } + if (isa($user, '_BogoUser')) + $user = new _PassUser($UserName, $user->_prefs); + $class = $user->nextClass(); + if ($user = new $class($UserName, $user->_prefs)) { + return $user->userExists($UserName); + } + $request->_user = $GLOBALS['ForbiddenUser']; + return false; +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +/** + * Base WikiUser class. + */ +class _WikiUser +{ + public $_userid = ''; + public $_level = WIKIAUTH_ANON; + public $_prefs = false; + public $_HomePagehandle = false; + + // constructor + function _WikiUser($UserName = '', $prefs = false) + { + + $this->_userid = $UserName; + $this->_HomePagehandle = false; + if ($UserName) { + $this->hasHomePage(); + } + if (empty($this->_prefs)) { + if ($prefs) $this->_prefs = $prefs; + else $this->getPreferences(); + } + } + + function UserName() + { + if (!empty($this->_userid)) { + return $this->_userid; + } else { + return ''; + } + } + + function getPreferences() + { + trigger_error("DEBUG: Note: undefined _WikiUser class trying to load prefs." . " " + . "New subclasses of _WikiUser must override this function."); + return false; + } + + function setPreferences($prefs, $id_only) + { + trigger_error("DEBUG: Note: undefined _WikiUser class trying to save prefs." + . " " + . "New subclasses of _WikiUser must override this function."); + return false; + } + + function userExists() + { + return $this->hasHomePage(); + } + + function checkPass($submitted_password) + { + // By definition, an undefined user class cannot sign in. + trigger_error("DEBUG: Warning: undefined _WikiUser class trying to sign in." + . " " + . "New subclasses of _WikiUser must override this function."); + return false; + } + + // returns page_handle to user's home page or false if none + function hasHomePage() + { + if ($this->_userid) { + if (!empty($this->_HomePagehandle) and is_object($this->_HomePagehandle)) { + return $this->_HomePagehandle->exists(); + } else { + // check db again (maybe someone else created it since + // we logged in.) + global $request; + $this->_HomePagehandle = $request->getPage($this->_userid); + return $this->_HomePagehandle->exists(); + } + } + // nope + return false; + } + + function createHomePage() + { + global $request; + $versiondata = array('author' => ADMIN_USER); + $request->_dbi->save(_("Automatically created user homepage to be able to store UserPreferences.") . + "\n{{Template/UserPage}}", + 1, $versiondata); + $request->_dbi->touch(); + $this->_HomePagehandle = $request->getPage($this->_userid); + } + + // innocent helper: case-insensitive position in _auth_methods + function array_position($string, $array) + { + $string = strtolower($string); + for ($found = 0; $found < count($array); $found++) { + if (strtolower($array[$found]) == $string) + return $found; + } + return false; + } + + function nextAuthMethodIndex() + { + if (empty($this->_auth_methods)) + $this->_auth_methods = $GLOBALS['USER_AUTH_ORDER']; + if (empty($this->_current_index)) { + if (strtolower(get_class($this)) != '_passuser') { + $this->_current_method = substr(get_class($this), 1, -8); + $this->_current_index = $this->array_position($this->_current_method, + $this->_auth_methods); + } else { + $this->_current_index = -1; + } + } + $this->_current_index++; + if ($this->_current_index >= count($this->_auth_methods)) + return false; + $this->_current_method = $this->_auth_methods[$this->_current_index]; + return $this->_current_index; + } + + function AuthMethod($index = false) + { + return $this->_auth_methods[$index === false + ? count($this->_auth_methods) - 1 + : $index]; + } + + // upgrade the user object + function nextClass() + { + $method = $this->AuthMethod($this->nextAuthMethodIndex()); + include_once("lib/WikiUser/$method.php"); + return "_" . $method . "PassUser"; + } + + //Fixme: for _HttpAuthPassUser + function PrintLoginForm(&$request, $args, $fail_message = false, + $separate_page = false) + { + include_once 'lib/Template.php'; + // Call update_locale in case the system's default language is not 'en'. + // (We have no user pref for lang at this point yet, no one is logged in.) + if ($GLOBALS['LANG'] != DEFAULT_LANGUAGE) + update_locale(DEFAULT_LANGUAGE); + $userid = $this->_userid; + $require_level = 0; + extract($args); // fixme + + $require_level = max(0, min(WIKIAUTH_ADMIN, (int)$require_level)); + + $pagename = $request->getArg('pagename'); + $nocache = 1; + $login = Template('login', + compact('pagename', 'userid', 'require_level', + 'fail_message', 'pass_required', 'nocache')); + // check if the html template was already processed + $separate_page = $separate_page ? true : !alreadyTemplateProcessed('html'); + if ($separate_page) { + $page = $request->getPage($pagename); + $revision = $page->getCurrentRevision(); + return GeneratePage($login, _("Sign In"), $revision); + } else { + return $login->printExpansion(); + } + } + + /** Signed in but not password checked or empty password. + */ + function isSignedIn() + { + return (isa($this, '_BogoUser') or isa($this, '_PassUser')); + } + + /** This is password checked for sure. + */ + function isAuthenticated() + { + //return isa($this,'_PassUser'); + //return isa($this,'_BogoUser') || isa($this,'_PassUser'); + return $this->_level >= WIKIAUTH_BOGO; + } + + function isAdmin() + { + static $group; + if ($this->_level == WIKIAUTH_ADMIN) return true; + if (!$this->isSignedIn()) return false; + if (!$this->isAuthenticated()) return false; + + if (!$group) $group = &$GLOBALS['request']->getGroup(); + return ($this->_level > WIKIAUTH_BOGO and $group->isMember(GROUP_ADMIN)); + } + + /** Name or IP for a signed user. UserName could come from a cookie e.g. + */ + function getId() + { + return ($this->UserName() + ? $this->UserName() + : $GLOBALS['request']->get('REMOTE_ADDR')); + } + + /** Name for an authenticated user. No IP here. + */ + function getAuthenticatedId() + { + return ($this->isAuthenticated() + ? $this->_userid + : ''); //$GLOBALS['request']->get('REMOTE_ADDR') ); + } + + function hasAuthority($require_level) + { + return $this->_level >= $require_level; + } + + /* This is quite restrictive and not according the login description online. + Any word char (A-Za-z0-9_), " ", ".", "@" and "-" + The backends may loosen or tighten this. + */ + function isValidName($userid = false) + { + if (!$userid) $userid = $this->_userid; + if (!$userid) return false; + if (defined('FUSIONFORGE') and FUSIONFORGE) { + return true; + } + return preg_match("/^[\-\w\.@ ]+$/U", $userid) and strlen($userid) < 32; + } + + /** + * Called on an auth_args POST request, such as login, logout or signin. + * TODO: Check BogoLogin users with empty password. (self-signed users) + */ + function AuthCheck($postargs) + { + // Normalize args, and extract. + $keys = array('userid', 'passwd', 'require_level', 'login', 'logout', + 'cancel'); + foreach ($keys as $key) + $args[$key] = isset($postargs[$key]) ? $postargs[$key] : false; + extract($args); + $require_level = max(0, min(WIKIAUTH_ADMIN, (int)$require_level)); + + if ($logout) { // Log out + if (LOGIN_LOG and is_writeable(LOGIN_LOG)) { + global $request; + $zone_offset = Request_AccessLogEntry::_zone_offset(); + $ncsa_time = date("d/M/Y:H:i:s", time()); + $entry = sprintf('%s - %s - [%s %s] "%s" %s - "%s" "%s"', + (string)$request->get('REMOTE_HOST'), + (string)$request->_user->_userid, + $ncsa_time, $zone_offset, + "logout " . get_class($request->_user), + "401", + (string)$request->get('HTTP_REFERER'), + (string)$request->get('HTTP_USER_AGENT') + ); + if (($fp = fopen(LOGIN_LOG, "a"))) { + flock($fp, LOCK_EX); + fputs($fp, "$entry\n"); + fclose($fp); + } + //error_log("$entry\n", 3, LOGIN_LOG); + } + if (method_exists($GLOBALS['request']->_user, "logout")) { //_HttpAuthPassUser + $GLOBALS['request']->_user->logout(); + } + $user = new _AnonUser(); + $user->_userid = ''; + $user->_level = WIKIAUTH_ANON; + return $user; + } elseif ($cancel) + return false; // User hit cancel button. + elseif (!$login && !$userid) + return false; // Nothing to do? + + if (!$this->isValidName($userid)) + return _("Invalid username."); + ; + + $authlevel = $this->checkPass($passwd === false ? '' : $passwd); + + if (LOGIN_LOG and is_writeable(LOGIN_LOG)) { + global $request; + $zone_offset = Request_AccessLogEntry::_zone_offset(); + $ncsa_time = date("d/M/Y:H:i:s", time()); + $manglepasswd = $passwd; + for ($i = 0; $i < strlen($manglepasswd); $i++) { + $c = substr($manglepasswd, $i, 1); + if (ord($c) < 32) $manglepasswd[$i] = "<"; + elseif ($c == '*') $manglepasswd[$i] = "*"; elseif ($c == '?') $manglepasswd[$i] = "?"; elseif ($c == '(') $manglepasswd[$i] = "("; elseif ($c == ')') $manglepasswd[$i] = ")"; elseif ($c == "\\") $manglepasswd[$i] = "\\"; elseif (ord($c) < 127) $manglepasswd[$i] = "x"; elseif (ord($c) >= 127) $manglepasswd[$i] = ">"; + } + if ((DEBUG & _DEBUG_LOGIN) and $authlevel <= 0) $manglepasswd = $passwd; + $entry = sprintf('%s - %s - [%s %s] "%s" %s - "%s" "%s"', + $request->get('REMOTE_HOST'), + (string)$request->_user->_userid, + $ncsa_time, $zone_offset, + "login $userid/$manglepasswd => $authlevel " . get_class($request->_user), + $authlevel > 0 ? "200" : "403", + (string)$request->get('HTTP_REFERER'), + (string)$request->get('HTTP_USER_AGENT') + ); + if (($fp = fopen(LOGIN_LOG, "a"))) { + flock($fp, LOCK_EX); + fputs($fp, "$entry\n"); + fclose($fp); + } + //error_log("$entry\n", 3, LOGIN_LOG); + } + + if ($authlevel <= 0) { // anon or forbidden + if ($passwd) + return _("Invalid password."); + else + return _("Invalid password or userid."); + } elseif ($authlevel < $require_level) { // auth ok, but not enough + if (!empty($this->_current_method) and strtolower(get_class($this)) == '_passuser') { + // upgrade class + $class = "_" . $this->_current_method . "PassUser"; + include_once 'lib/WikiUser/' . $this->_current_method . '.php'; + $user = new $class($userid, $this->_prefs); + $this->_level = $authlevel; + return $user; + } + $this->_userid = $userid; + $this->_level = $authlevel; + return _("Insufficient permissions."); + } + + // Successful login. + //$user = $GLOBALS['request']->_user; + if (!empty($this->_current_method) and + strtolower(get_class($this)) == '_passuser' + ) { + // upgrade class + $class = "_" . $this->_current_method . "PassUser"; + include_once 'lib/WikiUser/' . $this->_current_method . '.php'; + $user = new $class($userid, $this->_prefs); + $user->_level = $authlevel; + return $user; + } + $this->_userid = $userid; + $this->_level = $authlevel; + return $this; + } + +} + +/** + * Not authenticated in user, but he may be signed in. Basicly with view access only. + * prefs are stored in cookies, but only the userid. + */ +class _AnonUser + extends _WikiUser +{ + public $_level = WIKIAUTH_ANON; + + /** Anon only gets to load and save prefs in a cookie, that's it. + */ + function getPreferences() + { + global $request; + + if (empty($this->_prefs)) + $this->_prefs = new UserPreferences; + $UserName = $this->UserName(); + + // Try to read deprecated 1.3.x style cookies + if ($cookie = $request->cookies->get_old(WIKI_NAME)) { + if (!$unboxedcookie = $this->_prefs->retrieve($cookie)) { + trigger_error(_("Empty Preferences or format of UserPreferences cookie not recognised.") + . "\n" + . sprintf("%s='%s'", WIKI_NAME, $cookie) + . "\n" + . _("Default preferences will be used."), + E_USER_NOTICE); + } + /** + * Only set if it matches the UserName who is + * signing in or if this really is an Anon login (no + * username). (Remember, _BogoUser and higher inherit this + * function too!). + */ + if (!$UserName || $UserName == @$unboxedcookie['userid']) { + $this->_prefs->updatePrefs($unboxedcookie); + $UserName = @$unboxedcookie['userid']; + if (is_string($UserName) and (substr($UserName, 0, 2) != 's:')) + $this->_userid = $UserName; + else + $UserName = false; + } + // v1.3.8 policy: don't set PhpWiki cookies, only plaintext WIKI_ID cookies + if (!headers_sent()) + $request->deleteCookieVar(WIKI_NAME); + } + // Try to read deprecated 1.3.4 style cookies + if (!$UserName and ($cookie = $request->cookies->get_old("WIKI_PREF2"))) { + if (!$unboxedcookie = $this->_prefs->retrieve($cookie)) { + if (!$UserName || $UserName == $unboxedcookie['userid']) { + $this->_prefs->updatePrefs($unboxedcookie); + $UserName = $unboxedcookie['userid']; + if (is_string($UserName) and (substr($UserName, 0, 2) != 's:')) + $this->_userid = $UserName; + else + $UserName = false; + } + if (!headers_sent()) + $request->deleteCookieVar("WIKI_PREF2"); + } + } + if (!$UserName) { + // Try reading userid from old PhpWiki cookie formats: + if ($cookie = $request->cookies->get_old(getCookieName())) { + if (is_string($cookie) and (substr($cookie, 0, 2) != 's:')) + $UserName = $cookie; + elseif (is_array($cookie) and !empty($cookie['userid'])) + $UserName = $cookie['userid']; + } + if (!$UserName and !headers_sent()) + $request->deleteCookieVar(getCookieName()); + else + $this->_userid = $UserName; + } + + // initializeTheme() needs at least an empty object + /* + if (empty($this->_prefs)) + $this->_prefs = new UserPreferences; + */ + return $this->_prefs; + } + + /** _AnonUser::setPreferences(): Save prefs in a cookie and session and update all global vars + * + * Allow for multiple wikis in same domain. Encode only the + * _prefs array of the UserPreference object. Ideally the + * prefs array should just be imploded into a single string or + * something so it is completely human readable by the end + * user. In that case stricter error checking will be needed + * when loading the cookie. + */ + function setPreferences($prefs, $id_only = false) + { + if (!is_object($prefs)) { + if (is_object($this->_prefs)) { + $updated = $this->_prefs->updatePrefs($prefs); + $prefs =& $this->_prefs; + } else { + // update the prefs values from scratch. This could lead to unnecessary + // side-effects: duplicate emailVerified, ... + $this->_prefs = new UserPreferences($prefs); + $updated = true; + } + } else { + if (!isset($this->_prefs)) + $this->_prefs =& $prefs; + else + $updated = $this->_prefs->isChanged($prefs); + } + if ($updated) { + if ($id_only and !headers_sent()) { + global $request; + // new 1.3.8 policy: no array cookies, only plain userid string as in + // the pre 1.3.x versions. + // prefs should be stored besides the session in the homepagehandle or in a db. + $request->setCookieVar(getCookieName(), $this->_userid, + COOKIE_EXPIRATION_DAYS, COOKIE_DOMAIN); + //$request->setCookieVar(WIKI_NAME, array('userid' => $prefs->get('userid')), + // COOKIE_EXPIRATION_DAYS, COOKIE_DOMAIN); + } + } + if (is_object($prefs)) { + $packed = $prefs->store(); + $unpacked = $prefs->unpack($packed); + if (count($unpacked)) { + foreach (array('_method', '_select', '_update', '_insert') as $param) { + if (!empty($this->_prefs->{$param})) + $prefs->{$param} = $this->_prefs->{$param}; + } + $this->_prefs = $prefs; + } + } + return $updated; + } + + function userExists() + { + return true; + } + + function checkPass($submitted_password) + { + return false; + } + +} + +/** + * Helper class to finish the PassUser auth loop. + * This is added automatically to USER_AUTH_ORDER. + */ +class _ForbiddenUser + extends _AnonUser +{ + public $_level = WIKIAUTH_FORBIDDEN; + + function checkPass($submitted_password) + { + return WIKIAUTH_FORBIDDEN; + } + + function userExists() + { + if ($this->_HomePagehandle) return true; + return false; + } +} + +/** + * Do NOT extend _BogoUser to other classes, for checkPass() + * security. (In case of defects in code logic of the new class!) + * The intermediate step between anon and passuser. + * We also have the _BogoLoginPassUser class with stricter + * password checking, which fits into the auth loop. + * Note: This class is not called anymore by WikiUser() + */ +class _BogoUser + extends _AnonUser +{ + function userExists() + { + if (isWikiWord($this->_userid)) { + $this->_level = WIKIAUTH_BOGO; + return true; + } else { + $this->_level = WIKIAUTH_ANON; + return false; + } + } + + function checkPass($submitted_password) + { + // By definition, BogoUser has an empty password. + $this->userExists(); + return $this->_level; + } +} + +class _PassUser + extends _AnonUser + /** + * Called if ALLOW_USER_PASSWORDS and Anon and Bogo failed. + * + * The classes for all subsequent auth methods extend from this class. + * This handles the auth method type dispatcher according $USER_AUTH_ORDER, + * the three auth method policies first-only, strict and stacked + * and the two methods for prefs: homepage or database, + * if $DBAuthParams['pref_select'] is defined. + * + * Default is PersonalPage auth and prefs. + * + * @author: Reini Urban + * @tables: pref + */ +{ + public $_auth_dbi, $_prefs; + public $_current_method, $_current_index; + + // check and prepare the auth and pref methods only once + function _PassUser($UserName = '', $prefs = false) + { + //global $DBAuthParams, $DBParams; + if ($UserName) { + /*if (!$this->isValidName($UserName)) + return false;*/ + $this->_userid = $UserName; + if ($this->hasHomePage()) + $this->_HomePagehandle = $GLOBALS['request']->getPage($this->_userid); + } + $this->_authmethod = substr(get_class($this), 1, -8); + if ($this->_authmethod == 'a') $this->_authmethod = 'admin'; + + // Check the configured Prefs methods + $dbi = $this->getAuthDbh(); + $dbh = $GLOBALS['request']->getDbh(); + if ($dbi + and !$dbh->readonly + and !isset($this->_prefs->_select) + and $dbh->getAuthParam('pref_select') + ) { + if (!$this->_prefs) { + $this->_prefs = new UserPreferences(); + $need_pref = true; + } + $this->_prefs->_method = $dbh->getParam('dbtype'); + $this->_prefs->_select = $this->prepare($dbh->getAuthParam('pref_select'), "userid"); + // read-only prefs? + if (!isset($this->_prefs->_update) and $dbh->getAuthParam('pref_update')) { + $this->_prefs->_update = $this->prepare($dbh->getAuthParam('pref_update'), + array("userid", "pref_blob")); + } + } else { + if (!$this->_prefs) { + $this->_prefs = new UserPreferences(); + $need_pref = true; + } + $this->_prefs->_method = 'HomePage'; + } + + if (!$this->_prefs or isset($need_pref)) { + if ($prefs) $this->_prefs = $prefs; + else $this->getPreferences(); + } + + // Upgrade to the next parent _PassUser class. Avoid recursion. + if (strtolower(get_class($this)) === '_passuser') { + //auth policy: Check the order of the configured auth methods + // 1. first-only: Upgrade the class here in the constructor + // 2. old: ignore USER_AUTH_ORDER and try to use all available methods as + /// in the previous PhpWiki releases (slow) + // 3. strict: upgrade the class after checking the user existance in userExists() + // 4. stacked: upgrade the class after the password verification in checkPass() + // Methods: PersonalPage, HttpAuth, DB, Ldap, Imap, File + //if (!defined('USER_AUTH_POLICY')) define('USER_AUTH_POLICY','old'); + if (defined('USER_AUTH_POLICY')) { + // policy 1: only pre-define one method for all users + if (USER_AUTH_POLICY === 'first-only') { + $class = $this->nextClass(); + return new $class($UserName, $this->_prefs); + } // Use the default behaviour from the previous versions: + elseif (USER_AUTH_POLICY === 'old') { + // Default: try to be smart + // On php5 we can directly return and upgrade the Object, + // before we have to upgrade it manually. + if (!empty($GLOBALS['PHP_AUTH_USER']) or !empty($_SERVER['REMOTE_USER'])) { + include_once 'lib/WikiUser/HttpAuth.php'; + return new _HttpAuthPassUser($UserName, $this->_prefs); + } elseif (in_array('Db', $dbh->getAuthParam('USER_AUTH_ORDER')) and + $dbh->getAuthParam('auth_check') and + ($dbh->getAuthParam('auth_dsn') or $dbh->getParam('dsn')) + ) { + return new _DbPassUser($UserName, $this->_prefs); + } elseif (in_array('LDAP', $dbh->getAuthParam('USER_AUTH_ORDER')) and + defined('LDAP_AUTH_HOST') and defined('LDAP_BASE_DN') and + function_exists('ldap_connect') + ) { + include_once 'lib/WikiUser/LDAP.php'; + return new _LDAPPassUser($UserName, $this->_prefs); + } elseif (in_array('IMAP', $dbh->getAuthParam('USER_AUTH_ORDER')) and + defined('IMAP_AUTH_HOST') and function_exists('imap_open') + ) { + include_once 'lib/WikiUser/IMAP.php'; + return new _IMAPPassUser($UserName, $this->_prefs); + } elseif (in_array('File', $dbh->getAuthParam('USER_AUTH_ORDER')) and + defined('AUTH_USER_FILE') and file_exists(AUTH_USER_FILE) + ) { + include_once 'lib/WikiUser/File.php'; + return new _FilePassUser($UserName, $this->_prefs); + } else { + include_once 'lib/WikiUser/PersonalPage.php'; + return new _PersonalPagePassUser($UserName, $this->_prefs); + } + } else + // else use the page methods defined in _PassUser. + return $this; + } + } + } + + function getAuthDbh() + { + global $request; //, $DBParams, $DBAuthParams; + + $dbh = $request->getDbh(); + // session restauration doesn't re-connect to the database automatically, + // so dirty it here, to force a reconnect. + if (isset($this->_auth_dbi)) { + if (($dbh->getParam('dbtype') == 'SQL') and empty($this->_auth_dbi->connection)) + unset($this->_auth_dbi); + if (($dbh->getParam('dbtype') == 'ADODB') and empty($this->_auth_dbi->_connectionID)) + unset($this->_auth_dbi); + } + if (empty($this->_auth_dbi)) { + if ($dbh->getParam('dbtype') != 'SQL' + and $dbh->getParam('dbtype') != 'ADODB' + and $dbh->getParam('dbtype') != 'PDO' + ) + return false; + if (empty($GLOBALS['DBAuthParams'])) + return false; + if (!$dbh->getAuthParam('auth_dsn')) { + $dbh = $request->getDbh(); // use phpwiki database + } elseif ($dbh->getAuthParam('auth_dsn') == $dbh->getParam('dsn')) { + $dbh = $request->getDbh(); // same phpwiki database + } else { // use another external database handle. needs PHP >= 4.1 + $local_params = array_merge($GLOBALS['DBParams'], $GLOBALS['DBAuthParams']); + $local_params['dsn'] = $local_params['auth_dsn']; + $dbh = WikiDB::open($local_params); + } + $this->_auth_dbi =& $dbh->_backend->_dbh; + } + return $this->_auth_dbi; + } + + function _normalize_stmt_var($var, $oldstyle = false) + { + static $valid_variables = array('userid', 'password', 'pref_blob', 'groupname'); + // old-style: "'$userid'" + // new-style: '"\$userid"' or just "userid" + $new = str_replace(array("'", '"', '\$', '$'), '', $var); + if (!in_array($new, $valid_variables)) { + trigger_error("Unknown DBAuthParam statement variable: " . $new, E_USER_ERROR); + return false; + } + return !$oldstyle ? "'$" . $new . "'" : '\$' . $new; + } + + // TODO: use it again for the auth and member tables + // sprintfstyle vs prepare style: %s or ? + // multiple vars should be executed via prepare(?,?)+execute, + // single vars with execute(sprintf(quote(var))) + // help with position independency + function prepare($stmt, $variables, $oldstyle = false, $sprintfstyle = true) + { + global $request; + $dbi = $request->getDbh(); + $this->getAuthDbh(); + // "'\$userid"' => %s + // variables can be old-style: '"\$userid"' or new-style: "'$userid'" or just "userid" + // old-style strings don't survive pear/Config/IniConfig treatment, that's why we changed it. + $new = array(); + if (is_array($variables)) { + //$sprintfstyle = false; + for ($i = 0; $i < count($variables); $i++) { + $var = $this->_normalize_stmt_var($variables[$i], $oldstyle); + if (!$var) + trigger_error(sprintf("DbAuthParams: Undefined or empty statement variable %s in %s", + $variables[$i], $stmt), E_USER_WARNING); + $variables[$i] = $var; + if (!$var) $new[] = ''; + else { + $s = "%" . ($i + 1) . "s"; + $new[] = $sprintfstyle ? $s : "?"; + } + } + } else { + $var = $this->_normalize_stmt_var($variables, $oldstyle); + if (!$var) + trigger_error(sprintf("DbAuthParams: Undefined or empty statement variable %s in %s", + $variables, $stmt), E_USER_WARNING); + $variables = $var; + if (!$var) $new = ''; + else $new = $sprintfstyle ? '%s' : "?"; + } + $prefix = $dbi->getParam('prefix'); + // probably prefix table names if in same database + if ($prefix and isset($this->_auth_dbi) and isset($dbi->_backend->_dbh) and + ($dbi->getAuthParam('auth_dsn') and $dbi->getParam('dsn') == $dbi->getAuthParam('auth_dsn')) + ) { + if (!stristr($stmt, $prefix)) { + $oldstmt = $stmt; + $stmt = str_replace(array(" user ", " pref ", " member "), + array(" " . $prefix . "user ", + " " . $prefix . "pref ", + " " . $prefix . "member "), $stmt); + //Do it automatically for the lazy admin? Esp. on sf.net it's nice to have + trigger_error("Need to prefix the DBAUTH tablename in config/config.ini:\n $oldstmt \n=> $stmt", + E_USER_WARNING); + } + } + // Preparate the SELECT statement, for ADODB and PearDB (MDB not). + // Simple sprintf-style. + $new_stmt = str_replace($variables, $new, $stmt); + if ($new_stmt == $stmt) { + if ($oldstyle) { + trigger_error(sprintf("DbAuthParams: Invalid statement in %s", + $stmt), E_USER_WARNING); + } else { + trigger_error(sprintf("DbAuthParams: Old statement quoting style in %s", + $stmt), E_USER_WARNING); + $new_stmt = $this->prepare($stmt, $variables, 'oldstyle'); + } + } + return $new_stmt; + } + + function getPreferences() + { + if (!empty($this->_prefs->_method)) { + if ($this->_prefs->_method == 'ADODB') { + // FIXME: strange why this should be needed... + include_once 'lib/WikiUser/Db.php'; + include_once 'lib/WikiUser/AdoDb.php'; + return _AdoDbPassUser::getPreferences(); + } elseif ($this->_prefs->_method == 'SQL') { + include_once 'lib/WikiUser/Db.php'; + include_once 'lib/WikiUser/PearDb.php'; + return _PearDbPassUser::getPreferences(); + } elseif ($this->_prefs->_method == 'PDO') { + include_once 'lib/WikiUser/Db.php'; + include_once 'lib/WikiUser/PdoDb.php'; + return _PdoDbPassUser::getPreferences(); + } + } + + // We don't necessarily have to read the cookie first. Since + // the user has a password, the prefs stored in the homepage + // cannot be arbitrarily altered by other Bogo users. + _AnonUser::getPreferences(); + // User may have deleted cookie, retrieve from his + // PersonalPage if there is one. + if (!empty($this->_HomePagehandle)) { + if ($restored_from_page = $this->_prefs->retrieve + ($this->_HomePagehandle->get('pref')) + ) { + $this->_prefs->updatePrefs($restored_from_page, 'init'); + return $this->_prefs; + } + } + return $this->_prefs; + } + + function setPreferences($prefs, $id_only = false) + { + if (!empty($this->_prefs->_method)) { + if ($this->_prefs->_method == 'ADODB') { + // FIXME: strange why this should be needed... + include_once 'lib/WikiUser/Db.php'; + include_once 'lib/WikiUser/AdoDb.php'; + return _AdoDbPassUser::setPreferences($prefs, $id_only); + } elseif ($this->_prefs->_method == 'SQL') { + include_once 'lib/WikiUser/Db.php'; + include_once 'lib/WikiUser/PearDb.php'; + return _PearDbPassUser::setPreferences($prefs, $id_only); + } elseif ($this->_prefs->_method == 'PDO') { + include_once 'lib/WikiUser/Db.php'; + include_once 'lib/WikiUser/PdoDb.php'; + return _PdoDbPassUser::setPreferences($prefs, $id_only); + } + } + if ($updated = _AnonUser::setPreferences($prefs, $id_only)) { + // Encode only the _prefs array of the UserPreference object + // If no DB method exists to store the prefs we must store it in the page, not in the cookies. + if (empty($this->_HomePagehandle)) { + $this->_HomePagehandle = $GLOBALS['request']->getPage($this->_userid); + } + if (!$this->_HomePagehandle->exists()) { + $this->createHomePage(); + } + if (!empty($this->_HomePagehandle) and !$id_only) { + $this->_HomePagehandle->set('pref', $this->_prefs->store()); + } + } + return $updated; + } + + function mayChangePass() + { + return true; + } + + //The default method is getting the password from prefs. + // child methods obtain $stored_password from external auth. + function userExists() + { + //if ($this->_HomePagehandle) return true; + if (strtolower(get_class($this)) == "_passuser") { + $class = $this->nextClass(); + $user = new $class($this->_userid, $this->_prefs); + } else { + $user = $this; + } + /* new user => false does not return false, but the _userid is empty then */ + while ($user and $user->_userid) { + $user = UpgradeUser($this, $user); + if ($user->userExists()) { + $user = UpgradeUser($this, $user); + return true; + } + // prevent endless loop. does this work on all PHP's? + // it just has to set the classname, what it correctly does. + $class = $user->nextClass(); + if ($class == "_ForbiddenPassUser") + return false; + } + return false; + } + + //The default method is getting the password from prefs. + // child methods obtain $stored_password from external auth. + function checkPass($submitted_password) + { + $stored_password = $this->_prefs->get('passwd'); + if ($this->_checkPass($submitted_password, $stored_password)) { + $this->_level = WIKIAUTH_USER; + return $this->_level; + } else { + if ((USER_AUTH_POLICY === 'strict') and $this->userExists()) { + $this->_level = WIKIAUTH_FORBIDDEN; + return $this->_level; + } + return $this->_tryNextPass($submitted_password); + } + } + + function _checkPassLength($submitted_password) + { + if (strlen($submitted_password) < PASSWORD_LENGTH_MINIMUM) { + trigger_error(_("The length of the password is shorter than the system policy allows.")); + return false; + } + return true; + } + + /** + * The basic password checker for all PassUser objects. + * Uses global ENCRYPTED_PASSWD and PASSWORD_LENGTH_MINIMUM. + * Empty passwords are always false! + * PASSWORD_LENGTH_MINIMUM is enforced here and in the preference set method. + * @see UserPreferences::set + * + * DBPassUser password's have their own crypt definition. + * That's why DBPassUser::checkPass() doesn't call this method, if + * the db password method is 'plain', which means that the DB SQL + * statement just returns 1 or 0. To use CRYPT() or PASSWORD() and + * don't store plain passwords in the DB. + * + * TODO: remove crypt() function check from config.php:396 ?? + */ + function _checkPass($submitted_password, $stored_password) + { + if (!empty($submitted_password)) { + // This works only on plaintext passwords. + if (!ENCRYPTED_PASSWD and (strlen($stored_password) < PASSWORD_LENGTH_MINIMUM)) { + // With the EditMetaData plugin + trigger_error(_("The length of the stored password is shorter than the system policy allows. Sorry, you cannot login.\n You have to ask the System Administrator to reset your password.")); + return false; + } + if (!$this->_checkPassLength($submitted_password)) { + return false; + } + if (ENCRYPTED_PASSWD) { + // Verify against encrypted password. + if (function_exists('crypt')) { + if (crypt($submitted_password, $stored_password) == $stored_password) + return true; // matches encrypted password + else + return false; + } else { + trigger_error(_("The crypt function is not available in this version of PHP.") . " " + . _("Please set ENCRYPTED_PASSWD to false in config/config.ini and probably change ADMIN_PASSWD."), + E_USER_WARNING); + return false; + } + } else { + // Verify against cleartext password. + if ($submitted_password == $stored_password) + return true; + else { + // Check whether we forgot to enable ENCRYPTED_PASSWD + if (function_exists('crypt')) { + if (crypt($submitted_password, $stored_password) == $stored_password) { + trigger_error(_("Please set ENCRYPTED_PASSWD to true in config/config.ini."), + E_USER_WARNING); + return true; + } + } + } + } + } + return false; + } + + /** The default method is storing the password in prefs. + * Child methods (DB, File) may store in external auth also, but this + * must be explicitly enabled. + * This may be called by plugin/UserPreferences or by ->SetPreferences() + */ + function changePass($submitted_password) + { + $stored_password = $this->_prefs->get('passwd'); + // check if authenticated + if (!$this->isAuthenticated()) return false; + if (ENCRYPTED_PASSWD) { + $submitted_password = crypt($submitted_password); + } + // check other restrictions, with side-effects only. + $result = $this->_checkPass($submitted_password, $stored_password); + if ($stored_password != $submitted_password) { + $this->_prefs->set('passwd', $submitted_password); + //update the storage (session, homepage, ...) + $this->SetPreferences($this->_prefs); + return true; + } + //Todo: return an error msg to the caller what failed? + // same password or no privilege + return ENCRYPTED_PASSWD ? true : false; + } + + function _tryNextPass($submitted_password) + { + if (DEBUG & _DEBUG_LOGIN) { + $class = strtolower(get_class($this)); + if (substr($class, -10) == "dbpassuser") $class = "_dbpassuser"; + $GLOBALS['USER_AUTH_ERROR'][$class] = 'wrongpass'; + } + if (USER_AUTH_POLICY === 'strict') { + $class = $this->nextClass(); + if ($user = new $class($this->_userid, $this->_prefs)) { + if ($user->userExists()) { + return $user->checkPass($submitted_password); + } + } + } + if (USER_AUTH_POLICY === 'stacked' or USER_AUTH_POLICY === 'old') { + $class = $this->nextClass(); + if ($user = new $class($this->_userid, $this->_prefs)) + return $user->checkPass($submitted_password); + } + return $this->_level; + } + + function _tryNextUser() + { + if (DEBUG & _DEBUG_LOGIN) { + $class = strtolower(get_class($this)); + if (substr($class, -10) == "dbpassuser") $class = "_dbpassuser"; + $GLOBALS['USER_AUTH_ERROR'][$class] = 'nosuchuser'; + } + if (USER_AUTH_POLICY === 'strict' + or USER_AUTH_POLICY === 'stacked' + ) { + $class = $this->nextClass(); + while ($user = new $class($this->_userid, $this->_prefs)) { + $user = UpgradeUser($this, $user); + if ($user->userExists()) { + $user = UpgradeUser($this, $user); + return true; + } + if ($class == "_ForbiddenPassUser") return false; + $class = $this->nextClass(); + } + } + return false; + } + +} + +/** + * Insert more auth classes here... + * For example a customized db class for another db connection + * or a socket-based auth server. + * + */ + +/** + * For security, this class should not be extended. Instead, extend + * from _PassUser (think of this as unix "root"). + * + * FIXME: This should be a singleton class. Only ADMIN_USER may be of class AdminUser! + * Other members of the Administrators group must raise their level otherwise somehow. + * Currently every member is a AdminUser, which will not work for the various + * storage methods. + */ +class _AdminUser + extends _PassUser +{ + function mayChangePass() + { + return false; + } + + function checkPass($submitted_password) + { + if ($this->_userid == ADMIN_USER) + $stored_password = ADMIN_PASSWD; + else { + // Should not happen! Only ADMIN_USER should use this class. + // return $this->_tryNextPass($submitted_password);... [truncated message content] |
From: <var...@us...> - 2014-09-30 16:39:39
|
Revision: 9139 http://sourceforge.net/p/phpwiki/code/9139 Author: vargenau Date: 2014-09-30 16:39:29 +0000 (Tue, 30 Sep 2014) Log Message: ----------- Add missing images in Sidebar theme Modified Paths: -------------- trunk/pgsrc/ReleaseNotes Added Paths: ----------- trunk/themes/Sidebar/images/bulletLoading.gif trunk/themes/Sidebar/images/discussionitem_icon.png trunk/themes/Sidebar/images/file_icon.png trunk/themes/Sidebar/images/lock_icon.png trunk/themes/Sidebar/images/mail_icon.png trunk/themes/Sidebar/images/news_icon.png trunk/themes/Sidebar/images/url.png Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2014-09-30 16:31:24 UTC (rev 9138) +++ trunk/pgsrc/ReleaseNotes 2014-09-30 16:39:29 UTC (rev 9139) @@ -1,4 +1,4 @@ -Date: Fri, 26 Sep 2014 19:00:59 +0000 +Date: Tue, 30 Sep 2014 18:38:39 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -20,6 +20,8 @@ * fix Bug#646 Wrong number of links in BackLinks * make <includeonly> work * remove old WikiUser code (ENABLE_USER_NEW) +* admin always has rights to see and modify pages, regardless of ACLs, to avoid locking himself out +* add missing images in Sidebar theme == 1.5.0 2014-07-29 Marc-Etienne Vargenau == Added: trunk/themes/Sidebar/images/bulletLoading.gif =================================================================== (Binary files differ) Index: trunk/themes/Sidebar/images/bulletLoading.gif =================================================================== --- trunk/themes/Sidebar/images/bulletLoading.gif 2014-09-30 16:31:24 UTC (rev 9138) +++ trunk/themes/Sidebar/images/bulletLoading.gif 2014-09-30 16:39:29 UTC (rev 9139) Property changes on: trunk/themes/Sidebar/images/bulletLoading.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/gif \ No newline at end of property Added: trunk/themes/Sidebar/images/discussionitem_icon.png =================================================================== (Binary files differ) Index: trunk/themes/Sidebar/images/discussionitem_icon.png =================================================================== --- trunk/themes/Sidebar/images/discussionitem_icon.png 2014-09-30 16:31:24 UTC (rev 9138) +++ trunk/themes/Sidebar/images/discussionitem_icon.png 2014-09-30 16:39:29 UTC (rev 9139) Property changes on: trunk/themes/Sidebar/images/discussionitem_icon.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/themes/Sidebar/images/file_icon.png =================================================================== (Binary files differ) Index: trunk/themes/Sidebar/images/file_icon.png =================================================================== --- trunk/themes/Sidebar/images/file_icon.png 2014-09-30 16:31:24 UTC (rev 9138) +++ trunk/themes/Sidebar/images/file_icon.png 2014-09-30 16:39:29 UTC (rev 9139) Property changes on: trunk/themes/Sidebar/images/file_icon.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/themes/Sidebar/images/lock_icon.png =================================================================== (Binary files differ) Index: trunk/themes/Sidebar/images/lock_icon.png =================================================================== --- trunk/themes/Sidebar/images/lock_icon.png 2014-09-30 16:31:24 UTC (rev 9138) +++ trunk/themes/Sidebar/images/lock_icon.png 2014-09-30 16:39:29 UTC (rev 9139) Property changes on: trunk/themes/Sidebar/images/lock_icon.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/themes/Sidebar/images/mail_icon.png =================================================================== (Binary files differ) Index: trunk/themes/Sidebar/images/mail_icon.png =================================================================== --- trunk/themes/Sidebar/images/mail_icon.png 2014-09-30 16:31:24 UTC (rev 9138) +++ trunk/themes/Sidebar/images/mail_icon.png 2014-09-30 16:39:29 UTC (rev 9139) Property changes on: trunk/themes/Sidebar/images/mail_icon.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/themes/Sidebar/images/news_icon.png =================================================================== (Binary files differ) Index: trunk/themes/Sidebar/images/news_icon.png =================================================================== --- trunk/themes/Sidebar/images/news_icon.png 2014-09-30 16:31:24 UTC (rev 9138) +++ trunk/themes/Sidebar/images/news_icon.png 2014-09-30 16:39:29 UTC (rev 9139) Property changes on: trunk/themes/Sidebar/images/news_icon.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property Added: trunk/themes/Sidebar/images/url.png =================================================================== (Binary files differ) Index: trunk/themes/Sidebar/images/url.png =================================================================== --- trunk/themes/Sidebar/images/url.png 2014-09-30 16:31:24 UTC (rev 9138) +++ trunk/themes/Sidebar/images/url.png 2014-09-30 16:39:29 UTC (rev 9139) Property changes on: trunk/themes/Sidebar/images/url.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +image/png \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-10-02 14:40:04
|
Revision: 9161 http://sourceforge.net/p/phpwiki/code/9161 Author: vargenau Date: 2014-10-02 14:39:40 +0000 (Thu, 02 Oct 2014) Log Message: ----------- Set version to 1.5.1 Modified Paths: -------------- trunk/INSTALL trunk/Makefile trunk/config/phpwiki.spec trunk/lib/prepend.php trunk/locale/de/LC_MESSAGES/phpwiki.mo trunk/locale/de/pgsrc/%C3%84hnlicheSeiten trunk/locale/de/pgsrc/AlleBenutzer trunk/locale/de/pgsrc/AlleSeiten trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir trunk/locale/de/pgsrc/BackLinks trunk/locale/de/pgsrc/BenutzerEinstellungen trunk/locale/de/pgsrc/DebugAuthInfo trunk/locale/de/pgsrc/DebugGruppenInfo trunk/locale/de/pgsrc/DebugInfo trunk/locale/de/pgsrc/EditiereText trunk/locale/de/pgsrc/Einstellungen trunk/locale/de/pgsrc/FuzzySuche trunk/locale/de/pgsrc/G%C3%A4steBuch trunk/locale/de/pgsrc/GaesteBuch trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen trunk/locale/de/pgsrc/GleicheSeiten trunk/locale/de/pgsrc/Hilfe trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin trunk/locale/de/pgsrc/Hilfe%2FGuterStil trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow trunk/locale/de/pgsrc/Hilfe%2FPhpWiki trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin trunk/locale/de/pgsrc/Hilfe%2FWabiSabi trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb trunk/locale/de/pgsrc/HochLaden trunk/locale/de/pgsrc/InterWikiListe trunk/locale/de/pgsrc/KategorieAktionSeite trunk/locale/de/pgsrc/KategorieKategorie trunk/locale/de/pgsrc/KategorieWikiPlugin trunk/locale/de/pgsrc/LinkSuche trunk/locale/de/pgsrc/ListeRelationen trunk/locale/de/pgsrc/ListeSeiten trunk/locale/de/pgsrc/MeistBesucht trunk/locale/de/pgsrc/ModerierteSeite trunk/locale/de/pgsrc/NeueSeite trunk/locale/de/pgsrc/Neueste%C3%84nderungen trunk/locale/de/pgsrc/NeuesteSeiten trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen trunk/locale/de/pgsrc/PhpWikiDokumentation trunk/locale/de/pgsrc/PhpWikiSystemverwalten trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FUmbenennen trunk/locale/de/pgsrc/PhpWikiUmfrage trunk/locale/de/pgsrc/SandKasten trunk/locale/de/pgsrc/SandKiste trunk/locale/de/pgsrc/SeiteBeobarten trunk/locale/de/pgsrc/SeiteFinden trunk/locale/de/pgsrc/SeiteSpeichern trunk/locale/de/pgsrc/SeitenErzeugen trunk/locale/de/pgsrc/SeitenInfo trunk/locale/de/pgsrc/SeitenProtokoll trunk/locale/de/pgsrc/SemantischeRelationen trunk/locale/de/pgsrc/SemantischeSuche trunk/locale/de/pgsrc/StartSeite trunk/locale/de/pgsrc/StartSeiteAlias trunk/locale/de/pgsrc/TitelSuche trunk/locale/de/pgsrc/UpLoad trunk/locale/de/pgsrc/Verlinkte%C3%84nderungen trunk/locale/de/pgsrc/VerwaisteSeiten trunk/locale/de/pgsrc/VolltextSuche trunk/locale/de/pgsrc/Vorlage%2FBeispiel trunk/locale/de/pgsrc/WerIstOnline trunk/locale/de/pgsrc/WikiAdminAuswahl trunk/locale/de/pgsrc/WunschZettelSeiten trunk/locale/de/pgsrc/ZufallsSeite trunk/locale/es/LC_MESSAGES/phpwiki.mo trunk/locale/es/pgsrc/Ayuda trunk/locale/es/pgsrc/Ayuda%2FAgregarPaginas trunk/locale/es/pgsrc/Ayuda%2FBuenEstilo trunk/locale/es/pgsrc/Ayuda%2FComoUsarWiki trunk/locale/es/pgsrc/Ayuda%2FEditarElTexto trunk/locale/es/pgsrc/Ayuda%2FKBrown trunk/locale/es/pgsrc/Ayuda%2FMasAcercadeLaMecanica trunk/locale/es/pgsrc/Ayuda%2FPhpWiki trunk/locale/es/pgsrc/Ayuda%2FReglasDeFormatoDeTexto trunk/locale/es/pgsrc/Ayuda%2FWabiSabi trunk/locale/es/pgsrc/Ayuda%2FWikiWikiWeb trunk/locale/es/pgsrc/BuscarP%C3%A1gina trunk/locale/es/pgsrc/CajaDeArena trunk/locale/es/pgsrc/CambiosRecientes trunk/locale/es/pgsrc/MasPopulares trunk/locale/es/pgsrc/P%C3%A1ginaPrincipal trunk/locale/es/pgsrc/TodasLasPaginas trunk/locale/es/pgsrc/VisitantesRecientes trunk/locale/fr/LC_MESSAGES/phpwiki.mo trunk/locale/fr/pgsrc/%C3%89diterLesMetaDonn%C3%A9es trunk/locale/fr/pgsrc/%C3%89ditionsR%C3%A9centes trunk/locale/fr/pgsrc/AdministrationDePhpWiki trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FChown trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FD%C3%A9finirAcl trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRechercherRemplacer trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FRenommer trunk/locale/fr/pgsrc/AdministrationDePhpWiki%2FSupprimer trunk/locale/fr/pgsrc/Aide trunk/locale/fr/pgsrc/Aide%2F%C3%89diterLeContenu trunk/locale/fr/pgsrc/Aide%2FAjouterDesPages trunk/locale/fr/pgsrc/Aide%2FCommentUtiliserUnWiki trunk/locale/fr/pgsrc/Aide%2FD%C3%A9tailsTechniques trunk/locale/fr/pgsrc/Aide%2FIc%C3%B4nesDeLien trunk/locale/fr/pgsrc/Aide%2FInterWiki trunk/locale/fr/pgsrc/Aide%2FLienGoogle trunk/locale/fr/pgsrc/Aide%2FPhpWiki trunk/locale/fr/pgsrc/Aide%2FPlugin%C3%89diterMetaData trunk/locale/fr/pgsrc/Aide%2FPluginAjouterDesCommentaires trunk/locale/fr/pgsrc/Aide%2FPluginAlbumPhotos trunk/locale/fr/pgsrc/Aide%2FPluginBeauTableau trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde trunk/locale/fr/pgsrc/Aide%2FPluginCalendrier trunk/locale/fr/pgsrc/Aide%2FPluginColorationPhp trunk/locale/fr/pgsrc/Aide%2FPluginCommenter trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUnePage trunk/locale/fr/pgsrc/Aide%2FPluginCr%C3%A9erUneTdm trunk/locale/fr/pgsrc/Aide%2FPluginHistoriqueAuteur trunk/locale/fr/pgsrc/Aide%2FPluginHtmlPur trunk/locale/fr/pgsrc/Aide%2FPluginInclureUnePage trunk/locale/fr/pgsrc/Aide%2FPluginInfosSyst%C3%A8me trunk/locale/fr/pgsrc/Aide%2FPluginIns%C3%A9rer trunk/locale/fr/pgsrc/Aide%2FPluginListeDesSousPages trunk/locale/fr/pgsrc/Aide%2FPluginListeDuCalendrier trunk/locale/fr/pgsrc/Aide%2FPluginM%C3%A9t%C3%A9oPhp trunk/locale/fr/pgsrc/Aide%2FPluginRechercheExterne trunk/locale/fr/pgsrc/Aide%2FPluginRedirection trunk/locale/fr/pgsrc/Aide%2FPluginRessourcesRss trunk/locale/fr/pgsrc/Aide%2FPluginTableauAncienStyle trunk/locale/fr/pgsrc/Aide%2FPluginTeX2png trunk/locale/fr/pgsrc/Aide%2FPluginTestDeCache trunk/locale/fr/pgsrc/Aide%2FPluginWiki trunk/locale/fr/pgsrc/Aide%2FPluginWikiBlog trunk/locale/fr/pgsrc/Aide%2FR%C3%A8glesDeFormatageDesTextes trunk/locale/fr/pgsrc/Aide%2FSteve%20Wainstead trunk/locale/fr/pgsrc/Aide%2FStyleCorrect trunk/locale/fr/pgsrc/Aide%2FURLMagiquesPhpWiki trunk/locale/fr/pgsrc/Aide%2FWabiSabi trunk/locale/fr/pgsrc/Aide%2FWikiWikiWeb trunk/locale/fr/pgsrc/AliasAccueil trunk/locale/fr/pgsrc/Bac%C3%80Sable trunk/locale/fr/pgsrc/CarteInterWiki trunk/locale/fr/pgsrc/Cat%C3%A9gorieCat%C3%A9gorie trunk/locale/fr/pgsrc/Cat%C3%A9gorieGroupes trunk/locale/fr/pgsrc/Cat%C3%A9goriePageDAction trunk/locale/fr/pgsrc/Cat%C3%A9goriePagesAccueil trunk/locale/fr/pgsrc/Cat%C3%A9goriePluginWiki trunk/locale/fr/pgsrc/ChangementsLi%C3%A9s trunk/locale/fr/pgsrc/ChercherUnePage trunk/locale/fr/pgsrc/ClassezLa trunk/locale/fr/pgsrc/CommentairesR%C3%A9cents trunk/locale/fr/pgsrc/Cr%C3%A9erUnePage trunk/locale/fr/pgsrc/D%C3%A9poserUnFichier trunk/locale/fr/pgsrc/Derni%C3%A8resModifs trunk/locale/fr/pgsrc/Derni%C3%A8resModifsCompl%C3%A8tes trunk/locale/fr/pgsrc/DerniersVisiteurs trunk/locale/fr/pgsrc/DocumentationDePhpWiki trunk/locale/fr/pgsrc/GestionDesPlugins trunk/locale/fr/pgsrc/HistoriqueDeLaPage trunk/locale/fr/pgsrc/InfosAuthentification trunk/locale/fr/pgsrc/InfosDeD%C3%A9bogage trunk/locale/fr/pgsrc/InfosSurLaPage trunk/locale/fr/pgsrc/LesPlusVisit%C3%A9es trunk/locale/fr/pgsrc/ListeDePages trunk/locale/fr/pgsrc/ManuelPhpWiki trunk/locale/fr/pgsrc/ModifsR%C3%A9centesPhpWiki trunk/locale/fr/pgsrc/NotesDeVersion trunk/locale/fr/pgsrc/PageAccueil trunk/locale/fr/pgsrc/PageAl%C3%A9atoire trunk/locale/fr/pgsrc/PagesFloues trunk/locale/fr/pgsrc/PagesOrphelines trunk/locale/fr/pgsrc/PagesRecherch%C3%A9es trunk/locale/fr/pgsrc/PagesSemblables trunk/locale/fr/pgsrc/PierrickMeignen trunk/locale/fr/pgsrc/Pr%C3%A9f%C3%A9rencesUtilisateurs trunk/locale/fr/pgsrc/QuiEstEnLigne trunk/locale/fr/pgsrc/R%C3%A9cup%C3%A9rationDeLaPage trunk/locale/fr/pgsrc/R%C3%A9troLiens trunk/locale/fr/pgsrc/RechercheEnTexteInt%C3%A9gral trunk/locale/fr/pgsrc/RechercheInterWiki trunk/locale/fr/pgsrc/RechercheParTitre trunk/locale/fr/pgsrc/SommaireDuProjet trunk/locale/fr/pgsrc/SondagePhpWiki trunk/locale/fr/pgsrc/Suivre trunk/locale/fr/pgsrc/TousLesUtilisateurs trunk/locale/fr/pgsrc/ToutesLesPages trunk/locale/fr/pgsrc/TraduireUnTexte trunk/locale/fr/pgsrc/VersionsR%C3%A9centes trunk/locale/fr/pgsrc/VisiteursR%C3%A9cents trunk/locale/it/LC_MESSAGES/phpwiki.mo trunk/locale/it/pgsrc/Aiuto trunk/locale/it/pgsrc/Aiuto%2FAggiungerePagine trunk/locale/it/pgsrc/Aiuto%2FBuonStile trunk/locale/it/pgsrc/Aiuto%2FComeUsareWiki trunk/locale/it/pgsrc/Aiuto%2FMagicPhpWikiURLs trunk/locale/it/pgsrc/Aiuto%2FModificaIlTesto trunk/locale/it/pgsrc/Aiuto%2FPhpWiki trunk/locale/it/pgsrc/Aiuto%2FRegoleFormattazioneTesto trunk/locale/it/pgsrc/Aiuto%2FVarieSulFunzionamento trunk/locale/it/pgsrc/Aiuto%2FWabiSabi trunk/locale/it/pgsrc/Aiuto%2FWikiWikiWeb trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki trunk/locale/it/pgsrc/AmministrazioneDiPhpWiki%2FRimuovi trunk/locale/it/pgsrc/CambiamentiRecenti trunk/locale/it/pgsrc/FuzzyPages trunk/locale/it/pgsrc/NoteDiRilascio trunk/locale/it/pgsrc/PaginaDiProva trunk/locale/it/pgsrc/PaginaPrincipale trunk/locale/it/pgsrc/PiuPopolari trunk/locale/it/pgsrc/RicercaDelTesto trunk/locale/it/pgsrc/RicercaSuTutto trunk/locale/it/pgsrc/ScatolaDiSabbia trunk/locale/it/pgsrc/SteveWainstead trunk/locale/it/pgsrc/TrovaPagina trunk/locale/it/pgsrc/TutteLePagine trunk/locale/it/pgsrc/VisitatoriRecenti trunk/locale/ja/LC_MESSAGES/phpwiki.mo trunk/locale/ja/pgsrc/%E3%83%9A%E3%83%BC%E3%82%B8%E6%A4%9C%E7%B4%A2 trunk/locale/ja/pgsrc/%E3%83%9B%E3%83%BC%E3%83%A0%E3%83%9A%E3%83%BC%E3%82%B8 trunk/locale/nl/LC_MESSAGES/phpwiki.mo trunk/locale/nl/pgsrc/Help trunk/locale/nl/pgsrc/Help%2FGebruikersVoorkeuren trunk/locale/nl/pgsrc/Help%2FGoedeStijl trunk/locale/nl/pgsrc/Help%2FHoeWikiTeGebruiken trunk/locale/nl/pgsrc/Help%2FJanNieuwenhuizen trunk/locale/nl/pgsrc/Help%2FMeerOverTechnieken trunk/locale/nl/pgsrc/Help%2FPaginasToevoegen trunk/locale/nl/pgsrc/Help%2FPhpWiki trunk/locale/nl/pgsrc/Help%2FRecenteBezoekers trunk/locale/nl/pgsrc/Help%2FTekstFormatteringsRegels trunk/locale/nl/pgsrc/Help%2FToverPhpWikiURLs trunk/locale/nl/pgsrc/Help%2FVeranderTekst trunk/locale/nl/pgsrc/Help%2FWabiSabi trunk/locale/nl/pgsrc/Help%2FWikiWikiWeb trunk/locale/nl/pgsrc/MeestBezocht trunk/locale/nl/pgsrc/PhpWikiBeheer trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVervangt trunk/locale/nl/pgsrc/PhpWikiBeheer%2FVerwijder trunk/locale/nl/pgsrc/RecenteVeranderingen trunk/locale/nl/pgsrc/ThuisPagina trunk/locale/nl/pgsrc/UitgaveNoten trunk/locale/nl/pgsrc/ZandBak trunk/locale/nl/pgsrc/ZoekPagina 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/phpwiki.pot trunk/locale/po/sv.po trunk/locale/po/zh.po trunk/locale/sv/LC_MESSAGES/phpwiki.mo trunk/locale/sv/pgsrc/Framsida trunk/locale/sv/pgsrc/Hj%C3%A4lp trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FG%C3%A4stboken trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FHurManAnv%C3%A4nderWiki trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FL%C3%A4ggaTillSidor trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FMerOmMekanismerna trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FPhpWiki trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FRedigeraText trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FTextformateringsregler trunk/locale/sv/pgsrc/Hj%C3%A4lp%2FWikiWikiWeb trunk/locale/sv/pgsrc/MestPopul%C3%A4r trunk/locale/sv/pgsrc/PhpWikiAdministration trunk/locale/sv/pgsrc/S%C3%B6kEfterSida trunk/locale/sv/pgsrc/Sandl%C3%A5dan trunk/locale/sv/pgsrc/Senaste%C3%84ndringar trunk/locale/zh/LC_MESSAGES/phpwiki.mo trunk/locale/zh/pgsrc/%E9%A6%96%E9%A0%81 trunk/locale/zh/pgsrc/AllPages trunk/locale/zh/pgsrc/AllUsers trunk/locale/zh/pgsrc/BackLinks trunk/locale/zh/pgsrc/DebugInfo trunk/locale/zh/pgsrc/FindPage trunk/locale/zh/pgsrc/FullRecentChanges trunk/locale/zh/pgsrc/FullTextSearch trunk/locale/zh/pgsrc/FuzzyPages trunk/locale/zh/pgsrc/Help trunk/locale/zh/pgsrc/Help%2FAddingPages trunk/locale/zh/pgsrc/Help%2FCalendarPlugin trunk/locale/zh/pgsrc/Help%2FCommentPlugin trunk/locale/zh/pgsrc/Help%2FEditText trunk/locale/zh/pgsrc/Help%2FExternalSearchPlugin trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin trunk/locale/zh/pgsrc/Help%2FHowToUseWiki trunk/locale/zh/pgsrc/Help%2FInterWiki trunk/locale/zh/pgsrc/Help%2FLinkIcons trunk/locale/zh/pgsrc/Help%2FMagicPhpWikiURLs trunk/locale/zh/pgsrc/Help%2FMoreAboutMechanics trunk/locale/zh/pgsrc/Help%2FOldStyleTablePlugin trunk/locale/zh/pgsrc/Help%2FPhotoAlbumPlugin trunk/locale/zh/pgsrc/Help%2FPhpHighlightPlugin trunk/locale/zh/pgsrc/Help%2FPhpWeatherPlugin trunk/locale/zh/pgsrc/Help%2FPhpWiki trunk/locale/zh/pgsrc/Help%2FRedirectToPlugin trunk/locale/zh/pgsrc/Help%2FSystemInfoPlugin trunk/locale/zh/pgsrc/Help%2FTranscludePlugin trunk/locale/zh/pgsrc/Help%2FWikiPlugin trunk/locale/zh/pgsrc/Help%2FWikiWikiWeb trunk/locale/zh/pgsrc/HomePage trunk/locale/zh/pgsrc/HomePageAlias trunk/locale/zh/pgsrc/InterWikiMap trunk/locale/zh/pgsrc/InterWikiSearch trunk/locale/zh/pgsrc/LikePages trunk/locale/zh/pgsrc/OrphanedPages trunk/locale/zh/pgsrc/PageDump trunk/locale/zh/pgsrc/PhpWikiAdministration trunk/locale/zh/pgsrc/RandomPage trunk/locale/zh/pgsrc/RecentChanges trunk/locale/zh/pgsrc/RecentEdits trunk/locale/zh/pgsrc/RecentVisitors trunk/locale/zh/pgsrc/SandBox trunk/locale/zh/pgsrc/TitleSearch trunk/locale/zh/pgsrc/UpLoad trunk/locale/zh/pgsrc/UserPreferences trunk/locale/zh/pgsrc/WantedPages trunk/pgsrc/AllPages trunk/pgsrc/AllPagesByAcl trunk/pgsrc/AllPagesCreatedByMe trunk/pgsrc/AllPagesLastEditedByMe trunk/pgsrc/AllPagesOwnedByMe trunk/pgsrc/AllUserPages trunk/pgsrc/AllUsers trunk/pgsrc/AppendText trunk/pgsrc/AuthorHistory trunk/pgsrc/BackLinks trunk/pgsrc/BlogArchives trunk/pgsrc/BlogJournal trunk/pgsrc/CategoryActionPage trunk/pgsrc/CategoryCategory trunk/pgsrc/CategoryGroup trunk/pgsrc/CategoryHomePages trunk/pgsrc/CategoryWikiPlugin trunk/pgsrc/CreatePage trunk/pgsrc/DebugAuthInfo trunk/pgsrc/DebugBackendInfo trunk/pgsrc/DebugGroupInfo trunk/pgsrc/DebugInfo trunk/pgsrc/EditMetaData trunk/pgsrc/FindPage trunk/pgsrc/FullRecentChanges trunk/pgsrc/FullTextSearch trunk/pgsrc/FuzzyPages trunk/pgsrc/Help trunk/pgsrc/Help%2FActionPage trunk/pgsrc/Help%2FAddCommentPlugin trunk/pgsrc/Help%2FAddingPages trunk/pgsrc/Help%2FAdobe%20Flash trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users trunk/pgsrc/Help%2FAllPagesPlugin trunk/pgsrc/Help%2FAllUsersPlugin trunk/pgsrc/Help%2FAnalyseAccessLogSqlPlugin trunk/pgsrc/Help%2FAppendTextPlugin trunk/pgsrc/Help%2FAsciiMathPlugin trunk/pgsrc/Help%2FAsciiSVGPlugin trunk/pgsrc/Help%2FAtomFeedPlugin trunk/pgsrc/Help%2FAuthorHistoryPlugin trunk/pgsrc/Help%2FBackLinksPlugin trunk/pgsrc/Help%2FBlogArchivesPlugin trunk/pgsrc/Help%2FBlogJournalPlugin trunk/pgsrc/Help%2FBoxRightPlugin trunk/pgsrc/Help%2FCacheTestPlugin trunk/pgsrc/Help%2FCalendarListPlugin trunk/pgsrc/Help%2FCalendarPlugin trunk/pgsrc/Help%2FCategories trunk/pgsrc/Help%2FCategoryPagePlugin trunk/pgsrc/Help%2FChartPlugin trunk/pgsrc/Help%2FCommentPlugin trunk/pgsrc/Help%2FCreateBibPlugin trunk/pgsrc/Help%2FCreatePagePlugin trunk/pgsrc/Help%2FCreateTocPlugin trunk/pgsrc/Help%2FCurrentTimePlugin trunk/pgsrc/Help%2FDeadEndPagesPlugin trunk/pgsrc/Help%2FDebugAuthInfoPlugin trunk/pgsrc/Help%2FDebugBackendInfoPlugin trunk/pgsrc/Help%2FDebugGroupInfoPlugin trunk/pgsrc/Help%2FDiffPlugin trunk/pgsrc/Help%2FDynamicIncludePagePlugin trunk/pgsrc/Help%2FEditMetaDataPlugin trunk/pgsrc/Help%2FEditText trunk/pgsrc/Help%2FExternalSearchPlugin trunk/pgsrc/Help%2FFacebookLikePlugin trunk/pgsrc/Help%2FFileInfoPlugin trunk/pgsrc/Help%2FFoafViewerPlugin trunk/pgsrc/Help%2FFullTextSearchPlugin trunk/pgsrc/Help%2FFuzzyPagesPlugin trunk/pgsrc/Help%2FGoToPlugin trunk/pgsrc/Help%2FGoodStyle trunk/pgsrc/Help%2FGoogleLink trunk/pgsrc/Help%2FGoogleMapsPlugin trunk/pgsrc/Help%2FGooglePluginPlugin trunk/pgsrc/Help%2FGraphVizPlugin trunk/pgsrc/Help%2FHelloWorldPlugin trunk/pgsrc/Help%2FHowToUseWiki trunk/pgsrc/Help%2FHtmlConverterPlugin trunk/pgsrc/Help%2FImages trunk/pgsrc/Help%2FIncludePagePlugin trunk/pgsrc/Help%2FIncludePagesPlugin trunk/pgsrc/Help%2FIncludeSiteMapPlugin trunk/pgsrc/Help%2FIncludeTreePlugin trunk/pgsrc/Help%2FInterWiki trunk/pgsrc/Help%2FInterWikiSearchPlugin trunk/pgsrc/Help%2FJabberPresencePlugin trunk/pgsrc/Help%2FJeff%20Dairiki trunk/pgsrc/Help%2FLdapSearchPlugin trunk/pgsrc/Help%2FLikePagesPlugin trunk/pgsrc/Help%2FLinkDatabasePlugin trunk/pgsrc/Help%2FLinkIcons trunk/pgsrc/Help%2FListPagesPlugin trunk/pgsrc/Help%2FListSubpagesPlugin trunk/pgsrc/Help%2FMagicPhpWikiURLs trunk/pgsrc/Help%2FMediawikiTablePlugin trunk/pgsrc/Help%2FModeratedPagePlugin trunk/pgsrc/Help%2FMoreAboutMechanics trunk/pgsrc/Help%2FMostPopularPlugin trunk/pgsrc/Help%2FNewPagesPerUserPlugin trunk/pgsrc/Help%2FNoCachePlugin trunk/pgsrc/Help%2FOldStyleTablePlugin trunk/pgsrc/Help%2FOrphanedPagesPlugin trunk/pgsrc/Help%2FPageDumpPlugin trunk/pgsrc/Help%2FPageGroupPlugin trunk/pgsrc/Help%2FPageHistoryPlugin trunk/pgsrc/Help%2FPageInfoPlugin trunk/pgsrc/Help%2FPageList trunk/pgsrc/Help%2FPagePermissions trunk/pgsrc/Help%2FPageTrailPlugin trunk/pgsrc/Help%2FPasswordResetPlugin trunk/pgsrc/Help%2FPhotoAlbumPlugin trunk/pgsrc/Help%2FPhotoAlbumPlugin%2FSlides trunk/pgsrc/Help%2FPhpHighlightPlugin trunk/pgsrc/Help%2FPhpWeatherPlugin trunk/pgsrc/Help%2FPhpWiki trunk/pgsrc/Help%2FPloticusPlugin trunk/pgsrc/Help%2FPluginManagerPlugin trunk/pgsrc/Help%2FPopUpPlugin trunk/pgsrc/Help%2FPopularNearbyPlugin trunk/pgsrc/Help%2FPredefinedIcons trunk/pgsrc/Help%2FPreferenceAppPlugin trunk/pgsrc/Help%2FPreferencesInfoPlugin trunk/pgsrc/Help%2FPrevNextPlugin trunk/pgsrc/Help%2FRandomPagePlugin trunk/pgsrc/Help%2FRateItPlugin trunk/pgsrc/Help%2FRawHtmlPlugin trunk/pgsrc/Help%2FRecentChangesCachedPlugin trunk/pgsrc/Help%2FRecentChangesPlugin trunk/pgsrc/Help%2FRecentCommentsPlugin trunk/pgsrc/Help%2FRecentEditsPlugin trunk/pgsrc/Help%2FRecentReferrersPlugin trunk/pgsrc/Help%2FRedirectToPlugin trunk/pgsrc/Help%2FReini%20Urban trunk/pgsrc/Help%2FRelatedChangesPlugin trunk/pgsrc/Help%2FRichTablePlugin trunk/pgsrc/Help%2FRssFeedPlugin trunk/pgsrc/Help%2FSearchHighlightPlugin trunk/pgsrc/Help%2FSemanticRelations trunk/pgsrc/Help%2FSemanticRelationsPlugin trunk/pgsrc/Help%2FSemanticSearchPlugin trunk/pgsrc/Help%2FSiteMapPlugin trunk/pgsrc/Help%2FSpreadsheet trunk/pgsrc/Help%2FSqlResultPlugin trunk/pgsrc/Help%2FSteve%20Wainstead trunk/pgsrc/Help%2FSyncWikiPlugin trunk/pgsrc/Help%2FSyntaxHighlighterPlugin trunk/pgsrc/Help%2FSystemInfoPlugin trunk/pgsrc/Help%2FTeX2pngPlugin trunk/pgsrc/Help%2FTemplatePlugin trunk/pgsrc/Help%2FTexToPngPlugin trunk/pgsrc/Help%2FTextFormattingRules trunk/pgsrc/Help%2FTitleSearchPlugin trunk/pgsrc/Help%2FTranscludePlugin trunk/pgsrc/Help%2FTranslateTextPlugin trunk/pgsrc/Help%2FUnfoldSubpagesPlugin trunk/pgsrc/Help%2FUpLoadPlugin trunk/pgsrc/Help%2FUserPreferencesPlugin trunk/pgsrc/Help%2FUserRatingsPlugin trunk/pgsrc/Help%2FVideoPlugin trunk/pgsrc/Help%2FVisualWikiPlugin trunk/pgsrc/Help%2FWabiSabi trunk/pgsrc/Help%2FWantedPagesOldPlugin trunk/pgsrc/Help%2FWantedPagesPlugin trunk/pgsrc/Help%2FWatchPagePlugin trunk/pgsrc/Help%2FWhoIsOnlinePlugin trunk/pgsrc/Help%2FWikiAdminChownPlugin trunk/pgsrc/Help%2FWikiAdminPurgePlugin trunk/pgsrc/Help%2FWikiAdminRemovePlugin trunk/pgsrc/Help%2FWikiAdminRenamePlugin trunk/pgsrc/Help%2FWikiAdminSearchReplacePlugin trunk/pgsrc/Help%2FWikiAdminSelectPlugin trunk/pgsrc/Help%2FWikiAdminSetAclPlugin trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin trunk/pgsrc/Help%2FWikiAdminUtilsPlugin trunk/pgsrc/Help%2FWikiBlogPlugin trunk/pgsrc/Help%2FWikiFormPlugin trunk/pgsrc/Help%2FWikiFormRichPlugin trunk/pgsrc/Help%2FWikiForumPlugin trunk/pgsrc/Help%2FWikiPlugin trunk/pgsrc/Help%2FWikiPollPlugin trunk/pgsrc/Help%2FWikiTranslationPlugin trunk/pgsrc/Help%2FWikiWikiWeb trunk/pgsrc/Help%2FWikicreole trunk/pgsrc/Help%2FWikisUsingPhpWiki trunk/pgsrc/Help%2FYouTubePlugin trunk/pgsrc/Help%2Ftext2pngPlugin trunk/pgsrc/HomePage trunk/pgsrc/HomePageAlias trunk/pgsrc/InterWikiMap trunk/pgsrc/InterWikiSearch trunk/pgsrc/LdapSearch trunk/pgsrc/LeastPopular trunk/pgsrc/LikePages trunk/pgsrc/LinkDatabase trunk/pgsrc/LinkSearch trunk/pgsrc/ListRelations trunk/pgsrc/LockedPages trunk/pgsrc/ModeratedPage trunk/pgsrc/MostPopular trunk/pgsrc/MyRatings trunk/pgsrc/MyRecentChanges trunk/pgsrc/MyRecentEdits trunk/pgsrc/NewPagesPerUser trunk/pgsrc/OrphanedPages trunk/pgsrc/PageDump trunk/pgsrc/PageHistory trunk/pgsrc/PageInfo trunk/pgsrc/PasswordReset trunk/pgsrc/PhpWikiAdministration trunk/pgsrc/PhpWikiAdministration%2FChown trunk/pgsrc/PhpWikiAdministration%2FDeleteAcl trunk/pgsrc/PhpWikiAdministration%2FPurge trunk/pgsrc/PhpWikiAdministration%2FRemove trunk/pgsrc/PhpWikiAdministration%2FRename trunk/pgsrc/PhpWikiAdministration%2FSearchReplace trunk/pgsrc/PhpWikiAdministration%2FSetAcl trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple trunk/pgsrc/PhpWikiDebug trunk/pgsrc/PhpWikiDocumentation trunk/pgsrc/PhpWikiManual trunk/pgsrc/PhpWikiPoll trunk/pgsrc/PhpWikiRecentChanges trunk/pgsrc/PluginManager trunk/pgsrc/ProjectSummary trunk/pgsrc/RandomPage trunk/pgsrc/RateIt trunk/pgsrc/RecentChanges trunk/pgsrc/RecentChangesMyPages trunk/pgsrc/RecentComments trunk/pgsrc/RecentEdits trunk/pgsrc/RecentNewPages trunk/pgsrc/RecentReleases trunk/pgsrc/RecentVisitors trunk/pgsrc/RelatedChanges trunk/pgsrc/ReleaseNotes trunk/pgsrc/San%20Diego trunk/pgsrc/SandBox trunk/pgsrc/SearchHighlight trunk/pgsrc/SemanticRelations trunk/pgsrc/SemanticSearch trunk/pgsrc/SetGlobalAccessRights trunk/pgsrc/SetGlobalAccessRightsSimple trunk/pgsrc/SpecialPages trunk/pgsrc/SpellCheck trunk/pgsrc/SystemInfo trunk/pgsrc/Template%2FAttribute trunk/pgsrc/Template%2FCategory trunk/pgsrc/Template%2FExample trunk/pgsrc/Template%2FLinkto trunk/pgsrc/Template%2FNewPlugin trunk/pgsrc/Template%2FRelation trunk/pgsrc/Template%2FTalk trunk/pgsrc/Template%2FUserPage trunk/pgsrc/The%20PhpWiki%20programming%20team trunk/pgsrc/TitleSearch trunk/pgsrc/TranslateText trunk/pgsrc/UpLoad trunk/pgsrc/UriResolver trunk/pgsrc/UserContribs trunk/pgsrc/UserPreferences trunk/pgsrc/UserRatings trunk/pgsrc/WantedPages trunk/pgsrc/WatchPage trunk/pgsrc/WhoIsOnline trunk/pgsrc/WikiAdminSelect trunk/pgsrc/WikiBlog trunk/pgsrc/area trunk/pgsrc/is_a trunk/pgsrc/located_in trunk/pgsrc/population trunk/themes/blog/pgsrc/About trunk/themes/blog/pgsrc/Blog trunk/themes/blog/pgsrc/BlogArchives trunk/themes/blog/pgsrc/CategoryHowTo trunk/themes/blog/pgsrc/HomePage trunk/themes/blog/pgsrc/HowTo trunk/themes/blog/pgsrc/PhotoAlbum trunk/themes/fusionforge/pgsrc/CategoryWiki%20templates trunk/themes/fusionforge/pgsrc/CategoryWiki%20user trunk/themes/fusionforge/pgsrc/ExternalPages trunk/themes/fusionforge/pgsrc/FindPage trunk/themes/fusionforge/pgsrc/HomePage trunk/themes/fusionforge/pgsrc/InterWikiMap trunk/themes/fusionforge/pgsrc/PhpWikiAdministration trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetAclSimple trunk/themes/fusionforge/pgsrc/PhpWikiAdministration%2FSetExternal trunk/themes/fusionforge/pgsrc/SetGlobalAccessRightsSimple trunk/themes/fusionforge/pgsrc/SpecialPages trunk/themes/fusionforge/pgsrc/TextFormattingRules trunk/themes/fusionforge/pgsrc/UpLoad trunk/themes/fusionforge/pgsrc/colorbox trunk/themes/fusionforge/pgsrc/titlebar trunk/themes/wikilens/pgsrc/LeftbarContent Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/INSTALL 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,6 +1,6 @@ REQUIREMENTS -PhpWiki 1.5.0 requires a web server with at least PHP version 5.3. +PhpWiki 1.5.1 requires a web server with at least PHP version 5.3. All users of PHP are strongly encouraged to upgrade to PHP 5.3.29 or to PHP 5.4 or 5.5. @@ -61,7 +61,7 @@ Unzip this file into the directory where you want it to live. That's it. -bash$ unzip phpwiki-1.5.0.zip +bash$ unzip phpwiki-1.5.1.zip In the config subdirectory copy 'config-dist.ini' to 'config.ini' and edit the settings in 'config.ini' to your liking. Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/Makefile 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,4 +1,4 @@ -VERSION=1.5.0 +VERSION=1.5.1 RPMBUILD=rpmbuild clean: Modified: trunk/config/phpwiki.spec =================================================================== --- trunk/config/phpwiki.spec 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/config/phpwiki.spec 2014-10-02 14:39:40 UTC (rev 9161) @@ -40,7 +40,7 @@ # RPM spec preamble Summary: PHP-based Wiki webapplication Name: phpwiki -Version: 1.5.0 +Version: 1.5.1 Release: 1 BuildArch: noarch License: GPL Modified: trunk/lib/prepend.php =================================================================== --- trunk/lib/prepend.php 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/lib/prepend.php 2014-10-02 14:39:40 UTC (rev 9161) @@ -5,11 +5,11 @@ */ // see lib/stdlib.php: phpwiki_version() -define('PHPWIKI_VERSION', '1.5.0'); +define('PHPWIKI_VERSION', '1.5.1'); /** * Returns true if current php version is at mimimum a.b.c - * Called: check_php_version(5,2) + * Called: check_php_version(5,3) */ function check_php_version($a = '0', $b = '0', $c = '0') { Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/de/pgsrc/%C3%84hnlicheSeiten =================================================================== --- trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/%C3%84hnlicheSeiten 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=%C3%84hnlicheSeiten; flags=""; Modified: trunk/locale/de/pgsrc/AlleBenutzer =================================================================== --- trunk/locale/de/pgsrc/AlleBenutzer 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/AlleBenutzer 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=AlleBenutzer; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/AlleSeiten =================================================================== --- trunk/locale/de/pgsrc/AlleSeiten 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/AlleSeiten 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=AlleSeiten; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/AlleSeitenEditiertVonMir 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=AlleSeitenEditiertVonMir; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/AlleSeitenErzeugtVonMir 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=AlleSeitenErzeugtVonMir; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir =================================================================== --- trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/AlleSeitenImBesitzVonMir 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=AlleSeitenImBesitzVonMir; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/BackLinks =================================================================== --- trunk/locale/de/pgsrc/BackLinks 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/BackLinks 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=BackLinks; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/BenutzerEinstellungen =================================================================== --- trunk/locale/de/pgsrc/BenutzerEinstellungen 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/BenutzerEinstellungen 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=BenutzerEinstellungen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/DebugAuthInfo =================================================================== --- trunk/locale/de/pgsrc/DebugAuthInfo 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/DebugAuthInfo 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=DebugAuthInfo; flags=LOCKED; Modified: trunk/locale/de/pgsrc/DebugGruppenInfo =================================================================== --- trunk/locale/de/pgsrc/DebugGruppenInfo 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/DebugGruppenInfo 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=DebugGruppenInfo; flags=LOCKED; Modified: trunk/locale/de/pgsrc/DebugInfo =================================================================== --- trunk/locale/de/pgsrc/DebugInfo 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/DebugInfo 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=DebugInfo; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/EditiereText =================================================================== --- trunk/locale/de/pgsrc/EditiereText 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/EditiereText 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=EditiereText; flags=""; Modified: trunk/locale/de/pgsrc/Einstellungen =================================================================== --- trunk/locale/de/pgsrc/Einstellungen 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Einstellungen 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Einstellungen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/FuzzySuche =================================================================== --- trunk/locale/de/pgsrc/FuzzySuche 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/FuzzySuche 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=FuzzySuche; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/G%C3%A4steBuch =================================================================== --- trunk/locale/de/pgsrc/G%C3%A4steBuch 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/G%C3%A4steBuch 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=G%C3%A4steBuch; flags=""; Modified: trunk/locale/de/pgsrc/GaesteBuch =================================================================== --- trunk/locale/de/pgsrc/GaesteBuch 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/GaesteBuch 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=GaesteBuch; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen =================================================================== --- trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Geringf%C3%BCgige%C3%84nderungen 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Geringf%C3%BCgige%C3%84nderungen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/GleicheSeiten =================================================================== --- trunk/locale/de/pgsrc/GleicheSeiten 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/GleicheSeiten 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=GleicheSeiten; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Hilfe =================================================================== --- trunk/locale/de/pgsrc/Hilfe 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe; flags=PAGE_LOCKED%2CEXTERNAL_PAGE; Modified: trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FAktionsSeite 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FAktionsSeite; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FAutorenProtokollPlugin 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FAutorenProtokollPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FGraphVizPlugin 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FGraphVizPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FGuterStil =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FGuterStil 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FGuterStil; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FHalloWeltPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FHochLadenPlugin 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FHochLadenPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FInhaltsVerzeichnisPlugin 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FInhaltsVerzeichnisPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FNeueSeitePlugin 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FNeueSeitePlugin; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FNeuerKommentarPlugin 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FNeuerKommentarPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FPhotoAlbumPlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FPhotoAlbumPlugin%2FDiashow; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FPhpWiki =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FPhpWiki 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FPhpWiki; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FTextBearbeiten 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FTextBearbeiten; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FTextFormatierungsRegeln 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FTextFormatierungsRegeln; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FVorlagePlugin; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FWabiSabi =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FWabiSabi 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWabiSabi; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FWieManWikiBenutzt 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWieManWikiBenutzt; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FWikiTechnik 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWikiTechnik; flags=""; Modified: trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Hilfe%2FWikiWikiWeb 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Hilfe%2FWikiWikiWeb; flags=""; Modified: trunk/locale/de/pgsrc/HochLaden =================================================================== --- trunk/locale/de/pgsrc/HochLaden 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/HochLaden 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=HochLaden; flags=""; Modified: trunk/locale/de/pgsrc/InterWikiListe =================================================================== --- trunk/locale/de/pgsrc/InterWikiListe 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/InterWikiListe 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=InterWikiListe; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/KategorieAktionSeite =================================================================== --- trunk/locale/de/pgsrc/KategorieAktionSeite 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/KategorieAktionSeite 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=KategorieAktionSeite; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/KategorieKategorie =================================================================== --- trunk/locale/de/pgsrc/KategorieKategorie 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/KategorieKategorie 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=KategorieKategorie; flags=""; Modified: trunk/locale/de/pgsrc/KategorieWikiPlugin =================================================================== --- trunk/locale/de/pgsrc/KategorieWikiPlugin 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/KategorieWikiPlugin 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=KategorieWikiPlugin; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/LinkSuche =================================================================== --- trunk/locale/de/pgsrc/LinkSuche 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/LinkSuche 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=LinkSuche; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/ListeRelationen =================================================================== --- trunk/locale/de/pgsrc/ListeRelationen 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/ListeRelationen 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=ListeRelationen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/ListeSeiten =================================================================== --- trunk/locale/de/pgsrc/ListeSeiten 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/ListeSeiten 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=ListeSeiten; flags=""; Modified: trunk/locale/de/pgsrc/MeistBesucht =================================================================== --- trunk/locale/de/pgsrc/MeistBesucht 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/MeistBesucht 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=MeistBesucht; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/ModerierteSeite =================================================================== --- trunk/locale/de/pgsrc/ModerierteSeite 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/ModerierteSeite 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=ModerierteSeite; flags="LOCKED"; Modified: trunk/locale/de/pgsrc/NeueSeite =================================================================== --- trunk/locale/de/pgsrc/NeueSeite 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/NeueSeite 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=NeueSeite; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/Neueste%C3%84nderungen =================================================================== --- trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/Neueste%C3%84nderungen 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=Neueste%C3%84nderungen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/NeuesteSeiten =================================================================== --- trunk/locale/de/pgsrc/NeuesteSeiten 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/NeuesteSeiten 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=NeuesteSeiten; flags=""; Modified: trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen =================================================================== --- trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/PasswortZur%C3%BCcksetzen 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=PasswortZur%C3%BCcksetzen; flags=""; Modified: trunk/locale/de/pgsrc/PhpWikiDokumentation =================================================================== --- trunk/locale/de/pgsrc/PhpWikiDokumentation 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/PhpWikiDokumentation 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=PhpWikiDokumentation; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FAclSetzen 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten%2FAclSetzen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FChown 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten%2FChown; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen 2014-10-02 13:47:35 UTC (rev 9160) +++ trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FL%C3%B6schen 2014-10-02 14:39:40 UTC (rev 9161) @@ -1,5 +1,5 @@ -Date: Tue, 29 Jul 2014 10:42:12 +0000 -Mime-Version: 1.0 (Produced by PhpWiki 1.5.0) +Date: Thu, 2 Oct 2014 16:29:25 +0000 +Mime-Version: 1.0 (Produced by PhpWiki 1.5.1) Content-Type: application/x-phpwiki; pagename=PhpWikiSystemverwalten%2FL%C3%B6schen; flags=PAGE_LOCKED; Modified: trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErsetzen =================================================================== --- trunk/locale/de/pgsrc/PhpWikiSystemverwalten%2FSuchenErs... [truncated message content] |
From: <var...@us...> - 2014-10-03 13:46:41
|
Revision: 9166 http://sourceforge.net/p/phpwiki/code/9166 Author: vargenau Date: 2014-10-03 13:46:33 +0000 (Fri, 03 Oct 2014) Log Message: ----------- function ldap_connect exists Modified Paths: -------------- trunk/configurator.php trunk/lib/WikiGroup.php trunk/lib/WikiUser.php trunk/lib/plugin/LdapSearch.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2014-10-03 13:37:54 UTC (rev 9165) +++ trunk/configurator.php 2014-10-03 13:46:33 UTC (rev 9166) @@ -1128,106 +1128,57 @@ $properties["DBAUTH_USER_GROUPS"] = new _define_optional('DBAUTH_USER_GROUPS', "SELECT group FROM user WHERE user='\$userid'", ""); -if (function_exists('ldap_connect')) { - - $properties["LDAP AUTH Host"] = - new _define_optional('LDAP_AUTH_HOST', "ldap://localhost:389", " +$properties["LDAP AUTH Host"] = + new _define_optional('LDAP_AUTH_HOST', "ldap://localhost:389", " 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)."); - $properties["LDAP BASE DN"] = - new _define_optional('LDAP_BASE_DN', "ou=mycompany.com,o=My Company", " +$properties["LDAP BASE DN"] = + new _define_optional('LDAP_BASE_DN', "ou=mycompany.com,o=My Company", " The organizational or domain BASE DN: e.g. \"dc=mydomain,dc=com\". Note: ou=Users and ou=Groups are used for GroupLdap Membership Better use LDAP_OU_USERS and LDAP_OU_GROUP with GROUP_METHOD=LDAP."); - $properties["LDAP SET OPTION"] = - new _define_optional('LDAP_SET_OPTION', "LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0", " +$properties["LDAP SET OPTION"] = + new _define_optional('LDAP_SET_OPTION', "LDAP_OPT_PROTOCOL_VERSION=3:LDAP_OPT_REFERRALS=0", " Some LDAP servers need some more options, such as the Windows Active Directory Server. Specify the options (as allowed by the PHP LDAP module) and their values as NAME=value pairs separated by colons."); - $properties["LDAP AUTH USER"] = - new _define_optional('LDAP_AUTH_USER', "CN=ldapuser,ou=Users,o=Development,dc=mycompany.com", " +$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 allow anonymous queries. (Windows Active Directory Server)"); - $properties["LDAP AUTH PASSWORD"] = - new _define_optional('LDAP_AUTH_PASSWORD', "secret", " +$properties["LDAP AUTH PASSWORD"] = + new _define_optional('LDAP_AUTH_PASSWORD', "secret", " 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"] = - new _define_optional('LDAP_SEARCH_FIELD', "uid", " +$properties["LDAP SEARCH FIELD"] = + new _define_optional('LDAP_SEARCH_FIELD', "uid", " If you want to match usernames against an attribute other than uid, specify it here. Default: uid e.g.: LDAP_SEARCH_FIELD = sAMAccountName"); - $properties["LDAP OU USERS"] = - new _define_optional('LDAP_OU_USERS', "ou=Users", " +$properties["LDAP OU USERS"] = + new _define_optional('LDAP_OU_USERS', "ou=Users", " If you have an organizational unit for all users, define it here. This narrows the search, and is needed for LDAP group membership (if GROUP_METHOD=LDAP) Default: ou=Users"); - $properties["LDAP OU GROUP"] = - new _define_optional('LDAP_OU_GROUP', "ou=Groups", " +$properties["LDAP OU GROUP"] = + new _define_optional('LDAP_OU_GROUP', "ou=Groups", " If you have an organizational unit for all groups, define it here. This narrows the search, and is needed for LDAP group membership (if GROUP_METHOD=LDAP) The entries in this ou must have a gidNumber and cn attribute. Default: ou=Groups"); -} else { // function_exists('ldap_connect') - - $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 -; Better use LDAP_OU_USERS and LDAP_OU_GROUP with GROUP_METHOD=LDAP. -;LDAP_BASE_DN = \"ou=Users,o=Development,dc=mycompany.com\" - -; Some LDAP servers need some more options, such as the Windows Active -; Directory Server. Specify the options (as allowed by the PHP LDAP module) -; 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 -; 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 -; specified in the LDAP_AUTH_USER option (above). -; LDAP_AUTH_PASSWORD = secret - -; If you want to match usernames against an attribute other than uid, -; specify it here. Default: uid -; LDAP_SEARCH_FIELD = sAMAccountName - -; If you have an organizational unit for all users, define it here. -; This narrows the search, and is needed for LDAP group membership (if GROUP_METHOD=LDAP) -; Default: ou=Users -; LDAP_OU_USERS = ou=Users - -; If you have an organizational unit for all groups, define it here. -; This narrows the search, and is needed for LDAP group membership (if GROUP_METHOD=LDAP) -; The entries in this ou must have a gidNumber and cn attribute. -; Default: ou=Groups -; LDAP_OU_GROUP = ou=Groups", " -; Ignored. No LDAP support in this php. configure --with-ldap"); -} - if (function_exists('imap_open')) { $properties["IMAP Auth Host"] = Modified: trunk/lib/WikiGroup.php =================================================================== --- trunk/lib/WikiGroup.php 2014-10-03 13:37:54 UTC (rev 9165) +++ trunk/lib/WikiGroup.php 2014-10-03 13:46:33 UTC (rev 9166) @@ -963,16 +963,6 @@ E_USER_WARNING); return; } - // We should ignore multithreaded environments, not generally windows. - // CGI does work. - if (!function_exists('ldap_connect') and (!isWindows() or isCGI())) { - // on MacOSX >= 4.3 you'll need PHP_SHLIB_SUFFIX instead. - dl("ldap" . defined('PHP_SHLIB_SUFFIX') ? PHP_SHLIB_SUFFIX : DLL_EXT); - if (!function_exists('ldap_connect')) { - trigger_error(_("No LDAP in this PHP version"), E_USER_WARNING); - return; - } - } if (!defined("LDAP_BASE_DN")) define("LDAP_BASE_DN", ''); $this->base_dn = LDAP_BASE_DN; Modified: trunk/lib/WikiUser.php =================================================================== --- trunk/lib/WikiUser.php 2014-10-03 13:37:54 UTC (rev 9165) +++ trunk/lib/WikiUser.php 2014-10-03 13:46:33 UTC (rev 9166) @@ -1008,8 +1008,7 @@ ) { return new _DbPassUser($UserName, $this->_prefs); } elseif (in_array('LDAP', $dbh->getAuthParam('USER_AUTH_ORDER')) and - defined('LDAP_AUTH_HOST') and defined('LDAP_BASE_DN') and - function_exists('ldap_connect') + defined('LDAP_AUTH_HOST') and defined('LDAP_BASE_DN') ) { include_once 'lib/WikiUser/LDAP.php'; return new _LDAPPassUser($UserName, $this->_prefs); Modified: trunk/lib/plugin/LdapSearch.php =================================================================== --- trunk/lib/plugin/LdapSearch.php 2014-10-03 13:37:54 UTC (rev 9165) +++ trunk/lib/plugin/LdapSearch.php 2014-10-03 13:46:33 UTC (rev 9166) @@ -67,8 +67,6 @@ ); } - // I ought to require the ldap extension, but fail sanely, if I cant get it. - // - however at the moment this seems to work as is /** * @param WikiDB $dbi * @param string $argstr @@ -78,10 +76,6 @@ */ function run($dbi, $argstr, &$request, $basepage) { - if (!function_exists('ldap_connect')) { - if (!loadPhpExtension('ldap')) - return $this->error(_("Missing ldap extension")); - } $args = $this->getArgs($argstr, $request); extract($args); //include_once("lib/WikiUser/LDAP.php"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-10-03 13:51:46
|
Revision: 9168 http://sourceforge.net/p/phpwiki/code/9168 Author: vargenau Date: 2014-10-03 13:51:44 +0000 (Fri, 03 Oct 2014) Log Message: ----------- function imap_open exists Modified Paths: -------------- trunk/configurator.php trunk/lib/WikiUser.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2014-10-03 13:48:15 UTC (rev 9167) +++ trunk/configurator.php 2014-10-03 13:51:44 UTC (rev 9168) @@ -1179,10 +1179,8 @@ The entries in this ou must have a gidNumber and cn attribute. Default: ou=Groups"); -if (function_exists('imap_open')) { - - $properties["IMAP Auth Host"] = - new _define_optional('IMAP_AUTH_HOST', 'localhost:143/imap/notls', " +$properties["IMAP Auth Host"] = + new _define_optional('IMAP_AUTH_HOST', 'localhost:143/imap/notls', " If USER_AUTH_ORDER contains IMAP: The IMAP server to check usernames from. Defaults to localhost. @@ -1191,21 +1189,6 @@ localhost, localhost:143/imap/notls, localhost:993/imap/ssl/novalidate-cert (SuSE refuses non-SSL conections)"); -} else { // function_exists('imap_open') - - $properties["IMAP Authentication"] = - 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: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"); - -} - $properties["POP3 Authentication"] = new _define_optional('POP3_AUTH_HOST', 'localhost:110', " If USER_AUTH_ORDER contains POP3: Modified: trunk/lib/WikiUser.php =================================================================== --- trunk/lib/WikiUser.php 2014-10-03 13:48:15 UTC (rev 9167) +++ trunk/lib/WikiUser.php 2014-10-03 13:51:44 UTC (rev 9168) @@ -1013,7 +1013,7 @@ include_once 'lib/WikiUser/LDAP.php'; return new _LDAPPassUser($UserName, $this->_prefs); } elseif (in_array('IMAP', $dbh->getAuthParam('USER_AUTH_ORDER')) and - defined('IMAP_AUTH_HOST') and function_exists('imap_open') + defined('IMAP_AUTH_HOST') ) { include_once 'lib/WikiUser/IMAP.php'; return new _IMAPPassUser($UserName, $this->_prefs); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2014-10-03 14:00:02
|
Revision: 9170 http://sourceforge.net/p/phpwiki/code/9170 Author: vargenau Date: 2014-10-03 13:59:53 +0000 (Fri, 03 Oct 2014) Log Message: ----------- function mt_rand exists Modified Paths: -------------- trunk/configurator.php trunk/lib/Captcha.php trunk/lib/plugin/ModeratedPage.php trunk/lib/stdlib.php trunk/passencrypt.php Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2014-10-03 13:54:30 UTC (rev 9169) +++ trunk/configurator.php 2014-10-03 13:59:53 UTC (rev 9170) @@ -2519,15 +2519,9 @@ $start = ord($valid_chars); $end = ord(substr($valid_chars, -1)); better_srand(); - if (function_exists('mt_rand')) // mersenne twister - $length = mt_rand($minlength, $maxlength); - else // the usually bad glibc rand() - $length = rand($minlength, $maxlength); + $length = mt_rand($minlength, $maxlength); while ($length > 0) { - if (function_exists('mt_rand')) - $newchar = mt_rand($start, $end); - else - $newchar = rand($start, $end); + $newchar = mt_rand($start, $end); if (!strrpos($valid_chars, $newchar)) continue; // skip holes $newpass .= sprintf("%c", $newchar); $length--; Modified: trunk/lib/Captcha.php =================================================================== --- trunk/lib/Captcha.php 2014-10-03 13:54:30 UTC (rev 9169) +++ trunk/lib/Captcha.php 2014-10-03 13:59:53 UTC (rev 9170) @@ -97,10 +97,7 @@ $word = ""; better_srand(); while (strlen(trim($word)) == 0) { - if (function_exists('mt_rand')) - $x = mt_rand(0, count($text)); - else - $x = rand(0, count($text)); + $x = mt_rand(0, count($text)); return $text[$x]; } } Modified: trunk/lib/plugin/ModeratedPage.php =================================================================== --- trunk/lib/plugin/ModeratedPage.php 2014-10-03 13:54:30 UTC (rev 9169) +++ trunk/lib/plugin/ModeratedPage.php 2014-10-03 13:59:53 UTC (rev 9170) @@ -203,10 +203,10 @@ better_srand(); $s = ""; for ($i = 1; $i <= 25; $i++) { - $r = function_exists('mt_rand') ? mt_rand(55, 90) : rand(55, 90); + $r = mt_rand(55, 90); $s .= chr(($r < 65) ? ($r - 17) : $r); } - $len = $r = function_exists('mt_rand') ? mt_rand(15, 25) : rand(15, 25); + $len = $r = mt_rand(15, 25); return substr(base64_encode($s), 3, $len); } Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2014-10-03 13:54:30 UTC (rev 9169) +++ trunk/lib/stdlib.php 2014-10-03 13:59:53 UTC (rev 9170) @@ -1642,11 +1642,7 @@ $s = ""; for ($i = 1; $i <= $length; $i++) { // return only typeable 7 bit ascii, avoid quotes - if (function_exists('mt_rand')) - $s .= chr(mt_rand(40, 126)); - else - // the usually bad glibc srand() - $s .= chr(rand(40, 126)); + $s .= chr(mt_rand(40, 126)); } return $s; } @@ -1662,10 +1658,7 @@ $letters = "abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789"; $letter_len = strlen($letters); for ($i = 0; $i < $length; $i++) { - if (function_exists('mt_rand')) - $word .= $letters[mt_rand(0, $letter_len - 1)]; - else - $word .= $letters[rand(0, $letter_len - 1)]; + $word .= $letters[mt_rand(0, $letter_len - 1)]; } return $word; } Modified: trunk/passencrypt.php =================================================================== --- trunk/passencrypt.php 2014-10-03 13:54:30 UTC (rev 9169) +++ trunk/passencrypt.php 2014-10-03 13:59:53 UTC (rev 9170) @@ -61,11 +61,7 @@ $s = ""; for ($i = 1; $i <= $length; $i++) { // return only typeable 7 bit ascii, avoid quotes - if (function_exists('mt_rand')) - // the usually bad glibc srand() - $s .= chr(mt_rand(40, 126)); - else - $s .= chr(rand(40, 126)); + $s .= chr(mt_rand(40, 126)); } return $s; } @@ -83,15 +79,9 @@ $start = ord($valid_chars); $end = ord(substr($valid_chars, -1)); better_srand(); - if (function_exists('mt_rand')) // mersenne twister - $length = mt_rand($minlength, $maxlength); - else // the usually bad glibc rand() - $length = rand($minlength, $maxlength); + $length = mt_rand($minlength, $maxlength); while ($length > 0) { - if (function_exists('mt_rand')) - $newchar = mt_rand($start, $end); - else - $newchar = rand($start, $end); + $newchar = mt_rand($start, $end); if (!strrpos($valid_chars, $newchar)) continue; // skip holes $newpass .= sprintf("%c", $newchar); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |