phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] SF.net SVN: phpwiki:[7662] trunk/themes/fusionforge

[<var...@us...>]

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

Log Message:
-----------
Rename files from gforge to fusionforge

Modified Paths:
--------------
    trunk/themes/fusionforge/Makefile
    trunk/themes/fusionforge/fusionforge-autonumbering-min.css
    trunk/themes/fusionforge/fusionforge-autonumbering.css
    trunk/themes/fusionforge/fusionforge-print-min.css
    trunk/themes/fusionforge/fusionforge-print.css
    trunk/themes/fusionforge/fusionforge-rereading-min.css
    trunk/themes/fusionforge/fusionforge-rereading.css

Modified: trunk/themes/fusionforge/Makefile
===================================================================
--- trunk/themes/fusionforge/Makefile	2010-08-31 15:08:32 UTC (rev 7661)
+++ trunk/themes/fusionforge/Makefile	2010-08-31 15:12:14 UTC (rev 7662)
@@ -1,11 +1,11 @@
 # $Id$
 #
-# themes/gforge/Makefile
+# themes/fusionforge/Makefile
 #
 # minify CSS and JS
 #
 
-CSS_SRC = gforge.css gforge-print.css gforge-autonumbering.css gforge-rereading.css gforge-fullscreen.css
+CSS_SRC = fusionforge.css fusionforge-print.css fusionforge-autonumbering.css fusionforge-rereading.css fusionforge-fullscreen.css
 MAIN = wikilens
 JS_MAIN = wikilens.js
 

Modified: trunk/themes/fusionforge/fusionforge-autonumbering-min.css
===================================================================
--- trunk/themes/fusionforge/fusionforge-autonumbering-min.css	2010-08-31 15:08:32 UTC (rev 7661)
+++ trunk/themes/fusionforge/fusionforge-autonumbering-min.css	2010-08-31 15:12:14 UTC (rev 7662)
@@ -1 +1 @@
-@import url(gforge.css);body{counter-reset:chapter;}h2:before{content:counter(chapter) ". ";counter-increment:chapter;}h2{counter-reset:section;}h3:before{content:counter(chapter) "." counter(section) " ";counter-increment:section;}h3{counter-reset:subsection;}h4:before{content:counter(chapter) "." counter(section) "." counter(subsection) " ";counter-increment:subsection;}h4{counter-reset:subsection2;}h5:before{content:counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) " ";counter-increment:subsection2;}h5{counter-reset:subsection3;}h6:before{content:counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) "." counter(subsection3) " ";counter-increment:subsection3;}
\ No newline at end of file
+@import url(fusionforge.css);body{counter-reset:chapter;}h2:before{content:counter(chapter) ". ";counter-increment:chapter;}h2{counter-reset:section;}h3:before{content:counter(chapter) "." counter(section) " ";counter-increment:section;}h3{counter-reset:subsection;}h4:before{content:counter(chapter) "." counter(section) "." counter(subsection) " ";counter-increment:subsection;}h4{counter-reset:subsection2;}h5:before{content:counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) " ";counter-increment:subsection2;}h5{counter-reset:subsection3;}h6:before{content:counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) "." counter(subsection3) " ";counter-increment:subsection3;}
\ No newline at end of file

Modified: trunk/themes/fusionforge/fusionforge-autonumbering.css
===================================================================
--- trunk/themes/fusionforge/fusionforge-autonumbering.css	2010-08-31 15:08:32 UTC (rev 7661)
+++ trunk/themes/fusionforge/fusionforge-autonumbering.css	2010-08-31 15:12:14 UTC (rev 7662)
@@ -42,7 +42,7 @@
  * ALONE BASIS."
  */
 
-@import url(gforge.css);
+@import url(fusionforge.css);
 
 body {
     counter-reset: chapter;      /* Create a chapter counter scope */

Modified: trunk/themes/fusionforge/fusionforge-print-min.css
===================================================================
--- trunk/themes/fusionforge/fusionforge-print-min.css	2010-08-31 15:08:32 UTC (rev 7661)
+++ trunk/themes/fusionforge/fusionforge-print-min.css	2010-08-31 15:12:14 UTC (rev 7662)
@@ -1 +1 @@
-.toolpalettes{display:none;}.pagetrail{display:none;}.browsebanner{display:none;}.editdate{display:none;}a{color:black;}a.interwiki img{display:none;}a.named-interwiki img{display:none;}a.namedurl img{display:none;}img[src="/wiki/themes/gforge/buttons/no_order.png"]{display:none;}div.toc{border:1px solid black;}#toctoggle{display:none;}div.toc p.toctitle,h1,h2,h3,h4,h5,h6{border-bottom:1px solid black;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-color:black;}#content{background:white;border:none;}table.nobreak{page-break-inside:avoid!important;}
\ No newline at end of file
+.toolpalettes{display:none;}.pagetrail{display:none;}.browsebanner{display:none;}.editdate{display:none;}a{color:black;}a.interwiki img{display:none;}a.named-interwiki img{display:none;}a.namedurl img{display:none;}img[src="/wiki/themes/fusionforge/buttons/no_order.png"]{display:none;}div.toc{border:1px solid black;}#toctoggle{display:none;}div.toc p.toctitle,h1,h2,h3,h4,h5,h6{border-bottom:1px solid black;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-color:black;}#content{background:white;border:none;}table.nobreak{page-break-inside:avoid!important;}
\ No newline at end of file

Modified: trunk/themes/fusionforge/fusionforge-print.css
===================================================================
--- trunk/themes/fusionforge/fusionforge-print.css	2010-08-31 15:08:32 UTC (rev 7661)
+++ trunk/themes/fusionforge/fusionforge-print.css	2010-08-31 15:12:14 UTC (rev 7662)
@@ -63,7 +63,7 @@
 a.namedurl img { display: none; }
 
 /* Do not print "none" sorting icon */
-img[src="/wiki/themes/gforge/buttons/no_order.png"] { display: none; }
+img[src="/wiki/themes/fusionforge/buttons/no_order.png"] { display: none; }
 
 /**
  * Table of content

Modified: trunk/themes/fusionforge/fusionforge-rereading-min.css
===================================================================
--- trunk/themes/fusionforge/fusionforge-rereading-min.css	2010-08-31 15:08:32 UTC (rev 7661)
+++ trunk/themes/fusionforge/fusionforge-rereading-min.css	2010-08-31 15:12:14 UTC (rev 7662)
@@ -1 +1 @@
-@import url(gforge-autonumbering.css);#content{counter-reset:paragraph;}div.wikitext p:before{content:"{" counter(paragraph) ";}";counter-increment:paragraph;color:red;}
\ No newline at end of file
+@import url(fusionforge-autonumbering.css);#content{counter-reset:paragraph;}div.wikitext p:before{content:"{" counter(paragraph) ";}";counter-increment:paragraph;color:red;}
\ No newline at end of file

Modified: trunk/themes/fusionforge/fusionforge-rereading.css
===================================================================
--- trunk/themes/fusionforge/fusionforge-rereading.css	2010-08-31 15:08:32 UTC (rev 7661)
+++ trunk/themes/fusionforge/fusionforge-rereading.css	2010-08-31 15:12:14 UTC (rev 7662)
@@ -42,7 +42,7 @@
  * ALONE BASIS."
  */
 
-@import url(gforge-autonumbering.css);
+@import url(fusionforge-autonumbering.css);
 
 #content {
     counter-reset: paragraph;    /* Create a paragraph counter scope */


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7660] trunk/themes

[<var...@us...>]

Revision: 7660
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7660&view=rev
Author:   vargenau
Date:     2010-08-31 15:03:30 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
Rename gforge theme as fusionforge

Added Paths:
-----------
    trunk/themes/fusionforge/

Removed Paths:
-------------
    trunk/themes/gforge/


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7663] trunk

[<var...@us...>]

Revision: 7663
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7663&view=rev
Author:   vargenau
Date:     2010-08-31 15:23:17 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
Rename WikiUser/GForge.php as WikiUser/FusionForge.php

Modified Paths:
--------------
    trunk/g
    trunk/lib/SemanticWeb.php

Added Paths:
-----------
    trunk/lib/WikiUser/FusionForge.php

Removed Paths:
-------------
    trunk/lib/WikiUser/GForge.php

Modified: trunk/g
===================================================================
--- trunk/g	2010-08-31 15:12:14 UTC (rev 7662)
+++ trunk/g	2010-08-31 15:23:17 UTC (rev 7663)
@@ -160,9 +160,9 @@
     // Do not allow fake user
     define('ALLOW_BOGO_LOGIN', false);
 
-    // A dedicated auth has been created to get auth from GForge
-    $USER_AUTH_ORDER = array("GForge");
-    define('USER_AUTH_ORDER', 'GForge');
+    // A dedicated auth has been created to get auth from FusionForge
+    $USER_AUTH_ORDER = array("FusionForge");
+    define('USER_AUTH_ORDER', 'FusionForge');
     define('USER_AUTH_POLICY', 'strict');
 
     define('EXTERNAL_LINK_TARGET', '_top');

Modified: trunk/lib/SemanticWeb.php
===================================================================
--- trunk/lib/SemanticWeb.php	2010-08-31 15:12:14 UTC (rev 7662)
+++ trunk/lib/SemanticWeb.php	2010-08-31 15:23:17 UTC (rev 7663)
@@ -77,7 +77,7 @@
  *   http://phpwiki.org/SemanticWeb,
  *   http://en.wikipedia.org/wiki/Knowledge_representation
  *   http://www.ontoweb.org/
- *   http://www.semwebcentral.org/ (OWL on top of GForge)
+ *   http://www.semwebcentral.org/ (OWL on top of FusionForge)
  *
  *
  * Author: Reini Urban <ru...@x-...>

Copied: trunk/lib/WikiUser/FusionForge.php (from rev 7658, trunk/lib/WikiUser/GForge.php)
===================================================================
--- trunk/lib/WikiUser/FusionForge.php	                        (rev 0)
+++ trunk/lib/WikiUser/FusionForge.php	2010-08-31 15:23:17 UTC (rev 7663)
@@ -0,0 +1,108 @@
+<?php //-*-php-*-
+// rcs_id('$Id$');
+/*
+ * Copyright (C) 2006 Alain Peyrat
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/** Call the FusionForge functions to get the username
+ *
+ */
+class _FusionForgePassUser extends _PassUser {
+
+    var $_is_external = 0;
+
+    function _FusionForgePassUser($UserName='',$prefs=false) {
+        if ($prefs) $this->_prefs = $prefs;
+        if (!isset($this->_prefs->_method))
+           _PassUser::_PassUser($UserName);
+        if ($UserName) $this->_userid = $UserName;
+        $this->_authmethod = 'FusionForge';
+
+        // Is this double check really needed?
+        // It is not expensive so we keep it for now.
+        if ($this->userExists())
+            return $this;
+        else
+            return $GLOBALS['ForbiddenUser'];
+    }
+
+    function userExists() {
+            global $group_id;
+
+        // Mapping (PhpWiki vs FusionForge) performed is:
+        //     ANON  for non logged or non member
+        //     USER  for member of the project.
+        //     ADMIN for member having admin rights
+        if (session_loggedin()){
+
+            // Get project object (if error => ANON)
+            $project =& group_get_object($group_id);
+
+            if (!$project || !is_object($project)) {
+                $this->_level = WIKIAUTH_ANON;
+                return false;
+            } elseif ($project->isError()) {
+                $this->_level = WIKIAUTH_ANON;
+                return false;
+            }
+
+            $member = false ;
+            $user = session_get_user();
+            $perm =& $project->getPermission($user);
+            if (!$perm || !is_object($perm)) {
+                $this->_level = WIKIAUTH_ANON;
+                return false;
+            } elseif (!$perm->isError()) {
+                $member = $perm->isMember();
+            }
+
+            if ($member) {
+                $this->_userid = $user->getRealName();
+                $this->_is_external = $user->getIsExternal();
+                if ($perm->isAdmin()) {
+                    $this->_level = WIKIAUTH_ADMIN;
+                } else {
+                    $this->_level = WIKIAUTH_USER;
+                }
+                return $this;
+            }
+        }
+               $this->_level = WIKIAUTH_ANON;
+               return false;
+    }
+
+    function checkPass($submitted_password) {
+        return $this->userExists()
+            ? ($this->isAdmin() ? WIKIAUTH_ADMIN : WIKIAUTH_USER)
+            : WIKIAUTH_ANON;
+    }
+
+    function mayChangePass() {
+        return false;
+    }
+}
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
+?>

Deleted: trunk/lib/WikiUser/GForge.php
===================================================================
--- trunk/lib/WikiUser/GForge.php	2010-08-31 15:12:14 UTC (rev 7662)
+++ trunk/lib/WikiUser/GForge.php	2010-08-31 15:23:17 UTC (rev 7663)
@@ -1,108 +0,0 @@
-<?php //-*-php-*-
-// rcs_id('$Id$');
-/*
- * Copyright (C) 2006 Alain Peyrat
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/** Call the gforge functions to get the username
- *
- */
-class _GForgePassUser extends _PassUser {
-
-    var $_is_external = 0;
-
-    function _GForgePassUser($UserName='',$prefs=false) {
-        if ($prefs) $this->_prefs = $prefs;
-        if (!isset($this->_prefs->_method))
-           _PassUser::_PassUser($UserName);
-        if ($UserName) $this->_userid = $UserName;
-        $this->_authmethod = 'GForge';
-
-        // Is this double check really needed?
-        // It is not expensive so we keep it for now.
-        if ($this->userExists())
-            return $this;
-        else
-            return $GLOBALS['ForbiddenUser'];
-    }
-
-    function userExists() {
-            global $group_id;
-
-        // Mapping (phpWiki vs GForge) performed is:
-        //     ANON  for non logged or non member
-        //     USER  for member of the project.
-        //     ADMIN for member having admin rights
-        if (session_loggedin()){
-
-            // Get project object (if error => ANON)
-            $project =& group_get_object($group_id);
-
-            if (!$project || !is_object($project)) {
-                $this->_level = WIKIAUTH_ANON;
-                return false;
-            } elseif ($project->isError()) {
-                $this->_level = WIKIAUTH_ANON;
-                return false;
-            }
-
-            $member = false ;
-            $user = session_get_user();
-            $perm =& $project->getPermission($user);
-            if (!$perm || !is_object($perm)) {
-                $this->_level = WIKIAUTH_ANON;
-                return false;
-            } elseif (!$perm->isError()) {
-                $member = $perm->isMember();
-            }
-
-            if ($member) {
-                $this->_userid = $user->getRealName();
-                $this->_is_external = $user->getIsExternal();
-                if ($perm->isAdmin()) {
-                    $this->_level = WIKIAUTH_ADMIN;
-                } else {
-                    $this->_level = WIKIAUTH_USER;
-                }
-                return $this;
-            }
-        }
-               $this->_level = WIKIAUTH_ANON;
-               return false;
-    }
-
-    function checkPass($submitted_password) {
-        return $this->userExists()
-            ? ($this->isAdmin() ? WIKIAUTH_ADMIN : WIKIAUTH_USER)
-            : WIKIAUTH_ANON;
-    }
-
-    function mayChangePass() {
-        return false;
-    }
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:
-?>


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7666] trunk

[<var...@us...>]

Revision: 7666
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7666&view=rev
Author:   vargenau
Date:     2010-08-31 16:02:45 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
Rename from gforge to fusionforge

Modified Paths:
--------------
    trunk/g
    trunk/lib/IniConfig.php
    trunk/lib/MailNotify.php
    trunk/lib/WikiTheme.php
    trunk/lib/WikiUserNew.php
    trunk/lib/plugin/WatchPage.php
    trunk/pgsrc/Help%2FRecentChangesPlugin
    trunk/themes/fusionforge/templates/html.tmpl

Modified: trunk/g
===================================================================
--- trunk/g	2010-08-31 15:54:37 UTC (rev 7665)
+++ trunk/g	2010-08-31 16:02:45 UTC (rev 7666)
@@ -68,7 +68,7 @@
 
     define('THEME', 'fusionforge');
 
