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

[phpwiki-checkins] SF.net SVN: phpwiki:[7716] trunk/lib/stdlib.php

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

Revision: 7716
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7716&view=rev
Author:   vargenau
Date:     2010-10-20 16:19:40 +0000 (Wed, 20 Oct 2010)

Log Message:
-----------
Check file exists

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

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2010-10-14 15:49:22 UTC (rev 7715)
+++ trunk/lib/stdlib.php	2010-10-20 16:19:40 UTC (rev 7716)
@@ -649,9 +649,9 @@
     }
     $type = $img->getAttr('type');
     if (!$type) {
-        // TODO: map extension to mime-types if type is not given and php < 4.3
-        if (function_exists('mime_content_type'))
+        if (function_exists('mime_content_type') && file_exists($url)) {
             $type = mime_content_type($url);
+        }
     }
     $object = HTML::object(array_merge($img->_attr,
                                        array('type' => $type)), //'src' => $url


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7715] trunk/lib/WikiUser/FusionForge.php

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

Revision: 7715
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7715&view=rev
Author:   vargenau
Date:     2010-10-14 15:49:22 +0000 (Thu, 14 Oct 2010)

Log Message:
-----------
Remove &

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

Modified: trunk/lib/WikiUser/FusionForge.php
===================================================================
--- trunk/lib/WikiUser/FusionForge.php	2010-10-11 14:12:14 UTC (rev 7714)
+++ trunk/lib/WikiUser/FusionForge.php	2010-10-14 15:49:22 UTC (rev 7715)
@@ -52,7 +52,7 @@
         if (session_loggedin()){
 
             // Get project object (if error => ANON)
-            $project =& group_get_object($group_id);
+            $project = group_get_object($group_id);
 
             if (!$project || !is_object($project)) {
                 $this->_level = WIKIAUTH_ANON;


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

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

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

Revision: 7714
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7714&view=rev
Author:   vargenau
Date:     2010-10-11 14:12:14 +0000 (Mon, 11 Oct 2010)

Log Message:
-----------
Update path for Fusionforge

Modified Paths:
--------------
    trunk/themes/fusionforge/wikilens-min.js
    trunk/themes/fusionforge/wikilens.js

Modified: trunk/themes/fusionforge/wikilens-min.js
===================================================================
--- trunk/themes/fusionforge/wikilens-min.js	2010-10-08 13:56:07 UTC (rev 7713)
+++ trunk/themes/fusionforge/wikilens-min.js	2010-10-11 14:12:14 UTC (rev 7714)
@@ -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/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
+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="/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-10-08 13:56:07 UTC (rev 7713)
+++ trunk/themes/fusionforge/wikilens.js	2010-10-11 14:12:14 UTC (rev 7714)
@@ -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/fusionforge/images/RateIt';
+var rateit_imgsrc = '/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:[7713] trunk/wikiadmin.php

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

Revision: 7713
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7713&view=rev
Author:   vargenau
Date:     2010-10-08 13:56:07 +0000 (Fri, 08 Oct 2010)

Log Message:
-----------
Fix directory in Fusionforge

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

Modified: trunk/wikiadmin.php
===================================================================
--- trunk/wikiadmin.php	2010-10-08 13:55:13 UTC (rev 7712)
+++ trunk/wikiadmin.php	2010-10-08 13:56:07 UTC (rev 7713)
@@ -137,7 +137,7 @@
             print "<td>\n";
             print "<fieldset>\n";
             print "<legend>"._('Wiki Configuration')."</legend>\n";
-            print "<form action=\"/plugins/wiki/wikiadmin.php\" method=\"post\">\n";
+            print "<form action=\"/wiki/wikiadmin.php\" method=\"post\">\n";
             print "<input type=\"hidden\" name=\"id\" value=\"$id\" />\n";
             print "<input type=\"hidden\" name=\"pluginname\" value=\"$pluginname\" />\n";
             print "<input type=\"hidden\" name=\"type\" value=\"admin_post\" />\n";


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7712] trunk/doc/phpwiki.doxygen

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

Revision: 7712
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7712&view=rev
Author:   vargenau
Date:     2010-10-08 13:55:13 +0000 (Fri, 08 Oct 2010)

Log Message:
-----------
"gforge" dir renamed as "src" in Fusionforge

Modified Paths:
--------------
    trunk/doc/phpwiki.doxygen

Modified: trunk/doc/phpwiki.doxygen
===================================================================
--- trunk/doc/phpwiki.doxygen	2010-10-05 16:08:35 UTC (rev 7711)
+++ trunk/doc/phpwiki.doxygen	2010-10-08 13:55:13 UTC (rev 7712)
@@ -574,7 +574,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = gforge/plugins/wiki/www/lib
+INPUT                  = src/plugins/wiki/www/lib
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7711] trunk/lib/BlockParser.php

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

Revision: 7711
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7711&view=rev
Author:   vargenau
Date:     2010-10-05 16:08:35 +0000 (Tue, 05 Oct 2010)

Log Message:
-----------
Fix parsing problem: paragraph consisting only og "{{w.png}}{{w.png}}"

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

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2010-10-01 11:45:58 UTC (rev 7710)
+++ trunk/lib/BlockParser.php	2010-10-05 16:08:35 UTC (rev 7711)
@@ -1131,6 +1131,10 @@
     var $_re = '{{';
 
     function _match (&$input, $m) {
+        // If we find "}}", this is an inline template.
+        if (strpos($m->postmatch, "}}") !== false) {
+            return false;
+        }
         $pos = $input->getPos();
         $pi = $m->postmatch;
         if ($pi[0] == '{') {


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

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

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

Revision: 7710
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7710&view=rev
Author:   vargenau
Date:     2010-10-01 11:45:58 +0000 (Fri, 01 Oct 2010)

Log Message:
-----------
Set width to 100% for pagers

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

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2010-09-30 15:48:54 UTC (rev 7709)
+++ trunk/lib/PageList.php	2010-10-01 11:45:58 UTC (rev 7710)
@@ -195,7 +195,7 @@
             return $page_handle->get($this->_field);
         }
     }
-  
+
     function _getSortableValue ($page_handle, &$revision_handle) {
         $val = $this->_getValue($page_handle, $revision_handle);
         if ($this->_field == 'hits')
@@ -226,7 +226,7 @@
                         $this->_getValue($pagelist, $page_handle, $revision_handle),
                         HTML::raw(' '));
     }
