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

[phpwiki-checkins] SF.net SVN: phpwiki:[7067] trunk/lib/plugin/WikiPoll.php

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

Revision: 7067
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7067&view=rev
Author:   vargenau
Date:     2009-08-19 16:17:03 +0000 (Wed, 19 Aug 2009)

Log Message:
-----------
Valid XHTML code

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

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2009-08-08 18:13:23 UTC (rev 7066)
+++ trunk/lib/plugin/WikiPoll.php	2009-08-19 16:17:03 UTC (rev 7067)
@@ -266,7 +266,7 @@
                                               'name' => "answer[$i]",
                                               'value' => $a));
                 if ($result >= 0)
-                    $checkbox->setAttr('checked',1);
+                    $checkbox->setAttr('checked', "checked");
 	        if (!$readonly)
                     list($percent,$count,$all) = $this->storeResult($page, $i, $result ? 1 : 0);
                 else 
@@ -290,7 +290,7 @@
                                                    'name' => "answer[$i]",
                                                    'value' => $j));
                         if ($result == $j)
-                            $radio->setAttr('checked',1);
+                            $radio->setAttr('checked', "checked");
                         $row->pushContent(HTML::tr(HTML::td($radio),
                         		           HTML::td($a[$j]),
                         		           HTML::td($this->bar($percent)),


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7066] trunk/themes/MonoBook/commonPrint.css

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

Revision: 7066
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7066&view=rev
Author:   vargenau
Date:     2009-08-08 18:13:23 +0000 (Sat, 08 Aug 2009)

Log Message:
-----------
CSS3 Paged Media Module directives for printing (used by Prince XML)

Modified Paths:
--------------
    trunk/themes/MonoBook/commonPrint.css

Modified: trunk/themes/MonoBook/commonPrint.css
===================================================================
--- trunk/themes/MonoBook/commonPrint.css	2009-08-07 08:21:01 UTC (rev 7065)
+++ trunk/themes/MonoBook/commonPrint.css	2009-08-08 18:13:23 UTC (rev 7066)
@@ -10,6 +10,50 @@
 ** Copyright Alexander Limi
 */
 
+@page { 
+  size: A4 portrait; 
+  margin: 17mm 10mm 17mm 10mm;
+} 
+
+h1 {
+  string-set: header content();
+}
+
+@page :left {
+  @top-left {
+    content: "Phpwiki";
+  }
+  @top-right {
+    content: string(header); 
+  }
+  @bottom-left {
+    content: "Page " counter(page);
+  }
+}
+
+@page :right {
+  @top-left {
+    content: string(header); 
+  }
+  @top-right {
+    content: "Phpwiki";
+  }
+  @bottom-right {
+    content: "Page " counter(page);
+  }
+}
+
+@page :first {
+  @top-right {
+    content: normal;
+  }
+  @top-left {
+    content: normal;
+  }
+}
+
+h1, h2, h3, h4, h5, h6 { page-break-after: avoid; } 
+
 /* Thanks to A List Apart (http://alistapart.com/) for useful extras */
 a.stub,
 a.new{ color:#ba0000; text-decoration:none; }


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7065] trunk/lib/InlineParser.php

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

Revision: 7065
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7065&view=rev
Author:   vargenau
Date:     2009-08-07 08:21:01 +0000 (Fri, 07 Aug 2009)

Log Message:
-----------
Make Help/LinkIcons work for Gforge

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

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2009-08-07 05:02:25 UTC (rev 7064)
+++ trunk/lib/InlineParser.php	2009-08-07 08:21:01 UTC (rev 7065)
@@ -1064,8 +1064,12 @@
         // It's not a Mediawiki template, it's a Wikicreole image
         if (is_image($imagename)) {
             if ($imagename[0] == '/') {
-                // We should not hardcode "/phpwiki"
-                return LinkImage(SERVER_URL . "/phpwiki" . $imagename, $alt);
+                if (defined('GFORGE') and GFORGE) {
+                    return LinkImage("/wiki" . $imagename, $alt);
+                } else {
+                    // We should not hardcode "/phpwiki"
+                    return LinkImage(SERVER_URL . "/phpwiki" . $imagename, $alt);
+                }
             } else {
                 return LinkImage(getUploadDataPath() . $imagename, $alt);
             }


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7064] trunk/lib/InlineParser.php

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

Revision: 7064
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7064&view=rev
Author:   vargenau
Date:     2009-08-07 05:02:25 +0000 (Fri, 07 Aug 2009)

Log Message:
-----------
Make predefined icons work in both Gforge and plain Phpwiki

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

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2009-08-06 15:18:47 UTC (rev 7063)
+++ trunk/lib/InlineParser.php	2009-08-07 05:02:25 UTC (rev 7064)
@@ -1045,7 +1045,11 @@
                                 );
         foreach ($predefinedicons as $ascii => $icon) {
             if (trim($page) == $ascii) {
-                return LinkImage("/wiki/themes/default/images/$icon", $page);
+                if (defined('GFORGE') and GFORGE) {
+                    return LinkImage("/wiki/themes/default/images/$icon", $page);
+                } else {
+                    return LinkImage(SERVER_URL . "/phpwiki/themes/default/images/$icon", $page);
+                }
             }
         }
 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7063] trunk/lib/plugin/WikiAdminSearchReplace.php

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

Revision: 7063
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7063&view=rev
Author:   vargenau
Date:     2009-08-06 15:18:47 +0000 (Thu, 06 Aug 2009)

Log Message:
-----------
Do not display content at start; display content if found; put buttons inside fieldset

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

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2009-08-06 09:46:59 UTC (rev 7062)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2009-08-06 15:18:47 UTC (rev 7063)
@@ -169,7 +169,9 @@
         }
 
         if ($next_action == 'verify') {
-            $args['info'] = "checkbox,pagename,hi_content";
+            $args['info'] = "checkbox,pagename";
+        } else {
+            $args['info'] = "checkbox,pagename,hi_content,mtime,author";
         }
         $pagelist = new PageList_Selectable
 	    ($args['info'], $args['exclude'],
@@ -191,23 +193,21 @@
             $button_label = _("Yes");
             $header->pushContent(
               HTML::p(HTML::strong(
-                                   _("Are you sure you want to permanently search & replace text in the selected files?"))));
+                                   _("Are you sure you want to permanently replace text in the selected files?"))));
             $this->replaceForm($header, $post_args);
-        }
-        else {
+        } else {
             $button_label = _("Search & Replace");
             $this->replaceForm($header, $post_args);
             $header->pushContent(HTML::legend(_("Select the pages to search and replace")));
         }
 
-
-        $buttons = HTML::p(Button('submit:admin_replace[rename]', $button_label, 'wikiadmin'),
+        $buttons = HTML::p(Button('submit:admin_replace[replace]', $button_label, 'wikiadmin'),
                            Button('submit:admin_replace[cancel]', _("Cancel"), 'button'));
+        $header->pushContent($buttons);
 
         return HTML::form(array('action' => $request->getPostURL(),
                                 'method' => 'post'),
                           $header,
-                          $buttons,
                           $pagelist->getContent(),
                           HiddenInputs($request->getArgs(),
                                         false,
@@ -245,7 +245,6 @@
         $this->_tablePush($table, '', $this->checkBox($post_args, 'case_exact', _("Case exact?")));
 	$this->_tablePush($table, '', $this->checkBox($post_args, 'regex', _("Regex?")));
         $header->pushContent($table);
-        $header->pushContent(HTML::br());
         return $header;
     }
 }


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

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

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

Revision: 7062
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7062&view=rev
Author:   vargenau
Date:     2009-08-06 09:46:59 +0000 (Thu, 06 Aug 2009)

Log Message:
-----------
Fix hyperlinks syntax example

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

Modified: trunk/pgsrc/Help%2FTextFormattingRules
===================================================================
--- trunk/pgsrc/Help%2FTextFormattingRules	2009-08-06 08:48:31 UTC (rev 7061)
+++ trunk/pgsrc/Help%2FTextFormattingRules	2009-08-06 09:46:59 UTC (rev 7062)
@@ -1,4 +1,4 @@
-Date: Thu, 25 Jun 2009 11:58:58 +0000
+Date: Thu,  6 Aug 2009 13:46:43 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -285,7 +285,7 @@
 *** ##~#~[~[foo]]##: An anchor around the text "foo" with id "foo".
 *** ##~#~[~[|foo]]##: An empty anchor with id "foo".
 *** ##~#~[~[howdy|foo]]##: An anchor around the text "howdy" with id "foo".
-** References to name anchors are made thusly:\\##~[~[~#~#hyperlinks]]##, ##~[~[~OtherPage#foo]]##, ##~[~[~OtherPage#foo|named]]##.
+** References to name anchors are made thusly:\\##~[~[~#hyperlinks]]##, ##~[~[~OtherPage#foo]]##, ##~[~[~OtherPage#foo|named]]##.
 * Semantic links are named links like: is_a::WikiPage and attributes like size:-4000.
 * A pagelink within square brackets starting with ":" is not backlinked.
 


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7061] trunk/lib/InlineParser.php

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