-    // For Gforge, we create some specific pages, located in the theme
+    // For FusionForge, we create some specific pages, located in the theme
     // except for project "help"
     if ($group_name == "help") {
         define('WIKI_PGSRC', 'pgsrc');
@@ -115,7 +115,7 @@
     // Disable VACUUM (they are performed every night)
     define('DATABASE_OPTIMISE_FREQUENCY', 0);
 
-    // TBD: the name should be taken from Gforge
+    // TBD: the name should be taken from FusionForge
     // define('ADMIN_USER', 'ACOS Forge Administrator');
     define('ADMIN_USER', 'The PhpWiki programming team');
     // Dummy value

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2010-08-31 15:54:37 UTC (rev 7665)
+++ trunk/lib/IniConfig.php	2010-08-31 16:02:45 UTC (rev 7666)
@@ -44,7 +44,7 @@
  * - Old-style index.php => config/config.ini converter.
  *
  * - Don't use too much globals for easier integration into other projects
- *   (namespace pollution). (gforge, phpnuke, postnuke, phpBB2, carolina, ...)
+ *   (namespace pollution). (FusionForge, phpnuke, postnuke, phpBB2, carolina, ...)
  *   Use one global $phpwiki object instead which holds the cfg vars, constants
  *   and all other globals.
  *     (global $FieldSeparator, $charset, $WikiNameRegexp, $KeywordLinkRegexp;
@@ -918,7 +918,7 @@
     if (!defined('DEFAULT_LANGUAGE'))   // not needed anymore
         define('DEFAULT_LANGUAGE', ''); // detect from client
 
-    // Gforge hack
+    // FusionForge hack
     if (!FUSIONFORGE) {
         // Disable update_locale because Zend Debugger crash
         if(! extension_loaded('Zend Debugger')) {

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2010-08-31 15:54:37 UTC (rev 7665)
+++ trunk/lib/MailNotify.php	2010-08-31 16:02:45 UTC (rev 7666)
@@ -187,7 +187,7 @@
         $encoded_subject = $this->subject_encode($subject);
         $emails = $this->emails;
         $from = $this->from;
-        // Do not send if modification is from Gforge admin
+        // Do not send if modification is from FusionForge admin
         if (FUSIONFORGE and $from == ADMIN_USER) {
             return;
         }

Modified: trunk/lib/WikiTheme.php
===================================================================
--- trunk/lib/WikiTheme.php	2010-08-31 15:54:37 UTC (rev 7665)
+++ trunk/lib/WikiTheme.php	2010-08-31 16:02:45 UTC (rev 7666)
@@ -224,7 +224,7 @@
         }
         $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("wikicommon.js"))));
         if (!FUSIONFORGE) {
-            // Gforge already loads this
+            // FusionForge already loads this
             $this->addMoreHeaders(JavaScript('',array('src' => $this->_findData("sortable.js"))));
         }
         // by pixels

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2010-08-31 15:54:37 UTC (rev 7665)
+++ trunk/lib/WikiUserNew.php	2010-08-31 16:02:45 UTC (rev 7666)
@@ -1775,7 +1775,7 @@
 extends _UserPreference
 {
     function get($name) {
-        // get email address from Gforge
+        // get e-mail address from FusionForge
         if (FUSIONFORGE && session_loggedin()) {
             $user = session_get_user();
             return $user->getEmail();
@@ -1785,7 +1785,7 @@
     }
 
     function sanify($value) {
-        // email address is already checked by Gforge
+        // e-mail address is already checked by FusionForge
         if (FUSIONFORGE) return $value;
         // check for valid email address
         if ($this->get('email') == $value and $this->getraw('emailVerified'))
@@ -1807,7 +1807,7 @@
      * For true verification (value = 2), we'd need a mailserver hook.
      */
     function update($value) {
-        // email address is already checked by Gforge
+        // e-mail address is already checked by FusionForge
         if (FUSIONFORGE) return $value;
     	if (!empty($this->_init)) return;
         $verified = $this->getraw('emailVerified');

Modified: trunk/lib/plugin/WatchPage.php
===================================================================
--- trunk/lib/plugin/WatchPage.php	2010-08-31 15:54:37 UTC (rev 7665)
+++ trunk/lib/plugin/WatchPage.php	2010-08-31 16:02:45 UTC (rev 7666)
@@ -105,7 +105,7 @@
         if (!$user->isAuthenticated() or empty($userid)) {
             // wrong or unauthenticated user
             if (defined('FUSIONFORGE') and FUSIONFORGE) {
-                // No login banner for Gforge
+                // No login banner for FusionForge
                 return HTML::div(array('class' => 'error'),
                                  HTML::p(_("You must sign in to watch pages.")));
             }

Modified: trunk/pgsrc/Help%2FRecentChangesPlugin
===================================================================
--- trunk/pgsrc/Help%2FRecentChangesPlugin	2010-08-31 15:54:37 UTC (rev 7665)
+++ trunk/pgsrc/Help%2FRecentChangesPlugin	2010-08-31 16:02:45 UTC (rev 7666)
@@ -78,7 +78,7 @@
 |-
 | **historylinks**
 | Show history links
-| false (true for Monobook and Gforge)
+| false (true for Monobook and FusionForge)
 |-
 | **caption**
 | Custom caption

Modified: trunk/themes/fusionforge/templates/html.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/html.tmpl	2010-08-31 15:54:37 UTC (rev 7665)
+++ trunk/themes/fusionforge/templates/html.tmpl	2010-08-31 16:02:45 UTC (rev 7666)
@@ -3,7 +3,7 @@
 ?>
 <?php
 /*
- * No header for Gforge (already provided)
+ * No header for FusionForge (already provided)
  */
 ?>
 <?php $WikiTheme->header() ?>


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7665] trunk

[<var...@us...>]

Revision: 7665
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7665&view=rev
Author:   vargenau
Date:     2010-08-31 15:54:37 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
Rename from gforge to fusionforge

Modified Paths:
--------------
    trunk/doc/HISTORY
    trunk/pgsrc/ReleaseNotes
    trunk/themes/fusionforge/themeinfo.php

Modified: trunk/doc/HISTORY
===================================================================
--- trunk/doc/HISTORY	2010-08-31 15:42:34 UTC (rev 7664)
+++ trunk/doc/HISTORY	2010-08-31 15:54:37 UTC (rev 7665)
@@ -81,7 +81,7 @@
 * brought WikiUser (old) uptodate
 * added owner and acl fields to dumps
 * import GOOGLE_LICENSE_KEY and FORTUNE_DIR from config.ini
-* renamed global $Theme to $WikiTheme (gforge nameclash)
+* renamed global $Theme to $WikiTheme (Gforge nameclash)
 
 new:
 * new ENABLE_EDIT_TOOLBAR (from mediawiki), JS_SEARCHREPLACE currently broken.

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2010-08-31 15:42:34 UTC (rev 7664)
+++ trunk/pgsrc/ReleaseNotes	2010-08-31 15:54:37 UTC (rev 7665)
@@ -535,7 +535,7 @@
 * brought ~WikiUser (old) uptodate
 * added owner and acl fields to dumps
 * import GOOGLE_LICENSE_KEY and FORTUNE_DIR from config.ini
-* renamed global $Theme to $~WikiTheme (gforge nameclash)
+* renamed global $Theme to $~WikiTheme (Gforge nameclash)
 * aggressive WikiDB and cache memory optimization: don't cache %content
   and _cached_html if not needed.
 * PageDump added format=backup: dump all revisions.

Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php	2010-08-31 15:42:34 UTC (rev 7664)
+++ trunk/themes/fusionforge/themeinfo.php	2010-08-31 15:54:37 UTC (rev 7665)
@@ -11,7 +11,7 @@
 require_once('lib/WikiTheme.php');
 require_once('themes/wikilens/themeinfo.php');
 
-class WikiTheme_gforge extends WikiTheme_Wikilens {
+class WikiTheme_fusionforge extends WikiTheme_Wikilens {
 
     function header() {
         global $HTML, $group_id, $group_public_name, $request, $project;
@@ -148,7 +148,7 @@
     }
 }
 
-$WikiTheme = new WikiTheme_gforge('gforge');
+$WikiTheme = new WikiTheme_fusionforge('fusionforge');
 
 // Local Variables:
 // mode: php


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7664] trunk

[<var...@us...>]

Revision: 7664
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7664&view=rev
Author:   vargenau
Date:     2010-08-31 15:42:34 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
Rename from gforge to fusionforge

Modified Paths:
--------------
    trunk/TODO
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/doc/CREDITS
    trunk/g
    trunk/lib/CachedMarkup.php
    trunk/lib/WikiUserNew.php
    trunk/lib/loadsave.php
    trunk/lib/main.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/upgrade.php
    trunk/pgsrc/ReleaseNotes
    trunk/themes/Makefile
    trunk/themes/Makefile.global
    trunk/themes/fusionforge/wikilens-min.js
    trunk/themes/fusionforge/wikilens.js

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/TODO	2010-08-31 15:42:34 UTC (rev 7664)
@@ -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 @@
 
     * 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:
 

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/config/config-dist.ini	2010-08-31 15:42:34 UTC (rev 7664)
@@ -626,7 +626,8 @@
 ;   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)

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/configurator.php	2010-08-31 15:42:34 UTC (rev 7664)
@@ -889,7 +889,7 @@
 <dt>POP3</dt>
 	<dd>Authenticate against POP3_AUTH_HOST (email account)</dd>
 <dt>Session</dt>
-	<dd>Get username and level from a PHP session variable. (e.g. for gforge)</dd>
+	<dd>Get username and level from a PHP session variable. (e.g. for FusionForge)</dd>
 <dt>File</dt>
 	<dd>Store username:crypted-passwords in .htaccess like files. 
          Use Apache's htpasswd to manage this file.</dd>

Modified: trunk/doc/CREDITS
===================================================================
--- trunk/doc/CREDITS	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/doc/CREDITS	2010-08-31 15:42:34 UTC (rev 7664)
@@ -23,8 +23,8 @@
 ! Developers
 
 ;[ Marc-Etienne Vargenau | mailto:var...@us... ] :
-;: 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 @@
 Michael Heilemann (Kubrick css)
 Gabriel Wicke (MonoBook layout, CSS and js)
 Chris Snyder (RawHtml safe mode)
-Martin Langhoff <ma...@ca...> (gforge integration)
+Martin Langhoff <ma...@ca...> (Gforge integration)
 Ry4an Brase (IRC gateway)
 Sara von Mosch (Word to wiki converter)
 </pre>

Modified: trunk/g
===================================================================
--- trunk/g	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/g	2010-08-31 15:42:34 UTC (rev 7664)
@@ -66,14 +66,14 @@
     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 @@
     // 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 @@
     $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', "");
 

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/lib/CachedMarkup.php	2010-08-31 15:42:34 UTC (rev 7664)
@@ -37,13 +37,13 @@
 
     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);
         }
 

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/lib/WikiUserNew.php	2010-08-31 15:42:34 UTC (rev 7664)
@@ -1984,7 +1984,7 @@
         // 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 @@
                     '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:

Modified: trunk/lib/loadsave.php
===================================================================
--- trunk/lib/loadsave.php	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/lib/loadsave.php	2010-08-31 15:42:34 UTC (rev 7664)
@@ -113,7 +113,7 @@
     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 "</div>\n";
         echo "</td></tr>\n";
         echo "</table>\n";

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/lib/main.php	2010-08-31 15:42:34 UTC (rev 7664)
@@ -115,7 +115,7 @@
                 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);
                 }

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/lib/plugin/RecentChanges.php	2010-08-31 15:42:34 UTC (rev 7664)
@@ -494,7 +494,7 @@
             $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, '; ',

Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/lib/upgrade.php	2010-08-31 15:42:34 UTC (rev 7664)
@@ -146,7 +146,7 @@
 
     // 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;

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/pgsrc/ReleaseNotes	2010-08-31 15:42:34 UTC (rev 7664)
@@ -25,8 +25,8 @@
 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

Modified: trunk/themes/Makefile
===================================================================
--- trunk/themes/Makefile	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/themes/Makefile	2010-08-31 15:42:34 UTC (rev 7664)
@@ -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/

Modified: trunk/themes/Makefile.global
===================================================================
--- trunk/themes/Makefile.global	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/themes/Makefile.global	2010-08-31 15:42:34 UTC (rev 7664)
@@ -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

Modified: trunk/themes/fusionforge/wikilens-min.js
===================================================================
--- trunk/themes/fusionforge/wikilens-min.js	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/themes/fusionforge/wikilens-min.js	2010-08-31 15:42:34 UTC (rev 7664)
@@ -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

Modified: trunk/themes/fusionforge/wikilens.js
===================================================================
--- trunk/themes/fusionforge/wikilens.js	2010-08-31 15:23:17 UTC (rev 7663)
+++ trunk/themes/fusionforge/wikilens.js	2010-08-31 15:42:34 UTC (rev 7664)
@@ -23,7 +23,7 @@
 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 = '';
 //


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7661] trunk/themes/fusionforge

[<var...@us...>]

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

Log Message:
-----------
Rename files from gforge to fusionforge

Added Paths:
-----------
    trunk/themes/fusionforge/fusionforge-autonumbering-min.css
    trunk/themes/fusionforge/fusionforge-autonumbering.css
    trunk/themes/fusionforge/fusionforge-fullscreen-min.css
    trunk/themes/fusionforge/fusionforge-fullscreen.css
    trunk/themes/fusionforge/fusionforge-min.css
    trunk/themes/fusionforge/fusionforge-print-min.css
    trunk/themes/fusionforge/fusionforge-print.css
    trunk/themes/fusionforge/fusionforge-rereading-min.css
    trunk/themes/fusionforge/fusionforge-rereading.css
    trunk/themes/fusionforge/fusionforge.css

Removed Paths:
-------------
    trunk/themes/fusionforge/gforge-autonumbering-min.css
    trunk/themes/fusionforge/gforge-autonumbering.css
    trunk/themes/fusionforge/gforge-fullscreen-min.css
    trunk/themes/fusionforge/gforge-fullscreen.css
    trunk/themes/fusionforge/gforge-min.css
    trunk/themes/fusionforge/gforge-print-min.css
    trunk/themes/fusionforge/gforge-print.css
    trunk/themes/fusionforge/gforge-rereading-min.css
    trunk/themes/fusionforge/gforge-rereading.css
    trunk/themes/fusionforge/gforge.css

Copied: trunk/themes/fusionforge/fusionforge-autonumbering-min.css (from rev 7660, trunk/themes/fusionforge/gforge-autonumbering-min.css)
===================================================================
--- trunk/themes/fusionforge/fusionforge-autonumbering-min.css	                        (rev 0)
+++ trunk/themes/fusionforge/fusionforge-autonumbering-min.css	2010-08-31 15:08:32 UTC (rev 7661)
@@ -0,0 +1 @@
+@import url(gforge.css);body{counter-reset:chapter;}h2:before{content:counter(chapter) ". ";counter-increment:chapter;}h2{counter-reset:section;}h3:before{content:counter(chapter) "." counter(section) " ";counter-increment:section;}h3{counter-reset:subsection;}h4:before{content:counter(chapter) "." counter(section) "." counter(subsection) " ";counter-increment:subsection;}h4{counter-reset:subsection2;}h5:before{content:counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) " ";counter-increment:subsection2;}h5{counter-reset:subsection3;}h6:before{content:counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) "." counter(subsection3) " ";counter-increment:subsection3;}
\ No newline at end of file

Copied: trunk/themes/fusionforge/fusionforge-autonumbering.css (from rev 7660, trunk/themes/fusionforge/gforge-autonumbering.css)
===================================================================
--- trunk/themes/fusionforge/fusionforge-autonumbering.css	                        (rev 0)
+++ trunk/themes/fusionforge/fusionforge-autonumbering.css	2010-08-31 15:08:32 UTC (rev 7661)
@@ -0,0 +1,81 @@
+/**
+ * $Id$
+ *
+ * Copyright (C) 2008 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The Style Sheet ("Contribution") has not been tested and/or
+ * validated for release as or in products, combinations with products or
+ * other commercial use. Any use of the Contribution is entirely made at
+ * the user's own responsibility and the user can not rely on any features,
+ * functionalities or performances Alcatel-Lucent has attributed to the
+ * Contribution.
+ *
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
+ * ALONE BASIS."
+ */
+
+@import url(gforge.css);
+
+body {
+    counter-reset: chapter;      /* Create a chapter counter scope */
+}
+h2:before {
+    content: counter(chapter) ". ";
+    counter-increment: chapter;  /* Add 1 to chapter */
+}
+h2 {
+    counter-reset: section;      /* Set section to 0 */
+}
+h3:before {
+    content: counter(chapter) "." counter(section) " ";
+    counter-increment: section;
+}
+h3 {
+    counter-reset: subsection;   /* Set subsection to 0 */
+}
+h4:before {
+    content: counter(chapter) "." counter(section) "." counter(subsection) " ";
+    counter-increment: subsection;
+}
+h4 {
+    counter-reset: subsection2;      /* Set section to 0 */
+}
+h5:before {
+    content: counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) " ";
+    counter-increment: subsection2;
+}
+h5 {
+    counter-reset: subsection3;      /* Set subsection to 0 */
+}
+h6:before {
+    content: counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) "." counter(subsection3) " ";
+    counter-increment: subsection3;
+}

Copied: trunk/themes/fusionforge/fusionforge-fullscreen-min.css (from rev 7660, trunk/themes/fusionforge/gforge-fullscreen-min.css)
===================================================================
--- trunk/themes/fusionforge/fusionforge-fullscreen-min.css	                        (rev 0)
+++ trunk/themes/fusionforge/fusionforge-fullscreen-min.css	2010-08-31 15:08:32 UTC (rev 7661)
@@ -0,0 +1 @@
+#topbar{display:none;}#horiznavbar{display:none;}#leftnav{display:none;}.toolpalettes{display:none;}div.toc{border:1px solid black;padding:5px;}div.toc ul{list-style:none;}blockquote.mail-style-quote{margin:0;margin-bottom:1em;border:1px solid #284;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;border-style:none;border-left:medium solid #284;padding:0;padding-left:.5em;}div.wikitext pre{font-family:monospace;border-width:1px;border-style:dashed;padding:.5em;}h1,h2,h3,h4,h5,h6{padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid black;}#content{background:white;}
\ No newline at end of file

Copied: trunk/themes/fusionforge/fusionforge-fullscreen.css (from rev 7660, trunk/themes/fusionforge/gforge-fullscreen.css)
===================================================================
--- trunk/themes/fusionforge/fusionforge-fullscreen.css	                        (rev 0)
+++ trunk/themes/fusionforge/fusionforge-fullscreen.css	2010-08-31 15:08:32 UTC (rev 7661)
@@ -0,0 +1,96 @@
+/**
+ * $Id$
+ *
+ * Copyright (C) 2008 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The Style Sheet ("Contribution") has not been tested and/or
+ * validated for release as or in products, combinations with products or
+ * other commercial use. Any use of the Contribution is entirely made at
+ * the user's own responsibility and the user can not rely on any features,
+ * functionalities or performances Alcatel-Lucent has attributed to the
+ * Contribution.
+ *
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
+ * ALONE BASIS."
+ */
+
+/* Do not display the top bar, the horizontal navigation bar and the left bar */
+#topbar { display: none; }
+#horiznavbar { display: none; }
+#leftnav { display: none; }
+
+/* Do not display the wiki navigation and edition bars */
+.toolpalettes { display: none; }
+
+/**
+ * Table of content
+ */
+div.toc {
+    border: 1px solid black;
+    padding: 5px;
+}
+div.toc ul { list-style: none; }
+
+/*
+ * "E-mail" style blockquote
+ */
+blockquote.mail-style-quote {
+    margin: 0em;
+    margin-bottom: 1em;
+    border: 1px solid #284;
+    padding: 0.5em;
+}
+
+.mail-style-quote blockquote.mail-style-quote {
+    margin-left: 0.3em;
+    margin-bottom : 0em;
+    border-style: none;
+    border-left: medium solid #284;
+    padding: 0em;
+    padding-left: 0.5em;
+}
+
+div.wikitext pre {
+    font-family: monospace;
+    border-width: 1px;
+    border-style: dashed;
+    padding: 0.5em;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    padding-top: .5em;
+    padding-bottom: .17em;
+    border-bottom: 1px solid black;
+}
+
+#content {
+    background: white;
+}