-  
+
     function _getValue (&$pagelist, $page_handle, &$revision_handle) {
         if (!$revision_handle or (!$revision_handle->_data['%content']
                                   or $revision_handle->_data['%content'] === true)) {
@@ -239,7 +239,7 @@
             unset($revision_handle->_data['%content']);
         return $size;
     }
-  
+
     function _getSortableValue ($page_handle, &$revision_handle) {
         if (!$revision_handle)
             $revision_handle = $page_handle->getCurrentRevision(true);
@@ -358,7 +358,7 @@
                                       '»'.$this->search.'«');
         }
     }
-  
+
     function _getValue ($page_handle, &$revision_handle) {
         if (!$revision_handle or (!$revision_handle->_data['%content']
                                   or $revision_handle->_data['%content'] === true)) {
@@ -452,7 +452,7 @@
         else
             return $author;
     }
-  
+
     function _getSortableValue ($page_handle, &$revision_handle) {
         return _PageList_Column::_getValue($page_handle, $revision_handle);
     }
@@ -714,11 +714,11 @@
                      'external' => null,
                      );
     }
-  
+
     function pagingArgs() {
         return array('sortby','limit','paging','count','dosort');
     }
-  
+
     function clearArg($arg_name) {
         if (isset($this->_options[$arg_name]))
             unset($this->_options[$arg_name]);
@@ -804,7 +804,7 @@
             or (!empty($this->_excluded_pages)
                 and in_array($page_handle->getName(), $this->_excluded_pages)))
             return; // exclude page.
-          
+
         // enforce view permission
         if (!mayAccessPage('view', $page_handle->getName()))
             return;
@@ -927,7 +927,7 @@
     function asXML() {
         return AsXML($this->getContent());
     }
-  
+
     /**
      * Handle sortby requests for the DB iterator and table header links.
      * Prefix the column with + or - like "+pagename","-mtime", ...
@@ -936,7 +936,7 @@
      *   'init'       :   unify with predefined order. "pagename" => "+pagename"
      *   'flip_order' :   "mtime" => "+mtime" => "-mtime" ...
      *   'db'         :   "-pagename" => "pagename DESC"
-     *   'check'      : 
+     *   'check'      :
      *
      * Now all columns are sortable. (patch by DanFr)
      * Some columns have native DB backend methods, some not.
@@ -1454,11 +1454,11 @@
         }
         return $tokens;
     }
-  
+
     // make a table given the caption
     function _generateTable($caption) {
         if (count($this->_sortby) > 0) $this->_sortPages();
-      
+
         // wikiadminutils hack. that's a way to pagelist non-pages
         $rows = isset($this->_rows) ? $this->_rows : array();
         $i = 0;
@@ -1582,7 +1582,7 @@
                                           $this->_options['limit']);
             if ($tokens) {
                 $paging = Template("pagelink", $tokens);
-                $out->pushContent(HTML::table(array('width'=>'50%'), $paging));
+                $out->pushContent(HTML::table(array('width'=>'100%'), $paging));
             }
         }
 
@@ -1614,7 +1614,7 @@
                 $cols));
             return $out;
         }
-      
+
         // Ignore azhead if not sorted by pagename
         if (!empty($this->_options['azhead'])
             and strstr($this->sortby($this->_options['sortby'], 'init'), "pagename")
@@ -1693,7 +1693,7 @@
         }
         $out->pushContent($list);
         if ( $do_paging and $tokens ) {
-            $out->pushContent(HTML::table($paging));
+            $out->pushContent(HTML::table(array('width'=>'100%'), $paging));
         }
         return $out;
     }
@@ -1734,7 +1734,7 @@
         }
         return $html;
     }
-  
+
     function _emptyList($caption) {
         $html = HTML();
         if ($caption) {


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7709] trunk/lib/plugin/CreateToc.php

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

Revision: 7709
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7709&view=rev
Author:   vargenau
Date:     2010-09-30 15:48:54 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
Fixed: Some constructs might incorrectly be recognized as a header (e.g. lines starting with "!!!" or "==" inside <verbatim>)

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

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2010-09-22 18:19:06 UTC (rev 7708)
+++ trunk/lib/plugin/CreateToc.php	2010-09-30 15:48:54 UTC (rev 7709)
@@ -34,8 +34,6 @@
  * - Certain corner-edges will not work with TOC_FULL_SYNTAX.
  *   I believe I fixed all of them now, but who knows?
  * - bug #969495 "existing labels not honored" seems to be fixed.
- * - some constructs might incorrectly be recognized as a header
- *   (e.g. lines starting with "!!!" or "==" inside <verbatim>)
  */
 
 if (!defined('TOC_FULL_SYNTAX'))
@@ -241,8 +239,6 @@
     // - Wikicreole syntax (lines starting with "==", "===", etc.)
     // We must omit lines starting with "!" if inside a Mediawiki table
     // (they represent a table header)
-    // Some constructs might incorrectly be recognized as a header
-    // (e.g. lines starting with "!!!" or "==" inside <verbatim>)
     // Feature request: proper nesting; multiple levels (e.g. 1,3)
     function extractHeaders (&$content, &$markup, $backlink=0,
                              $counter=0, $levels=false, $firstlevelstyle='number', $basepage='')
@@ -254,16 +250,26 @@
         $headers = array();
         $j = 0;
         $insidetable = false;
