[Fusionforge-commits] FusionForge branch master updated. f85c9c9499e010db341ef8dfe679f27bd85668e5

Marc-Etienne VARGENAU vargenau at fusionforge.org
Fri Jul 25 16:57:39 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  f85c9c9499e010db341ef8dfe679f27bd85668e5 (commit)
      from  6f05e9b8ca695eccbc097e8ea2b7da5b92e661f5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f85c9c9499e010db341ef8dfe679f27bd85668e5
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Fri Jul 25 16:57:26 2014 +0200

    wiki: phpwiki.org --> phpwiki.fr

diff --git a/src/plugins/wiki/www/config/config-default.ini b/src/plugins/wiki/www/config/config-default.ini
index c13b8e5..6419540 100644
--- a/src/plugins/wiki/www/config/config-default.ini
+++ b/src/plugins/wiki/www/config/config-default.ini
@@ -147,7 +147,7 @@ COPYRIGHTPAGE_URL = "http://www.gnu.org/copyleft/gpl.html#SEC1"
 ; 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
diff --git a/src/plugins/wiki/www/config/config-dist.ini b/src/plugins/wiki/www/config/config-dist.ini
index ad59d32..b858110 100644
--- a/src/plugins/wiki/www/config/config-dist.ini
+++ b/src/plugins/wiki/www/config/config-dist.ini
@@ -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 @@ THEME = Sidebar
 ; 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.
 ;
diff --git a/src/plugins/wiki/www/configurator.php b/src/plugins/wiki/www/configurator.php
index bcb1223..5d191ab 100644
--- a/src/plugins/wiki/www/configurator.php
+++ b/src/plugins/wiki/www/configurator.php
@@ -1464,7 +1464,7 @@ $properties["AUTHORPAGE_TITLE"] =
     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"] =
diff --git a/src/plugins/wiki/www/lib/IniConfig.php b/src/plugins/wiki/www/lib/IniConfig.php
index 2d46485..dd83c63 100644
--- a/src/plugins/wiki/www/lib/IniConfig.php
+++ b/src/plugins/wiki/www/lib/IniConfig.php
@@ -779,7 +779,7 @@ function fixup_static_configs($file)
     // 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);
diff --git a/src/plugins/wiki/www/lib/SemanticWeb.php b/src/plugins/wiki/www/lib/SemanticWeb.php
index 35c1477..debd8c4 100644
--- a/src/plugins/wiki/www/lib/SemanticWeb.php
+++ b/src/plugins/wiki/www/lib/SemanticWeb.php
@@ -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)
diff --git a/src/plugins/wiki/www/lib/plugin/LdapSearch.php b/src/plugins/wiki/www/lib/plugin/LdapSearch.php
index 366c57d..3ad33af 100644
--- a/src/plugins/wiki/www/lib/plugin/LdapSearch.php
+++ b/src/plugins/wiki/www/lib/plugin/LdapSearch.php
@@ -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:
diff --git a/src/plugins/wiki/www/lib/plugin/ModeratedPage.php b/src/plugins/wiki/www/lib/plugin/ModeratedPage.php
index 6ceb077..76abf17 100644
--- a/src/plugins/wiki/www/lib/plugin/ModeratedPage.php
+++ b/src/plugins/wiki/www/lib/plugin/ModeratedPage.php
@@ -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
  */
 
diff --git a/src/plugins/wiki/www/lib/plugin/RecentChanges.php b/src/plugins/wiki/www/lib/plugin/RecentChanges.php
index 52d664e..94c81f2 100644
--- a/src/plugins/wiki/www/lib/plugin/RecentChanges.php
+++ b/src/plugins/wiki/www/lib/plugin/RecentChanges.php
@@ -749,7 +749,7 @@ class _RecentChanges_SideBarFormatter
 
         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");
 