Copied: trunk/themes/fusionforge/fusionforge-min.css (from rev 7660, trunk/themes/fusionforge/gforge-min.css)
===================================================================
--- trunk/themes/fusionforge/fusionforge-min.css	                        (rev 0)
+++ trunk/themes/fusionforge/fusionforge-min.css	2010-08-31 15:08:32 UTC (rev 7661)
@@ -0,0 +1 @@
+li p{margin:0;}div.br{display:none;}.toolbar,div.toolbar{margin:.5ex 0;}div.wikitext{width:auto;}div.wikitext table p{margin-top:.3em;margin-bottom:.3em;}img{vertical-align:baseline;}input{margin:.1em;}input.numeric{text-align:right;}fieldset{background-color:#e0f3f7;}legend{border:1px solid #d8d8e7;background-color:white;}div.wikiaction,form.wikiadmin div{border-bottom:1px solid #d8d8e7;border-right:1px solid #d8d8e7;border-top:1px solid #96a2ae;border-left:1px solid #96a2ae;margin-top:.5ex;margin-bottom:.5ex;padding:.5ex .5em;display:table;}div.wikiaction input[type=text],div.wikiadmin input[type=text],form.wikiadmin input[type=file]{margin-right:.5em;}div#navbuttons,div#signin,div#actionbuttons{line-height:3.0ex;}.wikiunknown a,.named-wikiunknown a{border-top:1px solid #c6d2de;border-left:1px solid #c6d2de;border-bottom:1px solid #a2a2a2;border-right:1px solid #a2a2a2;padding-left:1px;padding-right:1px;padding-top:1px;margin-right:.15em;}img.linkicon{vertical-align:middle;}img.inlineimage{vertical-align:middle;}.diff .prefix{position:relative;left:-1em;}.diff del,.diff ins{padding-left:1px;padding-right:1px;}img{border:0;}form{margin:0;}table{empty-cells:show;}caption{caption-side:top;text-align:left;margin-bottom:.5ex;}div.wikitext pre{font-family:monospace;border-width:1px;border-color:navy;border-style:dashed;padding:.5em;}div.wikitext{margin-top:1ex;margin-bottom:.5ex;background:white;padding-bottom:1em;clear:both;}body.sidebar{margin:.5em;}body.sidebar div.wikitext{padding:.5em;}body.sidebar div.wikitext ul{padding-left:1em;}body.sidebar h2{margin-top:0;}.wiki,.named-wiki{font-weight:bold;}a.wikiaction,a.wiki-rc-action,a.wikiunsafe,input.wikiaction,input.button,input.wikiadmin{text-decoration:none;white-space:nowrap;}input.wikiaction,input.button,input.wikiadmin{margin-right:1em;margin-left:1em;}.wikiunsafe{background-color:#fcc;}.wikiunknown,.named-wikiunknown{font-weight:normal;font-size:100%;}.wikiunknown a,.named-wikiunknown a{color:#447;background-color:#eee;text-decoration:none;font-weight:normal;font-size:smaller;}.backlinks{text-decoration:underline;}h1 .backlinks{text-decoration:none;color:inherit;}.wikipage{font-weight:normal;}.interwiki,i.interwiki .wikipage,em .interwiki .wikipage{font-style:oblique;}.interwiki .wikipage,i .interwiki,em .interwiki{font-style:normal;}div.toc{border:1px solid #aaa;background-color:#f9f9f9;padding:5px;}div.toc ul{list-style:none;}div.toc p.toctitle{font-weight:bold;font-size:1.6em;margin-bottom:1ex;}div.toc p{margin:0;}.toclist a{text-decoration:none;}div.toc p.toctitle,h2,h3,h4,h5,h6{font-family:Verdana,Arial,Helvetica,sans-serif;padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid #aaa;}h1,h1 .backlinks,h2,.wikitext h2 a,h3,.wikitext h3 a,h4,.wikitext h4 a,h5,h6{text-decoration:none;}.pagelist thead th{background:#d8d8d8;text-decoration:none;font-weight:bold;}.pagelist thead td u{text-decoration:none;}.pagelist tr{vertical-align:top;}.pagelist tr.evenrow{background:#eee;}.pagelist tr.oddrow{background:white;}th.gridbutton{background-color:#d8d8d8;color:#565c5e;font-weight:bold;white-space:nowrap;margin:5px 0;max-height:24px;padding:5px 0 5px 0;border-width:1px;border-style:solid;border-color:black;}input.gridbutton,a.gridbutton,a:hover.gridbutton,a:visited.gridbutton{text-decoration:none;color:#565c5e;}.toolbar,input.button,#signin{font-family:Verdana,Arial,Helvetica,sans-serif;}.toolbar{padding:0;margin:0;}.toolbar li{margin-left:-20px;list-style-type:none;font-weight:bold;}.toolbar a{text-decoration:none;}.edit-toolbar{padding:0;margin:0;}.edit-toolbar img,.edit-toolbar input{background-color:#fff;border:1px solid ButtonFace;}.tooltitle{font-weight:bold;}#navbuttons,#actionbuttons{white-space:nowrap;}#navbuttons .named-wiki,#actionbuttons .named-wiki,#navbuttons .wikiaction,#actionbuttons .wikiaction,#navbuttons .wikiadmin,#actionbuttons .wikiadmin{font-weight:normal;color:#565c5e;}#navbuttons .named-wiki:hover,#actionbuttons .named-wiki:hover,#navbuttons .wikiaction:hover,#actionbuttons .wikiaction:hover,#navbuttons .wikiadmin:hover,#actionbuttons .wikiadmin:hover{text-decoration:underline;}#actionbuttons td{border:1px solid #aaa;border-bottom:none;border-collapse:collapse;padding-left:.8em;padding-right:.8em;}#actionbuttons td.spacer{width:10px;border:none;padding-left:0;padding-right:0;}#actionbuttons td.bold a{font-weight:bold;}.editdate{font-family:Verdana,Arial,Helvetica,sans-serif;margin:0;padding:0;padding-top:.5ex;border-top:1px #aaa solid;}#logo img{float:right;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;}textarea.wikiedit{width:100%;margin-bottom:.5ex;margin-top:.5ex;padding:2px;}#editarea-size{margin-top:1ex;text-align:right;font-size:smaller;}#search-replace{margin-top:1ex;text-align:left;font-size:smaller;}#toolbar{padding:0;}.search-context{background:white;}.search-term{background:yellow;font-weight:normal;}#LSResult{position:absolute;text-align:left;display:none;z-index:100;background-color:white;border:1px solid #d0d0d0;font-size:9px;overflow:hidden;}#LSHighlight{background-color:#f08000;}#LSResult .evenrow{background-color:#f0f0f0;}.LSEnd{text-align:right;}.LSRow:hover{background-color:white;}.LSRow{padding:1px;}ul.LSRes{margin:0;padding:0;}li.LSRow{margin:0;list-style-image:none;}.pagetrail{background-color:#FF9;padding:.2em;}.transclusion-title{text-align:right;font-style:oblique;font-size:smaller;text-decoration:underline;margin-bottom:.25ex;margin-right:.25em;}.transclusion,.wiki-edithelp{font-size:smaller;}.transclusion{border:1px solid gray;padding-left:.8em;padding-right:.8em;padding-top:0;padding-bottom:0;margin-left:.25em;margin-right:.25em;margin-bottom:.1ex;}.wiki-edithelp{background:white;border:medium solid #fff8dc;padding-left:.5em;padding-right:.5em;padding-top:.75ex;padding-bottom:.75ex;margin-left:0;margin-right:0;margin-top:1ex;margin-bottom:1ex;}.wiki-edithelp p{font-family:Verdana,Arial,Helvetica,sans-serif;padding-left:.5em;padding-right:.5em;padding-top:.5ex;padding-bottom:.5ex;margin:0;}table.cal{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;empty-cells:hide;}table.cal td{background:white;text-align:right;}table.cal-header{font-size:larger;}table.cal-header tr,table.cal-header td{text-align:center;}.cal-arrow{font-weight:bold;text-decoration:none;}.cal-dayname td{text-align:center;font-size:smaller;text-decoration:underline;}a.cal-hide{text-decoration:none;}table.cal td.cal-today{margin:1px;border:1px solid gray;}.diff{margin-top:1ex;margin-bottom:.5ex;background:white;border:1px #ccc solid;color:black;border-top:1px solid #494f5d;border-left:1px solid #494f5d;border-bottom:1px solid #c6d2de;border-right:1px solid #c6d2de;padding-top:1px;padding-bottom:1px;padding-left:.125em;padding-right:.125em;padding:0;clear:both;}.diff .block{background:#ddd;padding-left:1em;}.diff .context{background:white;border:none;}.difftext{margin-top:0;margin-bottom:0;background:white;border:1px black solid;border-top:1px #e8e6df solid;border-left:1px #e8e6df solid;border-bottom:1px #d2d2d2 solid;border-right:1px #b2b2b2 solid;padding-left:0;padding-right:0;padding-top:0;padding-bottom:0;clear:both;}.diff .block tt{font-weight:normal;font-family:monospace;color:black;margin-left:0;border:none;}.diff del,.diff ins{font-weight:bold;text-decoration:none;}.diff .original,.diff .deleted,.diff .final,.diff .added{background:white;}.diff .original,.diff .deleted{background:#fcc;border:none;}.diff .final,.diff .added{background:#cfc;border:none;}.diff del{background:#f99;}.diff ins{background:#9f9;}td.pageinfo{font-weight:bold;}.pageinfo-minoredit,.pageinfo-authorid{font-size:smaller;font-style:oblique;}div.errors{font-weight:bold;border-width:2px;border-style:solid;background-color:#ffc0cb;border-color:red;padding:.5em;}div.warning{color:black;background:#eee;margin-top:1em;margin-bottom:1em;padding-left:.8em;padding-right:.8em;padding-top:.8ex;padding-bottom:0;border:thin solid blue;clear:both;}.debug{color:black;background:white;font-family:monospace;font-size:smaller;margin:1ex 0;padding:.5ex .5em;border:medium solid #fff8dc;}.hint{color:black;background:#eee;font-style:italic;margin-left:3em;padding:.5ex .5em;border:thin solid #aaa;}span.hint{padding:0;}.disabled-plugin{clear:both;margin:1ex 0;padding:0;}.disabled-plugin .title{color:#400;background-color:inherit;font-size:x-small;text-align:right;padding:0 .5em;}.disabled-plugin pre{color:black;background:#ddd;margin:0;padding:.3ex .5em;}span.redirectfrom{font-size:small;font-style:oblique;font-weight:normal;padding-left:1em;}.wiki-dl-table{border-collapse:collapse;border:2px #444 solid;}.wiki-dl-table tr{border-top:2px #444 solid;border-bottom:2px #444 solid;border-left:none;border-right:none;}.wiki-dl-table th,.wiki-dl-table td{padding:.25em .5em;}.wiki-dl-table th{vertical-align:top;text-align:right;border-right:1px #444 solid;border-left:none;border-top:none;border-bottom:none;}.wiki-dl-table td{border:none;}blockquote.mail-style-quote{margin:0;margin-bottom:1em;border:1px solid #284;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;background:transparent;border-style:none;border-left:medium solid #284;padding:0;padding-left:.5em;}.floatleft{float:left;}.floatright{float:right;}div.wikiblog{margin:1ex 2em;padding:0;}div.wikiblog>div{margin:0;padding:.5ex .5em;}div.wikiblog>div.wikiblog-footer{padding:.2ex .5em;}h3.wikiblog-summary{font-size:medium;font-weight:bold;margin:0 0 1ex 0;}table.wikiblog-form{width:auto;border-collapse:collapse;margin:.25em 0;}.wikiblog-form caption{caption-side:top;font-weight:bold;text-align:left;padding:.5ex .5em;}.wikiblog-form th{vertical-align:top;text-align:right;padding:0 0 .3em .5em;}.wikiblog-form td{padding:.25em .5em;}.wikiblog-form td.submit-button{padding:0;}.wikiblog-form input[type=text],.wikiblog-form textarea{margin:0;width:100%;}div.wikicomment div.wikicomment-footer{padding:.2ex .5em;}div.wikicomment div.wikicomment-footer named-wiki{font-size:small;}table.interwiki-map{margin:1em 2em;}.interwiki-map th{text-decoration:underline;text-align:left;padding-left:1em;}.interwiki-map td.interwiki-url{padding-left:2em;}.interwiki-map th.interwiki-url{padding-left:3em;}.dialog{background-color:#cdf;color:black;margin:2em auto 2em auto;border:thin black solid;width:50%;}.dialog h1,.dialog p,.dialog div{text-align:center;}.dialog h1{font-size:large;margin:.5em 0 1em 0;}.dialog div.message{background-color:white;color:black;color:black;margin:0 1em;padding:.5em .5em;}.dialog p.buttons{margin:1em 0 .5em 0;}.clear-floats{clear:both;}.gensmall{font-size:10px;}.genmed{font-size:11px;}td.cat{font-weight:bold;letter-spacing:1px;color:#000;background:url(./images/cellpic1.png);height:27px;}td.row1{background:#eaedf4;color:#000;}td.row2{background:#d9e2ec;color:#000;}td.row3{background:#cad9ea;color:#000;}td.spacerow{background:#cad9ea;color:#000;}.forumline{background:#fff;color:#000;border:1px solid #069;}.box{background:#fff;border:1px solid #888;}.box-title{font-weight:normal;background-color:#ccc;color:black;text-align:center;}.box-data{width:160px;font-size:9pt;font-weight:normal;}.box-data .wiki{font-weight:normal;}td.sidebar{border-spacing:0;margin:0;}div.rss{margin:1em;padding:1em;}div.feed{margin:-0.5em;margin-bottom:0;padding:.3em;font-weight:bold;font-size:1.2em;}.chandesc{font-weight:bold;}div.rssitem{padding-top:1em;padding-bottom:1em;border-top:2px solid #565c5e;}div.itemname{padding-bottom:1em;font-weight:bold;}div.itemdesc{padding-left:1em;}div.authordate{font-style:italic;}a.rssicon{font-weight:normal;font-size:small;vertical-align:middle;}table.sqlresult{border:1px outset gray;background:white;margin:.5ex .5em;padding:1px;}.sqlresult tr.evenrow{background:#eee;}.sqlresult tr.oddrow{background:white;}table.sqlresult td{margin:1px;border:1px solid gray;}img.tex{border:0;vertical-align:middle;}.boldsmall{font-weight:bold;font-size:11px;}#content{margin:0;padding:1em 1em 1.5em 1em;background:white;border:1px solid #aaa;line-height:1.2em;position:relative;z-index:2;}#footer{text-align:right;vertical-align:bottom;font-style:italic;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-width:1px;border-style:solid;border-collapse:collapse;vertical-align:top;}table.boxed td,table.bordered td,table.boxed th,table.bordered th{padding-left:5px;padding-right:5px;padding-top:0;padding-bottom:0;}table.boxed caption,table.bordered caption{text-align:center;font-weight:bold;caption-side:bottom;padding-top:.8em;}table.boxed th,table.bordered th{font-weight:bold;background-color:#d8d8d8;}div.boxright{background-color:#e9fbff;width:200px;right:10px;padding:.5em;float:right;border:thin solid;padding:.5em;}td.tdselected,td.tdunselected{text-align:center;font-weight:bold;padding-left:5px;padding-right:5px;}td.tdselected{color:white;background-color:#554295;}td.tdunselected{color:black;background-color:#e9e8de;}.browsebanner table{width:100%;background-color:#e9fbff;border-style:solid;border-color:blue;border-width:2px;}.browsebanner table td{text-align:center;font-weight:bold;font-style:oblique;}.rateit{font-size:60%;font-weight:bold;vertical-align:middle;}
\ No newline at end of file

Copied: trunk/themes/fusionforge/fusionforge-print-min.css (from rev 7660, trunk/themes/fusionforge/gforge-print-min.css)
===================================================================
--- trunk/themes/fusionforge/fusionforge-print-min.css	                        (rev 0)
+++ trunk/themes/fusionforge/fusionforge-print-min.css	2010-08-31 15:08:32 UTC (rev 7661)
@@ -0,0 +1 @@
+.toolpalettes{display:none;}.pagetrail{display:none;}.browsebanner{display:none;}.editdate{display:none;}a{color:black;}a.interwiki img{display:none;}a.named-interwiki img{display:none;}a.namedurl img{display:none;}img[src="/wiki/themes/gforge/buttons/no_order.png"]{display:none;}div.toc{border:1px solid black;}#toctoggle{display:none;}div.toc p.toctitle,h1,h2,h3,h4,h5,h6{border-bottom:1px solid black;}table.boxed,table.bordered,table.bordered th,table.bordered td{border-color:black;}#content{background:white;border:none;}table.nobreak{page-break-inside:avoid!important;}
\ No newline at end of file

Copied: trunk/themes/fusionforge/fusionforge-print.css (from rev 7660, trunk/themes/fusionforge/gforge-print.css)
===================================================================
--- trunk/themes/fusionforge/fusionforge-print.css	                        (rev 0)
+++ trunk/themes/fusionforge/fusionforge-print.css	2010-08-31 15:08:32 UTC (rev 7661)
@@ -0,0 +1,101 @@
+/**
+ * $Id$
+ *
+ * Copyright (C) 2008 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The Style Sheet ("Contribution") has not been tested and/or
+ * validated for release as or in products, combinations with products or
+ * other commercial use. Any use of the Contribution is entirely made at
+ * the user's own responsibility and the user can not rely on any features,
+ * functionalities or performances Alcatel-Lucent has attributed to the
+ * Contribution.
+ *
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
+ * ALONE BASIS."
+ */
+
+/* Do not print the wiki navigation and edition bars */
+.toolpalettes { display: none; }
+
+/* Do not print Page Trail line */
+.pagetrail { display: none; }
+
+/* Do not print main wiki browse banner */
+.browsebanner { display: none; }
+
+/* Do not print date of last edition */
+.editdate { display: none; }
+
+/* Print links in black */
+a { color: black; }
+
+/* Do not print icons in front of hyperlinks */
+a.interwiki img { display: none; }
+a.named-interwiki img { display: none; }
+a.namedurl img { display: none; }
+
+/* Do not print "none" sorting icon */
+img[src="/wiki/themes/gforge/buttons/no_order.png"] { display: none; }
+
+/**
+ * Table of content
+ */
+div.toc {
+    border: 1px solid black;
+}
+
+/* Do not print TOC toggle image */
+#toctoggle { display: none; }
+
+div.toc p.toctitle, h1, h2, h3, h4, h5, h6 {
+    border-bottom: 1px solid black;
+}
+
+/*
+div.toclist a::after {
+    content: leader('.') target-counter(attr(href), page);
+}
+*/
+
+table.boxed, table.bordered, table.bordered th, table.bordered td {
+    border-color: black;
+}
+
+#content {
+    background: white;
+    border: none;
+}
+
+/* Do not cut tables with class "nobreak" */
+
+table.nobreak {
+    page-break-inside: avoid !important;
+}