Revision: 7061
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7061&view=rev
Author:   vargenau
Date:     2009-08-06 08:48:31 +0000 (Thu, 06 Aug 2009)

Log Message:
-----------
Allow "#[[" syntax for anchors

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

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2009-08-05 20:05:32 UTC (rev 7060)
+++ trunk/lib/InlineParser.php	2009-08-06 08:48:31 UTC (rev 7061)
@@ -330,7 +330,7 @@
     
    $wikicreolesyntax = false;
 
-   if (string_starts_with($bracketlink, "[[")) {
+   if (string_starts_with($bracketlink, "[[") or string_starts_with($bracketlink, "#[[")) {
        $wikicreolesyntax = true;
        $bracketlink = str_replace("[[", "[", $bracketlink);
        $bracketlink = str_replace("]]", "]", $bracketlink);


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

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

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

Revision: 7060
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7060&view=rev
Author:   vargenau
Date:     2009-08-05 20:05:32 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
Add [[PhpWikiDocumentation]]

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

Modified: trunk/pgsrc/Help%FPredefinedIcons
===================================================================
--- trunk/pgsrc/Help%2FPredefinedIcons	2009-08-05 15:48:12 UTC (rev 7059)
+++ trunk/pgsrc/Help%2FPredefinedIcons	2009-08-05 20:05:32 UTC (rev 7060)
@@ -1,4 +1,4 @@
-Date: Wed,  5 Aug 2009 18:54:09 +0000
+Date: Wed,  5 Aug 2009 22:54:09 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
 X-Rcs-Id: $Id$
 Content-Type: application/x-phpwiki;
@@ -20,3 +20,7 @@
 |= Notation | ##~{{(+)}}## | ##~{{(-)}}## | ##~{{(?)}}## | ##~{{(on)}}## | ##~{{(off)}}## | ##~{{(*)}}## | ##~{{(*r)}}## | ##~{{(*g)}}## | ##~{{(*b)}}## | ##~{{(*y)}}##
 |= Image | {{(+)}} | {{(-)}} | {{(?)}} | {{(on)}} | {{(off)}} | {{(*)}} | {{(*r)}} | {{(*g)}} | {{(*b)}} | {{(*y)}}
 
+<noinclude>
+----
+[[PhpWikiDocumentation]]
+</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:[7059] trunk

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

Revision: 7059
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7059&view=rev
Author:   vargenau
Date:     2009-08-05 15:48:12 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
Use CSS to separate buttons

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminRename.php
    trunk/themes/gforge/gforge.css

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2009-08-05 15:06:15 UTC (rev 7058)
+++ trunk/lib/plugin/WikiAdminRename.php	2009-08-05 15:48:12 UTC (rev 7059)
@@ -224,7 +224,6 @@
         }
 
         $buttons = HTML::p(Button('submit:admin_rename[rename]', $button_label, 'wikiadmin'),
-			   HTML::Raw('  '),
                            Button('submit:admin_rename[cancel]', _("Cancel"), 'button'));
 
         if ($singlepage === false) {

Modified: trunk/themes/gforge/gforge.css
===================================================================
--- trunk/themes/gforge/gforge.css	2009-08-05 15:06:15 UTC (rev 7058)
+++ trunk/themes/gforge/gforge.css	2009-08-05 15:48:12 UTC (rev 7059)
@@ -200,11 +200,15 @@
 a.wikiaction, a.wiki-rc-action, a.wikiunsafe,
 input.wikiaction, input.button, input.wikiadmin {
   text-decoration: none;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
   /* don't wrap text buttons */
   white-space: nowrap;
 }
 
+input.wikiaction, input.button, input.wikiadmin {
+  margin-right: 1em;
+  margin-left: 1em;
+}
+
 .wikiunsafe { background-color: #fcc; }
 
 /* Unknown links */


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

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

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

Revision: 7058
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7058&view=rev
Author:   vargenau
Date:     2009-08-05 15:06:15 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
Add predefined icons (icons taken or adapted from Mediawiki commons)

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

Added Paths:
-----------
    trunk/pgsrc/Help%2FPredefinedIcons
    trunk/themes/default/images/ic_biggrin.png
    trunk/themes/default/images/ic_bluestar.png
    trunk/themes/default/images/ic_check.png
    trunk/themes/default/images/ic_cross.png
    trunk/themes/default/images/ic_danger.png
    trunk/themes/default/images/ic_greenstar.png
    trunk/themes/default/images/ic_handno.png
    trunk/themes/default/images/ic_handyes.png
    trunk/themes/default/images/ic_help.png
    trunk/themes/default/images/ic_info.png
    trunk/themes/default/images/ic_lightoff.png
    trunk/themes/default/images/ic_lighton.png
    trunk/themes/default/images/ic_minus.png
    trunk/themes/default/images/ic_plus.png
    trunk/themes/default/images/ic_redstar.png
    trunk/themes/default/images/ic_sad.png
    trunk/themes/default/images/ic_smile.png
    trunk/themes/default/images/ic_tongue.png
    trunk/themes/default/images/ic_wink.png
    trunk/themes/default/images/ic_yellowstar.png

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2009-08-05 09:48:51 UTC (rev 7057)
+++ trunk/lib/InlineParser.php	2009-08-05 15:06:15 UTC (rev 7058)
@@ -1019,6 +1019,36 @@
     function markup ($match) {
 
         $page = substr($match,2,-2);
+
+        // Check for predefined icons.
+        $predefinedicons = array(":)" => "ic_smile.png",
+                                 ":(" => "ic_sad.png",
+                                 ":P" => "ic_tongue.png",
+                                 ":D" => "ic_biggrin.png",
+                                 ";)" => "ic_wink.png",
+                                 "(y)" => "ic_handyes.png",
+                                 "(n)" => "ic_handno.png",
+                                 "(i)" => "ic_info.png",
+                                 "(/)" => "ic_check.png",
+                                 "(x)" => "ic_cross.png",
+                                 "(!)" => "ic_danger.png",
+                                 "(+)" => "ic_plus.png",
+                                 "(-)" => "ic_minus.png",
+                                 "(?)" => "ic_help.png",
+                                 "(on)" => "ic_lighton.png",
+                                 "(off)" => "ic_lightoff.png",
+                                 "(*)" => "ic_yellowstar.png",
+                                 "(*r)" => "ic_redstar.png",
+                                 "(*g)" => "ic_greenstar.png",
+                                 "(*b)" => "ic_bluestar.png",
+                                 "(*y)" => "ic_yellowstar.png",
+                                );
+        foreach ($predefinedicons as $ascii => $icon) {
+            if (trim($page) == $ascii) {
+                return LinkImage("/wiki/themes/default/images/$icon", $page);
+            }
+        }
+
         if (strpos($page, "|") === false) {
             $imagename = $page;
             $alt = "";

Added: trunk/pgsrc/Help%FPredefinedIcons
===================================================================
--- trunk/pgsrc/Help%2FPredefinedIcons	                        (rev 0)
+++ trunk/pgsrc/Help%2FPredefinedIcons	2009-08-05 15:06:15 UTC (rev 7058)
@@ -0,0 +1,22 @@
+Date: Wed,  5 Aug 2009 18:54:09 +0000
+Mime-Version: 1.0 (Produced by PhpWiki 1.3.14-20080124)
+X-Rcs-Id: $Id$
+Content-Type: application/x-phpwiki;
+  pagename=Help%2FPredefinedIcons;
+  flags=PAGE_LOCKED%2CEXTERNAL_PAGE;
+  markup=2;
+  charset=iso-8859-1
+Content-Transfer-Encoding: binary
+
+Phpwiki allows you to easily include some **predefined icons** in your wiki pages.
+
+The following icons are available:
+
+|= Notation | ##~{{:)}}## | ##~{{:(}}## | ##~{{:P}}## | ##~{{:D}}## | ##~{{;)}}## | ##~{{(y)}}## | ##~{{(n)}}## | ##~{{(i)}}## | ##~{{(/)}}## | ##~{{(x)}}## | ##~{{(!)}}##
+|= Image | {{:)}} | {{:(}} | {{:P}} | {{:D}} | {{;)}} | {{(y)}} | {{(n)}} | {{(i)}} | {{(/)}} | {{(x)}} | {{(!)}}
+
+-----
+
+|= Notation | ##~{{(+)}}## | ##~{{(-)}}## | ##~{{(?)}}## | ##~{{(on)}}## | ##~{{(off)}}## | ##~{{(*)}}## | ##~{{(*r)}}## | ##~{{(*g)}}## | ##~{{(*b)}}## | ##~{{(*y)}}##
+|= Image | {{(+)}} | {{(-)}} | {{(?)}} | {{(on)}} | {{(off)}} | {{(*)}} | {{(*r)}} | {{(*g)}} | {{(*b)}} | {{(*y)}}
+


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

Added: trunk/themes/default/images/ic_biggrin.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_biggrin.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_bluestar.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_bluestar.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_check.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_check.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_cross.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_cross.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_danger.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_danger.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_greenstar.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_greenstar.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_handno.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_handno.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_handyes.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_handyes.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_help.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_help.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_info.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_info.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_lightoff.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_lightoff.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_lighton.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_lighton.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_minus.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_minus.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_plus.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_plus.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_redstar.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_redstar.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_sad.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_sad.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_smile.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_smile.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_tongue.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_tongue.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_wink.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_wink.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/themes/default/images/ic_yellowstar.png
===================================================================
(Binary files differ)


Property changes on: trunk/themes/default/images/ic_yellowstar.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


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

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

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

Revision: 7057
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7057&view=rev
Author:   vargenau
Date:     2009-08-05 09:48:51 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
SetAcl, Chown, Markup and Rename are marked as minor edits

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminChown.php
    trunk/lib/plugin/WikiAdminMarkup.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSetAcl.php

Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php	2009-08-05 09:27:48 UTC (rev 7056)
+++ trunk/lib/plugin/WikiAdminChown.php	2009-08-05 09:48:51 UTC (rev 7057)
@@ -75,7 +75,7 @@
                     $meta = $current->_data;
                     $text = $current->getPackedContent();
                     $meta['summary'] = "Change page owner from '".$owner."' to '".$newowner."'";
-                    $meta['is_minor_edit'] = 0;
+                    $meta['is_minor_edit'] = 1;
                     $meta['author'] =  $request->_user->UserName();
                     unset($meta['mtime']); // force new date
                     $page->set('owner', $newowner);

Modified: trunk/lib/plugin/WikiAdminMarkup.php
===================================================================
--- trunk/lib/plugin/WikiAdminMarkup.php	2009-08-05 09:27:48 UTC (rev 7056)
+++ trunk/lib/plugin/WikiAdminMarkup.php	2009-08-05 09:48:51 UTC (rev 7057)
@@ -78,7 +78,7 @@
                     // convert text?
                     $text = $current->getPackedContent();
                     $meta['summary'] = sprintf(_("Change markup type from %s to %s"), $markup, $newmarkup);
-                    $meta['is_minor_edit'] = 0;
+                    $meta['is_minor_edit'] = 1;
                     $meta['author'] =  $request->_user->UserName();
                     unset($meta['mtime']); // force new date
                     $page->save($text, $version + 1, $meta);

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2009-08-05 09:27:48 UTC (rev 7056)
+++ trunk/lib/plugin/WikiAdminRename.php	2009-08-05 09:48:51 UTC (rev 7057)
@@ -93,7 +93,7 @@
                     $meta = $current->_data;
                     $text = $current->getPackedContent();
                     $meta['summary'] = sprintf(_("Renamed page from '%s' to '%s'"), $name, $newname);
-                    $meta['is_minor_edit'] = 0;
+                    $meta['is_minor_edit'] = 1;
                     $meta['author'] = $request->_user->UserName();
                     unset($meta['mtime']); // force new date
                     $page->save($text, $version + 1, $meta);

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2009-08-05 09:27:48 UTC (rev 7056)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2009-08-05 09:48:51 UTC (rev 7057)
@@ -116,7 +116,7 @@
                                                $pagename,
                                                $oldperm ? $oldperm->asAclGroupLines() : "None",
                                                $perm->asAclGroupLines());
-                    $meta['is_minor_edit'] = 0;
+                    $meta['is_minor_edit'] = 1;
                     $meta['author'] =  $request->_user->UserName();
                     unset($meta['mtime']); // force new date
                     $page->save($text, $version + 1, $meta);


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7056] trunk/lib/plugin/RecentChanges.php

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

Revision: 7056
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7056&view=rev
Author:   vargenau
Date:     2009-08-05 09:27:48 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
Display "minor edit" for minor edits (like in PageHistory)

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

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2009-08-05 09:04:53 UTC (rev 7055)
+++ trunk/lib/plugin/RecentChanges.php	2009-08-05 09:27:48 UTC (rev 7056)
@@ -463,8 +463,14 @@
         $class = 'rc-' . $this->importance($rev);
 
         $time = $this->time($rev);
-        if (! $rev->get('is_minor_edit'))
+        if ($rev->get('is_minor_edit')) {
+            $minor_flag = HTML(" ",
+                               HTML::span(array('class' => 'pageinfo-minoredit'),
+                                          "(" . _("minor edit") . ")"));
+        } else {
             $time = HTML::span(array('class' => 'pageinfo-majoredit'), $time);
+            $minor_flag = '';
+        }
 
         $line = HTML::li(array('class' => $class));
 
@@ -488,7 +494,8 @@
 			       $time, ' . . ',
 			       $this->authorLink($rev),' ',
 			       $this->authorContribs($rev),' ',
-			       $this->summaryAsHTML($rev));
+                               $this->summaryAsHTML($rev),' ',
+                               $minor_flag);
 	} else {
 	    $line->pushContent($linkorname, ' ',
 			       $time, ' ',


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7055] trunk/lib/plugin/WikiAdminSelect.php

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

Revision: 7055
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7055&view=rev
Author:   vargenau
Date:     2009-08-05 09:04:53 +0000 (Wed, 05 Aug 2009)

Log Message:
-----------
Put buttons in alphabetic order like in page PhpWikiAdministration

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

Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2009-08-04 15:55:40 UTC (rev 7054)
+++ trunk/lib/plugin/WikiAdminSelect.php	2009-08-05 09:04:53 UTC (rev 7055)
@@ -164,6 +164,7 @@
                 $plugin_dir = PHPWIKI_DIR . "/$plugin_dir";
             $fs = new fileSet($plugin_dir, 'WikiAdmin*.php');
             $actions = $fs->getFiles();
+            sort($actions);
             foreach ($actions as $f) {
                 $f = preg_replace('/.php$/','', $f);
                 $s = preg_replace('/^WikiAdmin/','', $f);


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

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

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

Revision: 7054
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7054&view=rev
Author:   vargenau
Date:     2009-08-04 15:55:40 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
Use WikiPlugin_WikiAdminSelect::getDefaultArguments instead of PageList::supportedArgs for getDefaultArguments

Modified Paths:
--------------
    trunk/lib/plugin/WikiAdminChown.php
    trunk/lib/plugin/WikiAdminMarkup.php
    trunk/lib/plugin/WikiAdminPurge.php
    trunk/lib/plugin/WikiAdminRemove.php
    trunk/lib/plugin/WikiAdminRename.php
    trunk/lib/plugin/WikiAdminSearchReplace.php
    trunk/lib/plugin/WikiAdminSetAcl.php
    trunk/lib/plugin/WikiAdminSetExternal.php

Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php	2009-08-04 15:54:24 UTC (rev 7053)
+++ trunk/lib/plugin/WikiAdminChown.php	2009-08-04 15:55:40 UTC (rev 7054)
@@ -50,9 +50,8 @@
     function getDefaultArguments() {
         return array_merge 
             (
-             PageList::supportedArgs(),
+             WikiPlugin_WikiAdminSelect::getDefaultArguments(),
              array(
-                   's' 		=> false,
                    'user' 	=> false,
                    /* Columns to include in listing */
                    'info'     => 'pagename,owner,mtime',

Modified: trunk/lib/plugin/WikiAdminMarkup.php
===================================================================
--- trunk/lib/plugin/WikiAdminMarkup.php	2009-08-04 15:54:24 UTC (rev 7053)
+++ trunk/lib/plugin/WikiAdminMarkup.php	2009-08-04 15:55:40 UTC (rev 7054)
@@ -50,9 +50,8 @@
     function getDefaultArguments() {
         return array_merge 
             (
-             PageList::supportedArgs(),
+             WikiPlugin_WikiAdminSelect::getDefaultArguments(),
              array(
-                   's' 		=> false,
                    'markup' 	=> 2,
                    /* Columns to include in listing */
                    'info'     => 'pagename,markup,mtime',

Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php	2009-08-04 15:54:24 UTC (rev 7053)
+++ trunk/lib/plugin/WikiAdminPurge.php	2009-08-04 15:55:40 UTC (rev 7054)
@@ -43,16 +43,7 @@
                             "\$Revision$");
     }
 
-    function getDefaultArguments() {
-        return array_merge
-            (
-             PageList::supportedArgs(),
-             array(
-                   's' 	=> false,
-                     /* Columns to include in listing */
-                     'info'     => 'most',
-                   ));
-    }
+    /* getDefaultArguments() is inherited from WikiAdminSelect class */ 
 
     function collectPages(&$list, &$dbi, $sortby, $limit=0) {
 

Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php	2009-08-04 15:54:24 UTC (rev 7053)
+++ trunk/lib/plugin/WikiAdminRemove.php	2009-08-04 15:55:40 UTC (rev 7054)
@@ -53,9 +53,8 @@
     function getDefaultArguments() {
         return array_merge
             (
-             PageList::supportedArgs(),
+             WikiPlugin_WikiAdminSelect::getDefaultArguments(),
              array(
-                   's' 	=> false,
                      /*
                       * Show only pages which have been 'deleted' this
                       * long (in days).  (negative or non-numeric

Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php	2009-08-04 15:54:24 UTC (rev 7053)
+++ trunk/lib/plugin/WikiAdminRename.php	2009-08-04 15:55:40 UTC (rev 7054)
@@ -50,9 +50,8 @@
     function getDefaultArguments() {
         return array_merge
             (
-             PageList::supportedArgs(),
+             WikiPlugin_WikiAdminSelect::getDefaultArguments(),
              array(
-		   's' 	=> false,
 		   /* Columns to include in listing */
 		   'info'     => 'pagename,mtime',
 		   'updatelinks' => 0,

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2009-08-04 15:54:24 UTC (rev 7053)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2009-08-04 15:55:40 UTC (rev 7054)
@@ -50,9 +50,8 @@
     function getDefaultArguments() {
         return array_merge
             (
-             PageList::supportedArgs(),
+             WikiPlugin_WikiAdminSelect::getDefaultArguments(),
              array(
-                   's' 	=> false,
                    /* Columns to include in listing */
                    'info'     => 'some',
                    ));

Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php	2009-08-04 15:54:24 UTC (rev 7053)
+++ trunk/lib/plugin/WikiAdminSetAcl.php	2009-08-04 15:55:40 UTC (rev 7054)
@@ -56,10 +56,9 @@
     function getDefaultArguments() {
         return array_merge
             (
-             PageList::supportedArgs(),
+             WikiPlugin_WikiAdminSelect::getDefaultArguments(),
              array(
                      'p'        => "[]",  // list of pages
-                     's' 	=> false, /* select by pagename */
                      /* Columns to include in listing */
                      'info'     => 'pagename,perm,mtime,owner,author',
                      ));

Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php	2009-08-04 15:54:24 UTC (rev 7053)
+++ trunk/lib/plugin/WikiAdminSetExternal.php	2009-08-04 15:55:40 UTC (rev 7054)
@@ -47,9 +47,8 @@
     function getDefaultArguments() {
         return array_merge 
             (
-             PageList::supportedArgs(),
+             WikiPlugin_WikiAdminSelect::getDefaultArguments(),
              array(
-                   's' 		=> false,
                    'external' 	=> 1,
                    /* Columns to include in listing */
                    'info'     => 'pagename,external,mtime',


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7053] trunk/lib/plugin/WikiAdminSelect.php

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

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

Log Message:
-----------
No limit and no paging for WikiAdminSelect

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

Modified: trunk/lib/plugin/WikiAdminSelect.php
===================================================================
--- trunk/lib/plugin/WikiAdminSelect.php	2009-08-04 12:54:57 UTC (rev 7052)
+++ trunk/lib/plugin/WikiAdminSelect.php	2009-08-04 15:54:24 UTC (rev 7053)
@@ -2,6 +2,7 @@
 rcs_id('$Id$');
 /*
  Copyright 2002 $ThePhpWikiProgrammingTeam
+ Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
 
  This file is part of PhpWiki.
 
@@ -55,12 +56,12 @@
                      'author'   => false,
                      'owner'    => false,
                      'creator'  => false,
-
                      'only'    => '',
                      'exclude' => '',
                      'info'    => 'most',
                      'sortby'  => 'pagename',
-                     'limit'    => 150,
+                     'limit'   => 0,
+                     'paging'  => 'none',
                      'debug'   => 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:[7052] trunk/lib/MailNotify.php

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

Revision: 7052
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7052&view=rev
Author:   vargenau
Date:     2009-08-04 12:54:57 +0000 (Tue, 04 Aug 2009)

Log Message:
-----------
Be silent by default

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

Modified: trunk/lib/MailNotify.php
===================================================================
--- trunk/lib/MailNotify.php	2009-07-31 20:12:11 UTC (rev 7051)
+++ trunk/lib/MailNotify.php	2009-08-04 12:54:57 UTC (rev 7052)
@@ -176,13 +176,11 @@
         return array($this->emails, $this->userids);
     }
     
-    function sendMail($subject, $content, 
+    function sendMail($subject,
+                      $content,
                       $notice = false,
-                      $silent = 0)
+                      $silent = true)
     {
-        global $request;
-	if (!DEBUG and $silent === 0)
-	    $silent = true;
         $emails = $this->emails;
         $from = $this->from;
         // Do not send if modification is from Gforge admin


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7051] trunk/lib/plugin/WikiAdminSearchReplace.php

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

Revision: 7051
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7051&view=rev
Author:   vargenau
Date:     2009-07-31 20:12:11 +0000 (Fri, 31 Jul 2009)

Log Message:
-----------
No message needed if string not found

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

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2009-07-29 20:26:26 UTC (rev 7050)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2009-07-31 20:12:11 UTC (rev 7051)
@@ -101,14 +101,10 @@
         foreach ($pages as $pagename) {
             if (!mayAccessPage('edit', $pagename)) {
 		$ul->pushContent(HTML::li(fmt("Access denied to change page '%s'.",$pagename)));
-            } elseif ($this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex))
-            {
+            } elseif ($this->replaceHelper($dbi, $request, $pagename, $from, $to, $case_exact, $regex)) {
                 $ul->pushContent(HTML::li(fmt("Replaced '%s' with '%s' in page '%s'.", 
                                               $from, $to, WikiLink($pagename))));
                 $count++;
-            } else {
-                $ul->pushContent(HTML::li(fmt("Search string '%s' not found in content of page '%s'.", 
-                                              $from, WikiLink($pagename))));
             }
         }
         if ($count) {
@@ -120,12 +116,11 @@
                 $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count)));
             }
             $result->pushContent($ul);
-            return $result;
         } else {
             $result->setAttr('class', 'error');
             $result->pushContent(HTML::p("No pages changed."));
-            return $result;
         }
+        return $result;
     }
     
     function run($dbi, $argstr, &$request, $basepage) {


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7050] trunk/lib/plugin/IncludePage.php

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

Revision: 7050
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7050&view=rev
Author:   vargenau
Date:     2009-07-29 20:26:26 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
Test isset

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

Modified: trunk/lib/plugin/IncludePage.php
===================================================================
--- trunk/lib/plugin/IncludePage.php	2009-07-24 06:22:16 UTC (rev 7049)
+++ trunk/lib/plugin/IncludePage.php	2009-07-29 20:26:26 UTC (rev 7050)
@@ -59,6 +59,8 @@
     function getWikiPageLinks($argstr, $basepage) {
         extract($this->getArgs($argstr));
 
+        if (!isset($page))
+            return false;
         if ($page) {
             // Expand relative page names.
             $page = new WikiPageName($page, $basepage);


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7049] trunk/lib/WikiUser/LdapUpper.php

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

Revision: 7049
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7049&view=rev
Author:   rurban
Date:     2009-07-24 06:22:16 +0000 (Fri, 24 Jul 2009)

Log Message:
-----------
svn propset svn:keywords Id

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

Property Changed:
----------------
    trunk/lib/WikiUser/LdapUpper.php

Modified: trunk/lib/WikiUser/LdapUpper.php
===================================================================
--- trunk/lib/WikiUser/LdapUpper.php	2009-07-24 06:18:16 UTC (rev 7048)
+++ trunk/lib/WikiUser/LdapUpper.php	2009-07-24 06:22:16 UTC (rev 7049)
@@ -1,5 +1,5 @@
 <?php //-*-php-*-
-rcs_id('$Id: LDAP.php,v 1.5 2005/10/10 19:43:49 rurban Exp $');
+rcs_id('$Id$');
 /* Copyright (C) 2007,2009 Reini Urban
  * This file is part of PhpWiki. Terms and Conditions see LICENSE. (GPL2)
  */


Property changes on: trunk/lib/WikiUser/LdapUpper.php
___________________________________________________________________
Added: svn:keywords
   + Id


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7048] trunk/lib/WikiUser/LDAP.php

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

Revision: 7048
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7048&view=rev
Author:   rurban
Date:     2009-07-24 06:18:16 +0000 (Fri, 24 Jul 2009)

Log Message:
-----------
trim spaces from usernames as LDAP does it internally
be more paranoid about * in usernames

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

Modified: trunk/lib/WikiUser/LDAP.php
===================================================================
--- trunk/lib/WikiUser/LDAP.php	2009-07-24 06:12:19 UTC (rev 7047)
+++ trunk/lib/WikiUser/LDAP.php	2009-07-24 06:18:16 UTC (rev 7048)
@@ -119,6 +119,7 @@
     function checkPass($submitted_password) {
 
         $this->_authmethod = 'LDAP';
+	$this->_userid = trim($this->_userid);
         $userid = $this->_userid;
         if (!$this->isValidName()) {
             trigger_error(_("Invalid username."), E_USER_WARNING);
@@ -202,12 +203,13 @@
 
 
     function userExists() {
+	$this->_userid = trim($this->_userid);
         $userid = $this->_userid;
-        /*if (strstr($userid, '*')) {
+        if (strstr($userid, '*')) {
             trigger_error(fmt("Invalid username '%s' for LDAP Auth", $userid),
                           E_USER_WARNING);
             return false;
-	}*/
+	}
         if ($ldap = $this->_init()) {
             // Need to set the right root search information. see ../index.php
 	    $st_search = $this->_searchparam($userid);


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7047] trunk/lib/WikiUser/LdapUpper.php

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

Revision: 7047
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7047&view=rev
Author:   rurban
Date:     2009-07-24 06:12:19 +0000 (Fri, 24 Jul 2009)

Log Message:
-----------
remove unused code
trim spaces from usernames as LDAP does it internally

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

Modified: trunk/lib/WikiUser/LdapUpper.php
===================================================================
--- trunk/lib/WikiUser/LdapUpper.php	2009-07-24 06:02:36 UTC (rev 7046)
+++ trunk/lib/WikiUser/LdapUpper.php	2009-07-24 06:12:19 UTC (rev 7047)
@@ -16,13 +16,12 @@
 {
 
     function checkPass($submitted_password) {
-        $userid = strtolower($this->_userid);
 	return parent::checkPass($submitted_password);
     }
 
     function UserName() {
         if (!empty($this->_userid)) {
-	    $this->_userid = strtoupper($this->_userid);
+	    $this->_userid = trim(strtoupper($this->_userid));
 	    if (!empty($this->_HomePagehandle) and is_object($this->_HomePagehandle))
 	        $this->_HomePagehandle->_pagename = $this->_userid;
             return strtoupper($this->_userid);
@@ -31,8 +30,7 @@
 
     function userExists() {
 	// lowercase check and uppercase visibility 
-        $userid = strtolower($this->_userid);
-	$this->_userid = strtoupper($this->_userid);
+	$this->_userid = trim(strtoupper($this->_userid));
 	return parent::userExists();
     }
 }


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7046] trunk/locale/po/de.po

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

Revision: 7046
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7046&view=rev
Author:   rurban
Date:     2009-07-24 06:02:36 +0000 (Fri, 24 Jul 2009)

Log Message:
-----------
resolve more fuzzies

Modified Paths:
--------------
    trunk/locale/po/de.po

Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2009-07-24 06:01:37 UTC (rev 7045)
+++ trunk/locale/po/de.po	2009-07-24 06:02:36 UTC (rev 7046)
@@ -1,10 +1,10 @@
 # Deutsche PhpWiki locale
 # This file is part of PhpWiki.
-# Copyright (C) Copyright 1999, 2000, 2001, 2002, 2003, 2004
+# Copyright (C) Copyright 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2009
 # ThePhpWikiProgrammingTeam.
 msgid ""
 msgstr ""
-"Project-Id-Version: PhpWiki-1.3.11\n"
+"Project-Id-Version: PhpWiki-1.3.15\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-07-04 01:30+0200\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
@@ -20,24 +20,24 @@
 msgid "BAD semantic relation link"
 msgstr ""
 
-#: ../lib/CachedMarkup.php:569
-#, fuzzy, php-format
+#: ../lib/CachedMarkup.php:505
+#, php-format
 msgid "Attribute %s, base value: %s"
-msgstr "Attribute für %s"
+msgstr "Attribut %s, Basis: %s"
 
-#: ../lib/CachedMarkup.php:570
-#, fuzzy, php-format
+#: ../lib/CachedMarkup.php:506
+#, php-format
 msgid "Attribute %s, value: %s"
-msgstr "Attribute für %s"
+msgstr "Attribut %s, Wert: %s"
 
-#: ../lib/CachedMarkup.php:578
-#, fuzzy, php-format
+#: ../lib/CachedMarkup.php:514
+#, php-format
 msgid "Relation %s to page %s"
-msgstr "Löschen in %s fehlgeschlagen: %s"
+msgstr "Relation %s zu Seite %s"
 
 #: ../lib/CachedMarkup.php:633
 msgid "Found by "
-msgstr ""
+msgstr "Gefunden von "
 
 #: ../lib/Captcha.php:32
 msgid "Typed in verification word mismatch ... are you a bot?"
@@ -80,9 +80,8 @@
 msgstr "Aktion rückgängig gemacht"
 
 #: ../lib/EditToolbar.php:52
-#, fuzzy
 msgid "Substring \"\\1\" found \\2 times. Replace with \"\\3\"?"
-msgstr "Substring \"%s\" %s mal gefunden. Ersetze mit \"%s\"?"
+msgstr "Substring \"\\1\" \\2 mal gefunden. Ersetze mit \"\\3\"?"
 
 #: ../lib/EditToolbar.php:53
 #, php-format
@@ -95,9 +94,8 @@
 msgstr "Suchen & Ersetzen"
 
 #: ../lib/EditToolbar.php:55
-#, fuzzy
 msgid "Search for"
-msgstr "Suche"
+msgstr "Suche nach"
 
 #: ../lib/EditToolbar.php:56
 msgid "Replace with"
@@ -126,41 +124,36 @@
 msgstr "Fetter Text"
 
 #: ../lib/EditToolbar.php:128
-#, fuzzy
 msgid "Bold text [alt-b]"
-msgstr "Fetter Text"
+msgstr "Fetter Text [alt-f]"
 
 #: ../lib/EditToolbar.php:132
 msgid "Italic text"
 msgstr "Kursiver Text"
 
 #: ../lib/EditToolbar.php:133
-#, fuzzy
 msgid "Italic text [alt-i]"
-msgstr "Kursiver Text"
+msgstr "Kursiver Text [alt-k]"
 
 #: ../lib/EditToolbar.php:137
 msgid "Strike-through text"
-msgstr ""
+msgstr "Durchgestrichen"
 
 #: ../lib/EditToolbar.php:138
-#, fuzzy
 msgid "Strike"
-msgstr "Größe"
+msgstr "Durchstreichen"
 
 #: ../lib/EditToolbar.php:142
-#, fuzzy
 msgid "Color text"
-msgstr "Fetter Text"
+msgstr "Farbiger Text"
 
 #: ../lib/EditToolbar.php:143
-#, fuzzy
 msgid "Color"
-msgstr "Schließen"
+msgstr "Farbe"
 
 #: ../lib/EditToolbar.php:147
 msgid "PageName|optional label"
-msgstr ""
+msgstr "SeitenName|optionaler Name"
 
 #: ../lib/EditToolbar.php:148
 msgid "Link to page"
@@ -168,7 +161,7 @@
 
 #: ../lib/EditToolbar.php:152
 msgid "http://www.example.com|optional label"
-msgstr ""
+msgstr "http://www.example.com|optionaler Name"
 
 #: ../lib/EditToolbar.php:153
 msgid "External link (remember http:// prefix)"
@@ -200,21 +193,18 @@
 
 #: ../lib/EditToolbar.php:178
 msgid "Sample table"
-msgstr ""
+msgstr "Beispieltabelle"
 
 #: ../lib/EditToolbar.php:183
-#, fuzzy
 msgid "Enumeration"
-msgstr "E-Mail Bestätigung"
+msgstr "Num. Liste"
 
 #: ../lib/EditToolbar.php:188
-#, fuzzy
 msgid "List"
-msgstr "Letzte"
+msgstr "Liste"
 
 #: ../lib/EditToolbar.php:193 ../lib/plugin/CreateToc.php:430
 #: ../lib/plugin/CreateToc.php:446
-#, fuzzy
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
@@ -229,14 +219,13 @@
 msgstr "Weiterleiten"
 
 #: ../lib/EditToolbar.php:202
-#, fuzzy
 msgid "Template Name"
-msgstr "Benutzeroberfläche"
+msgstr "Vorlagenname"
 
 #: ../lib/EditToolbar.php:203 ../lib/plugin/PopularTags.php:64
 #: ../lib/plugin/Template.php:62
 msgid "Template"
-msgstr "Benutzeroberfläche"
+msgstr "Vorlage"
 
 #: ../lib/EditToolbar.php:205 ../lib/EditToolbar.php:207
 #: ../lib/WysiwygEdit/Wikiwyg.php:80 ../lib/editpage.php:711
@@ -287,14 +276,12 @@
 msgstr "SeitenLink einfügen (Doppelklick)"
 
 #: ../lib/EditToolbar.php:430 ../lib/EditToolbar.php:431
-#, fuzzy
 msgid "AddImage"
-msgstr "SeitenLink einfügen"
+msgstr "Bild einf\xFCgen"
 
 #: ../lib/EditToolbar.php:433
-#, fuzzy
 msgid "Insert Image (double-click)"
-msgstr "SeitenLink einfügen (Doppelklick)"
+msgstr "Bild einf\xFCgen (Doppelklick)"
 
 #: ../lib/EditToolbar.php:465 ../lib/EditToolbar.php:466
 msgid "AddTemplate"
@@ -341,19 +328,19 @@
 msgstr "unbekannte Farbe %s ignoriert"
 
 #: ../lib/MailNotify.php:194
-#, fuzzy, php-format
+#, php-format
 msgid "PageChange Notification of %s"
-msgstr "SeitenÄnderung Benachrichtigung von %s an %s gesendet"
+msgstr "Seiten\xC4nderung Benachrichtigung von %s"
 
 #: ../lib/MailNotify.php:227
-#, fuzzy, php-format
+#, php-format
 msgid "sent to %s"
-msgstr "Zurück zu %s"
+msgstr "an %s gesendet"
 
 #: ../lib/MailNotify.php:233
-#, fuzzy, php-format
+#, php-format
 msgid "Error: Couldn't send %s to %s"
-msgstr "Kann nicht zu »%s« verbinden"
+msgstr "Fehler: Konnte nicht %s an %s senden"
 
 #: ../lib/MailNotify.php:255
 msgid "Page change"
@@ -389,7 +376,6 @@
 msgstr "Seite gelöscht %s"
 
 #: ../lib/MailNotify.php:393
-#, fuzzy
 msgid "e-mail address confirmation"
 msgstr "E-Mail Bestätigung"
 
@@ -414,9 +400,8 @@
 msgstr "Sortiere nach %s"
 
 #: ../lib/PageList.php:157
-#, fuzzy
 msgid "reverse"
-msgstr "Zurückspeichern"
+msgstr "umdrehen"
 
 #: ../lib/PageList.php:169
 msgid "Click to reverse sort order"
@@ -573,9 +558,8 @@
 msgstr "Umbenennen"
 
 #: ../lib/PagePerm.php:191 ../lib/plugin/WikiAdminSearchReplace.php:243
-#, fuzzy
 msgid "Replace"
-msgstr "Ersetze: "
+msgstr "Ersetze"
 
 #: ../lib/PagePerm.php:313
 msgid "List this page and all subpages"
@@ -595,7 +579,6 @@
 msgstr "Erzeuge eine neue (Unter)Seite"
 
 #: ../lib/PagePerm.php:317
-#, fuzzy
 msgid "Download page contents"
 msgstr "Runterladen der Seite"
 
@@ -607,11 +590,9 @@
 msgid "Remove this page"
 msgstr "Löschen der Seite"
 
-# Erzeugen??
 #: ../lib/PagePerm.php:320
-#, fuzzy
 msgid "Purge this page"
-msgstr "um diese Seite zu erzeugen"
+msgstr "L\xF6sche diese Seite endg\xFCltig"
 
 #: ../lib/PagePerm.php:369
 #, php-format
@@ -770,14 +751,12 @@
 
 #: ../lib/SemanticWeb.php:151 ../lib/plugin/SemanticSearch.php:330
 #: ../lib/plugin/SemanticSearchAdvanced.php:189
-#, fuzzy
 msgid "Relation"
-msgstr "Verwandte Links"
+msgstr ""
 
 #: ../lib/SemanticWeb.php:153 ../lib/plugin/SemanticSearch.php:406
-#, fuzzy
 msgid "Attribute"
-msgstr "Attribute für %s"
+msgstr "Attribut"
 
 #: ../lib/Template.php:179
 #, php-format
@@ -1090,9 +1069,8 @@
 msgstr "Anmelden"
 
 #: ../lib/WikiTheme.php:1028
-#, fuzzy
 msgid "Rename Page"
-msgstr "Seite Löschen"
+msgstr "Seite Umbenennen"
 
 #: ../lib/WikiTheme.php:1029 ../themes/MacOSX/themeinfo.php:133
 msgid "Lock Page"
@@ -1107,9 +1085,8 @@
 msgstr "Seite Löschen"
 
 #: ../lib/WikiTheme.php:1032 ../lib/purgepage.php:22 ../lib/purgepage.php:59
-#, fuzzy
 msgid "Purge Page"
-msgstr "Seiten Änderung"
+msgstr "Seiten endg\xFCltig l\xF6schen"
 
 #: ../lib/WikiTheme.php:1197
 msgid ""
@@ -1297,19 +1274,17 @@
 msgstr ""
 
 #: ../lib/WikiUser/LDAP.php:156
-#, fuzzy
 msgid "User not found in LDAP"
-msgstr "%s nicht gefunden"
+msgstr "Benutzer in LDAP nicht gefunden"
 
 #: ../lib/WikiUser/LDAP.php:191
-#, fuzzy
 msgid "Wrong password: "
-msgstr "Falsches Password. Noch einmal eingeben."
+msgstr "Falsches Password: "
 
 #: ../lib/WikiUser/LDAP.php:197
-#, fuzzy, php-format
+#, php-format
 msgid "Could not connect to LDAP host %s"
-msgstr "Kann nicht zu »%s« verbinden"
+msgstr "Kann nicht zu LDAP host \xBB%s\xAB verbinden"
 
 #: ../lib/WikiUser/POP3.php:61
 #, php-format
@@ -1419,36 +1394,30 @@
 msgstr ""
 
 #: ../lib/WysiwygEdit/Wikiwyg.php:69
-#, fuzzy
 msgid "Apply changes"
-msgstr "Keine Änderungen."
+msgstr "\xC4nderungen anwenden"
 
 #: ../lib/WysiwygEdit/Wikiwyg.php:70
-#, fuzzy
 msgid "Exit toolbar"
-msgstr "Werkzeugleiste"
+msgstr "Beende Werkzeugleiste"
 
 #: ../lib/WysiwygEdit/Wikiwyg.php:71
-#, fuzzy
 msgid "Title 1"
-msgstr "Titel"
+msgstr "Titel 1"
 
 #: ../lib/WysiwygEdit/Wikiwyg.php:72
-#, fuzzy
 msgid "Title 2"
-msgstr "Titel"
+msgstr "Titel 2"
 
 #: ../lib/WysiwygEdit/Wikiwyg.php:73
-#, fuzzy
 msgid "Title 3"
-msgstr "Titel"
+msgstr "Titel 3"
 
 #: ../lib/WysiwygEdit/Wikiwyg.php:74
 msgid "Verbatim"
 msgstr ""
 
 #: ../lib/WysiwygEdit/Wikiwyg.php:75
-#, fuzzy
 msgid "Table of content"
 msgstr "Inhaltsverzeichnis"
 
@@ -1457,14 +1426,13 @@
 msgstr ""
 
 #: ../lib/WysiwygEdit/Wikiwyg.php:77
-#, fuzzy
 msgid "Sup"
-msgstr "Unterseite"
+msgstr ""
 
 #: ../lib/WysiwygEdit/Wikiwyg.php:78
 #, fuzzy
 msgid "Sub"
-msgstr "Eingeben"
+msgstr ""
 
 #: ../lib/WysiwygEdit/Wikiwyg.php:106
 msgid "Warning: This Wikiwyg editor has only Beta quality!"
@@ -1678,14 +1646,12 @@
 msgstr "Seite jetzt freigegeben."
 
 #: ../lib/editpage.php:259
-#, fuzzy
 msgid "Page now public."
-msgstr "Seite jetzt freigegeben."
+msgstr "Seite jetzt \xF6ffentlich freigegeben."
 
 #: ../lib/editpage.php:260
-#, fuzzy
 msgid "Page now not-public."
-msgstr "Seite jetzt freigegeben."
+msgstr "Seite jetzt nicht mehr \xF6ffentlich freigegeben."
 
 #: ../lib/editpage.php:269
 #, fuzzy
@@ -1715,9 +1681,9 @@
 msgstr ""
 
 #: ../lib/editpage.php:473
-#, fuzzy, php-format
+#, php-format
 msgid "%s is listed at %s with %s"
-msgstr "%s blockiert von %s"
+msgstr "%s ist gelistet auf %s mit %s"
 
 #: ../lib/editpage.php:497
 msgid "Spam Prevention"
@@ -2006,9 +1972,8 @@
 msgstr "Leerer Seitenname!"
 
 #: ../lib/loadsave.php:896
-#, fuzzy
 msgid "Invalid pagename!"
-msgstr "Ungültiger Benutzername."
+msgstr "Ung\xFCltiger Seitenname!"
 
 #: ../lib/loadsave.php:959
 #, php-format
@@ -2270,17 +2235,14 @@
 msgid "edit this page"
 msgstr "um diese Seite zu bearbeiten"
 
-# Erzeugen??
 #: ../lib/main.php:558
-#, fuzzy
 msgid "rename this page"
-msgstr "um diese Seite zu erzeugen"
+msgstr "um diese Seite umzubennen"
 
 #: ../lib/main.php:559
 msgid "revert to a previous version of this page"
 msgstr "Zurückspeichern einer älteren Version dieser Seite."
 
-# Erzeugen??
 #: ../lib/main.php:560
 msgid "create this page"
 msgstr "um diese Seite zu erzeugen"
@@ -2293,11 +2255,9 @@
 msgid "lock this page"
 msgstr "um diese Seite zu sperren"
 
-# Erzeugen??
 #: ../lib/main.php:563
-#, fuzzy
 msgid "purge this page"
-msgstr "um diese Seite zu erzeugen"
+msgstr "um diese Seite endg\xFCltig zu l\xF6schen"
 
 #: ../lib/main.php:564
 msgid "remove this page"
@@ -2337,9 +2297,8 @@
 msgstr "um alle HTML Seiten als Zipdatei von diesem Wiki herunterzuladen"
 
 #: ../lib/main.php:578
-#, fuzzy
 msgid "use"
-msgstr "Benutzer"
+msgstr "benutze"
 
 #: ../lib/main.php:596
 msgid "Browsing pages"
@@ -2365,21 +2324,19 @@
 msgid "Reverting to a previous version of pages"
 msgstr "Zurückspeichern einer älteren Version"
 
-# Erzeugen??
 #: ../lib/main.php:602
 msgid "Creating pages"
-msgstr "Das Seitenerzeugung in diesem Wiki"
+msgstr "Neue Seiten erzeugen"
 
 #: ../lib/main.php:603
 msgid "Loading files"
-msgstr "Das Dateienladen in diesem Wiki"
+msgstr "Dateien hinaufladen"
 
 #: ../lib/main.php:604
 msgid "Locking pages"
-msgstr "Das Seitensperrung in diesem Wiki"
+msgstr "Seiten sperren"
 
 #: ../lib/main.php:605
-#, fuzzy
 msgid "Purging pages"
 msgstr "Das Durchblättern der Seiten dieses Wikis"
 
@@ -2530,19 +2487,19 @@
 msgstr "Alle Seiten in diesem Wiki (%d insgesamt):"
 
 #: ../lib/plugin/AllPages.php:78
-#, fuzzy
-msgid "List of user-created pages ({total} total):"
-msgstr "Liste der Seiten erzeugt von [%s] (%d insgesamt):"
+#, php-format
+msgid "List of user-created pages (%d total):"
+msgstr "Liste der Benutzer erzeugten Seiten (%d insgesamt):"
 
 #: ../lib/plugin/AllPages.php:84
 #, fuzzy, php-format
 msgid "List of pages owned by [%s] ({total} total):"
-msgstr "Liste der Seiten owned by [%s] (%d insgesamt):"
+msgstr "Liste der Seiten im Besitz von [%s] (%d insgesamt):"
 
 #: ../lib/plugin/AllPages.php:95
 #, fuzzy, php-format
 msgid "List of pages last edited by [%s] ({total} total):"
-msgstr "Liste der Seiten last edited by [%s] (%d insgesamt):"
+msgstr "Liste der Seiten zuletzt ge\xE4ndert von [%s] (%d insgesamt):"
 
 #: ../lib/plugin/AllPages.php:106
 #, fuzzy, php-format
@@ -2827,9 +2784,8 @@
 msgstr "Eine Seite ist mit %s verlinkt:"
 
 #: ../lib/plugin/BackLinks.php:168
-#, fuzzy
 msgid "Those"
-msgstr "Schließen"
+msgstr "Diese"
 
 #: ../lib/plugin/BackLinks.php:167
 #, php-format
@@ -2872,9 +2828,8 @@
 msgstr ""
 
 #: ../lib/plugin/BlogJournal.php:84
-#, fuzzy
 msgid "New entry"
-msgstr "Neuer Kommentar."
+msgstr "Neuer Eintrag"
 
 #: ../lib/plugin/BlogJournal.php:86
 msgid "No Blog Entries"
@@ -2893,9 +2848,8 @@
 msgstr "Nächster Monat"
 
 #: ../lib/plugin/Calendar.php:132
-#, fuzzy
 msgid "Wk"
-msgstr "Br."
+msgstr "Cw"
 
 #: ../lib/plugin/Calendar.php:173 ../lib/plugin/CalendarList.php:143
 #, php-format
@@ -2931,9 +2885,8 @@
 msgstr "Kommentar in WikiText verstecken."
 
 #: ../lib/plugin/CreateBib.php:36
-#, fuzzy
 msgid "CreateBib"
-msgstr "InhaltsVerzeichnis"
+msgstr ""
 
 #: ../lib/plugin/CreateBib.php:40
 msgid "Automatically create a Bibtex file from linked pages"
@@ -2954,9 +2907,8 @@
 msgstr "Erzeuge neue Wiki-Seite mit dem angegebenem Namen."
 
 #: ../lib/plugin/CreatePage.php:71
-#, fuzzy
 msgid "Cannot create page with empty name!"
-msgstr "Das Verzeichnis »%s« kann nicht erzeugt werden"
+msgstr "Kann Seite mit leerem Namen nicht erzeugen"
 
 #: ../lib/plugin/CreatePage.php:75
 #, fuzzy
@@ -3010,14 +2962,12 @@
 msgstr "InhaltsVerzeichnis deaktiviert für altes Markup"
 
 #: ../lib/plugin/CreateToc.php:436
-#, fuzzy
 msgid "Click to display to TOC"
-msgstr "Klicken um anzuzeigen"
+msgstr "Klicken um TOC anzuzeigen"
 
 #: ../lib/plugin/CurrentTime.php:59
-#, fuzzy
 msgid "CurrentTime"
-msgstr "Ausgewählte Darstellung"
+msgstr "AktuelleZeit"
 
 #: ../lib/plugin/CurrentTime.php:63
 msgid "A simple plugin that displays current time and date"
@@ -3066,9 +3016,9 @@
 msgstr "Meta-Daten für %s bearbeiten"
 
 #: ../lib/plugin/EditMetaData.php:132
-#, fuzzy, php-format
+#, php-format
 msgid "No metadata for %s"
-msgstr "Meta-Daten für %s bearbeiten"
+msgstr "Keine Meta-Daten f\xFCr %s"
 
 #: ../lib/plugin/EditMetaData.php:146
 msgid ""
@@ -3115,9 +3065,9 @@
 msgstr "Erforderliches Argument »%s« fehlt."
 
 #: ../lib/plugin/FileInfo.php:81
-#, fuzzy, php-format
+#, php-format
 msgid "File '%s' not found."
-msgstr "%s nicht gefunden"
+msgstr "Datei '%s' nicht gefunden"
 
 #: ../lib/plugin/FileInfo.php:95
 msgid ""
@@ -3125,9 +3075,8 @@
 msgstr ""
 
 #: ../lib/plugin/FileInfo.php:96
-#, fuzzy
 msgid "page not locked"
-msgstr "Seite jetzt gesperrt."
+msgstr "Seite nicht gesperrt"
 
 #: ../lib/plugin/FoafViewer.php:52
 msgid "FoafViewer"
@@ -3221,9 +3170,9 @@
 msgstr ""
 
 #: ../lib/plugin/FullTextSearch.php:167 ../lib/plugin/WantedPages.php:175
-#, fuzzy, php-format
+#, php-format
 msgid "(%d Links)"
-msgstr "Links"
+msgstr "(%d Verweise)"
 
 #: ../lib/plugin/FuzzyPages.php:39
 msgid "FuzzyPages"
@@ -3470,18 +3419,16 @@
 msgstr "Durchsuche ein LDAP Verzeichnis"
 
 #: ../lib/plugin/LdapSearch.php:81
-#, fuzzy
 msgid "Missing ldap extension"
-msgstr "Fehlende Zugriffsberechtigung:"
+msgstr "Fehlende php LDAP extension"
 
 #: ../lib/plugin/LdapSearch.php:104
-#, fuzzy
 msgid "Failed to connect to LDAP host"
 msgstr "LDAP Server nicht gefunden"
 
 #: ../lib/plugin/LdapSearch.php:137
 msgid "Failed to bind LDAP host"
-msgstr ""
+msgstr "Konnte nicht mit LDAP Host verbinden"
 
 # "ÄhnlicheSeiten" (LikePages sind keine SamePages; die korrekte
 # deutsche Übersetzung ist "ÄhnlicheSeiten" which would be the best.
@@ -3553,9 +3500,8 @@
 msgstr "Nicht unterstützter format Parameter %s"
 
 #: ../lib/plugin/LinkSearch.php:35 ../lib/plugin/LinkSearch.php:113
-#, fuzzy
 msgid "LinkSearch"
-msgstr "LiveSuche"
+msgstr "LinkSuche"
 
 #: ../lib/plugin/LinkSearch.php:38
 msgid "Search page and link names"
@@ -3571,13 +3517,12 @@
 msgstr ""
 
 #: ../lib/plugin/LinkSearch.php:98
-#, fuzzy
 msgid "outgoing"
-msgstr "Anmelden"
+msgstr "ausgehend"
 
 #: ../lib/plugin/LinkSearch.php:99
 msgid "incoming"
-msgstr ""
+msgstr "eingehend"
 
 #: ../lib/plugin/LinkSearch.php:114
 msgid "Search in pages for links with the matching name."
@@ -3585,9 +3530,8 @@
 
 #: ../lib/plugin/LinkSearch.php:148 ../lib/plugin/SemanticSearch.php:333
 #: ../lib/plugin/SemanticSearchAdvanced.php:191
-#, fuzzy
 msgid "Link"
-msgstr "Links"
+msgstr "Verweis"
 
 #: ../lib/plugin/LinkSearch.php:158
 #, php-format
@@ -3610,9 +3554,8 @@
 msgstr "Sie müssen sich anmelden um die Bewertungen zu sehen."
 
 #: ../lib/plugin/ListRelations.php:34
-#, fuzzy
 msgid "ListRelations"
-msgstr "SemantischeBeziehungen"
+msgstr "ListeRelationen"
 
 #: ../lib/plugin/ListRelations.php:37
 msgid ""
@@ -3622,7 +3565,7 @@
 
 #: ../lib/plugin/ListSubpages.php:34
 msgid "ListSubpages"
-msgstr "UnterseitenListe"
+msgstr "ListeUnterseiten"
 
 #: ../lib/plugin/ListSubpages.php:38
 msgid "Lists the names of all SubPages of the current page."
@@ -3697,7 +3640,7 @@
 
 #: ../lib/plugin/ModeratedPage.php:405
 msgid "Reason: "
-msgstr ""
+msgstr "Grund: "
 
 #: ../lib/plugin/ModeratedPage.php:406
 msgid "Approve"
@@ -3748,9 +3691,8 @@
 msgstr ""
 
 #: ../lib/plugin/NewPagesPerUser.php:23
-#, fuzzy
 msgid "List all new pages per month per user"
-msgstr "Liste alle eingetragenen Benutzer."
+msgstr "Liste aller neuen Seiten pro Monat und Benutzer"
 
 #: ../lib/plugin/NoCache.php:40
 msgid "NoCache"
@@ -4815,9 +4757,8 @@
 msgstr ""
 
 #: ../lib/plugin/SemanticSearch.php:126
-#, fuzzy
 msgid "Relations"
-msgstr "Verwandte Links"
+msgstr "Relationen"
 
 #: ../lib/plugin/SemanticSearch.php:134 ../lib/plugin/SemanticSearch.php:213
 msgid "Add an AND query"


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7045] trunk/locale/de/pgsrc/ Hilfe%2FPhotoAlbumPlugin%2FDiashow

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

Revision: 7045
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7045&view=rev
Author:   rurban
Date:     2009-07-24 06:01:37 +0000 (Fri, 24 Jul 2009)

Log Message:
-----------
translate

Modified Paths:
--------------
    trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow

Modified: trunk/locale/de/pgsrc/Hilfe%FPhotoAlbumPlugin%FDiashow
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow	2009-07-17 09:07:16 UTC (rev 7044)
+++ trunk/locale/de/pgsrc/Hilfe%2FPhotoAlbumPlugin%2FDiashow	2009-07-24 06:01:37 UTC (rev 7045)
@@ -8,7 +8,7 @@
   charset=utf-8
 Content-Transfer-Encoding: binary
 
-[ Back | PhotoAlbumPlugin ]
+[ Zurück | PhotoAlbumPlugin ]
 
 <<PhotoAlbum
          src="themes/Hawaiian/images/pictures/"


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

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

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

Revision: 7044
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7044&view=rev
Author:   vargenau
Date:     2009-07-17 09:07:16 +0000 (Fri, 17 Jul 2009)

Log Message:
-----------
Add fieldset

Modified Paths:
--------------
    trunk/lib/purgepage.php
    trunk/lib/removepage.php

Modified: trunk/lib/purgepage.php
===================================================================
--- trunk/lib/purgepage.php	2009-07-16 12:58:22 UTC (rev 7043)
+++ trunk/lib/purgepage.php	2009-07-17 09:07:16 UTC (rev 7044)
@@ -22,26 +22,23 @@
         $purgeB = Button('submit:verify', _("Purge Page"), 'wikiadmin');
         $cancelB = Button('submit:cancel', _("Cancel"), 'button'); // use generic wiki button look
 
-        $html = HTML(HTML::p(fmt("You are about to purge '%s'!", $pagelink)),
+        $fieldset = HTML::fieldset(HTML::p(fmt("You are about to purge '%s'!", $pagelink)),
                      HTML::form(array('method' => 'post',
                                       'action' => $request->getPostURL()),
                                 HiddenInputs(array('currentversion' => $version,
                                                    'pagename' => $page->getName(),
                                                    'action' => 'purge')),
-                                
                                 HTML::div(array('class' => 'toolbar'),
                                           $purgeB,
                                           $WikiTheme->getButtonSeparator(),
-                                          $cancelB)),
-                     HTML::hr()
+                                          $cancelB))
                      );
         $sample = HTML::div(array('class' => 'transclusion'));
         // simple and fast preview expanding only newlines
         foreach (explode("\n", firstNWordsOfContent(100, $current->getPackedContent())) as $s) {
             $sample->pushContent($s, HTML::br());
         }
-        $html->pushContent(HTML::div(array('class' => 'wikitext'), 
-                                     $sample));
+        $html = HTML($fieldset, HTML::div(array('class' => 'wikitext'), $sample));
     }
     elseif ($request->getArg('currentversion') != $version) {
         $html = HTML(HTML::p(array('class' => 'error'), (_("Someone has edited the page!"))),

Modified: trunk/lib/removepage.php
===================================================================
--- trunk/lib/removepage.php	2009-07-16 12:58:22 UTC (rev 7043)
+++ trunk/lib/removepage.php	2009-07-17 09:07:16 UTC (rev 7044)
@@ -22,26 +22,23 @@
         $removeB = Button('submit:verify', _("Remove Page"), 'wikiadmin');
         $cancelB = Button('submit:cancel', _("Cancel"), 'button'); // use generic wiki button look
 
-        $html = HTML(HTML::p(fmt("You are about to remove '%s'!", $pagelink)),
+        $fieldset = HTML::fieldset(HTML::p(fmt("You are about to remove '%s'!", $pagelink)),
                      HTML::form(array('method' => 'post',
                                       'action' => $request->getPostURL()),
                                 HiddenInputs(array('currentversion' => $version,
                                                    'pagename' => $page->getName(),
                                                    'action' => 'remove')),
-                                
                                 HTML::div(array('class' => 'toolbar'),
                                           $removeB,
                                           $WikiTheme->getButtonSeparator(),
-                                          $cancelB)),
-                     HTML::hr()
+                                          $cancelB))
                      );
         $sample = HTML::div(array('class' => 'transclusion'));
         // simple and fast preview expanding only newlines
         foreach (explode("\n", firstNWordsOfContent(100, $current->getPackedContent())) as $s) {
             $sample->pushContent($s, HTML::br());
         }
-        $html->pushContent(HTML::div(array('class' => 'wikitext'), 
-                                     $sample));
+        $html = HTML($fieldset, HTML::div(array('class' => 'wikitext'), $sample));
     }
     elseif ($request->getArg('currentversion') != $version) {
         $html = HTML(HTML::p(array('class' => 'error'), (_("Someone has edited the page!"))),


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

[phpwiki-checkins] SF.net SVN: phpwiki:[7043] trunk/lib/diff.php

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

Revision: 7043
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7043&view=rev
Author:   vargenau
Date:     2009-07-16 12:58:22 +0000 (Thu, 16 Jul 2009)

Log Message:
-----------
Fix bug #1889583 Diff display is incomplete

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

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2009-07-16 08:51:13 UTC (rev 7042)
+++ trunk/lib/diff.php	2009-07-16 12:58:22 UTC (rev 7043)
@@ -45,7 +45,7 @@
 
         foreach ($words as $word) {
             // new-line should only come as first char of word.
-            if (!$word)
+            if ($word === "") 
                 continue;
             if ($word[0] == "\n") {
                 $this->_group .= " ";


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