Thread: [phpwiki-checkins] SF.net SVN: phpwiki:[7659] trunk (Page 5)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7659
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7659&view=rev
Author:   vargenau
Date:     2010-08-31 14:55:29 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
GFORGE --> FUSIONFORGE

Modified Paths:
--------------
    trunk/g
    trunk/lib/EditToolbar.php
    trunk/lib/IniConfig.php
    trunk/lib/MailNotify.php
    trunk/lib/PageList.php
    trunk/lib/PagePerm.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUserNew.php
    trunk/lib/loadsave.php
    trunk/lib/main.php
    trunk/lib/plugin/PluginManager.php
    trunk/lib/plugin/UpLoad.php
    trunk/lib/plugin/UserPreferences.php
    trunk/lib/plugin/WatchPage.php
    trunk/lib/wikilens/RatingsUser.php

Modified: trunk/g
===================================================================

--- trunk/g	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/g	2010-08-31 14:55:29 UTC (rev 7659)
@@ -76,7 +76,7 @@
         define('WIKI_PGSRC', 'themes/gforge/pgsrc');
     }
 
-    define('GFORGE', true);
+    define('FUSIONFORGE', true);
 
     define('PATH_INFO_PREFIX', '/'.$group_name . '/');
     define('USE_PATH_INFO', true);

Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/lib/EditToolbar.php	2010-08-31 14:55:29 UTC (rev 7659)
@@ -114,7 +114,7 @@
 
         if (ENABLE_EDIT_TOOLBAR) {
             $username = $request->_user->UserName();
-            if (GFORGE or DISABLE_MARKUP_WIKIWORD or (!isWikiWord($username))) {
+            if (FUSIONFORGE or DISABLE_MARKUP_WIKIWORD or (!isWikiWord($username))) {
                 $username = '[['.$username.']]';
             }
 	    $signature = " ––".$username." ".CTime();
@@ -302,7 +302,7 @@
             $categories = array();
             while ($p = $pages->next()) {
 		$page = $p->getName();
-                if (GFORGE) {
+                if (FUSIONFORGE) {
                     $categories[] = "['$page', '%0A----%0A%5B%5B".$page."%5D%5D']";
 		} else if (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) {
 		    $categories[] = "['$page', '%0A%5B".$page."%5D']";

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/lib/IniConfig.php	2010-08-31 14:55:29 UTC (rev 7659)
@@ -194,7 +194,7 @@
          'DISABLE_HTTP_REDIRECT',
          'PLUGIN_CACHED_USECACHE', 'PLUGIN_CACHED_FORCE_SYNCMAP',
          'BLOG_DEFAULT_EMPTY_PREFIX', 'DATABASE_PERSISTENT',
-         'GFORGE',
+         'FUSIONFORGE',
          'ENABLE_DISCUSSION_LINK', 'ENABLE_CAPTCHA',
          'ENABLE_WYSIWYG', 'WYSIWYG_DEFAULT_PAGETYPE_HTML',
          'DISABLE_MARKUP_WIKIWORD', 'ENABLE_MARKUP_COLOR', 'ENABLE_MARKUP_TEMPLATE',
@@ -620,8 +620,8 @@
       .'UserRatings:' // UserRatings works only in wikilens derived themes
       .'WantedPages:WatchPage:WhoIsOnline:WikiAdminSelect');
 
-    // The GFORGE theme omits them
-    if (!GFORGE) {
+    // The FUSIONFORGE theme omits them
+    if (!FUSIONFORGE) {
        // Add some some action pages depending on configuration
        if (DEBUG) {
           $ActionPages[] = 'DebugInfo';
@@ -708,8 +708,8 @@
     $AllAllowedPlugins[] = 'WikiPoll';
     $AllAllowedPlugins[] = 'YouTube';
 
-    // The GFORGE theme omits them
-    if (!GFORGE) {
+    // The FUSIONFORGE theme omits them
+    if (!FUSIONFORGE) {
         $AllAllowedPlugins[] = 'AddComment';
         $AllAllowedPlugins[] = 'AnalyseAccessLogSql';
         $AllAllowedPlugins[] = 'AsciiMath';
@@ -773,8 +773,8 @@
     $AllActionPages[] = 'SetGlobalAccessRightsSimple';
     $AllActionPages[] = 'UserContribs';
 
-    // The GFORGE theme omits them
-    if (!GFORGE) {
+    // The FUSIONFORGE theme omits them
+    if (!FUSIONFORGE) {
        // Add some some action pages depending on configuration
        if (DEBUG) {
           $AllActionPages[] = 'PhpWikiAdministration/Chmod';
@@ -782,7 +782,7 @@
        $AllActionPages[] = 'PhpWikiAdministration/Markup';
     }
 
-    if (GFORGE) {
+    if (FUSIONFORGE) {
        if (ENABLE_EXTERNAL_PAGES) {
           $AllAllowedPlugins[] = 'WikiAdminSetExternal';
           $AllActionPages[] = 'ExternalPages';
@@ -919,7 +919,7 @@
         define('DEFAULT_LANGUAGE', ''); // detect from client
 
     // Gforge hack
-    if (!GFORGE) {
+    if (!FUSIONFORGE) {
         // Disable update_locale because Zend Debugger crash
         if(! extension_loaded('Zend Debugger')) {
             update_locale(isset($LANG) ? $LANG : DEFAULT_LANGUAGE);

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/lib/MailNotify.php	2010-08-31 14:55:29 UTC (rev 7659)
@@ -61,7 +61,7 @@
 
     function fromId() {
         global $request;
-        if (GFORGE) {
+        if (FUSIONFORGE) {
             return $request->_user->getId();
         } else {
             return $request->_user->getId() . '@' .  $request->get('REMOTE_HOST');
@@ -72,7 +72,7 @@
         global $request;
 
         // Disable verification of emails for corporate env.
-        if (GFORGE) {
+        if (FUSIONFORGE) {
             $doverify = false;
         }
 
@@ -188,7 +188,7 @@
         $emails = $this->emails;
         $from = $this->from;
         // Do not send if modification is from Gforge admin
-        if (GFORGE and $from == ADMIN_USER) {
+        if (FUSIONFORGE and $from == ADMIN_USER) {
             return;
         }
         if (!$notice) $notice = _("PageChange Notification of %s");

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/lib/PageList.php	2010-08-31 14:55:29 UTC (rev 7659)
@@ -1282,7 +1282,7 @@
                 trigger_error(sprintf("%s: Bad column", $column), E_USER_NOTICE);
             return false;
         }
-        if (!GFORGE) {
+        if (!FUSIONFORGE) {
             // FIXME: anon users might rate and see ratings also.
             // Defer this logic to the plugin.
             if ($column == 'rating' and !$GLOBALS['request']->_user->isSignedIn()) {

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/lib/PagePerm.php	2010-08-31 14:55:29 UTC (rev 7659)
@@ -236,7 +236,7 @@
     $page = $request->getPage($pagename);
 
     // Exceptions:
-    if (GFORGE) {
+    if (FUSIONFORGE) {
     	if ($pagename != '.' && isset($request->_user->_is_external) && $request->_user->_is_external && ! $page->get('external')) {
     		$permcache[$pagename][$access] = 0;
     		return 0;

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/lib/WikiTheme.php	2010-08-31 14:55:29 UTC (rev 7659)
@@ -223,7 +223,7 @@
             return;
         }
         $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikicommon.js"))));
-        if (!GFORGE) {
+        if (!FUSIONFORGE) {
             // Gforge already loads this
             $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("sortable.js"))));
         }

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/lib/WikiUserNew.php	2010-08-31 14:55:29 UTC (rev 7659)
@@ -563,7 +563,7 @@
     function isValidName ($userid = false) {
         if (!$userid) $userid = $this->_userid;
         if (!$userid) return false;
-        if (GFORGE) {
+        if (FUSIONFORGE) {
             return true;
         }
         return preg_match("/^[\-\w\.@ ]+$/U", $userid) and strlen($userid) < 32;
@@ -1776,7 +1776,7 @@
 {
     function get($name) {
         // get email address from Gforge
-        if (GFORGE && session_loggedin()) {
+        if (FUSIONFORGE && session_loggedin()) {
             $user = session_get_user();
             return $user->getEmail();
         } else {
@@ -1786,7 +1786,7 @@
 
     function sanify($value) {
         // email address is already checked by Gforge
-        if (GFORGE) return $value;
+        if (FUSIONFORGE) return $value;
         // check for valid email address
         if ($this->get('email') == $value and $this->getraw('emailVerified'))
             return $value;
@@ -1808,7 +1808,7 @@
      */
     function update($value) {
         // email address is already checked by Gforge
-        if (GFORGE) return $value;
+        if (FUSIONFORGE) return $value;
     	if (!empty($this->_init)) return;
         $verified = $this->getraw('emailVerified');
         // hack!
@@ -1982,8 +1982,8 @@
                     );
 
         // This should be probably be done with $customUserPreferenceColumns
-        // For now, we use GFORGE define
-        if (GFORGE) {
+        // For now, we use FUSIONFORGE define
+        if (FUSIONFORGE) {
             $gforgeprefs = array(
                     'pageTrail'     => new _UserPreference_bool(),
                     'diffMenuItem' => new _UserPreference_bool(),
@@ -2161,7 +2161,7 @@
             }
         }
 
-        if (GFORGE) {
+        if (FUSIONFORGE) {
             // Merge current notifyPages with notifyPagesAll
             // notifyPages are pages to notify in the current project
             // while $notifyPagesAll is used to store all the monitored pages.
@@ -2210,7 +2210,7 @@
             }
         }
         
-        if (GFORGE) {
+        if (FUSIONFORGE) {
             // Restore notifyPages from notifyPagesAll
             // notifyPages are pages to notify in the current project
             // while $notifyPagesAll is used to store all the monitored pages.

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/lib/loadsave.php	2010-08-31 14:55:29 UTC (rev 7659)
@@ -1527,7 +1527,7 @@
     // Ensure that all mandatory pages are loaded
     $finder = new FileFinder;
 
-    if (!GFORGE) {
+    if (!FUSIONFORGE) {
         $mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/OldTextFormattingRules:Help/TextFormattingRules:PhpWikiAdministration');
     } else if (WIKI_NAME == "help") {
         $mandatory = explode(':','SandBox:Template/Category:Template/Talk:SpecialPages:CategoryCategory:CategoryActionPage:Help/TextFormattingRules:PhpWikiAdministration');

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/lib/main.php	2010-08-31 14:55:29 UTC (rev 7659)
@@ -954,7 +954,7 @@
             // Switched auth between sessions.
             // Note: There's no way to demandload a missing class-definition
             // afterwards! Stupid php.
-            if (defined('GFORGE') and GFORGE) {
+            if (defined('FUSIONFORGE') and FUSIONFORGE) {
                 if (empty($HTTP_SERVER_VARS['PHP_AUTH_USER'])) {
                     return false;
                 }
@@ -1413,7 +1413,7 @@
     $request->finish();
 }
 
-if ((!GFORGE) || (forge_get_config('installation_environment') != 'production')) {
+if ((!FUSIONFORGE) || (forge_get_config('installation_environment') != 'production')) {
     if (defined('E_STRICT') and (E_ALL & E_STRICT)) // strict php5?
         error_reporting(E_ALL & ~E_STRICT);         // exclude E_STRICT
     else

Modified: trunk/lib/plugin/PluginManager.php
===================================================================
--- trunk/lib/plugin/PluginManager.php	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/lib/plugin/PluginManager.php	2010-08-31 14:55:29 UTC (rev 7659)
@@ -120,7 +120,7 @@
             // make a link if an actionpage exists
             $pluginNamelink = $pluginName;
             $pluginDocPageName = _("Help")."/" . $pluginName . "Plugin";
-            if (defined('GFORGE') and GFORGE) {
+            if (defined('FUSIONFORGE') and FUSIONFORGE) {
                 $pluginDocPageName = _("Help").":" . $pluginName . "Plugin";
             }
 
@@ -148,7 +148,7 @@
                     $pluginDocPageNamelink = WikiLink($pluginDocPageName,'if_known');
             }
 
-            if (defined('GFORGE') and GFORGE) {
+            if (defined('FUSIONFORGE') and FUSIONFORGE) {
                 $pluginDocPageNamelink = WikiLink($pluginDocPageName, 'known');
             }
 

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/lib/plugin/UpLoad.php	2010-08-31 14:55:29 UTC (rev 7659)
@@ -174,7 +174,7 @@
             // Make sure that the user is logged in.
             $user = $request->getUser();
             if (!$user->isAuthenticated()) {
-                if (defined('GFORGE') and GFORGE) {
+                if (defined('FUSIONFORGE') and FUSIONFORGE) {
                     $message->pushContent(HTML::div(array('class' => 'error'),
                                             HTML::p(_("You cannot upload files.")),
                                             HTML::ul(

Modified: trunk/lib/plugin/UserPreferences.php
===================================================================
--- trunk/lib/plugin/UserPreferences.php	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/lib/plugin/UserPreferences.php	2010-08-31 14:55:29 UTC (rev 7659)
@@ -68,7 +68,7 @@
         $user->_request = $request;
         if (isa($request,'MockRequest'))
             return '';
-        if (defined('GFORGE') and GFORGE) {
+        if (defined('FUSIONFORGE') and FUSIONFORGE) {
             if (!($user->isAuthenticated())) {
                 return HTML::div(array('class' => 'errors'),
                                  _("Error: You are not logged in, cannot display UserPreferences."));

Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/lib/plugin/WatchPage.php	2010-08-31 14:55:29 UTC (rev 7659)
@@ -104,7 +104,7 @@
         $page = $args['page'];
         if (!$user->isAuthenticated() or empty($userid)) {
             // wrong or unauthenticated user
-            if (defined('GFORGE') and GFORGE) {
+            if (defined('FUSIONFORGE') and FUSIONFORGE) {
                 // No login banner for Gforge
                 return HTML::div(array('class' => 'error'),
                                  HTML::p(_("You must sign in to watch pages.")));
@@ -113,7 +113,7 @@
         } else {
             $pref = &$request->_prefs;
             $messages = "";
-            if (!defined('GFORGE') or !GFORGE) {
+            if (!defined('FUSIONFORGE') or !FUSIONFORGE) {
                 $email = $pref->get("email");
                 if (empty($email)) {
                     return HTML::div(

Modified: trunk/lib/wikilens/RatingsUser.php
===================================================================
--- trunk/lib/wikilens/RatingsUser.php	2010-08-31 13:42:28 UTC (rev 7658)
+++ trunk/lib/wikilens/RatingsUser.php	2010-08-31 14:55:29 UTC (rev 7659)
@@ -363,7 +363,7 @@
 
             while($rating = $rating_iter->next())
             {
-                if (defined('GFORGE') and GFORGE) {
+                if (defined('FUSIONFORGE') and FUSIONFORGE) {
                     $rating['pagename'] = preg_replace('/^'.PAGE_PREFIX.'/', '', $rating['pagename']);
                 }
                 $this->_num_ratings++;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