Copied: trunk/themes/fusionforge/fusionforge-rereading-min.css (from rev 7660, trunk/themes/fusionforge/gforge-rereading-min.css)
===================================================================
--- trunk/themes/fusionforge/fusionforge-rereading-min.css	                        (rev 0)
+++ trunk/themes/fusionforge/fusionforge-rereading-min.css	2010-08-31 15:08:32 UTC (rev 7661)
@@ -0,0 +1 @@
+@import url(gforge-autonumbering.css);#content{counter-reset:paragraph;}div.wikitext p:before{content:"{" counter(paragraph) ";}";counter-increment:paragraph;color:red;}
\ No newline at end of file

Copied: trunk/themes/fusionforge/fusionforge-rereading.css (from rev 7660, trunk/themes/fusionforge/gforge-rereading.css)
===================================================================
--- trunk/themes/fusionforge/fusionforge-rereading.css	                        (rev 0)
+++ trunk/themes/fusionforge/fusionforge-rereading.css	2010-08-31 15:08:32 UTC (rev 7661)
@@ -0,0 +1,55 @@
+/**
+ * $Id$
+ *
+ * Copyright (C) 2008 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The Style Sheet ("Contribution") has not been tested and/or
+ * validated for release as or in products, combinations with products or
+ * other commercial use. Any use of the Contribution is entirely made at
+ * the user's own responsibility and the user can not rely on any features,
+ * functionalities or performances Alcatel-Lucent has attributed to the
+ * Contribution.
+ *
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
+ * ALONE BASIS."
+ */
+
+@import url(gforge-autonumbering.css);
+
+#content {
+    counter-reset: paragraph;    /* Create a paragraph counter scope */
+}
+div.wikitext p:before {
+    content: "{" counter(paragraph) "} ";
+    counter-increment: paragraph;
+    color: red;
+}
+

