From 0721a80c7480a0766a1231a6e38e7717a0e7617e Mon Sep 17 00:00:00 2001 From: vargenau Date: Tue, 31 Aug 2010 15:42:34 +0000 Subject: [PATCH] Rename from gforge to fusionforge git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@7664 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- TODO | 3 +-- config/config-dist.ini | 3 ++- configurator.php | 2 +- doc/CREDITS | 6 +++--- g | 8 ++++---- lib/CachedMarkup.php | 4 ++-- lib/WikiUserNew.php | 4 ++-- lib/loadsave.php | 2 +- lib/main.php | 2 +- lib/plugin/RecentChanges.php | 2 +- lib/upgrade.php | 2 +- pgsrc/ReleaseNotes | 4 ++-- themes/Makefile | 2 +- themes/Makefile.global | 2 +- themes/fusionforge/wikilens-min.js | 2 +- themes/fusionforge/wikilens.js | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/TODO b/TODO index 433a9250a..2e7f49399 100644 --- a/TODO +++ b/TODO @@ -11,7 +11,6 @@ ** in MonoBook, IEFixes.js cannot be minimized, yuicompressor-2.4.2 gives syntax errors * plugin Video does not work - short-term TODO: * rename should check existing subpages and rename these also. * Sidebar: merge AVL theme (internal MonoBook derivate with customizable @@ -161,7 +160,7 @@ already done lately: * change remove_page in WikiDb API, so that RecentChanges displays it. (just purge all revisions?) - * rename global $Theme to $WikiTheme (gforge nameclash) (100%) + * rename global $Theme to $WikiTheme (Gforge nameclash) (100%) 1.4.0 Goals: diff --git a/config/config-dist.ini b/config/config-dist.ini index 583e9a4c3..1fff16cec 100644 --- a/config/config-dist.ini +++ b/config/config-dist.ini @@ -626,7 +626,8 @@ ALLOW_USER_PASSWORDS = true ; LDAP: Authenticate against LDAP_AUTH_HOST with LDAP_BASE_DN ; IMAP: Authenticate against IMAP_AUTH_HOST (email account) ; POP3: Authenticate against POP3_AUTH_HOST (email account) -; Session: Get username and level from a PHP session variable. (e.g. for gforge) +; Session: Get username and level from a PHP session variable +; (e.g. for FusionForge) ; File: Store username:crypted-passwords in .htaccess like files. ; Use Apache's htpasswd to manage this file. ; HttpAuth: Use the protection by the webserver (.htaccess/.htpasswd) diff --git a/configurator.php b/configurator.php index 7357d7568..0ab985d47 100644 --- a/configurator.php +++ b/configurator.php @@ -889,7 +889,7 @@ Try any of these in the given order:
POP3
Authenticate against POP3_AUTH_HOST (email account)
Session
-
Get username and level from a PHP session variable. (e.g. for gforge)
+
Get username and level from a PHP session variable. (e.g. for FusionForge)
File
Store username:crypted-passwords in .htaccess like files. Use Apache's htpasswd to manage this file.
diff --git a/doc/CREDITS b/doc/CREDITS index b2380012f..4e632a98c 100644 --- a/doc/CREDITS +++ b/doc/CREDITS @@ -23,8 +23,8 @@ Please report bugs to mailto:phpwiki-talk@lists.sourceforge.net ! Developers ;[ Marc-Etienne Vargenau | mailto:vargenau@users.sourceforge.net ] : -;: Chief of gforge integration, WikiCreole integration, -;: html conformity, documentation, ... +;: Chief of FusionForge integration, WikiCreole integration, +;: HTML conformity, documentation, ... ;Sabri Labbenes ;: Wikiwyg @@ -217,7 +217,7 @@ Dietrich Ayala (NuSphere Corporation) for nusoap Michael Heilemann (Kubrick css) Gabriel Wicke (MonoBook layout, CSS and js) Chris Snyder (RawHtml safe mode) -Martin Langhoff (gforge integration) +Martin Langhoff (Gforge integration) Ry4an Brase (IRC gateway) Sara von Mosch (Word to wiki converter) diff --git a/g b/g index d66131b13..9216f2a57 100644 --- a/g +++ b/g @@ -66,14 +66,14 @@ if (!$group_id || !$project) { define('VIRTUAL_PATH', '/wiki/g/'.$group_name); define('PAGE_PREFIX', '_g'.$group_id.'_'); - define('THEME', 'gforge'); + define('THEME', 'fusionforge'); // For Gforge, we create some specific pages, located in the theme // except for project "help" if ($group_name == "help") { define('WIKI_PGSRC', 'pgsrc'); } else { - define('WIKI_PGSRC', 'themes/gforge/pgsrc'); + define('WIKI_PGSRC', 'themes/fusionforge/pgsrc'); } define('FUSIONFORGE', true); @@ -102,7 +102,7 @@ if (!$group_id || !$project) { // Get the maximum upload filesize from PHP config define('MAX_UPLOAD_SIZE', octets(ini_get('upload_max_filesize'))); - // Disable access log (already in apache & gforge). + // Disable access log (already in Apache & FusionForge). define('ACCESS_LOG_SQL', 0); define('DEBUG', ($sys_install_type != 'production')); @@ -171,7 +171,7 @@ if (!$group_id || !$project) { $LANG='en'; $LC_ALL='en_US'; // We use a local interwiki map file - define('INTERWIKI_MAP_FILE', 'themes/gforge/interwiki.map'); + define('INTERWIKI_MAP_FILE', 'themes/fusionforge/interwiki.map'); define('DEFAULT_WIKI_PAGES', ""); diff --git a/lib/CachedMarkup.php b/lib/CachedMarkup.php index dab503da9..cbc34372e 100644 --- a/lib/CachedMarkup.php +++ b/lib/CachedMarkup.php @@ -37,13 +37,13 @@ class CacheableMarkup extends XmlContent { function pack() { - // Gforge hack + // FusionForge hack // This causes a strange bug when a comment containing // a single quote is entered in the Summary box: // - the history is wrong (user and comment missing) // - the table of contents plugin no longer works global $WikiTheme; - if (isa($WikiTheme, 'WikiTheme_gforge')) { + if (isa($WikiTheme, 'WikiTheme_fusionforge')) { return serialize($this); } diff --git a/lib/WikiUserNew.php b/lib/WikiUserNew.php index 4e40c5a65..9884c1113 100644 --- a/lib/WikiUserNew.php +++ b/lib/WikiUserNew.php @@ -1984,7 +1984,7 @@ class UserPreferences // This should be probably be done with $customUserPreferenceColumns // For now, we use FUSIONFORGE define if (FUSIONFORGE) { - $gforgeprefs = array( + $fusionforgeprefs = array( 'pageTrail' => new _UserPreference_bool(), 'diffMenuItem' => new _UserPreference_bool(), 'pageInfoMenuItem' => new _UserPreference_bool(), @@ -2002,7 +2002,7 @@ class UserPreferences 'likePagesMenuItem' => new _UserPreference_bool(), 'specialPagesMenuItem' => new _UserPreference_bool(), ); - $this->_prefs = array_merge($this->_prefs, $gforgeprefs); + $this->_prefs = array_merge($this->_prefs, $fusionforgeprefs); } // add custom theme-specific pref types: diff --git a/lib/loadsave.php b/lib/loadsave.php index c08d83e33..b1e579004 100644 --- a/lib/loadsave.php +++ b/lib/loadsave.php @@ -113,7 +113,7 @@ function EndLoadDump(&$request) PrintXML(HTML::p(HTML::strong(_("Complete."))), HTML::p(fmt("Return to %s", $pagelink))); // Ugly hack to get valid XHTML code - if (isa($WikiTheme, 'WikiTheme_gforge')) { + if (isa($WikiTheme, 'WikiTheme_fusionforge')) { echo "\n"; echo "\n"; echo "\n"; diff --git a/lib/main.php b/lib/main.php index 6236e302e..74f2f45ce 100644 --- a/lib/main.php +++ b/lib/main.php @@ -115,7 +115,7 @@ class WikiRequest extends Request { if (isset($this->_user) and ( ! isa($this->_user, WikiUserClassname()) or (strtolower(get_class($this->_user)) == '_passuser') - or (strtolower(get_class($this->_user)) == '_gforgepassuser'))) + or (strtolower(get_class($this->_user)) == '_fusionforgepassuser'))) { $this->_user = WikiUser($userid, $this->_user->_prefs); } diff --git a/lib/plugin/RecentChanges.php b/lib/plugin/RecentChanges.php index 7f1d24916..b8dd4c138 100644 --- a/lib/plugin/RecentChanges.php +++ b/lib/plugin/RecentChanges.php @@ -494,7 +494,7 @@ extends _RecentChanges_Formatter $linkorname = $this->pageLink($rev); } - if ((isa($WikiTheme, 'WikiTheme_MonoBook')) or (isa($WikiTheme, 'WikiTheme_gforge'))) { + if ((isa($WikiTheme, 'WikiTheme_MonoBook')) or (isa($WikiTheme, 'WikiTheme_fusionforge'))) { $line->pushContent( $args['historylinks'] ? '' : $this->historyLink($rev), ' . . ', $linkorname, '; ', diff --git a/lib/upgrade.php b/lib/upgrade.php index 9734d0b05..ec17d63a7 100644 --- a/lib/upgrade.php +++ b/lib/upgrade.php @@ -146,7 +146,7 @@ class Upgrade { // see loadsave.php for saving new pages. function CheckPgsrcUpdate() { - // Check some theme specific pgsrc files (blog, wikilens, gforge, custom). + // Check some theme specific pgsrc files (blog, wikilens, fusionforge, custom). // We check theme specific pgsrc first in case the page is present in both // theme specific and global pgsrc global $WikiTheme; diff --git a/pgsrc/ReleaseNotes b/pgsrc/ReleaseNotes index 807f06d80..ab3fe4603 100644 --- a/pgsrc/ReleaseNotes +++ b/pgsrc/ReleaseNotes @@ -25,8 +25,8 @@ paragraphs). Improved dumping, pageset handling for format= with ~ActionPages. e.g. dump pagesets or multi-page pdf's. -The Sidebar theme is now an extension of the Monobook theme (known from wikipedia), -the new gforge theme is to be used together with gforge (the successor of Sourceforge). +The Sidebar theme is now an extension of the Monobook theme (known from Wikipedia), +the new fusionforge theme is to be used together with FusionForge (the successor of Gforge). === Fixes === * fix ~PagePerm for multiple groups: not a member and undecided: check other groups diff --git a/themes/Makefile b/themes/Makefile index 929991d67..aa31badbe 100644 --- a/themes/Makefile +++ b/themes/Makefile @@ -7,7 +7,7 @@ .PHONY: all css js -THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX gforge \ +THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX fusionforge \ Portland shamino_com Crao Wordpress smaller Hawaiian # http://developer.yahoo.com/yui/compressor/ diff --git a/themes/Makefile.global b/themes/Makefile.global index 020033a0d..b6936b4ec 100644 --- a/themes/Makefile.global +++ b/themes/Makefile.global @@ -6,7 +6,7 @@ .PHONY: all css js -THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX gforge +THEMES = default MonoBook wikilens Sidebar SpaceWiki blog MacOSX fusionforge # http://developer.yahoo.com/yui/compressor/ YUICOMPRESSOR = java -jar ../default/yuicompressor-2.4.2.jar diff --git a/themes/fusionforge/wikilens-min.js b/themes/fusionforge/wikilens-min.js index c57377ea9..42974d4a1 100644 --- a/themes/fusionforge/wikilens-min.js +++ b/themes/fusionforge/wikilens-min.js @@ -1 +1 @@ -var rating=new Array;var prediction=new Array;var avg=new Array;var numusers=new Array;var canRate=new Array;var msg_rating_votes="Rating: %.1f (%d votes)";var msg_curr_rating="Your current rating: ";var msg_curr_prediction="Your current prediction: ";var msg_to=" to ";var msg_add_rating="Add your rating: ";var msg_thanks="Thanks!";var msg_rating_deleted="Rating deleted!";var rateit_imgsrc="/plugins/wiki/themes/gforge/images/RateIt";var rateit_action="RateIt";var idTop="";function displayRating(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(canRate[a]){if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(g<=(k*2)){e="O"}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function displayRating2(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(k<=n){if(g<=(k*2)){e="Rp"}else{if(g<=(n*2)){e="R"}}}else{if(g<=(n*2)){e="Rp"}else{if(g<=(k*2)){e="Rm"}}}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function sprintfRating(b,a,c){var d=Math.round(a*10)/10;if(c<2){b=b.replace(/votes/,"vote")}return b.replace(/\%.1f/,d).replace(/\%d/,c)}function clickRating(c,f,i,a,e,g){var h=a+"Action";var j=document.getElementById("rateit-widget-top");var k=numusers[a];var b=rating[a];if(g=="X"){deleteRating(h,f,e);if(j&&k){var d=avg[a]*k;var l;if(b&&b>0){if(k>1){l=(d-b)/(k-1);numusers[a]--}else{l=0;numusers[a]=0}}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,k-1)}}rating[a]=0;displayRating2(a,c,0,0,1)}else{submitRating(h,f,i,e,g);if(j&&k){var d=avg[a]*k;var l;if(b&&(b>0)){l=(d+g-b)/k}else{l=(d+g)/(k+1);numusers[a]++}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;if(g!=rating[a]){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,numusers[a])}}}else{if(j&&idTop==a){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,g,1);avg[a]=g;numusers[a]=1}}rating[a]=g;displayRating2(a,c,g,0,1)}}function submitRating(d,e,a,f,g){var c=Math.round(Math.random()*(1000000));var b=WikiURL(e)+"version="+a+"&action="+rateit_action+"&mode=add&rating="+g+"&dimension="+f+"&nocache=1&nopurge=1&rand="+c;document[d].title=msg_thanks;document[d].src=b}function deleteRating(c,d,e){var b=Math.round(Math.random()*(1000000));var a=WikiURL(d)+"action="+rateit_action+"&mode=delete&dimension="+e+"&nocache=1&nopurge=1&rand="+b;document[c].title=msg_rating_deleted;document[c].src=a}; \ No newline at end of file +var rating=new Array;var prediction=new Array;var avg=new Array;var numusers=new Array;var canRate=new Array;var msg_rating_votes="Rating: %.1f (%d votes)";var msg_curr_rating="Your current rating: ";var msg_curr_prediction="Your current prediction: ";var msg_to=" to ";var msg_add_rating="Add your rating: ";var msg_thanks="Thanks!";var msg_rating_deleted="Rating deleted!";var rateit_imgsrc="/plugins/wiki/themes/fusionforge/images/RateIt";var rateit_action="RateIt";var idTop="";function displayRating(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(canRate[a]){if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(g<=(k*2)){e="O"}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function displayRating2(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(k<=n){if(g<=(k*2)){e="Rp"}else{if(g<=(n*2)){e="R"}}}else{if(g<=(n*2)){e="Rp"}else{if(g<=(k*2)){e="Rm"}}}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function sprintfRating(b,a,c){var d=Math.round(a*10)/10;if(c<2){b=b.replace(/votes/,"vote")}return b.replace(/\%.1f/,d).replace(/\%d/,c)}function clickRating(c,f,i,a,e,g){var h=a+"Action";var j=document.getElementById("rateit-widget-top");var k=numusers[a];var b=rating[a];if(g=="X"){deleteRating(h,f,e);if(j&&k){var d=avg[a]*k;var l;if(b&&b>0){if(k>1){l=(d-b)/(k-1);numusers[a]--}else{l=0;numusers[a]=0}}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,k-1)}}rating[a]=0;displayRating2(a,c,0,0,1)}else{submitRating(h,f,i,e,g);if(j&&k){var d=avg[a]*k;var l;if(b&&(b>0)){l=(d+g-b)/k}else{l=(d+g)/(k+1);numusers[a]++}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;if(g!=rating[a]){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,numusers[a])}}}else{if(j&&idTop==a){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,g,1);avg[a]=g;numusers[a]=1}}rating[a]=g;displayRating2(a,c,g,0,1)}}function submitRating(d,e,a,f,g){var c=Math.round(Math.random()*(1000000));var b=WikiURL(e)+"version="+a+"&action="+rateit_action+"&mode=add&rating="+g+"&dimension="+f+"&nocache=1&nopurge=1&rand="+c;document[d].title=msg_thanks;document[d].src=b}function deleteRating(c,d,e){var b=Math.round(Math.random()*(1000000));var a=WikiURL(d)+"action="+rateit_action+"&mode=delete&dimension="+e+"&nocache=1&nopurge=1&rand="+b;document[c].title=msg_rating_deleted;document[c].src=a}; \ No newline at end of file diff --git a/themes/fusionforge/wikilens.js b/themes/fusionforge/wikilens.js index 351c6bfc3..448cc3c0e 100644 --- a/themes/fusionforge/wikilens.js +++ b/themes/fusionforge/wikilens.js @@ -23,7 +23,7 @@ var msg_thanks = "Thanks!"; var msg_rating_deleted = "Rating deleted!"; //var rateit_imgsrc = '/phpwiki-cvs/themes/MonoBook/images/RateIt'; -var rateit_imgsrc = '/plugins/wiki/themes/gforge/images/RateIt'; +var rateit_imgsrc = '/plugins/wiki/themes/fusionforge/images/RateIt'; var rateit_action = 'RateIt'; var idTop = ''; // -- 2.45.0