+        $insideverbatim = false;
         for ($i=0; $i<count($content); $i++) {
             if (preg_match('/^\s*{\|/', $content[$i])) {
                $insidetable = true;
                continue;
-            }
-            if (preg_match('/^\s*\|}/', $content[$i])) {
+            } else if (preg_match('/^\s*{{{/', $content[$i]) 
+                    || preg_match('/^\s*<pre>/', $content[$i]) 
+                    || preg_match('/^\s*<verbatim>/', $content[$i])) {
+               $insideverbatim = true;
+               continue;
+            } else if (preg_match('/^\s*\|}/', $content[$i])) {
                $insidetable = false;
                continue;
+            } else if (preg_match('/^\s*}}}/', $content[$i]) 
+                    || preg_match('/^\s*<\/pre>/', $content[$i]) 
+                    || preg_match('/^\s*<\/verbatim>/', $content[$i])) {
+               $insideverbatim = false;
+               continue;
             }
-            if ($insidetable) {
+            if (($insidetable) || ($insideverbatim)) {
                continue;
             }
             foreach ($levels as $level) {
@@ -311,11 +317,11 @@
                             if (($hstart === 0) && is_string($markup->_content[$j])) {
                                 if ($backlink) {
                                     if ($counter)
-                                        $anchorString = "<a href=\"$url\" name=\"$manchor\">$counterString</a> - \$2";
+                                        $anchorString = "<a href=\"$url\" id=\"$manchor\">$counterString</a> - \$2";
                                     else
-                                        $anchorString = "<a href=\"$url\" name=\"$manchor\">\$2</a>";
+                                        $anchorString = "<a href=\"$url\" id=\"$manchor\">\$2</a>";
                                 } else {
-                                    $anchorString = "<a name=\"$manchor\"></a>";
+                                    $anchorString = "<a id=\"$manchor\"></a>";
                                     if ($counter)
                                         $anchorString .= "$counterString - ";
                                 }
@@ -334,15 +340,15 @@
 
                                 if ($backlink) {
                                     if ($counter) {
-                                        $anchorString = "\$1<a href=\"$url\" name=\"$manchor\">$counterString</a> - ";
+                                        $anchorString = "\$1<a href=\"$url\" id=\"$manchor\">$counterString</a> - ";
                                     } else {
                                         /* Not possible to make a backlink on a
                                          * title with a WikiWord */
-                                        $anchorString = "\$1<a name=\"$manchor\"></a>";
+                                        $anchorString = "\$1<a id=\"$manchor\"></a>";
                                     }
                                 }
                                 else {
-                                    $anchorString = "\$1<a name=\"$manchor\"></a>";
+                                    $anchorString = "\$1<a id=\"$manchor\"></a>";
                                     if ($counter)
                                         $anchorString .= "$counterString - ";
                                 }
@@ -404,9 +410,10 @@
             $r = $page->getCurrentRevision();
         }
 
+        $current = $page->getCurrentRevision();
         //FIXME: I suspect this only to crash with Apache2
-        if (!$r->get('markup') or $r->get('markup') < 2) {
-            if (in_array(php_sapi_name(), array('apache2handler','apache2filter'))) {
+        if (!$current->get('markup') or $current->get('markup') < 2) {
+            if (in_array(php_sapi_name(),array('apache2handler','apache2filter'))) {
                 return $this->error(_("CreateToc disabled for old markup."));
             }
         }
@@ -466,7 +473,7 @@
         if ($extracollapse)
             $toclink = HTML(_("Table of Contents"),
                             " ",
-                            HTML::a(array('name'=>'TOC')),
+                            HTML::a(array('id'=>'TOC')),
                             HTML::img(array(
                                             'id'=>$toctoggleid,
                                             'class'=>'wikiaction',
@@ -475,7 +482,7 @@
                                             'alt' => 'toctoggle',
                                             'src' => $jshide ? $close : $open )));
         else
-            $toclink = HTML::a(array('name'=>'TOC',
+            $toclink = HTML::a(array('id'=>'TOC',
                                      'class'=>'wikiaction',
                                      'title'=>_("Click to display"),
                                      'onclick'=>"toggletoc(this, '".$open."', '".$close."', '".$toclistid."')"),


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

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

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

Revision: 7708
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7708&view=rev
Author:   vargenau
Date:     2010-09-22 18:19:06 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
Update from Fusionforge

Modified Paths:
--------------
    trunk/g
    trunk/wikiadmin.php

Modified: trunk/g
===================================================================
--- trunk/g	2010-09-22 14:57:42 UTC (rev 7707)
+++ trunk/g	2010-09-22 18:19:06 UTC (rev 7708)
@@ -52,9 +52,9 @@
 require_once $gfplugins.'wiki/common/wikiconfig.class.php';
 
 if (!$group_id || !$project) {
-     exit_no_group();
+    exit_no_group();
 } else if (!($project->usesPlugin("wiki"))) {
-    exit_error("Wiki plugin not activated in project", $project->getPublicName());
+    exit_disabled('home');
 } else {
 
     $group_name = $project->getUnixName();

Modified: trunk/wikiadmin.php
===================================================================
--- trunk/wikiadmin.php	2010-09-22 14:57:42 UTC (rev 7707)
+++ trunk/wikiadmin.php	2010-09-22 18:19:06 UTC (rev 7708)
@@ -60,8 +60,12 @@
 
 $user = session_get_user(); // get the session user
 
-if (!$user || !is_object($user) || $user->isError() || !$user->isActive()) {
-    exit_error("Invalid User", "Cannot Process your request for this user.");
+if (!$user || !is_object($user)) {
+    exit_error(_('Invalid User'),'home');
+} else if ( $user->isError()) {
+	exit_error($user->getErrorMessage(),'home');
+} else if ( !$user->isActive()) {
+	exit_error(_('User not active'),'home');
 }
 
 $type = getStringFromRequest('type');
@@ -70,21 +74,21 @@
 $config = getArrayFromRequest('config');
 
 if (!$type) {
-    exit_error("Cannot Process your request","No TYPE specified");
+    exit_missing_params($_SERVER['HTTP_REFERER'],array(_('No TYPE specified')),'home');
 } elseif (!$id) {
-    exit_error("Cannot Process your request","No ID specified");
+    exit_missing_params($_SERVER['HTTP_REFERER'],array(_('No ID specified')),'home');
 } else {
     if ($type == 'admin_post') {
         $group = group_get_object($id);
         if ( !$group) {
-            exit_error(_('Invalid Project'), _('Inexistent Project'));
+			exit_no_group();
         }
         if (!($group->usesPlugin($pluginname))) { //check if the group has the wiki plugin active
-            exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
+			exit_error(sprintf(_('First activate the %s plugin through the Project\'s Admin Interface'),$pluginname),'home');
         }
         $userperm = $group->getPermission($user); //we'll check if the user belongs to the group
         if ( !$userperm->IsMember()) {
-            exit_error(_('Access Denied'), _('You are not a member of this project'));
+			exit_permission_denied(_('You are not a member of this project'),'home');
         }
         //only project admin can access here
         if ( $userperm->isAdmin() ) {
@@ -105,20 +109,20 @@
             $type = 'admin';
             $feedback = _('Configuration saved.');
         } else {
-            exit_error(_('Access Denied'), _('You are not a project Admin'));
+            exit_permission_denied(_('You are not a project Admin'),'home');
         }
     }
     if ($type == 'admin') {
         $group = group_get_object($id);
         if ( !$group) {
-            exit_error(_('Invalid Project'), _('Inexistent Project'));
+			exit_no_group();
         }
         if ( ! ($group->usesPlugin ($pluginname)) ) {//check if the group has the plugin active
-            exit_error("Error", "First activate the $pluginname plugin through the Project's Admin Interface");
+			exit_error(sprintf(_('First activate the %s plugin through the Project\'s Admin Interface'),$pluginname),'home');
         }
         $userperm = $group->getPermission($user); //we'll check if the user belongs to the group
         if ( !$userperm->IsMember()) {
-            exit_error(_('Access Denied'), _('You are not a member of this project'));
+            exit_permission_denied(_('You are not a member of this project'),'home');
         }
         //only project admin can access here
         if ( $userperm->isAdmin() ) {
@@ -166,7 +170,7 @@
             print "</tr>\n";
             print "</table>\n";
         } else {
-            exit_error(_('Access Denied'), _('You are not a project Admin'));
+            exit_permission_denied(_('You are not a project Admin'),'home');
         }
     }
 }


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

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

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

Revision: 7707
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7707&view=rev
Author:   vargenau
Date:     2010-09-22 14:57:42 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
Wiki page title in bold

Modified Paths:
--------------
    trunk/themes/fusionforge/fusionforge-min.css
    trunk/themes/fusionforge/fusionforge.css

Modified: trunk/themes/fusionforge/fusionforge-min.css
===================================================================
--- trunk/themes/fusionforge/fusionforge-min.css	2010-09-22 14:39:24 UTC (rev 7706)
+++ trunk/themes/fusionforge/fusionforge-min.css	2010-09-22 14:57:42 UTC (rev 7707)
@@ -1 +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
+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;}h1{font-weight:bold;}.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

Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2010-09-22 14:39:24 UTC (rev 7706)
+++ trunk/themes/fusionforge/fusionforge.css	2010-09-22 14:57:42 UTC (rev 7707)
@@ -230,6 +230,8 @@
 }
 h1 .backlinks { text-decoration: none; color: inherit; }
 
+h1 { font-weight: bold; }
+
 /* Interwiki links */
 .wikipage  { font-weight: normal; }
 .interwiki, i.interwiki .wikipage, em .interwiki .wikipage { font-style: oblique; }


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

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

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

Revision: 7706
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7706&view=rev
Author:   vargenau
Date:     2010-09-22 14:39:24 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
Better handle nonexistent revisions

Modified Paths:
--------------
    trunk/themes/fusionforge/templates/actionbar.tmpl
    trunk/themes/fusionforge/templates/browse.tmpl

Modified: trunk/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/actionbar.tmpl	2010-09-21 07:45:12 UTC (rev 7705)
+++ trunk/themes/fusionforge/templates/actionbar.tmpl	2010-09-22 14:39:24 UTC (rev 7706)
@@ -50,8 +50,16 @@
     <td class="spacer">&nbsp;</td>
     <td class="spacer">&nbsp;</td>
 
-    <?php if (!($page->get('locked')) and (mayAccessPage('edit', $page->getName())) and $revision) { ?>
-      <td class="bold"><?php echo Button("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page")) ?></td>
+    <?php if (!($page->get('locked')) and (mayAccessPage('edit', $page->getName()))) { ?>
+      <td class="bold">
+      <?php if (! $dbh->isWikiPage($page->getName())) { ?>
+      <?php echo Button("edit", _("Create Page")) ?>
+      <?php } else if ($revision && (($revision->isCurrent()) || ($revision->hasDefaultContents()))) { ?>
+      <?php echo Button("edit", _("Edit")) ?>
+      <?php } else { ?>
+      <?php echo Button("edit", _("Edit Old Revision")) ?>
+      <?php } ?>
+      </td>
     <?php } else if ($dbh->isWikiPage($page->getName())) { ?>
       <td><?php echo Button("viewsource", _("View Source")) ?></td>
     <?php } ?>

Modified: trunk/themes/fusionforge/templates/browse.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/browse.tmpl	2010-09-21 07:45:12 UTC (rev 7705)
+++ trunk/themes/fusionforge/templates/browse.tmpl	2010-09-22 14:39:24 UTC (rev 7706)
@@ -5,10 +5,16 @@
 $curuserprefs = $user->getPreferences();
 ?>
 
+<?php if ($page->exists() and $revision and $revision->hasDefaultContents()) { ?>
+  <p class="error"><strong><?php echo _("Error:")?></strong>
+  <?php echo _("This revision of the page does not exist.")?>
+  <?php echo Button('browse', _("View the current version."), $page)?>
+  </p>
+<?php } else { ?>
 <?php if ($revision and !$revision->isCurrent()) { ?>
   <p class="warning_msg"><strong><?php echo _("Note:")?></strong>
-     <?php echo _("You are viewing an old revision of this page.")?>
-  <?php echo Button('browse', _("View the current version"), $page)?>.
+  <?php echo _("You are viewing an old revision of this page.")?>
+  <?php echo Button('browse', _("View the current version."), $page)?>
   </p>
 <?php } ?>
 <?php if (!empty($redirected)) { ?>
@@ -31,6 +37,8 @@
 
 <?php echo $CONTENT?>
 
+<?php } ?>
+
 <div id="footer"><?php // for top & bottom toolbars stylesheet ?>
   <?php echo Template('browse-footer')?>
 </div>


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

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

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

Revision: 7705
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7705&view=rev
Author:   vargenau
Date:     2010-09-21 07:45:12 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
If you display an old revision of a page, the Table of Contents will not be correct. The Table of Contents will be taken from the last saved revision: fixed

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

Modified: trunk/pgsrc/Help%2FCreateTocPlugin
===================================================================
--- trunk/pgsrc/Help%2FCreateTocPlugin	2010-09-21 07:08:56 UTC (rev 7704)
+++ trunk/pgsrc/Help%2FCreateTocPlugin	2010-09-21 07:45:12 UTC (rev 7705)
@@ -1,4 +1,4 @@
-Date: Mon, 20 Sep 2010 18:07:40 +0000
+Date: Tue, 21 Sep 2010 09:44:16 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -144,7 +144,6 @@
 ** an image,
 ** or a ~~.
 * If you preview the page, the Table of Contents will not be correct if you modified headers. The Table of Contents will be taken from the last saved revision.
-* If you display an old revision of a page, the Table of Contents will not be correct. The Table of Contents will be taken from the last saved revision.
 
 <noinclude>
 ----


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7704] trunk/lib/plugin/CreateToc.php

[<ru...@us...>]

Revision: 7704
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7704&view=rev
Author:   rurban
Date:     2010-09-21 07:08:56 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
revert 7551-7553. we use named anchors to jump to, not internal ids

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

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2010-09-21 06:28:07 UTC (rev 7703)
+++ trunk/lib/plugin/CreateToc.php	2010-09-21 07:08:56 UTC (rev 7704)
@@ -311,11 +311,11 @@
                             if (($hstart === 0) && is_string($markup->_content[$j])) {
                                 if ($backlink) {
                                     if ($counter)
-                                        $anchorString = "<a href=\"$url\" id=\"$manchor\">$counterString</a> - \$2";
+                                        $anchorString = "<a href=\"$url\" name=\"$manchor\">$counterString</a> - \$2";
                                     else
-                                        $anchorString = "<a href=\"$url\" id=\"$manchor\">\$2</a>";
+                                        $anchorString = "<a href=\"$url\" name=\"$manchor\">\$2</a>";
                                 } else {
-                                    $anchorString = "<a id=\"$manchor\"></a>";
+                                    $anchorString = "<a name=\"$manchor\"></a>";
                                     if ($counter)
                                         $anchorString .= "$counterString - ";
                                 }
@@ -334,15 +334,15 @@
 
                                 if ($backlink) {
                                     if ($counter) {
-                                        $anchorString = "\$1<a href=\"$url\" id=\"$manchor\">$counterString</a> - ";
+                                        $anchorString = "\$1<a href=\"$url\" name=\"$manchor\">$counterString</a> - ";
                                     } else {
                                         /* Not possible to make a backlink on a
                                          * title with a WikiWord */
-                                        $anchorString = "\$1<a id=\"$manchor\"></a>";
+                                        $anchorString = "\$1<a name=\"$manchor\"></a>";
                                     }
                                 }
                                 else {
-                                    $anchorString = "\$1<a id=\"$manchor\"></a>";
+                                    $anchorString = "\$1<a name=\"$manchor\"></a>";
                                     if ($counter)
                                         $anchorString .= "$counterString - ";
                                 }
@@ -404,10 +404,9 @@
             $r = $page->getCurrentRevision();
         }
 
-        $current = $page->getCurrentRevision();
         //FIXME: I suspect this only to crash with Apache2
-        if (!$current->get('markup') or $current->get('markup') < 2) {
-            if (in_array(php_sapi_name(),array('apache2handler','apache2filter'))) {
+        if (!$r->get('markup') or $r->get('markup') < 2) {
+            if (in_array(php_sapi_name(), array('apache2handler','apache2filter'))) {
                 return $this->error(_("CreateToc disabled for old markup."));
             }
         }
@@ -467,7 +466,7 @@
         if ($extracollapse)
             $toclink = HTML(_("Table of Contents"),
                             " ",
-                            HTML::a(array('id'=>'TOC')),
+                            HTML::a(array('name'=>'TOC')),
                             HTML::img(array(
                                             'id'=>$toctoggleid,
                                             'class'=>'wikiaction',
@@ -476,7 +475,7 @@
                                             'alt' => 'toctoggle',
                                             'src' => $jshide ? $close : $open )));
         else
-            $toclink = HTML::a(array('id'=>'TOC',
+            $toclink = HTML::a(array('name'=>'TOC',
                                      'class'=>'wikiaction',
                                      'title'=>_("Click to display"),
                                      'onclick'=>"toggletoc(this, '".$open."', '".$close."', '".$toclistid."')"),


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7703] trunk/lib/pear/DB

[<ru...@us...>]

Revision: 7703
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7703&view=rev
Author:   rurban
Date:     2010-09-21 06:28:07 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
revert r7639. This external source is written in tab-width 4 (windows) even if there are currently no tabs anymore. The vim settings are also in tab-width 4

Modified Paths:
--------------
    trunk/lib/pear/DB/common.php
    trunk/lib/pear/DB/dbase.php
    trunk/lib/pear/DB/fbsql.php
    trunk/lib/pear/DB/ibase.php
    trunk/lib/pear/DB/ifx.php
    trunk/lib/pear/DB/ldap.php
    trunk/lib/pear/DB/msql.php
    trunk/lib/pear/DB/mssql.php
    trunk/lib/pear/DB/mysql.php
    trunk/lib/pear/DB/mysqli.php
    trunk/lib/pear/DB/oci8.php
    trunk/lib/pear/DB/odbc.php
    trunk/lib/pear/DB/pgsql.php
    trunk/lib/pear/DB/sqlite.php
    trunk/lib/pear/DB/storage.php
    trunk/lib/pear/DB/sybase.php

Modified: trunk/lib/pear/DB/common.php
===================================================================
--- trunk/lib/pear/DB/common.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/common.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -2019,7 +2019,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/dbase.php
===================================================================
--- trunk/lib/pear/DB/dbase.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/dbase.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -212,7 +212,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/fbsql.php
===================================================================
--- trunk/lib/pear/DB/fbsql.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/fbsql.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -647,7 +647,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/ibase.php
===================================================================
--- trunk/lib/pear/DB/ibase.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/ibase.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -776,7 +776,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/ifx.php
===================================================================
--- trunk/lib/pear/DB/ifx.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/ifx.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -571,7 +571,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/ldap.php
===================================================================
--- trunk/lib/pear/DB/ldap.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/ldap.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -909,7 +909,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/msql.php
===================================================================
--- trunk/lib/pear/DB/msql.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/msql.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -234,7 +234,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/mssql.php
===================================================================
--- trunk/lib/pear/DB/mssql.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/mssql.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -730,7 +730,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/mysql.php
===================================================================
--- trunk/lib/pear/DB/mysql.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/mysql.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -907,7 +907,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/mysqli.php
===================================================================
--- trunk/lib/pear/DB/mysqli.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/mysqli.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -883,7 +883,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/oci8.php
===================================================================
--- trunk/lib/pear/DB/oci8.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/oci8.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -881,7 +881,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/odbc.php
===================================================================
--- trunk/lib/pear/DB/odbc.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/odbc.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -569,7 +569,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/pgsql.php
===================================================================
--- trunk/lib/pear/DB/pgsql.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/pgsql.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -843,7 +843,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/sqlite.php
===================================================================
--- trunk/lib/pear/DB/sqlite.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/sqlite.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -687,7 +687,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/storage.php
===================================================================
--- trunk/lib/pear/DB/storage.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/storage.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -487,7 +487,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * End:
  */

Modified: trunk/lib/pear/DB/sybase.php
===================================================================
--- trunk/lib/pear/DB/sybase.php	2010-09-21 06:08:32 UTC (rev 7702)
+++ trunk/lib/pear/DB/sybase.php	2010-09-21 06:28:07 UTC (rev 7703)
@@ -829,7 +829,7 @@
 
 /*
  * Local variables:
- * tab-width: 8
+ * tab-width: 4
  * c-basic-offset: 4
  * 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:[7702] trunk/lib/WikiUserNew.php

[<ru...@us...>]

Revision: 7702
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7702&view=rev
Author:   rurban
Date:     2010-09-21 06:08:32 +0000 (Tue, 21 Sep 2010)

Log Message:
-----------
new may return an empty object. we must check for _userid to avoid recursion cycles

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

Modified: trunk/lib/WikiUserNew.php
===================================================================
--- trunk/lib/WikiUserNew.php	2010-09-20 16:09:07 UTC (rev 7701)
+++ trunk/lib/WikiUserNew.php	2010-09-21 06:08:32 UTC (rev 7702)
@@ -222,7 +222,8 @@
 	    	    $class = $_PassUser->nextClass();
 	    	else
 		    $class = get_class($_PassUser);
-    		if ($user = new $class($UserName, $_PassUser->_prefs)) {
+    		if ($user = new $class($UserName, $_PassUser->_prefs)
+    		    and $user->_userid) {
 	            return $user;
             	} else {
             	    return $_PassUser;


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

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

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

Revision: 7701
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7701&view=rev
Author:   vargenau
Date:     2010-09-20 16:09:07 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
Display correct TOC in history

Modified Paths:
--------------
    trunk/lib/plugin/CreateToc.php
    trunk/pgsrc/Help%2FCreateTocPlugin

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2010-09-20 16:03:26 UTC (rev 7700)
+++ trunk/lib/plugin/CreateToc.php	2010-09-20 16:09:07 UTC (rev 7701)
@@ -67,6 +67,7 @@
                      'width'     => '200px',
                      'with_counter' => 0,
                      'with_toclink' => 0,             // link back to TOC
+                     'version'   => false,
                     );
     }
     // Initialisation of toc counter
@@ -168,13 +169,13 @@
                            $level, &$hstart, &$hend, $basepage=false) {
         $hstart = 0;
         $hend = 0;
-            $h = $this->_getHeader($level);
+        $h = $this->_getHeader($level);
         $qheading = $this->_quote($heading);
-            for ($j=$start_index; $j < count($content); $j++) {
+        for ($j=$start_index; $j < count($content); $j++) {
             if (is_string($content[$j])) {
-                    if (preg_match("/<$h>$qheading<\/$h>/",
+                if (preg_match("/<$h>$qheading<\/$h>/",
                                    $content[$j]))
-                        return $j;
+                    return $j;
             }
             elseif (isa($content[$j], 'cached_link'))
             {
@@ -213,10 +214,10 @@
                         }
                     }
                 }
-                }
             }
-            trigger_error("Heading <$h> $heading </$h> not found\n", E_USER_NOTICE);
-            return 0;
+        }
+        trigger_error("Heading <$h> $heading </$h> not found\n", E_USER_NOTICE);
+        return 0;
     }
 
     /** prevent from duplicate anchors,
@@ -371,7 +372,7 @@
             $pagename = $page->name;
         }
         if (!$pagename) {
-            return $this->error(_("no page specified"));
+            return $this->error(_("No page specified."));
         }
         if (isBrowserIE() and browserDetect("Mac")) {
             $jshide = 0;
@@ -380,22 +381,39 @@
             $with_counter = 1;
         }
 
-        // Check if user is allowed to get the Page.
+        // Check if page exists.
+        if (!($dbi->isWikiPage($pagename))) {
+            return $this->error(sprintf(_("Page '%s' does not exist."), $pagename));
+        }
+
+        // Check if user is allowed to get the page.
         if (!mayAccessPage ('view', $pagename)) {
             return $this->error(sprintf(_("Illegal access to page %s: no read access"),
             $pagename));
         }
 
         $page = $dbi->getPage($pagename);
+
+        if ($version) {
+            $r = $page->getRevision($version);
+            if ((!$r) || ($r->hasDefaultContents())) {
+                return $this->error(sprintf(_("%s: no such revision %d."),
+                                            $pagename, $version));
+            }
+        } else {
+            $r = $page->getCurrentRevision();
+        }
+
         $current = $page->getCurrentRevision();
         //FIXME: I suspect this only to crash with Apache2
         if (!$current->get('markup') or $current->get('markup') < 2) {
             if (in_array(php_sapi_name(),array('apache2handler','apache2filter'))) {
-                trigger_error(_("CreateToc disabled for old markup"), E_USER_WARNING);
-                return '';
+                return $this->error(_("CreateToc disabled for old markup."));
             }
         }
-        $content = $current->getContent();
+
+        $content = $r->getContent();
+
         $html = HTML::div(array('class' => 'toc', 'id'=> GenerateId("toc")));
         if ($notoc) {
             $html->setAttr('style','display:none;');

Modified: trunk/pgsrc/Help%2FCreateTocPlugin
===================================================================
--- trunk/pgsrc/Help%2FCreateTocPlugin	2010-09-20 16:03:26 UTC (rev 7700)
+++ trunk/pgsrc/Help%2FCreateTocPlugin	2010-09-20 16:09:07 UTC (rev 7701)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Mon, 20 Sep 2010 18:07:40 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -63,6 +63,10 @@
 | Table of Contents of which page?
 | current pagename
 |-
+| **version**
+| page version
+| most recent version
+|-
 | **position**
 | Where to display the Table of Contents: full, left or right.
 | full


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7700] trunk/lib/plugin

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

Revision: 7700
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7700&view=rev
Author:   vargenau
Date:     2010-09-20 16:03:26 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
Better test that a given revision exists

Modified Paths:
--------------
    trunk/lib/plugin/IncludePage.php
    trunk/lib/plugin/PageGroup.php
    trunk/lib/plugin/Template.php

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2010-09-20 14:45:28 UTC (rev 7699)
+++ trunk/lib/plugin/IncludePage.php	2010-09-20 16:03:26 UTC (rev 7700)
@@ -107,8 +107,8 @@
         $p = $dbi->getPage($page);
         if ($rev) {
             $r = $p->getRevision($rev);
-            if (!$r) {
-                return $this->error(sprintf(_("%s(%d): no such revision"),
+            if ((!$r) || ($r->hasDefaultContents())) {
+                return $this->error(sprintf(_("%s: no such revision %d."),
                                             $page, $rev));
             }
         } else {

Modified: trunk/lib/plugin/PageGroup.php
===================================================================
--- trunk/lib/plugin/PageGroup.php	2010-09-20 14:45:28 UTC (rev 7699)
+++ trunk/lib/plugin/PageGroup.php	2010-09-20 16:03:26 UTC (rev 7700)
@@ -120,10 +120,9 @@
         $p = $dbi->getPage($parent);
         if ($rev) {
             $r = $p->getRevision($rev);
-            if (!$r) {
-                $this->error(sprintf(_("%s(%d): no such revision"), $parent,
-                                     $rev));
-                return '';
+            if ((!$r) || ($r->hasDefaultContents())) {
+                return $this->error(sprintf(_("%s: no such revision %d."),
+                                            $parent, $rev));
             }
         } else {
             $r = $p->getCurrentRevision();

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2010-09-20 14:45:28 UTC (rev 7699)
+++ trunk/lib/plugin/Template.php	2010-09-20 16:03:26 UTC (rev 7700)
@@ -145,8 +145,8 @@
         $p = $dbi->getPage($page);
         if ($args['rev']) {
             $r = $p->getRevision($args['rev']);
-            if (!$r) {
-                return $this->error(sprintf(_("%s(%d): no such revision."),
+            if ((!$r) || ($r->hasDefaultContents())) {
+                return $this->error(sprintf(_("%s: no such revision %d."),
                                             $page, $args['rev']));
             }
         } else {


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

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

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

Revision: 7699
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7699&view=rev
Author:   vargenau
Date:     2010-09-20 14:45:28 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
Add "version" as synonym of "rev"

Modified Paths:
--------------
    trunk/lib/plugin/IncludePage.php
    trunk/pgsrc/Help%2FIncludePagePlugin

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2010-09-20 13:28:46 UTC (rev 7698)
+++ trunk/lib/plugin/IncludePage.php	2010-09-20 14:45:28 UTC (rev 7699)
@@ -41,6 +41,7 @@
     function getDefaultArguments() {
         return array( 'page'    => false, // the page to include
                       'rev'     => false, // the revision (defaults to most recent)
+                      'version' => false, // same as "rev"
                       'quiet'   => false, // if set, inclusion appears as normal content
                       'bytes'   => false, // maximum number of bytes to include
                       'words'   => false, // maximum number of words to include
@@ -68,6 +69,13 @@
     function run($dbi, $argstr, &$request, $basepage) {
         $args = $this->getArgs($argstr, $request);
         extract($args);
+
+        if ($version && $rev) {
+            return $this->error(_("Choose only one of 'version' or 'rev' parameters."));
+        } elseif ($version) {
+            $rev = $version;
+        }
+
         if ($page) {
             // Expand relative page names.
             $page = new WikiPageName($page, $basepage);

Modified: trunk/pgsrc/Help%2FIncludePagePlugin
===================================================================
--- trunk/pgsrc/Help%2FIncludePagePlugin	2010-09-20 13:28:46 UTC (rev 7698)
+++ trunk/pgsrc/Help%2FIncludePagePlugin	2010-09-20 14:45:28 UTC (rev 7699)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Mon, 20 Sep 2010 16:44:13 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -31,8 +31,12 @@
 |-
 | **rev**
 | the revision
-| defaults to most recent
+| most recent revision
 |-
+| **version**
+| page revision (same as ##rev##)
+| most recent revision
+|-
 | **quiet**
 | if set, inclusion appears as normal content
 | false


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

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

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

Revision: 7698
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7698&view=rev
Author:   vargenau
Date:     2010-09-20 13:28:46 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
Add "version" as synonym of "rev"

Modified Paths:
--------------
    trunk/lib/plugin/Template.php
    trunk/pgsrc/Help%2FTemplatePlugin

Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php	2010-09-20 13:04:55 UTC (rev 7697)
+++ trunk/lib/plugin/Template.php	2010-09-20 13:28:46 UTC (rev 7698)
@@ -70,6 +70,7 @@
                      'page'    => false, // the page to include
                      'vars'    => false, // TODO: get rid of this, all remaining args should be vars
                      'rev'     => false, // the revision (defaults to most recent)
+                     'version' => false, // same as "rev"
                      'section' => false, // just include a named section
                      'sectionhead' => false // when including a named section show the heading
                      );
@@ -94,17 +95,24 @@
     }
 
     function run($dbi, $argstr, &$request, $basepage) {
-            $this->vars = array();
+        $this->vars = array();
         $args = $this->getArgs($argstr, $request);
         $vars = $args['vars'] ? $args['vars'] : $this->vars;
         $page = $args['page'];
+
+        if ($args['version'] && $args['rev']) {
+            return $this->error(_("Choose only one of 'version' or 'rev' parameters."));
+        } elseif ($args['version']) {
+            $args['rev'] = $args['version'];
+        }
+
         if ($page) {
             // Expand relative page names.
             $page = new WikiPageName($page, $basepage);
             $page = $page->name;
         }
         if (!$page) {
-            return $this->error(_("no page specified"));
+            return $this->error(_("No page specified."));
         }
 
         // If "Template:$page" exists, use it
@@ -125,12 +133,12 @@
 
         // Check if page exists
         if (!($dbi->isWikiPage($page))) {
-            return $this->error(sprintf(_("Page '%s' does not exist"), $page));
+            return $this->error(sprintf(_("Page '%s' does not exist."), $page));
         }
 
         // Check if user is allowed to get the Page.
         if (!mayAccessPage ('view', $page)) {
-                return $this->error(sprintf(_("Illegal inclusion of page %s: no read access"),
+                return $this->error(sprintf(_("Illegal inclusion of page %s: no read access."),
                                         $page));
         }
 
@@ -138,7 +146,7 @@
         if ($args['rev']) {
             $r = $p->getRevision($args['rev']);
             if (!$r) {
-                return $this->error(sprintf(_("%s(%d): no such revision"),
+                return $this->error(sprintf(_("%s(%d): no such revision."),
                                             $page, $args['rev']));
             }
         } else {

Modified: trunk/pgsrc/Help%2FTemplatePlugin
===================================================================
--- trunk/pgsrc/Help%2FTemplatePlugin	2010-09-20 13:04:55 UTC (rev 7697)
+++ trunk/pgsrc/Help%2FTemplatePlugin	2010-09-20 13:28:46 UTC (rev 7698)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 13:46:13 +0000
+Date: Fri, 20 Sep 2010 13:46:13 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -73,6 +73,10 @@
 | page revision
 | most recent revision
 |-
+| **version**
+| page revision (same as ##rev##)
+| most recent revision
+|-
 | **section**
 | just include a named section
 | (empty)


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7697] trunk/lib/BlockParser.php

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

Revision: 7697
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7697&view=rev
Author:   vargenau
Date:     2010-09-20 13:04:55 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
{{foo?version=2}} no longer worked

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

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2010-09-20 10:20:25 UTC (rev 7696)
+++ trunk/lib/BlockParser.php	2010-09-20 13:04:55 UTC (rev 7697)
@@ -1182,7 +1182,7 @@
         // {{foo?version=5}}
         // in that case, output is "page=foo rev=5"
         if (strstr($pi, "?")) {
-            $pi = str_replace("?version=", "\" rev=\"", $page);
+            $pi = str_replace("?version=", "\" rev=\"", $pi);
         }
 
         if ($vars)


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7696] trunk/lib/EditToolbar.php

[<ru...@us...>]

Revision: 7696
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7696&view=rev
Author:   rurban
Date:     2010-09-20 10:20:25 +0000 (Mon, 20 Sep 2010)

Log Message:
-----------
remove duplicate global decl. This may have actually led to a bug

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

Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2010-09-17 11:49:14 UTC (rev 7695)
+++ trunk/lib/EditToolbar.php	2010-09-20 10:20:25 UTC (rev 7696)
@@ -216,7 +216,6 @@
 	    }
     
             foreach ($toolarray as $tool) {
-            	global $WikiTheme;
                 $image = $WikiTheme->getImageURL($tool["image"]);
                 $open  = $tool["open"];
                 $close = $tool["close"];


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7695] trunk/pgsrc/ReleaseNotes

[<ru...@us...>]

Revision: 7695
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7695&view=rev
Author:   rurban
Date:     2010-09-17 11:49:14 +0000 (Fri, 17 Sep 2010)

Log Message:
-----------
fix ReleaseNotes

Modified Paths:
--------------
    trunk/pgsrc/ReleaseNotes

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2010-09-17 11:34:00 UTC (rev 7694)
+++ trunk/pgsrc/ReleaseNotes	2010-09-17 11:49:14 UTC (rev 7695)
@@ -1,4 +1,4 @@
-Date: Fri, 10 Sep 2010 14:12:16 +0000
+Date: Fri, 17 Sep 2010 14:12:16 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0RC1)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -10,11 +10,13 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3>>
 
-== 1.4.0RC1 2010-09-10 Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
+== 1.4.0RC1 2010-09-17 Reini Urban, Marc-Etienne Vargenau, Sabri Labbenes, Sébastien Le Callonnec ==
 
-An important modification in this release is the implementation of full Wikicreole 1.0
-syntax, including additions.
+This is a new major release, where everything changed from 1.2, and lots of changes since 13.4.
 
+An important modification in this release is the implementation 
+of full Wikicreole 1.0 syntax, including additions.
+
 The "classic" Phpwiki syntax is still supported.
 
 The documentation pages found in pgsrc have been mostly converted to UTF-8 and 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7694] trunk/wiki

[<ru...@us...>]

Revision: 7694
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7694&view=rev
Author:   rurban
Date:     2010-09-17 11:34:00 +0000 (Fri, 17 Sep 2010)

Log Message:
-----------
useful /wiki settings overrides only as comments

Modified Paths:
--------------
    trunk/wiki

Modified: trunk/wiki
===================================================================
--- trunk/wiki	2010-09-17 11:33:14 UTC (rev 7693)
+++ trunk/wiki	2010-09-17 11:34:00 UTC (rev 7694)
@@ -20,9 +20,9 @@
 define('VIRTUAL_PATH', $_SERVER['SCRIPT_NAME']);
 
 // Override the default configuration for CONSTANTS before index.php
-$LANG='de'; $LC_ALL='de_DE';
-define('THEME', 'default');
-define('WIKI_NAME', "WikiDemo:$LANG:" . THEME);
+//$LANG='de'; $LC_ALL='de_DE';
+//define('THEME', 'default');
+//define('WIKI_NAME', "WikiDemo:$LANG:" . THEME);
 
 // Load the default configuration.
 include "index.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:[7693] trunk/lib/IniConfig.php

[<ru...@us...>]

Revision: 7693
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7693&view=rev
Author:   rurban
Date:     2010-09-17 11:33:14 +0000 (Fri, 17 Sep 2010)

Log Message:
-----------
avoid setup error

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

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2010-09-17 11:32:55 UTC (rev 7692)
+++ trunk/lib/IniConfig.php	2010-09-17 11:33:14 UTC (rev 7693)
@@ -125,6 +125,7 @@
     if (!file_exists($file)) {
         // We need to DATA_PATH for configurator, or pass the posted values
         // somewhow to the script
+        $GLOBALS['charset'] = 'utf-8';
         include_once(dirname(__FILE__)."/install.php");
         run_install("_part1");
         if (!defined("_PHPWIKI_INSTALL_RUNNING"))


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7692] trunk/lib/FileFinder.php

[<ru...@us...>]

Revision: 7692
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7692&view=rev
Author:   rurban
Date:     2010-09-17 11:32:55 +0000 (Fri, 17 Sep 2010)

Log Message:
-----------
fix windows abs_path

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

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2010-09-17 08:59:58 UTC (rev 7691)
+++ trunk/lib/FileFinder.php	2010-09-17 11:32:55 UTC (rev 7692)
@@ -154,7 +154,7 @@
         if (substr($path,0,1) == '/') {
             return true;
         } elseif (isWindows() and preg_match("/^[a-z]:/i", $path)
-                  and (substr($path,3,1) == "/" or substr($path,3,1) == "\\")) 
+                  and (substr($path,2,1) == "/" or substr($path,2,1) == "\\")) 
         {
             return true;
         } else {


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