Copied: trunk/themes/fusionforge/fusionforge.css (from rev 7660, trunk/themes/fusionforge/gforge.css)
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	                        (rev 0)
+++ trunk/themes/fusionforge/fusionforge.css	2010-08-31 15:08:32 UTC (rev 7661)
@@ -0,0 +1,1048 @@
+/**
+ * $Id$
+ *
+ * Copyright (C) 2002-2007 $ThePhpWikiProgrammingTeam
+ * Copyright (C) 2008-2009 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/*
+ * Standard Alcatel-Lucent disclaimer for contributing to open source
+ *
+ * "The Style Sheet ("Contribution") has not been tested and/or
+ * validated for release as or in products, combinations with products or
+ * other commercial use. Any use of the Contribution is entirely made at
+ * the user's own responsibility and the user can not rely on any features,
+ * functionalities or performances Alcatel-Lucent has attributed to the
+ * Contribution.
+ *
+ * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
+ * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
+ * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
+ * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
+ * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
+ * ALONE BASIS."
+ */
+
+/* Because in some cases there is a <p> in nested lists */
+li p { margin:0; }
+
+/* Hide the elements we put in just to get around NS4 bugs. */
+div.br { display: none; }
+
+/* This makes spacings in NS4 too big. */
+.toolbar, div.toolbar { margin: 0.5ex 0ex; }
+
+/* This breaks NS4, but is necessary for IE4. */
+div.wikitext { width: auto; }
+
+div.wikitext table p { margin-top: 0.3em;  margin-bottom: 0.3em;}
+
+/**
+ * General
+ */
+/* for NS4 */
+img { vertical-align: baseline; }
+input { margin: 0.1em; }
+input.numeric { text-align: right; }
+
+fieldset {
+    background-color: #e0f3f7;
+}
+
+legend {
+    border: 1px solid #d8d8e7;
+    background-color: white;
+}
+
+/**
+ * Wiki Forms
+ * 
+ * The div inside the wikiadmin upload form does not
+ * have a class yet, so it must be referenced indirectly
+ */
+/* div.wikiaction, div.wikiadmin { */
+div.wikiaction, form.wikiadmin div {
+  border-bottom: 1px solid #d8d8e7;
+  border-right:  1px solid #d8d8e7;
+  border-top:  1px solid #96a2ae;
+  border-left: 1px solid #96a2ae;
+
+  margin-top: 0.5ex;
+  margin-bottom: 0.5ex;
+  padding: 0.5ex 0.5em;
+  /* Emulate the display behaviour of a table, to shrink it's width.
+   * ie5.1Mac ignores this */
+  display: table;
+}
+
+/* Add space between the input field and following buttons, but not after the last button. */
+div.wikiaction input[type=text], div.wikiadmin input[type=text], form.wikiadmin input[type=file] { margin-right: 0.5em; }
+
+div#navbuttons, div#signin, div#actionbuttons { line-height: 3.0ex; }
+
+/* QuestionMark */
+.wikiunknown a, .named-wikiunknown a {
+  border-top:  1px solid #c6d2de;
+  border-left: 1px solid #c6d2de;
+  border-bottom: 1px solid #a2a2a2;
+  border-right:  1px solid #a2a2a2;
+  padding-left:  1px;
+  padding-right: 1px;
+  padding-top: 1px;
+  margin-right: .15em;
+}
+
+/* Link icons */
+img.linkicon { vertical-align: middle; }
+
+img.inlineimage { vertical-align: middle; }
+
+/**
+ * Edit Page & View Source
+ */
+/* color: inherit; and background: inherit; display as lime in NS4 */
+
+/**
+ * Diff Output
+ */
+.diff .prefix {
+  position: relative;
+  left: -1em;
+}
+/* deleted & added words */
+.diff del, .diff ins {
+  padding-left: 1px;
+  padding-right: 1px;
+}
+
+/**
+ * General
+ */ 
+img { border: 0ex; }
+
+form { margin: 0ex; }
+
+table {
+  /* For Mozilla */
+  empty-cells: show;
+}
+
+caption {
+  caption-side: top;
+  text-align: left;
+  margin-bottom: .5ex;
+}
+
+/**
+ * Wiki
+ */
+
+div.wikitext pre { 
+  font-family: monospace; 
+  border-width: 1px;
+  border-color: navy;
+  border-style: dashed;
+  padding: 0.5em;
+}
+
+/**
+ * PageTypes
+ */
+/* Main wiki text box */
+div.wikitext {
+  margin-top:    1ex;
+  margin-bottom: 0.5ex;
+  background: white;
+  padding-bottom: 1em;
+  clear: both;
+}
+
+/* Mozilla RecentChanges Sidebar */
+body.sidebar {
+  margin: 0.5em;
+}
+body.sidebar div.wikitext {
+  padding: 0.5em;
+}
+body.sidebar div.wikitext ul { padding-left: 1em; }
+body.sidebar h2 { margin-top: 0; }
+
+/**
+ * Link styles
+ */
+.wiki, .named-wiki {
+  /* text-decoration: none; */
+  font-weight: bold;
+}
+
+/* Action buttons */
+a.wikiaction, a.wiki-rc-action, a.wikiunsafe,
+input.wikiaction, input.button, input.wikiadmin {
+  text-decoration: none;
+  /* don't wrap text buttons */
+  white-space: nowrap;
+}
+
+input.wikiaction, input.button, input.wikiadmin {
+  margin-right: 1em;
+  margin-left: 1em;
+}
+
+.wikiunsafe { background-color: #fcc; }
+
+/* Unknown links */
+.wikiunknown, .named-wikiunknown {
+  font-weight: normal;
+  font-size: 100%;
+}
+ /* QuestionMark #600 */
+.wikiunknown a, .named-wikiunknown a {
+  color: #447;
+  background-color: #eee;
+  text-decoration: none;
+  font-weight: normal;
+  font-size: smaller;
+}
+
+/* Backlinks */
+.backlinks {
+  text-decoration: underline;
+}
+h1 .backlinks { text-decoration: none; color: inherit; }
+
+/* Interwiki links */
+.wikipage  { font-weight: normal; }
+.interwiki, i.interwiki .wikipage, em .interwiki .wikipage { font-style: oblique; }
+.interwiki .wikipage, i .interwiki, em .interwiki { font-style: normal; }
+
+/**
+ * Table of content
+ */
+div.toc {
+    border: 1px solid #aaaaaa;
+    background-color: #f9f9f9;
+    padding: 5px;
+}
+
+div.toc ul { list-style: none }
+
+div.toc p.toctitle { font-weight: bold; font-size: 1.6em; margin-bottom: 1ex; }
+div.toc p { margin: 0; }
+
+.toclist a { text-decoration: none; }
+
+/**
+ * headings
+ */
+div.toc p.toctitle, h2, h3, h4, h5, h6 { 
+	font-family: Verdana, Arial, Helvetica, sans-serif; 
+        padding-top: .5em;
+        padding-bottom: .17em;
+        border-bottom: 1px solid #aaaaaa;
+}
+
+h1, h1 .backlinks, h2, .wikitext h2 a, h3, .wikitext h3 a, h4, .wikitext h4 a, h5, h6 {
+    text-decoration: none;
+}
+
+/**
+ * Tables
+ */
+.pagelist thead th {
+  background: #d8d8d8;
+  text-decoration: none;
+  font-weight: bold;
+}
+.pagelist thead td u { text-decoration: none; }
+.pagelist tr { vertical-align: top; }
+.pagelist tr.evenrow { background: #eee; }
+.pagelist tr.oddrow  { background: white; }
+th.gridbutton {
+  background-color: #d8d8d8;
+  color: #565c5e;
+  font-weight: bold;
+  white-space: nowrap;
+  margin: 5px 0px;
+  max-height: 24px;
+  padding: 5px 0px 5px 0px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: black;
+}
+input.gridbutton, a.gridbutton, a:hover.gridbutton, a:visited.gridbutton {
+  text-decoration: none;
+  color: #565c5e;
+}
+
+/**
+ * Toolbar
+ */
+.toolbar, input.button, #signin { 
+	font-family: Verdana, Arial, Helvetica, sans-serif; 
+}
+
+.toolbar {
+  padding: 0;
+  margin:  0;
+}
+.toolbar li {
+  margin-left: -20px; /* Because there is no list symbol */
+  list-style-type: none;
+  font-weight: bold;
+}
+.toolbar a {
+  text-decoration: none;
+}
+
+.edit-toolbar {
+  padding: 0;
+  margin:  0;
+}
+.edit-toolbar img, .edit-toolbar input {
+  background-color: #fff;
+  border: 1px solid ButtonFace;
+}
+
+.tooltitle {
+	font-weight: bold ;
+}
+
+#navbuttons, #actionbuttons {
+  white-space: nowrap;
+}
+
+#navbuttons .named-wiki,
+#actionbuttons .named-wiki,
+#navbuttons .wikiaction,
+#actionbuttons .wikiaction,
+#navbuttons .wikiadmin,
+#actionbuttons .wikiadmin {
+  font-weight: normal;
+  color: #565c5e; /* Alcatel-Lucent grey */
+}
+
+#navbuttons .named-wiki:hover,
+#actionbuttons .named-wiki:hover,
+#navbuttons .wikiaction:hover,
+#actionbuttons .wikiaction:hover,
+#navbuttons .wikiadmin:hover,
+#actionbuttons .wikiadmin:hover {
+  text-decoration: underline;
+}
+
+#actionbuttons td {
+    border: 1px solid #aaaaaa;
+    border-bottom: none;
+    border-collapse: collapse;
+    padding-left:0.8em;
+    padding-right:0.8em;
+}
+
+#actionbuttons td.spacer {
+    width:10px;
+    border:none;
+    padding-left:0;
+    padding-right:0;
+}
+
+#actionbuttons td.bold a {
+    font-weight: bold;
+}
+
+.editdate {
+  font-family: Verdana, Arial, Helvetica, sans-serif;
+  margin: 0;
+  padding: 0;
+  padding-top: 0.5ex;
+  border-top: 1px #aaaaaa solid;
+}
+
+#logo img {
+  float: right;
+  border: 1px black solid;
+  /* "paper" borders */
+  border-top:  1px #e8e6df solid;
+  border-left: 1px #e8e6df solid;
+  border-bottom: 1px #d2d2d2 solid;
+  border-right:  1px #b2b2b2 solid;
+}
+
+/**
+ * Edit Page & View Source
+ */
+
+/* Make the textarea the full page width */
+textarea.wikiedit {
+  width: 100%;
+  margin-bottom: 0.5ex;
+  margin-top:    0.5ex;
+  padding: 2px;
+}
+
+#editarea-size {
+  margin-top: 1ex;
+  text-align: right;
+  font-size: smaller;
+}
+#search-replace {
+  margin-top: 1ex;
+  text-align: left;
+  font-size: smaller;
+}
+#toolbar { padding:0px; }
+
+/**
+ * Search Results
+ */
+.search-context { background: white; }
+.search-term {
+  background: yellow;
+  font-weight: normal;
+}
+#LSResult {
+  position: absolute;
+  text-align: left;
+  display: none;
+  z-index: 100;
+  background-color: white;
+  border: 1px solid #d0d0d0; 
+  font-size: 9px;
+  overflow: hidden;
+}
+#LSHighlight {
+  background-color: #f08000;
+}
+#LSResult .evenrow {
+  background-color: #f0f0f0;
+} 
+#LSREsult .oddrow {
+} 
+.LSEnd {
+  text-align: right;
+}
+.LSRow:hover {
+  background-color: white;
+}
+.LSRow {
+  padding: 1px;
+} 
+ul.LSRes {
+  margin: 0px;
+  padding: 0px;
+}
+li.LSRow {
+  margin: 0px;
+  list-style-image: none;
+}
+
+/* PageTrail plugin */
+.pagetrail {
+     background-color: #FFFF99;
+     padding: 0.2em;
+}
+
+/* IncludePage plugin */
+.transclusion-title {
+  text-align: right;
+  font-style: oblique;
+  font-size:  smaller;
+  text-decoration: underline;
+  margin-bottom: 0.25ex;
+  margin-right:  0.25em;
+} 
+.transclusion, .wiki-edithelp {
+  font-size: smaller;
+}
+.transclusion {
+  border: 1px solid gray;
+  padding-left:  0.8em; 
+  padding-right: 0.8em; 
+  padding-top:     0px;
+  padding-bottom:  0px;
+  margin-left:   0.25em;
+  margin-right:  0.25em;
+  margin-bottom: 0.1ex;
+}
+.wiki-edithelp {
+  background: white;
+  border: medium solid #fff8dc; /* darker ivory */
+  padding-left:  0.5em;
+  padding-right: 0.5em;
+  padding-top:    0.75ex;
+  padding-bottom: 0.75ex;
+  margin-left:  0;
+  margin-right: 0;
+  margin-top: 1ex;
+  margin-bottom: 1ex;
+}
+.wiki-edithelp p {
+  font-family: Verdana, Arial, Helvetica, sans-serif;
+  padding-left:  0.5em;
+  padding-right: 0.5em;
+  padding-top:    0.5ex;
+  padding-bottom: 0.5ex;
+  margin: 0;
+}
+
+/**
+ * Calendar plugin
+ */
+table.cal {
+  border: 1px outset gray;
+  background: white;
+  margin: 0.5ex 0.5em;
+  padding: 1px;
+  /* For Mozilla */
+  empty-cells: hide;
+} 
+
+/* cells */
+table.cal td {
+  background: white;
+  text-align: right;
+} 
+
+/* Month-name header */
+table.cal-header { font-size: larger; }
+table.cal-header tr, table.cal-header td { text-align: center; }
+.cal-arrow {
+  font-weight: bold;
+  text-decoration: none;
+}
+
+/* Day-names header */
+table.cal tbody tr .cal-dayname {  }
+.cal-dayname td {
+  text-align: center;
+  font-size: smaller;
+  text-decoration: underline;
+}
+
+/* Individual days */
+a.cal-hide { text-decoration: none; }
+
+/* Today */
+ /* cell */
+table.cal td.cal-today {
+  margin: 1px;
+  border: 1px solid gray;
+}
+ /* text */
+table.cal td.cal-today a.cal-hide {  }
+
+/**
+ * Diff Output
+ */
+/* main box */
+.diff {
+  margin-top:    1ex;
+  margin-bottom: 0.5ex;
+  background: white;
+  border: 1px #ccc solid;
+  color: black;
+  border-top: 1px solid #494f5d;
+  border-left:  1px solid #494f5d;
+  border-bottom:  1px solid #c6d2de;
+  border-right: 1px solid #c6d2de;
+  padding-top:    1px;
+  padding-bottom: 1px;
+  padding-left:  .125em;
+  padding-right: .125em;
+  padding: 0;
+  clear: both;
+}
+.diff .block {
+  background: #ddd;
+  padding-left: 1em;
+}
+
+/* individual blocks */
+.diff .context {
+  background: white;
+  /* for NS4 */
+  border: none;
+}
+/* entire difftextblock */
+.difftext {
+  margin-top:    0;
+  margin-bottom: 0;
+  background: white;
+  border: 1px black solid;
+  border-top:  1px #e8e6df solid;
+  border-left: 1px #e8e6df solid;
+  border-bottom: 1px #d2d2d2 solid;
+  border-right:  1px #b2b2b2 solid;
+  padding-left:  0em; 
+  padding-right: 0em;
+  padding-top:    0ex;
+  padding-bottom: 0ex;
+  clear: both;
+}
+/* + - line prefix */
+.diff .block tt {
+  font-weight: normal;
+  font-family: monospace;
+  color: black;
+  margin-left: 0;
+  border: none;
+}
+/* changed words */
+.diff del, .diff ins {
+  font-weight: bold;
+  text-decoration: none;
+}
+
+/* blocks containing deleted or added words */
+.diff .original, .diff .deleted,
+.diff .final, .diff .added {
+  background: white;
+}
+/* blocks containing deleted words */
+.diff .original, .diff .deleted {
+  background: #fcc;
+  border: none;
+}
+/* blocks containing added words */
+.diff .final, .diff .added {
+  background: #cfc;
+  border: none;
+}
+
+/* deleted words */
+.diff del { background: #f99; }
+/* added words */
+.diff ins { background: #9f9; }
+
+/**
+ * PageHistory, Info
+ */
+td.pageinfo { font-weight: bold; }
+.pageinfo-minoredit, .pageinfo-authorid {
+  font-size: smaller;
+  font-style: oblique;
+}
+
+div.errors {
+    font-weight: bold;
+    border-width: 2px;
+    border-style: solid;
+    background-color: #ffc0cb; /* pink */
+    border-color: red;
+    padding: 0.5em;
+}
+
+div.warning {
+  color: black;
+  background: #eee;
+  margin-top:    1em;
+  margin-bottom: 1em;
+  padding-left:  0.8em; 
+  padding-right: 0.8em; 
+  padding-top:    0.8ex;
+  padding-bottom: 0;
+  border: thin solid blue;
+  clear: both;
+}
+
+/* Debug */
+.debug {
+  color: black;
+  background: white;
+  font-family: monospace;
+  font-size: smaller;
+  margin: 1ex 0;
+  padding: 0.5ex 0.5em;
+  border: medium solid #fff8dc; /* darker ivory */
+}
+
+/* Hints */
+.hint {
+  color: black;
+  background: #eeeeee;
+  font-style: italic;
+  margin-left: 3em;
+  padding: 0.5ex 0.5em;
+  border: thin solid #aaaaaa;
+}
+span.hint {
+  padding: 0;
+}
+
+/* Disabled Plugins */
+.disabled-plugin
+{
+  clear: both;
+  margin: 1ex 0;
+  padding: 0;
+}
+.disabled-plugin .title {
+  color: #400;
+  background-color: inherit;
+  font-size: x-small;
+  text-align: right;
+  padding: 0 0.5em;
+}
+.disabled-plugin pre {
+  color: black;
+  background: #ddd;
+  margin: 0;
+  padding: 0.3ex 0.5em;
+}
+
+/* "(Redirected from ...)" message. */
+span.redirectfrom {
+  font-size: small;
+  font-style: oblique;
+  font-weight: normal;
+  padding-left: 1em;
+}
+
+/*
+ * "DL tables"
+ */
+.wiki-dl-table {
+  border-collapse: collapse;
+  border: 2px #444 solid;
+}
+.wiki-dl-table tr {
+  border-top: 2px #444 solid;
+  border-bottom: 2px #444 solid;
+  border-left: none; 
+  border-right: none; 
+}
+.wiki-dl-table th,
+.wiki-dl-table td {
+  padding: 0.25em 0.5em;
+}
+.wiki-dl-table th {
+  vertical-align: top;
+  text-align: right;
+  border-right: 1px #444 solid;
+  border-left: none;
+  border-top: none;
+  border-bottom: none;
+}
+.wiki-dl-table td {
+  border: none;
+}
+
+/*
+ * "E-mail" style blockquote
+ */
+blockquote.mail-style-quote {
+	margin: 0em;
+	margin-bottom: 1em;
+	border: 1px solid #284;
+	padding: 0.5em;
+} 
+.mail-style-quote blockquote.mail-style-quote {
+        margin-left: 0.3em;
+	margin-bottom : 0em;
+	background: transparent;
+	border-style: none;
+	border-left: medium solid #284;
+	padding: 0em;
+	padding-left: 0.5em;
+}
+
+/*
+ * wikiblog
+ */
+.floatleft { float: left; }
+.floatright { float: right; }
+
+div.wikiblog {
+  /* border: thin black solid; */
+  margin: 1ex 2em;
+  padding: 0 0;
+}
+div.wikiblog > div {
+  margin: 0 0;
+  padding: 0.5ex 0.5em;
+}
+div.wikiblog-header {
+  /* background-color: #ccf; */
+}
+div.wikiblog > div.wikiblog-footer {
+  /* background-color: #eee; */
+  padding: 0.2ex 0.5em;
+}
+h3.wikiblog-summary {
+  font-size: medium;
+  font-weight: bold;
+  margin: 0 0 1ex 0;
+}
+
+table.wikiblog-form {
+  width: auto;
+  border-collapse: collapse;
+  margin: 0.25em 0;
+}
+.wikiblog-form caption {
+  caption-side: top;
+  font-weight: bold;
+  text-align: left;
+  padding: 0.5ex 0.5em;
+}
+.wikiblog-form th {
+  vertical-align: top;
+  text-align: right;
+  padding: 0 0 0.3em 0.5em;
+}
+.wikiblog-form td {
+  padding: 0.25em 0.5em;
+}
+.wikiblog-form td.submit-button {
+  padding: 0;
+}
+.wikiblog-form input[type=text],
+.wikiblog-form textarea {
+  margin: 0 0;
+  width: 100%;
+}
+div.wikicomment div.wikicomment-footer {
+  padding: 0.2ex 0.5em;
+}
+div.wikicomment div.wikicomment-footer named-wiki {
+  font-size: small;
+}
+table.interwiki-map {
+  margin: 1em 2em;
+}
+.interwiki-map th {
+  text-decoration: underline;
+  text-align: left;
+  padding-left: 1em;
+}
+.interwiki-map td.interwiki-url {
+  padding-left: 2em;
+}
+.interwiki-map th.interwiki-url {
+  padding-left: 3em;
+}
+
+.dialog {
+  background-color: #cdf;
+  color: black;
+  margin: 2em auto 2em auto;
+  border: thin black solid;
+  width: 50%;
+}
+.dialog h1, .dialog p, .dialog div {
+  text-align: center;
+}
+.dialog h1 {
+  font-size: large;
+  margin: 0.5em 0 1em 0;
+}
+.dialog div.message {
+  background-color: white;
+  color: black;
+  color: black;
+  margin: 0 1em;
+  padding: 0.5em 0.5em;
+}
+.dialog p.buttons {
+  margin: 1em 0 0.5em 0;
+}
+
+.clear-floats {
+  clear: both;
+}
+
+
+/* postnuke css:*/
+.gensmall{font-size:10px}
+.genmed{font-size:11px}
+td.cat{font-weight:bold;letter-spacing:1px;color:#000000;background: url(./images/cellpic1.png);height:27px}
+/* Main table cell colours and backgrounds */
+td.row1{background:#eaedf4;color:#000000}
+td.row2{background:#d9e2ec;color:#000000}
+td.row3{background:#cad9ea;color:#000000}
+td.spacerow{background:#cad9ea;color:#000000}
+
+/* This is the outline round the main forum tables */
+.forumline{background:#ffffff;color:#000000;border:1px solid #006699}
+
+/* Sidebar */
+.box { background:#ffffff; border: 1px solid #888888 }
+.box-title { font-weight: normal; background-color: #ccc; color: black; text-align: center; }
+.box-data { width: 160px; font-size: 9pt; font-weight: normal; }
+.box-data .wiki { font-weight: normal; }
+td.sidebar { border-spacing: 0px; margin: 0ex;}
+
+/* RssFeed */
+div.rss { margin: 1em; padding: 1em; }
+div.feed { margin: -0.5em; margin-bottom: 0em; padding: 0.3em;
+           font-weight: bold; font-size: 1.2em; }
+.chandesc { font-weight: bold; }
+div.rssitem { padding-top:1em; padding-bottom: 1em;
+              border-top: 2px solid #565c5e; /* Alcatel-Lucent grey */ }
+div.itemname { padding-bottom: 1em; font-weight: bold; }
+div.itemdesc { padding-left: 1em; }
+div.authordate { font-style: italic; }
+a.rssicon { font-weight:normal; font-size:small; vertical-align:middle; }
+
+/* SqlResult */
+table.sqlresult {
+  border: 1px outset gray;
+  background: white;
+  margin: 0.5ex 0.5em;
+  padding: 1px;
+}
+.sqlresult tr.evenrow { background: #eee; }
+.sqlresult tr.oddrow  { background: white; }
+table.sqlresult td {
+  margin: 1px;
+  border: 1px solid gray;
+}
+
+/**
+ * TeX2png plugin
+ */
+img.tex { 
+  border: 0ex;
+  vertical-align: middle; 
+}
+
+/**
+ * PhotoAlbum plugin
+ */
+.boldsmall {
+  font-weight: bold;
+  font-size: 11px;
+}
+
+#content {
+    margin: 0;
+    padding: 1em 1em 1.5em 1em;
+    background: white;
+    border: 1px solid #aaaaaa;
+    line-height: 1.2em;
+    position: relative;
+    z-index: 2;
+}
+
+/* the left column width is specified in class .portlet */
+
+#footer {
+        text-align: right;
+        vertical-align: bottom;
+        font-style: italic;
+}
+
+/*
+ * table class="boxed"
+ * will put a border around the table (but not around the cells)
+ *
+ * table class="bordered"
+ * will put a border around the table and the cells
+ *
+ * In both cases, the caption will be bold and centered under the table
+ *
+ * In both cases, the headers (th) will have a "#d8d8d8" background
+ */
+
+table.boxed, table.bordered, table.bordered th, table.bordered td {
+    border-width: 1px;
+    border-style: solid;
+    border-collapse: collapse;
+    vertical-align: top;
+}
+
+table.boxed td, table.bordered td,
+table.boxed th, table.bordered th {
+    padding-left: 5px;
+    padding-right: 5px;
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+
+table.boxed caption, table.bordered caption {
+    text-align: center;
+    font-weight: bold;
+    caption-side: bottom;
+    padding-top: 0.8em;
+}
+
+table.boxed th, table.bordered th {
+    font-weight: bold;
+    background-color: #d8d8d8;
+}
+
+/* plugin BoxRight */
+div.boxright {
+  background-color: #e9fbff;
+  width: 200px; 
+  right: 10px;
+  padding: 0.5em; 
+  float: right; 
+  border: thin solid; 
+  padding: 0.5em;
+}
+
+td.tdselected, td.tdunselected {
+   text-align: center;
+   font-weight: bold;
+   padding-left: 5px;
+   padding-right: 5px;
+}
+
+td.tdselected {
+   color: white;
+   background-color: #554295;
+}
+
+td.tdunselected {
+   color: black;
+   background-color: #e9e8de;
+}
+
+/* Main wiki browse banner */
+.browsebanner table {
+   width: 100%;
+   background-color: #e9fbff;
+   border-style: solid;
+   border-color: blue;
+   border-width: 2px;
+}
+
+.browsebanner table td {
+   text-align: center;
+   font-weight: bold;
+   font-style: oblique;
+}
+
+.rateit {
+   font-size: 60%;
+   font-weight: bold;
+   vertical-align: middle;
+}
+
+/* For emacs users
+ *
+ * Local Variables:
+ * mode: c
+ * c-file-style: cc-mode
+ * End:
+ */

Deleted: trunk/themes/fusionforge/gforge-autonumbering-min.css
===================================================================
--- trunk/themes/fusionforge/gforge-autonumbering-min.css	2010-08-31 15:03:30 UTC (rev 7660)
+++ trunk/themes/fusionforge/gforge-autonumbering-min.css	2010-08-31 15:08:32 UTC (rev 7661)
@@ -1 +0,0 @@
-@import url(gforge.css);body{counter-reset:chapter;}h2:before{content:counter(chapter) ". ";counter-increment:chapter;}h2{counter-reset:section;}h3:before{content:counter(chapter) "." counter(section) " ";counter-increment:section;}h3{counter-reset:subsection;}h4:before{content:counter(chapter) "." counter(section) "." counter(subsection) " ";counter-increment:subsection;}h4{counter-reset:subsection2;}h5:before{content:counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) " ";counter-increment:subsection2;}h5{counter-reset:subsection3;}h6:before{content:counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) "." counter(subsection3) " ";counter-increment:subsection3;}
\ No newline at end of file

Deleted: trunk/themes/fusionforge/gforge-autonumbering.css
===================================================================
--- trunk/themes/fusionforge/gforge-autonumbering.css	2010-08-31 15:03:30 UTC (rev 7660)
+++ trunk/themes/fusionforge/gforge-autonumbering.css	2010-08-31 15:08:32 UTC (rev 7661)
@@ -1,81 +0,0 @@
-/**
- * $Id$
- *
- * Copyright (C) 2008 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-/*
- * Standard Alcatel-Lucent disclaimer for contributing to open source
- *
- * "The Style Sheet ("Contribution") has not been tested and/or
- * validated for release as or in products, combinations with products or
- * other commercial use. Any use of the Contribution is entirely made at
- * the user's own responsibility and the user can not rely on any features,
- * functionalities or performances Alcatel-Lucent has attributed to the
- * Contribution.
- *
- * THE CONTRIBUTION BY ALCATEL-LUCENT IS PROVIDED AS IS, WITHOUT WARRANTY
- * OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, COMPLIANCE,
- * NON-INTERFERENCE AND/OR INTERWORKING WITH THE SOFTWARE TO WHICH THE
- * CONTRIBUTION HAS BEEN MADE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * ALCATEL-LUCENT BE LIABLE FOR ANY DAMAGES OR OTHER LIABLITY, WHETHER IN
- * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * CONTRIBUTION OR THE USE OR OTHER DEALINGS IN THE CONTRIBUTION, WHETHER
- * TOGETHER WITH THE SOFTWARE TO WHICH THE CONTRIBUTION RELATES OR ON A STAND
- * ALONE BASIS."
- */
-
-@import url(gforge.css);
-
-body {
-    counter-reset: chapter;      /* Create a chapter counter scope */
-}
-h2:before {
-    content: counter(chapter) ". ";
-    counter-increment: chapter;  /* Add 1 to chapter */
-}
-h2 {
-    counter-reset: section;      /* Set section to 0 */
-}
-h3:before {
-    content: counter(chapter) "." counter(section) " ";
-    counter-increment: section;
-}
-h3 {
-    counter-reset: subsection;   /* Set subsection to 0 */
-}
-h4:before {
-    content: counter(chapter) "." counter(section) "." counter(subsection) " ";
-    counter-increment: subsection;
-}
-h4 {
-    counter-reset: subsection2;      /* Set section to 0 */
-}
-h5:before {
-    content: counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) " ";
-    counter-increment: subsection2;
-}
-h5 {
-    counter-reset: subsection3;      /* Set subsection to 0 */
-}
-h6:before {
-    content: counter(chapter) "." counter(section) "." counter(subsection) "." counter(subsection2) "." counter(subsection3) " ";
-    counter-increment: subsection3;
-}

Deleted: trunk/themes/fusionforge/gforge-fullscreen-min.css
===================================================================
--- trunk/themes/fusionforge/gforge-fullscreen-min.css	2010-08-31 15:03:30 UTC (rev 7660)
+++ trunk/themes/fusionforge/gforge-fullscreen-min.css	2010-08-31 15:08:32 UTC (rev 7661)
@@ -1 +0,0 @@
-#topbar{display:none;}#horiznavbar{display:none;}#leftnav{display:none;}.toolpalettes{display:none;}div.toc{border:1px solid black;padding:5px;}div.toc ul{list-style:none;}blockquote.mail-style-quote{margin:0;margin-bottom:1em;border:1px solid #284;padding:.5em;}.mail-style-quote blockquote.mail-style-quote{margin-left:.3em;margin-bottom:0;border-style:none;border-left:medium solid #284;padding:0;padding-left:.5em;}div.wikitext pre{font-family:monospace;border-width:1px;border-style:dashed;padding:.5em;}h1,h2,h3,h4,h5,h6{padding-top:.5em;padding-bottom:.17em;border-bottom:1px solid black;}#content{background:white;}
\ No newline at end of file

Deleted: trunk/themes/fusionforge/gforge-fullscreen.css
===================================================================
--- trunk/themes/fusionforge/gforge-fullscreen.css	2010-08-31 15:03:30 UTC (rev 7660)
+++ trunk/themes/fusionforge/gforge-fullscreen.css	2010-08-31 15:08:32 UTC (rev 7661)
@@ -1,96 +0,0 @@
-/**
- * $Id$
- *
- * Copyright (C) 2008 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 a...
 
[truncated message content]

[phpwiki-checkins] SF.net SVN: phpwiki:[7659] trunk

[<var...@us...>]

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.

[phpwiki-checkins] SF.net SVN: phpwiki:[7658] trunk/lib/main.php

[<var...@us...>]

Revision: 7658
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7658&view=rev
Author:   vargenau
Date:     2010-08-31 13:42:28 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
Special case for Gforge

Modified Paths:
--------------
    trunk/lib/main.php

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2010-08-31 12:07:02 UTC (rev 7657)
+++ trunk/lib/main.php	2010-08-31 13:42:28 UTC (rev 7658)
@@ -1413,11 +1413,14 @@
     $request->finish();
 }
 
-//$x = error_reporting();  // DEBUG: why is it 1 here? should be E_ALL
-if (defined('E_STRICT') and (E_ALL & E_STRICT)) // strict php5?
-	error_reporting(E_ALL & ~E_STRICT);         // exclude E_STRICT
-else
-	error_reporting(E_ALL); // php4
+if ((!GFORGE) || (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
+        error_reporting(E_ALL); // php4
+} else {
+    error_reporting(E_ERROR);
+}
 
 // don't run the main loop for special requests (test, getimg, xmlrpc, soap, ...)
 if (!defined('PHPWIKI_NOMAIN') or !PHPWIKI_NOMAIN)


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7657] trunk/themes/gforge/pgsrc/ SetGlobalAccessRightsSimple

[<var...@us...>]

Revision: 7657
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7657&view=rev
Author:   vargenau
Date:     2010-08-31 12:07:02 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
Oops: missing plugin call

Modified Paths:
--------------
    trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple

Modified: trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple	2010-08-31 11:42:09 UTC (rev 7656)
+++ trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple	2010-08-31 12:07:02 UTC (rev 7657)
@@ -22,5 +22,7 @@
 
 view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
 
+<<WikiAdminSetAclSimple s=. info=pagename>>
+
 ----
 [[CategoryActionPage]]


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7656] trunk/themes/gforge/pgsrc

[<var...@us...>]

Revision: 7656
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7656&view=rev
Author:   vargenau
Date:     2010-08-31 11:42:09 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
Add svn:keywords Id

Modified Paths:
--------------
    trunk/themes/gforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
    trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple

Property Changed:
----------------
    trunk/themes/gforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
    trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple

Modified: trunk/themes/gforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
===================================================================
--- trunk/themes/gforge/pgsrc/PhpWikiAdministration%2FSetAclSimple	2010-08-31 11:37:18 UTC (rev 7655)
+++ trunk/themes/gforge/pgsrc/PhpWikiAdministration%2FSetAclSimple	2010-08-31 11:42:09 UTC (rev 7656)
@@ -1,6 +1,6 @@
 Date: Tue, 31 Aug 2010 11:36:17 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: PhpWikiAdministration%2FSetAclSimple 7644 2010-08-13 13:34:26Z vargenau $
+X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiAdministration%2FSetAclSimple;
   flags=PAGE_LOCKED;


Property changes on: trunk/themes/gforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple	2010-08-31 11:37:18 UTC (rev 7655)
+++ trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple	2010-08-31 11:42:09 UTC (rev 7656)
@@ -1,6 +1,6 @@
 Date: Tue, 31 Aug 2010 11:36:04 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: SetGlobalAccessRightsSimple 7654 2010-08-31 09:41:22Z vargenau $
+X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
   pagename=SetGlobalAccessRightsSimple;
   flags=PAGE_LOCKED;


Property changes on: trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple
___________________________________________________________________
Added: svn:keywords
   + Id


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7655] trunk

[<var...@us...>]

Revision: 7655
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7655&view=rev
Author:   vargenau
Date:     2010-08-31 11:37:18 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
Add explanations for Simple Access Rights

Modified Paths:
--------------
    trunk/pgsrc/SetGlobalAccessRightsSimple

Added Paths:
-----------
    trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple

Modified: trunk/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/pgsrc/SetGlobalAccessRightsSimple	2010-08-31 09:41:22 UTC (rev 7654)
+++ trunk/pgsrc/SetGlobalAccessRightsSimple	2010-08-31 11:37:18 UTC (rev 7655)
@@ -11,6 +11,17 @@
 This action page will allow you to set the default access rights for wiki pages.
 Pages without individual access rights will use these default access rights.
 
+----
+
+//Liberal Access Rights// means //Everyone can edit//.
+
+view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
+
+
+//Restrictive Access Rights// means //Only logged users can see the page//.
+
+view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
+
 <<WikiAdminSetAclSimple s=. info=pagename>>
 
 ----

Added: trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple	                        (rev 0)
+++ trunk/themes/gforge/pgsrc/SetGlobalAccessRightsSimple	2010-08-31 11:37:18 UTC (rev 7655)
@@ -0,0 +1,26 @@
+Date: Tue, 31 Aug 2010 11:36:04 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id: SetGlobalAccessRightsSimple 7654 2010-08-31 09:41:22Z vargenau $
+Content-Type: application/x-phpwiki;
+  pagename=SetGlobalAccessRightsSimple;
+  flags=PAGE_LOCKED;
+  markup=2;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+This action page will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
+
+----
+
+//Liberal Access Rights// means //Everyone can edit//, even if not member of the project.
+
+view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
+
+
+//Restrictive Access Rights// means //Only project members can see the page//.
+
+view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
+
+----
+[[CategoryActionPage]]


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7654] trunk

[<var...@us...>]

Revision: 7654
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7654&view=rev
Author:   vargenau
Date:     2010-08-31 09:41:22 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
Add explanations for Simple Access Rights

Modified Paths:
--------------
    trunk/pgsrc/PhpWikiAdministration
    trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
    trunk/pgsrc/SetGlobalAccessRights
    trunk/pgsrc/SetGlobalAccessRightsSimple
    trunk/themes/gforge/pgsrc/PhpWikiAdministration

Added Paths:
-----------
    trunk/themes/gforge/pgsrc/PhpWikiAdministration%2FSetAclSimple

Modified: trunk/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/pgsrc/PhpWikiAdministration	2010-08-30 10:41:28 UTC (rev 7653)
+++ trunk/pgsrc/PhpWikiAdministration	2010-08-31 09:41:22 UTC (rev 7654)
@@ -1,4 +1,4 @@
-Date: Fri, 13 Aug 2010 15:31:59 +0000
+Date: Tue, 31 Aug 2010 11:36:04 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -24,6 +24,8 @@
 
 == Global Access Rights ==
 
+These action pages will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
 * [[SetGlobalAccessRightsSimple]]
 * [[SetGlobalAccessRights]]
 

Modified: trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
===================================================================
--- trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple	2010-08-30 10:41:28 UTC (rev 7653)
+++ trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple	2010-08-31 09:41:22 UTC (rev 7654)
@@ -1,4 +1,4 @@
-Date: Fri, 13 Aug 2010 15:31:59 +0000
+Date: Tue, 31 Aug 2010 11:36:04 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -12,6 +12,17 @@
 
 ----
 
+//Liberal Access Rights// means //Everyone can edit//.
+
+view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
+
+
+//Restrictive Access Rights// means //Only logged users can see the page//.
+
+view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
+
+----
+
 <<WikiAdminSetAclSimple>>
 
 ----

Modified: trunk/pgsrc/SetGlobalAccessRights
===================================================================
--- trunk/pgsrc/SetGlobalAccessRights	2010-08-30 10:41:28 UTC (rev 7653)
+++ trunk/pgsrc/SetGlobalAccessRights	2010-08-31 09:41:22 UTC (rev 7654)
@@ -1,4 +1,4 @@
-Date: Fri, 13 Aug 2010 15:31:59 +0000
+Date: Tue, 31 Aug 2010 11:36:04 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -8,6 +8,9 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
+This action page will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
+
 <<WikiAdminSetAcl s=. info=pagename>>
 
 ----

Modified: trunk/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/pgsrc/SetGlobalAccessRightsSimple	2010-08-30 10:41:28 UTC (rev 7653)
+++ trunk/pgsrc/SetGlobalAccessRightsSimple	2010-08-31 09:41:22 UTC (rev 7654)
@@ -1,4 +1,4 @@
-Date: Fri, 13 Aug 2010 15:31:59 +0000
+Date: Tue, 31 Aug 2010 11:36:04 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -8,6 +8,9 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
+This action page will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
+
 <<WikiAdminSetAclSimple s=. info=pagename>>
 
 ----

Modified: trunk/themes/gforge/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/themes/gforge/pgsrc/PhpWikiAdministration	2010-08-30 10:41:28 UTC (rev 7653)
+++ trunk/themes/gforge/pgsrc/PhpWikiAdministration	2010-08-31 09:41:22 UTC (rev 7654)
@@ -1,4 +1,4 @@
-Date: Fri, 13 Aug 2010 15:31:51 +0000
+Date: Tue, 31 Aug 2010 11:36:17 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -24,6 +24,8 @@
 
 == Global Access Rights ==
 
+These action pages will allow you to set the default access rights for wiki pages.
+Pages without individual access rights will use these default access rights.
 * [[SetGlobalAccessRightsSimple]]
 * [[SetGlobalAccessRights]]
 

Added: trunk/themes/gforge/pgsrc/PhpWikiAdministration%2FSetAclSimple
===================================================================
--- trunk/themes/gforge/pgsrc/PhpWikiAdministration%2FSetAclSimple	                        (rev 0)
+++ trunk/themes/gforge/pgsrc/PhpWikiAdministration%2FSetAclSimple	2010-08-31 09:41:22 UTC (rev 7654)
@@ -0,0 +1,29 @@
+Date: Tue, 31 Aug 2010 11:36:17 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id: PhpWikiAdministration%2FSetAclSimple 7644 2010-08-13 13:34:26Z vargenau $
+Content-Type: application/x-phpwiki;
+  pagename=PhpWikiAdministration%2FSetAclSimple;
+  flags=PAGE_LOCKED;
+  markup=2;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+For more complex Access Rights modifications, see **[[phpwiki:?action=setacl|SetAcl]]**.
+
+----
+
+//Liberal Access Rights// means //Everyone can edit//, even if not member of the project.
+
+view:_EVERY; edit:_EVERY; create:_EVERY; list:_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER'
+
+
+//Restrictive Access Rights// means //Only project members can see the page//.
+
+view:_AUTHENTICATED,-_EVERY; edit:_AUTHENTICATED,-_EVERY; create:_AUTHENTICATED,-_EVERY; list:_AUTHENTICATED,-_EVERY; remove:_ADMIN,_OWNER; purge:_ADMIN,_OWNER; dump:_ADMIN,_OWNER; change:_ADMIN,_OWNER
+
+----
+
+<<WikiAdminSetAclSimple>>
+
+----
+[[CategoryActionPage]]


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7653] trunk/lib/plugin/RedirectTo.php

[<var...@us...>]

Revision: 7653
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7653&view=rev
Author:   vargenau
Date:     2010-08-30 10:41:28 +0000 (Mon, 30 Aug 2010)

Log Message:
-----------
Allow encoded spaces in URL for RedirectTo plugin

Modified Paths:
--------------
    trunk/lib/plugin/RedirectTo.php

Modified: trunk/lib/plugin/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2010-08-24 15:11:11 UTC (rev 7652)
+++ trunk/lib/plugin/RedirectTo.php	2010-08-30 10:41:28 UTC (rev 7653)
@@ -59,14 +59,14 @@
         $href = $args['href'];
         $page = $args['page'];
         if ($href) {
-            /*
-             * Use quotes on the href argument value, like:
-             *   <<RedirectTo href="http://funky.com/a b \" c.htm" ?>
-             *
-             * Do we want some checking on href to avoid malicious
-             * uses of the plugin? Like stripping tags or hexcode.
-             */
-            $url = preg_replace('/%\d\d/','',strip_tags($href));
+            // If URL is urlencoded, decode it.
+            if (strpos('%', $href) !== false) {
+                $href = urldecode($href);
+            }
+            $url = strip_tags($href);
+            if ($url != $href) { // URL contains tags
+                return $this->disabled(_("Illegal characters in external URL."));
+            }
             $thispage = $request->getPage();
             if (! $thispage->get('locked')) {
                 return $this->disabled(_("Redirect to an external URL is only allowed in locked pages."));


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7652] trunk/pgsrc/Help%2FPageList

[<var...@us...>]

Revision: 7652
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7652&view=rev
Author:   vargenau
Date:     2010-08-24 15:11:11 +0000 (Tue, 24 Aug 2010)

Log Message:
-----------
limit default is 50 (paging now works)

Modified Paths:
--------------
    trunk/pgsrc/Help%2FPageList

Modified: trunk/pgsrc/Help%2FPageList
===================================================================
--- trunk/pgsrc/Help%2FPageList	2010-08-24 14:24:17 UTC (rev 7651)
+++ trunk/pgsrc/Help%2FPageList	2010-08-24 15:11:11 UTC (rev 7652)
@@ -1,4 +1,4 @@
-Date: Mon, 23 Aug 2010 17:09:36 +0000
+Date: Tue, 24 Aug 2010 17:10:44 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -54,7 +54,7 @@
 |-
 | **limit**
 | number of rows 
-| 5000
+| 50
 |-
 | **paging**
 | auto (top + bottom rows if applicable) \\ top (top only if applicable) \\ bottom (bottom only if applicable) \\ none (don't page at all)


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7651] trunk

[<var...@us...>]

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

Log Message:
-----------
Remove method asAclGroupLines that was introduced in r6688

Modified Paths:
--------------
    trunk/lib/PageList.php
    trunk/lib/PagePerm.php
    trunk/lib/plugin/WikiAdminSetAcl.php
    trunk/themes/MonoBook/templates/info.tmpl
    trunk/themes/default/templates/info.tmpl

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/lib/PageList.php	2010-08-24 14:24:17 UTC (rev 7651)
@@ -536,7 +536,7 @@
         $result = HTML::span();
         $result->pushContent($type);
         $result->pushContent(HTML::br());
-        $result->pushContent($perm->asAclGroupLines());
+        $result->pushContent($perm->asAclLines());
         return $result;
     }
 };

Modified: trunk/lib/PagePerm.php
===================================================================
--- trunk/lib/PagePerm.php	2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/lib/PagePerm.php	2010-08-24 14:24:17 UTC (rev 7651)
@@ -705,32 +705,6 @@
         return $s;
     }
 
-    // Print ACL as group followed by actions allowed for the group
-    function asAclGroupLines() {
-
-        $s = '';
-        $perm =& $this->perm;
-        $actions = array("view", "edit", "create", "list", "remove", "purge", "dump", "change");
-        $groups = array(ACL_EVERY, ACL_ANONYMOUS, ACL_BOGOUSER, ACL_HASHOMEPAGE, ACL_SIGNED, ACL_AUTHENTICATED, ACL_ADMIN, ACL_OWNER, ACL_CREATOR);
-
-        foreach ($groups as $group) {
-            $none = true;
-            foreach ($actions as $action) {
-                if (isset($perm[$action][$group])) {
-                    if ($none) {
-                        $none = false;
-                        $s .= "$group:";
-                    }
-                    $s .= (($perm[$action][$group] ? " " : " -") . $action);
-                }
-            }
-            if (!($none)) {
-                $s .= "; ";
-            }
-        }
-        return $s;
-    }
-
     // This is just a bad hack for testing.
     // Simplify the ACL to a unix-like "rwx------+" string
     // See getfacl(8)

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2010-08-24 14:24:17 UTC (rev 7651)
@@ -95,9 +95,9 @@
                     $result->pushContent(HTML::p(fmt("ACL changed for page '%s'",
                                                      $pagename)));
                     $result->pushContent(HTML::p(fmt("from '%s'",
-                                                     $oldperm ? $oldperm->asAclGroupLines() : "None")));
+                                                     $oldperm ? $oldperm->asAclLines() : "None")));
                     $result->pushContent(HTML::p(fmt("to '%s'.",
-                                                     $perm->asAclGroupLines())));
+                                                     $perm->asAclLines())));
 
                     // Create new revision so that ACL change appears in history.
                     $current = $page->getCurrentRevision();