diff --git a/src/plugins/wiki/www/lib/plugin/RssFeed.php b/src/plugins/wiki/www/lib/plugin/RssFeed.php
index f13d865..4ecaba8 100644
--- a/src/plugins/wiki/www/lib/plugin/RssFeed.php
+++ b/src/plugins/wiki/www/lib/plugin/RssFeed.php
@@ -37,7 +37,7 @@ class WikiPlugin_RssFeed
     {
         return array('feed' => "",
             'description' => "",
-            'url' => "", //"http://phpwiki.org/RecentChanges?format=rss",
+            'url' => "", //"http://phpwiki.fr/RecentChanges?format=rss",
             'maxitem' => 0,
             'titleonly' => false,
             'debug' => false,
diff --git a/src/plugins/wiki/www/locale/README b/src/plugins/wiki/www/locale/README
index ad3c0fc..56af4df 100644
--- a/src/plugins/wiki/www/locale/README
+++ b/src/plugins/wiki/www/locale/README
@@ -22,7 +22,7 @@ code of one of the supported languages, like this:
 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
diff --git a/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre b/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre
index 4595440..bf254ff 100644
--- a/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre
+++ b/src/plugins/wiki/www/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre
@@ -17,7 +17,7 @@ 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.org/">>
+<<FrameInclude src="http://phpwiki.fr/">>
 }}}
 
 Pour inclure une page depuis ce wiki, utilisez l'argument <b>page</b> :
diff --git a/src/plugins/wiki/www/pgsrc/Help%2FFrameIncludePlugin b/src/plugins/wiki/www/pgsrc/Help%2FFrameIncludePlugin
index b4e1934..e3a4da0 100644
--- a/src/plugins/wiki/www/pgsrc/Help%2FFrameIncludePlugin
+++ b/src/plugins/wiki/www/pgsrc/Help%2FFrameIncludePlugin
@@ -15,7 +15,7 @@ You might also be interested in the [[Help:IncludePagePlugin|IncludePage]] plugi
 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:
diff --git a/src/plugins/wiki/www/themes/MonoBook/templates/browse-footer.tmpl b/src/plugins/wiki/www/themes/MonoBook/templates/browse-footer.tmpl
index 17a06f4..d23db96 100644
--- a/src/plugins/wiki/www/themes/MonoBook/templates/browse-footer.tmpl
+++ b/src/plugins/wiki/www/themes/MonoBook/templates/browse-footer.tmpl
@@ -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>
diff --git a/src/plugins/wiki/www/themes/shamino_com/templates/browse-footer.tmpl b/src/plugins/wiki/www/themes/shamino_com/templates/browse-footer.tmpl
index b0508e6..80a5f3b 100644
--- a/src/plugins/wiki/www/themes/shamino_com/templates/browse-footer.tmpl
+++ b/src/plugins/wiki/www/themes/shamino_com/templates/browse-footer.tmpl
@@ -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>

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

Summary of changes:
 src/plugins/wiki/www/config/config-default.ini                 |    2 +-
 src/plugins/wiki/www/config/config-dist.ini                    |    4 ++--
 src/plugins/wiki/www/configurator.php                          |    2 +-
 src/plugins/wiki/www/lib/IniConfig.php                         |    2 +-
 src/plugins/wiki/www/lib/SemanticWeb.php                       |    2 +-
 src/plugins/wiki/www/lib/plugin/LdapSearch.php                 |    2 +-
 src/plugins/wiki/www/lib/plugin/ModeratedPage.php              |    2 +-
 src/plugins/wiki/www/lib/plugin/RecentChanges.php              |    2 +-
 src/plugins/wiki/www/lib/plugin/RssFeed.php                    |    2 +-
 src/plugins/wiki/www/locale/README                             |    2 +-
 .../wiki/www/locale/fr/pgsrc/Aide%2FPluginInclureUnCadre       |    2 +-
 src/plugins/wiki/www/pgsrc/Help%2FFrameIncludePlugin           |    2 +-
 .../wiki/www/themes/MonoBook/templates/browse-footer.tmpl      |    8 ++++----
 .../wiki/www/themes/shamino_com/templates/browse-footer.tmpl   |    2 +-
 14 files changed, 18 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list