@@ -106,8 +106,8 @@
                     $text = $current->getPackedContent();
                     $meta['summary'] = sprintf(_("ACL changed for page '%s' from '%s' to '%s'."),
                                                $pagename,
-                                               $oldperm ? $oldperm->asAclGroupLines() : "None",
-                                               $perm->asAclGroupLines());
+                                               $oldperm ? $oldperm->asAclLines() : "None",
+                                               $perm->asAclLines());
                     $meta['is_minor_edit'] = 1;
                     $meta['author'] =  $request->_user->UserName();
                     unset($meta['mtime']); // force new date
@@ -242,7 +242,7 @@
         elseif ($type == 'default')
             $type = _("default page permission");
         $header->pushContent(HTML::strong(_("Type").': '), HTML::tt($type),HTML::br());
-        $header->pushContent(HTML::strong(_("ACL").': '), HTML::tt($perm->asAclGroupLines()),HTML::br());
+        $header->pushContent(HTML::strong(_("ACL").': '), HTML::tt($perm->asAclLines()),HTML::br());
 
         $header->pushContent(HTML::p(HTML::strong(_("Description").': '),
                                      _("Selected Grant checkboxes allow access, unselected checkboxes deny access."),

Modified: trunk/themes/MonoBook/templates/info.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/info.tmpl	2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/themes/MonoBook/templates/info.tmpl	2010-08-24 14:24:17 UTC (rev 7651)
@@ -148,7 +148,7 @@
   </tr>
   <tr>
     <td align="right" valign="top" class="pageinfo">ACL</td>
-    <td><?php echo $perm->asAclGroupLines() ?></td>
+    <td><?php echo $perm->asAclLines() ?></td>
   </tr>
 <?php } ?>
 

Modified: trunk/themes/default/templates/info.tmpl
===================================================================
--- trunk/themes/default/templates/info.tmpl	2010-08-24 10:06:49 UTC (rev 7650)
+++ trunk/themes/default/templates/info.tmpl	2010-08-24 14:24:17 UTC (rev 7651)
@@ -140,7 +140,7 @@
   </tr>
   <tr>
     <td align="right" valign="top" class="pageinfo">ACL</td>
-    <td><?php echo $perm->asAclGroupLines() ?></td>
+    <td><?php echo $perm->asAclLines() ?></td>
   </tr>
 <?php } ?>
 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7650] trunk/pgsrc/AllPagesByAcl

[<var...@us...>]

Revision: 7650
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7650&view=rev
Author:   vargenau
Date:     2010-08-24 10:06:49 +0000 (Tue, 24 Aug 2010)

Log Message:
-----------
Fix pagename=AllPagesByAcl

Modified Paths:
--------------
    trunk/pgsrc/AllPagesByAcl

Property Changed:
----------------
    trunk/pgsrc/AllPagesByAcl

Modified: trunk/pgsrc/AllPagesByAcl
===================================================================
--- trunk/pgsrc/AllPagesByAcl	2010-08-24 10:03:52 UTC (rev 7649)
+++ trunk/pgsrc/AllPagesByAcl	2010-08-24 10:06:49 UTC (rev 7650)
@@ -1,8 +1,8 @@
 Date: Tue, 24 Aug 2010 12:00:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
-X-Rcs-Id: $Id: AllPages 7614 2010-07-15 15:56:21Z vargenau $
+X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
-  pagename=AllPages;
+  pagename=AllPagesByAcl;
   flags=PAGE_LOCKED;
   markup=2;
   charset=UTF-8


Property changes on: trunk/pgsrc/AllPagesByAcl
___________________________________________________________________
Added: svn:keywords
   + Id


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7649] trunk

[<var...@us...>]

Revision: 7649
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7649&view=rev
Author:   vargenau
Date:     2010-08-24 10:03:52 +0000 (Tue, 24 Aug 2010)

Log Message:
-----------
New action page: AllPagesByAcl

Modified Paths:
--------------
    trunk/lib/IniConfig.php
    trunk/pgsrc/SpecialPages
    trunk/themes/gforge/pgsrc/SpecialPages

Added Paths:
-----------
    trunk/pgsrc/AllPagesByAcl

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2010-08-23 15:13:51 UTC (rev 7648)
+++ trunk/lib/IniConfig.php	2010-08-24 10:03:52 UTC (rev 7649)
@@ -4,7 +4,7 @@
  * A configurator intended to read its config from a PHP-style INI file,
  * instead of a PHP file.
  *
- * Pass a filename to the IniConfig() function and it will read all it's
+ * Pass a filename to the IniConfig() function and it will read all its
  * definitions from there, all by itself, and proceed to do a mass-define
  * of all valid PHPWiki config items.  In this way, we can hopefully be
  * totally backwards-compatible with the old index.php method, while still
@@ -743,18 +743,19 @@
         $AllAllowedPlugins[] = '_WikiTranslation';
     }
 
-    // Used by SetupWiki to pull in required pages, if not translated, then in english.
+    // Used by SetupWiki to pull in required pages, if not translated, then in English.
     // Also used by _WikiTranslation. Really important are only those which return pagelists
     // or contain basic functionality.
     $AllActionPages = $ActionPages;
     $AllActionPages[] = 'AllPagesCreatedByMe';
     $AllActionPages[] = 'AllPagesLastEditedByMe';
     $AllActionPages[] = 'AllPagesOwnedByMe';
+    $AllActionPages[] = 'AllPagesByAcl';
     $AllActionPages[] = 'AllUserPages';
     $AllActionPages[] = 'FullRecentChanges';
     $AllActionPages[] = 'LeastPopular';
     $AllActionPages[] = 'LockedPages';
-    $AllActionPages[] = 'MyRatings'; // MyRatings works only in wikilens derived themes
+    $AllActionPages[] = 'MyRatings'; // MyRatings works only in wikilens-derived themes
     $AllActionPages[] = 'MyRecentEdits';
     $AllActionPages[] = 'MyRecentChanges';
     $AllActionPages[] = 'PhpWikiAdministration';

Added: trunk/pgsrc/AllPagesByAcl
===================================================================
--- trunk/pgsrc/AllPagesByAcl	                        (rev 0)
+++ trunk/pgsrc/AllPagesByAcl	2010-08-24 10:03:52 UTC (rev 7649)
@@ -0,0 +1,16 @@
+Date: Tue, 24 Aug 2010 12:00:09 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id: AllPages 7614 2010-07-15 15:56:21Z vargenau $
+Content-Type: application/x-phpwiki;
+  pagename=AllPages;
+  flags=PAGE_LOCKED;
+  markup=2;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+Here is the list of **all pages** on this Wiki, sorted by ACL (Access Control List).
+
+<<AllPages info||=acl sortby||=acl>>
+
+----
+[[CategoryActionPage]]

Modified: trunk/pgsrc/SpecialPages
===================================================================
--- trunk/pgsrc/SpecialPages	2010-08-23 15:13:51 UTC (rev 7648)
+++ trunk/pgsrc/SpecialPages	2010-08-24 10:03:52 UTC (rev 7649)
@@ -1,4 +1,4 @@
-Date: Wed, 19 May 2010 18:15:54 +0000
+Date: Tue, 24 Aug 2010 12:00:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -21,6 +21,7 @@
 * [[AllPagesCreatedByMe]]
 * [[AllPagesOwnedByMe]]
 * [[AllPagesLastEditedByMe]]
+* [[AllPagesByAcl]]
 * [[NewPagesPerUser]]
 * [[LockedPages]]
 * [[OrphanedPages]]

Modified: trunk/themes/gforge/pgsrc/SpecialPages
===================================================================
--- trunk/themes/gforge/pgsrc/SpecialPages	2010-08-23 15:13:51 UTC (rev 7648)
+++ trunk/themes/gforge/pgsrc/SpecialPages	2010-08-24 10:03:52 UTC (rev 7649)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Jul 2010 16:58:46 +0000
+Date: Tue, 24 Aug 2010 11:59:55 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -21,6 +21,7 @@
 * [[AllPagesCreatedByMe]]
 * [[AllPagesOwnedByMe]]
 * [[AllPagesLastEditedByMe]]
+* [[AllPagesByAcl]]
 * [[NewPagesPerUser]]
 * [[LockedPages]]
 * [[OrphanedPages]]


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7648] trunk/lib/PageList.php

[<var...@us...>]

Revision: 7648
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7648&view=rev
Author:   vargenau
Date:     2010-08-23 15:13:51 +0000 (Mon, 23 Aug 2010)

Log Message:
-----------
Avoid information duplication

Modified Paths:
--------------
    trunk/lib/PageList.php

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2010-08-23 15:10:10 UTC (rev 7647)
+++ trunk/lib/PageList.php	2010-08-23 15:13:51 UTC (rev 7648)
@@ -22,43 +22,9 @@
 
 /**
  * List a number of pagenames, optionally as table with various columns.
- * This library relieves some work for these plugins:
  *
- * AllPages, BackLinks, LikePages, MostPopular, TitleSearch, WikiAdmin* and more
+ * See pgsrc/Help%2FPageList for arguments and details
  *
- * It also allows dynamic expansion of those plugins to include more
- * columns in their output.
- *
- * Column 'info=' arguments:
- *
- * 'pagename' _("Page Name")
- * 'mtime'    _("Last Modified")
- * 'hits'     _("Hits")
- * 'summary'  _("Last Summary")
- * 'version'  _("Version")),
- * 'author'   _("Last Author")),
- * 'locked'   _("Locked"), _("locked")
- * 'minor'    _("Minor Edit"), _("minor")
- * 'markup'   _("Markup")
- * 'size'     _("Size")
- * 'creator'  _("Creator")
- * 'owner'    _("Owner")
- * 'checkbox'  selectable checkbox at the left.
- * 'content'
- *
- * Special, custom columns: Either theme or plugin (WikiAdmin*) specific.
- * 'remove'   _("Remove")   
- * 'perm'     _("Permission Mask")
- * 'acl'      _("ACL")
- * 'renamed_pagename'   _("Rename to")
- * 'ratingwidget', ... wikilens theme specific.
- * 'custom'   See plugin/_WikiTranslation
- *
- * Symbolic 'info=' arguments:
- * 'all'       All columns except the special columns
- * 'most'      pagename, mtime, author, size, hits, ...
- * 'some'      pagename, mtime, author
- *
  * FIXME: In this refactoring I (Jeff) have un-implemented _ctime, _cauthor, and
  * number-of-revision.  Note the _ctime and _cauthor as they were implemented
  * were somewhat flawed: revision 1 of a page doesn't have to exist in the


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7647] trunk

[<var...@us...>]

Revision: 7647
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7647&view=rev
Author:   vargenau
Date:     2010-08-23 15:10:10 +0000 (Mon, 23 Aug 2010)

Log Message:
-----------
Move "perm" and "acl" columns from plugins to PageList

Modified Paths:
--------------
    trunk/lib/PageList.php
    trunk/lib/plugin/WikiAdminChmod.php
    trunk/lib/plugin/WikiAdminSetAcl.php
    trunk/pgsrc/Help%2FPageList

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2010-08-20 16:58:24 UTC (rev 7646)
+++ trunk/lib/PageList.php	2010-08-23 15:10:10 UTC (rev 7647)
@@ -546,6 +546,35 @@
     }
 };
 
+class _PageList_Column_perm extends _PageList_Column {
+    function _getValue ($page_handle, &$revision_handle) {
+        $perm_array = pagePermissions($page_handle->_pagename);
+        return pagePermissionsSimpleFormat($perm_array,
+                                           $page_handle->get('author'),
+                                           $page_handle->get('group'));
+    }
+};
+
+class _PageList_Column_acl extends _PageList_Column {
+    function _getValue ($page_handle, &$revision_handle) {
+        $perm_tree = pagePermissions($page_handle->_pagename);
+
+        list($type, $perm) = pagePermissionsAcl($perm_tree[0], $perm_tree);
+        if ($type == 'inherited') {
+            $type = sprintf(_("page permission inherited from %s"), $perm_tree[1][0]);
+        } elseif ($type == 'page') {
+            $type = _("individual page permission");
+        } elseif ($type == 'default') {
+            $type = _("default page permission");
+        }
+        $result = HTML::span();
+        $result->pushContent($type);
+        $result->pushContent(HTML::br());
+        $result->pushContent($perm->asAclGroupLines());
+        return $result;
+    }
+};
+
 class PageList {
     var $_group_rows = 3;
     var $_columns = array();
@@ -1176,11 +1205,11 @@
                   // initialised by the plugin
                   'renamed_pagename'
                   => new _PageList_Column_renamed_pagename('rename', _("Rename to")),
+                  */
                   'perm'
                   => new _PageList_Column_perm('perm', _("Permission")),
                   'acl'
                   => new _PageList_Column_acl('acl', _("ACL")),
-                  */
                   'checkbox'
                   => new _PageList_Column_checkbox('p', _("All")),
                   'pagename'

Modified: trunk/lib/plugin/WikiAdminChmod.php
===================================================================
--- trunk/lib/plugin/WikiAdminChmod.php	2010-08-20 16:58:24 UTC (rev 7646)
+++ trunk/lib/plugin/WikiAdminChmod.php	2010-08-23 15:10:10 UTC (rev 7647)
@@ -188,16 +188,6 @@
     }
 }
 
-// conflicts with WikiAdminSetAcl
-class _PageList_Column_chmod_perm extends _PageList_Column {
-    function _getValue ($page_handle, &$revision_handle) {
-        $perm_array = pagePermissions($page_handle->_pagename);
-        return pagePermissionsSimpleFormat($perm_array,
-                                           $page_handle->get('author'),
-                                           $page_handle->get('group'));
-    }
-};
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2010-08-20 16:58:24 UTC (rev 7646)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2010-08-23 15:10:10 UTC (rev 7647)
@@ -278,35 +278,6 @@
     }
 }
 
-class _PageList_Column_acl extends _PageList_Column {
-    function _getValue ($page_handle, &$revision_handle) {
-        $perm_tree = pagePermissions($page_handle->_pagename);
-
-        list($type, $perm) = pagePermissionsAcl($perm_tree[0], $perm_tree);
-        if ($type == 'inherited') {
-            $type = sprintf(_("page permission inherited from %s"), $perm_tree[1][0]);
-        } elseif ($type == 'page') {
-            $type = _("individual page permission");
-        } elseif ($type == 'default') {
-            $type = _("default page permission");
-        }
-        $result = HTML::span();
-        $result->pushContent($type);
-        $result->pushContent(HTML::br());
-        $result->pushContent($perm->asAclGroupLines());
-        return $result;
-    }
-};
-
-class _PageList_Column_perm extends _PageList_Column {
-    function _getValue ($page_handle, &$revision_handle) {
-        $perm_array = pagePermissions($page_handle->_pagename);
-        return pagePermissionsSimpleFormat($perm_array,
-                                           $page_handle->get('author'),
-                                           $page_handle->get('group'));
-    }
-};
-
 // Local Variables:
 // mode: php
 // tab-width: 8

Modified: trunk/pgsrc/Help%2FPageList
===================================================================
--- trunk/pgsrc/Help%2FPageList	2010-08-20 16:58:24 UTC (rev 7646)
+++ trunk/pgsrc/Help%2FPageList	2010-08-23 15:10:10 UTC (rev 7647)
@@ -1,4 +1,4 @@
-Date: Tue,  1 Jun 2010 17:01:57 +0000
+Date: Mon, 23 Aug 2010 17:09:36 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -111,11 +111,11 @@
 |= owner     | Owner
 |= checkbox  | Selectable checkbox at the left
 |= content   | Page content
+|= perm      | Permission Mask
+|= acl       | ACL
 
 Special, custom columns, either theme or plugin (~WikiAdmin*) specific:
 |= remove              | Remove
-|= perm                | Permission Mask
-|= acl                 | ACL
 |= renamed_pagename    | Rename to
 |= ratingwidget        | wikilens theme specific.
 |= custom              | See plugin/_WikiTranslation


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7646] trunk/themes/Portland/images/

[<var...@us...>]

Revision: 7646
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7646&view=rev
Author:   vargenau
Date:     2010-08-20 16:58:24 +0000 (Fri, 20 Aug 2010)

Log Message:
-----------
Remove empty images dir

Removed Paths:
-------------
    trunk/themes/Portland/images/


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7645] trunk/g

[<var...@us...>]

Revision: 7645
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7645&view=rev
Author:   vargenau
Date:     2010-08-13 14:22:15 +0000 (Fri, 13 Aug 2010)

Log Message:
-----------
Avoid using index.php

Modified Paths:
--------------
    trunk/g

Modified: trunk/g
===================================================================
--- trunk/g	2010-08-13 13:34:26 UTC (rev 7644)
+++ trunk/g	2010-08-13 14:22:15 UTC (rev 7645)
@@ -221,7 +221,9 @@
     }
 
     // Load the default configuration.
-    include dirname(__FILE__).'/index.php';
+    require_once(dirname(__FILE__).'/lib/prepend.php');
+    require_once(dirname(__FILE__).'/lib/IniConfig.php');
+    IniConfig(dirname(__FILE__)."/config/config-default.ini");
 
     // Override the default configuration for VARIABLES after index.php:
     // E.g. Use another DB:


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7644] trunk

[<var...@us...>]

Revision: 7644
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7644&view=rev
Author:   vargenau
Date:     2010-08-13 13:34:26 +0000 (Fri, 13 Aug 2010)

Log Message:
-----------
New plugin: WikiAdminSetAclSimple

Modified Paths:
--------------
    trunk/lib/IniConfig.php
    trunk/lib/main.php
    trunk/pgsrc/Help%2FPagePermissions
    trunk/pgsrc/PhpWikiAdministration
    trunk/pgsrc/PhpWikiAdministration%2FSetAcl
    trunk/themes/gforge/pgsrc/PhpWikiAdministration
    trunk/themes/gforge/templates/actionbar.tmpl

Added Paths:
-----------
    trunk/lib/plugin/WikiAdminSetAclSimple.php
    trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin
    trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
    trunk/pgsrc/SetGlobalAccessRights
    trunk/pgsrc/SetGlobalAccessRightsSimple

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2010-08-12 14:54:41 UTC (rev 7643)
+++ trunk/lib/IniConfig.php	2010-08-13 13:34:26 UTC (rev 7644)
@@ -700,6 +700,7 @@
     $AllAllowedPlugins[] = 'WikiAdminRename';
     $AllAllowedPlugins[] = 'WikiAdminSearchReplace';
     $AllAllowedPlugins[] = 'WikiAdminSetAcl';
+    $AllAllowedPlugins[] = 'WikiAdminSetAclSimple';
     $AllAllowedPlugins[] = 'WikiAdminUtils';
     $AllAllowedPlugins[] = 'WikicreoleTable';
     $AllAllowedPlugins[] = 'WikiForm';
@@ -763,9 +764,12 @@
     $AllActionPages[] = 'PhpWikiAdministration/Rename';
     $AllActionPages[] = 'PhpWikiAdministration/SearchReplace';
     $AllActionPages[] = 'PhpWikiAdministration/SetAcl';
+    $AllActionPages[] = 'PhpWikiAdministration/SetAclSimple';
     $AllActionPages[] = 'RecentChangesMyPages';
     $AllActionPages[] = 'RecentEdits';
     $AllActionPages[] = 'RecentNewPages';
+    $AllActionPages[] = 'SetGlobalAccessRights';
+    $AllActionPages[] = 'SetGlobalAccessRightsSimple';
     $AllActionPages[] = 'UserContribs';
 
     // The GFORGE theme omits them

Modified: trunk/lib/main.php
===================================================================
--- trunk/lib/main.php	2010-08-12 14:54:41 UTC (rev 7643)
+++ trunk/lib/main.php	2010-08-13 13:34:26 UTC (rev 7644)
@@ -717,6 +717,7 @@
             case 'upgrade':
             case 'chown':
             case 'setacl':
+            case 'setaclsimple':
                 return WIKIAUTH_ADMIN;
 
             /* authcheck occurs only in the plugin.
@@ -1087,6 +1088,10 @@
         $this->adminActionSubpage(_("SetAcl"));
     }
 
+    function action_setaclsimple () {
+        $this->adminActionSubpage(_("SetAclSimple"));
+    }
+
     function action_rename () {
         $this->adminActionSubpage(_("Rename"));
     }
@@ -1410,9 +1415,10 @@
 
 //$x = error_reporting();  // DEBUG: why is it 1 here? should be E_ALL
 if (defined('E_STRICT') and (E_ALL & E_STRICT)) // strict php5?
-    error_reporting(E_ALL & ~E_STRICT); 	// exclude E_STRICT
+	error_reporting(E_ALL & ~E_STRICT);         // exclude E_STRICT
 else
-    error_reporting(E_ALL); // php4
+	error_reporting(E_ALL); // php4
+
 // don't run the main loop for special requests (test, getimg, xmlrpc, soap, ...)
 if (!defined('PHPWIKI_NOMAIN') or !PHPWIKI_NOMAIN)
     main();

Added: trunk/lib/plugin/WikiAdminSetAclSimple.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAclSimple.php	                        (rev 0)
+++ trunk/lib/plugin/WikiAdminSetAclSimple.php	2010-08-13 13:34:26 UTC (rev 7644)
@@ -0,0 +1,181 @@
+<?php // -*-php-*-
+// rcs_id('$Id$');
+/*
+ * Copyright 2004 $ThePhpWikiProgrammingTeam
+ * Copyright 2009-2010 Marc-Etienne Vargenau, 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/**
+ * Set simple individual PagePermissions
+ *
+ * Usage:   <<WikiAdminSetAclSimple >> or called via WikiAdminSelect
+ * Author:  Marc-Etienne Vargenau, Alcatel-Lucent
+ *
+ */
+
+require_once('lib/plugin/WikiAdminSetAcl.php');
+
+class WikiPlugin_WikiAdminSetAclSimple
+extends WikiPlugin_WikiAdminSetAcl
+{
+    function getName() {
+        return _("WikiAdminSetAclSimple");
+    }
+
+    function getDescription() {
+        return _("Set simple individual page permissions.");
+    }
+
+    function run($dbi, $argstr, &$request, $basepage) {
+        if ($request->getArg('action') != 'browse')
+            if ($request->getArg('action') != _("PhpWikiAdministration/SetAclSimple"))
+                return $this->disabled("(action != 'browse')");
+        if (!ENABLE_PAGEPERM)
+            return $this->disabled("ENABLE_PAGEPERM = false");
+
+        $args = $this->getArgs($argstr, $request);
+        $this->_args = $args;
+        $this->preSelectS($args, $request);
+
+        $p = $request->getArg('p');
+        $post_args = $request->getArg('admin_setacl');
+        $pages = array();
+        if ($p && !$request->isPost())
+            $pages = $p;
+        elseif ($this->_list)
+            $pages = $this->_list;
+        $header = HTML::fieldset();
+        if ($p && $request->isPost() &&
+            (!empty($post_args['aclliberal']) || !empty($post_args['aclrestricted']))) {
+            // without individual PagePermissions:
+            if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) {
+                $request->_notAuthorized(WIKIAUTH_ADMIN);
+                $this->disabled("! user->isAdmin");
+            }
+            if (!empty($post_args['aclliberal'])) {
+                return $this->setaclPages($request, array_keys($p), $this->liberalPerms());
+            } else if (!empty($post_args['aclrestricted'])) {
+                return $this->setaclPages($request, array_keys($p), $this->restrictedPerms());
+            }
+        }
+        if (empty($pages)) {
+            // List all pages to select from.
+            $pages = $this->collectPages($pages, $dbi, $args['sortby'], $args['limit'], $args['exclude']);
+        }
+        $pagelist = new PageList_Selectable($args['info'],
+                                            $args['exclude'],
+                                            array('types' => array(
+                                                  'acl'
+                                                  => new _PageList_Column_acl('acl', _("ACL")))));
+
+        $pagelist->addPageList($pages);
+        $button_label_liberal = _("Set Liberal Access Rights");
+        $button_label_restrictive = _("Set Restrictive Access Rights");
+        $header = $this->setaclForm($header, $pages);
+        $header->pushContent(HTML::legend(_("Select the pages where to change access rights")));
+
+        $buttons = HTML::p(Button('submit:admin_setacl[aclliberal]', $button_label_liberal, 'wikiadmin'),
+                           Button('submit:admin_setacl[aclrestricted]', $button_label_restrictive, 'wikiadmin'));
+        $header->pushContent($buttons);
+
+        return HTML::form(array('action' => $request->getPostURL(),
+                                'method' => 'post'),
+                          $header,
+                          $pagelist->getContent(),
+                          HiddenInputs($request->getArgs(),
+                                        false,
+                                        array('admin_setacl')),
+                          ENABLE_PAGEPERM
+                          ? ''
+                          : HiddenInputs(array('require_authority_for_post' => WIKIAUTH_ADMIN)));
+    }
+
+    /*
+     * acces rights where everyone can edit
+     * _EVERY: view edit list create;
+     * _ADMIN: remove purge dump change;
+     * _OWNER: remove purge dump change;
+     */
+
+    function liberalPerms() {
+
+        $perm = array('view'   => array(ACL_EVERY => true),
+                      'edit'   => array(ACL_EVERY => true),
+                      'create' => array(ACL_EVERY => true),
+                      'list'   => array(ACL_EVERY => true),
+                      'remove' => array(ACL_ADMIN => true,
+                                        ACL_OWNER => true),
+                      'purge'  => array(ACL_ADMIN => true,
+                                        ACL_OWNER => true),
+                      'dump'   => array(ACL_ADMIN => true,
+                                        ACL_OWNER => true),
+                      'change' => array(ACL_ADMIN => true,
+                                        ACL_OWNER => true));
+        return $perm;
+    }
+
+    /*
+     * acces rights where only authenticated users can see pages
+     * _AUTHENTICATED: view edit list create;
+     * _ADMIN: remove purge dump change;
+     * _OWNER: remove purge dump change;
+     * _EVERY: -view -edit -list -create;
+     */
+
+    function restrictedPerms() {
+
+        $perm = array('view'   => array(ACL_AUTHENTICATED => true,
+                                        ACL_EVERY => false),
+                      'edit'   => array(ACL_AUTHENTICATED => true,
+                                        ACL_EVERY => false),
+                      'create' => array(ACL_AUTHENTICATED => true,
+                                        ACL_EVERY => false),
+                      'list'   => array(ACL_AUTHENTICATED => true,
+                                        ACL_EVERY => false),
+                      'remove' => array(ACL_ADMIN => true,
+                                        ACL_OWNER => true),
+                      'purge'  => array(ACL_ADMIN => true,
+                                        ACL_OWNER => true),
+                      'dump'   => array(ACL_ADMIN => true,
+                                        ACL_OWNER => true),
+                      'change' => array(ACL_ADMIN => true,
+                                        ACL_OWNER => true));
+        return $perm;
+    }
+
+    function setaclForm(&$header, $pagehash) {
+
+        $pages = array();
+        foreach ($pagehash as $name => $checked) {
+           if ($checked) $pages[] = $name;
+        }
+
+        $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::tt(join(', ',$pages)), HTML::br());
+        return $header;
+    }
+};
+
+// Local Variables:
+// mode: php
+// tab-width: 8
+// c-basic-offset: 4
+// c-hanging-comment-ender-p: nil
+// indent-tabs-mode: nil
+// End:
+?>


Property changes on: trunk/lib/plugin/WikiAdminSetAclSimple.php
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/pgsrc/Help%2FPagePermissions
===================================================================
--- trunk/pgsrc/Help%2FPagePermissions	2010-08-12 14:54:41 UTC (rev 7643)
+++ trunk/pgsrc/Help%2FPagePermissions	2010-08-13 13:34:26 UTC (rev 7644)
@@ -1,4 +1,4 @@
-Date: Tue,  1 Jun 2010 17:01:57 +0000
+Date: Fri, 13 Aug 2010 15:31:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -111,7 +111,7 @@
 |= dump   | zip, ziphtml, dumpserial, dumphtml 
 |= edit   | revert, edit 
 |= create | //edit or create, if the page doesn't exist yet//
-|= change | upload, loadfile, remove, lock, unlock, upgrade, chown, setacl, rename. \\ All other actionpages which are not wikiwords.
+|= change | upload, loadfile, remove, lock, unlock, upgrade, chown, setacl, setaclsimple, rename. \\ All other actionpages which are not wikiwords.
 
 === Default Permissions ===
 

Added: trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin
===================================================================
--- trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin	                        (rev 0)
+++ trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin	2010-08-13 13:34:26 UTC (rev 7644)
@@ -0,0 +1,52 @@
+Date: Fri, 13 Aug 2010 15:31:59 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+  pagename=Help%2FWikiAdminSetAclSimplePlugin;
+  flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+  markup=2;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+The **~WikiAdminSetAclSimple** [[Help:WikiPlugin|plugin]] allows to change access rights on pages.
+
+== Usage ==
+{{{
+<<WikiAdminSetAclSimple arguments>>
+}}}
+
+== Arguments ==
+
+{| class="bordered"
+|-
+! Argument
+! Description
+! Default value
+|-
+| **p**
+| Pages to select
+| //None//
+|-
+| **info**
+| Columns to include in listing
+| pagename, perm, mtime, owner, author
+|}
+
+== Example ==
+
+{{{
+<<WikiAdminSetAclSimple s=Temp*>>
+}}}
+
+<<WikiAdminSetAclSimple s=Temp*>>
+
+== Author ==
+* [[PhpWiki:ReiniUrban|Reini Urban]]
+
+== See Also ==
+* [[PhpWikiAdministration]]
+
+<noinclude>
+----
+[[PhpWikiDocumentation]] [[CategoryWikiPlugin]]
+</noinclude>


Property changes on: trunk/pgsrc/Help%2FWikiAdminSetAclSimplePlugin
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/pgsrc/PhpWikiAdministration	2010-08-12 14:54:41 UTC (rev 7643)
+++ trunk/pgsrc/PhpWikiAdministration	2010-08-13 13:34:26 UTC (rev 7644)
@@ -1,4 +1,4 @@
-Date: Wed, 19 May 2010 18:15:54 +0000
+Date: Fri, 13 Aug 2010 15:31:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -20,8 +20,13 @@
 
 or call the available ~WikiAdmin actions directly:
 
-| [[/Chown]] | [[/Markup]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]]
+| [[/Chown]] | [[/Markup]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]]
 
+== Global Access Rights ==
+
+* [[SetGlobalAccessRightsSimple]]
+* [[SetGlobalAccessRights]]
+
 == User Management ==
 
 === Reset a users password ===

Modified: trunk/pgsrc/PhpWikiAdministration%2FSetAcl
===================================================================
--- trunk/pgsrc/PhpWikiAdministration%2FSetAcl	2010-08-12 14:54:41 UTC (rev 7643)
+++ trunk/pgsrc/PhpWikiAdministration%2FSetAcl	2010-08-13 13:34:26 UTC (rev 7644)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Apr 2010 16:32:58 +0000
+Date: Fri, 13 Aug 2010 15:31:59 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -8,6 +8,10 @@
   charset=UTF-8
 Content-Transfer-Encoding: binary
 
+For simple Access Rights modifications, see **[[phpwiki:?action=setaclsimple|SetAclSimple]]**.
+
+----
+
 <<WikiAdminSetAcl>>
 
 ----

Added: trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
===================================================================
--- trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple	                        (rev 0)
+++ trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple	2010-08-13 13:34:26 UTC (rev 7644)
@@ -0,0 +1,18 @@
+Date: Fri, 13 Aug 2010 15:31:59 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+  pagename=PhpWikiAdministration%2FSetAclSimple;
+  flags=PAGE_LOCKED;
+  markup=2;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+For more complex Access Rights modifications, see **[[phpwiki:?action=setacl|SetAcl]]**.
+
+----
+
+<<WikiAdminSetAclSimple>>
+
+----
+[[CategoryActionPage]]


Property changes on: trunk/pgsrc/PhpWikiAdministration%2FSetAclSimple
___________________________________________________________________
Added: svn:keywords
   + Id

Added: trunk/pgsrc/SetGlobalAccessRights
===================================================================
--- trunk/pgsrc/SetGlobalAccessRights	                        (rev 0)
+++ trunk/pgsrc/SetGlobalAccessRights	2010-08-13 13:34:26 UTC (rev 7644)
@@ -0,0 +1,14 @@
+Date: Fri, 13 Aug 2010 15:31:59 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+  pagename=SetGlobalAccessRights;
+  flags=PAGE_LOCKED;
+  markup=2;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+<<WikiAdminSetAcl s=. info=pagename>>
+
+----
+[[CategoryActionPage]]


Property changes on: trunk/pgsrc/SetGlobalAccessRights
___________________________________________________________________
Added: svn:keywords
   + Id

Added: trunk/pgsrc/SetGlobalAccessRightsSimple
===================================================================
--- trunk/pgsrc/SetGlobalAccessRightsSimple	                        (rev 0)
+++ trunk/pgsrc/SetGlobalAccessRightsSimple	2010-08-13 13:34:26 UTC (rev 7644)
@@ -0,0 +1,14 @@
+Date: Fri, 13 Aug 2010 15:31:59 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+  pagename=SetGlobalAccessRightsSimple;
+  flags=PAGE_LOCKED;
+  markup=2;
+  charset=UTF-8
+Content-Transfer-Encoding: binary
+
+<<WikiAdminSetAclSimple s=. info=pagename>>
+
+----
+[[CategoryActionPage]]


Property changes on: trunk/pgsrc/SetGlobalAccessRightsSimple
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/themes/gforge/pgsrc/PhpWikiAdministration
===================================================================
--- trunk/themes/gforge/pgsrc/PhpWikiAdministration	2010-08-12 14:54:41 UTC (rev 7643)
+++ trunk/themes/gforge/pgsrc/PhpWikiAdministration	2010-08-13 13:34:26 UTC (rev 7644)
@@ -1,4 +1,4 @@
-Date: Thu, 15 Jul 2010 16:58:46 +0000
+Date: Fri, 13 Aug 2010 15:31:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC-20100415)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -20,8 +20,13 @@
 
 or call the available ~WikiAdmin actions directly:
 
-| [[/Chown]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]]
+| [[/Chown]] | [[/Purge]] | [[/Remove]] | [[/Rename]] | [[/SearchReplace]] | [[/SetAcl]] | [[/SetAclSimple]]
 
+== Global Access Rights ==
+
+* [[SetGlobalAccessRightsSimple]]
+* [[SetGlobalAccessRights]]
+
 == Cleanup ==
 
 A Wiki SandBox is very easy to clean. Here you can restore it to

Modified: trunk/themes/gforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/gforge/templates/actionbar.tmpl	2010-08-12 14:54:41 UTC (rev 7643)
+++ trunk/themes/gforge/templates/actionbar.tmpl	2010-08-13 13:34:26 UTC (rev 7644)
@@ -104,7 +104,7 @@
         <?php } ?>
 
         <?php if ($curuserprefs->get('setaclMenuItem')) { ?>
-          <td><?php echo Button('setacl', _("Access Rights")) ?></td>
+          <td><?php echo Button('setaclsimple', _("Access Rights")) ?></td>
           <td class="spacer">&nbsp;</td>
         <?php } ?>
       <?php } ?>


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7643] trunk/lib/IniConfig.php

[<var...@us...>]

Revision: 7643
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7643&view=rev
Author:   vargenau
Date:     2010-08-12 14:54:41 +0000 (Thu, 12 Aug 2010)

Log Message:
-----------
Whitespace only

Modified Paths:
--------------
    trunk/lib/IniConfig.php

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2010-08-12 14:47:15 UTC (rev 7642)
+++ trunk/lib/IniConfig.php	2010-08-12 14:54:41 UTC (rev 7643)
@@ -217,7 +217,7 @@
     	}
     }
     unset($k); unset($v);
-  
+
     foreach ($_IC_VALID_VALUE as $item) {
         if (defined($item)) {
             unset($rs[$item]);
@@ -260,7 +260,7 @@
             $val = false;
             //trigger_error(sprintf("missing boolean config setting for %s",$item));
         }
-      
+
         // calculate them later: old or dynamic constants
         if (!array_key_exists($item, $rs) and
             in_array($item, array('USE_PATH_INFO', 'USE_DB_SESSION',
@@ -319,7 +319,7 @@
         trigger_error(sprintf("Invalid DATABASE_TYPE=%s. Choose one of %s",
                               DATABASE_TYPE, join(",", $valid_database_types)),
                       E_USER_ERROR);
-    unset($valid_database_types);                
+    unset($valid_database_types);
     if (DATABASE_TYPE == 'PDO') {
         if (!check_php_version(5))
             trigger_error("Invalid DATABASE_TYPE=PDO. PDO requires at least php-5.0!",
@@ -334,7 +334,7 @@
     }
     // Detect readonly database, e.g. system mounted read-only for maintenance
     // via dbh->readonly later. Unfortunately not possible as constant.
-      
+
     // USE_DB_SESSION default logic:
     if (!defined('USE_DB_SESSION')) {
         if ($DBParams['db_session_table']
@@ -363,7 +363,7 @@
     	}
     }
     unset($item); unset($major); unset($max);
-  
+
     // User authentication
     if (!isset($GLOBALS['USER_AUTH_ORDER'])) {
         if (isset($rs['USER_AUTH_ORDER']))
@@ -377,7 +377,7 @@
     if (in_array('Db', $GLOBALS['USER_AUTH_ORDER']) && empty($rs['DBAUTH_AUTH_DSN'])) {
         $rs['DBAUTH_AUTH_DSN'] = $DBParams['dsn'];
     }
-  
+
     global $DBAuthParams;
     $DBAP_MAP = array('DBAUTH_AUTH_DSN' => 'auth_dsn',
                       'DBAUTH_AUTH_CHECK' => 'auth_check',
@@ -463,7 +463,7 @@
 	}
     }
     unset($item);
-      
+
     // LDAP bind options
     global $LDAP_SET_OPTION;
     if (defined('LDAP_SET_OPTION') and LDAP_SET_OPTION) {
@@ -548,7 +548,7 @@
 
     unset($rs);
     unset($rsdef);
-  
+
     fixup_static_configs($file); //[1ms]
     // Dump all globals and constants
     // The question is if reading this is faster then doing IniConfig() + fixup_static_configs()
@@ -575,7 +575,7 @@
     global $HTTP_SERVER_VARS, $DBParams, $LANG, $ErrorManager;
     // init FileFinder to add proper include paths
     FindFile("lib/interwiki.map",true);
-  
+
     // "\x80"-"\x9f" (and "\x00" - "\x1f") are non-printing control
     // chars in iso-8859-*
     // $FieldSeparator = "\263"; // this is a superscript 3 in ISO-8859-1.
@@ -789,7 +789,7 @@
     	$themes_dir = FindFile("themes");
         define('PHPWIKI_DIR', dirname($themes_dir));
     }
-      
+
     // 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
@@ -814,7 +814,7 @@
 
     if (!defined('THEME'))
         define('THEME', 'default');
-      
+
     /*$configurator_link = HTML(HTML::br(), "=>",
                               HTML::a(array('href'=>DATA_PATH."/configurator.php"),
     								  _("Configurator")));*/
@@ -1044,7 +1044,7 @@
             }
         }
     }
-   
+
     if (SERVER_PORT
         && SERVER_PORT != (SERVER_PROTOCOL == 'https' ? 443 : 80)) {
         define('SERVER_URL',
@@ -1126,5 +1126,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7642] trunk/index.php

[<var...@us...>]

Revision: 7642
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7642&view=rev
Author:   vargenau
Date:     2010-08-12 14:47:15 +0000 (Thu, 12 Aug 2010)

Log Message:
-----------
Update copyright to 2010

Modified Paths:
--------------
    trunk/index.php

Modified: trunk/index.php
===================================================================
--- trunk/index.php	2010-08-11 13:00:46 UTC (rev 7641)
+++ trunk/index.php	2010-08-12 14:47:15 UTC (rev 7642)
@@ -1,37 +1,36 @@
 <?php // -*-php-*-
+// $Id$
 
 /*
-Copyright 1999,2000,2001,2002,2003,2004,2009 $ThePhpWikiProgrammingTeam
-= array(
-"Steve Wainstead", "Clifford A. Adams", "Lawrence Akka",
-"Scott R. Anderson", "Jon Åslund", "Neil Brown", "Jeff Dairiki",
-"Stéphane Gourichon", "Jan Hidders", "Arno Hollosi", "John Jorgensen",
-"Antti Kaihola", "Jeremie Kass", "Carsten Klapp", "Marco Milanesi",
-"Grant Morgan", "Jan Nieuwenhuizen", "Aredridel Niothke",
-"Pablo Roca Rozas", "Sandino Araico Sánchez", "Joel Uckelman",
-"Reini Urban", "Marc-Etienne Vargenau", "Joby Walker", "Tim Voght",
-"Jochen Kalmbach");
+ * Copyright 1999-2010 $ThePhpWikiProgrammingTeam
+ * = array(
+ * "Steve Wainstead", "Clifford A. Adams", "Lawrence Akka",
+ * "Scott R. Anderson", "Jon Åslund", "Neil Brown", "Jeff Dairiki",
+ * "Stéphane Gourichon", "Jan Hidders", "Arno Hollosi", "John Jorgensen",
+ * "Antti Kaihola", "Jeremie Kass", "Carsten Klapp", "Marco Milanesi",
+ * "Grant Morgan", "Jan Nieuwenhuizen", "Aredridel Niothke",
+ * "Pablo Roca Rozas", "Sandino Araico Sánchez", "Joel Uckelman",
+ * "Reini Urban", "Marc-Etienne Vargenau", "Joby Walker", "Tim Voght",
+ * "Jochen Kalmbach");
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
 
-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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
 require_once (dirname(__FILE__).'/lib/prepend.php');
-//rcs_id('$Id$');
-
 require_once(dirname(__FILE__).'/lib/IniConfig.php');
 IniConfig(dirname(__FILE__)."/config/config.ini");
 
@@ -61,5 +60,5 @@
 // c-basic-offset: 4
 // c-hanging-comment-ender-p: nil
 // indent-tabs-mode: nil
-// End: 
+// End:
 ?>


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