PhpWiki

Update of /cvsroot/phpwiki/phpwiki/themes/MonoBook/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10366

Modified Files:
	signin.tmpl 
Log Message:
Removed userpage if not logged in

Index: signin.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/MonoBook/templates/signin.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -2 -b -p -d -r1.3 -r1.4
--- signin.tmpl	7 Jan 2007 20:20:09 -0000	1.3
+++ signin.tmpl	13 Jan 2007 23:56:04 -0000	1.4
@@ -8,8 +8,8 @@ rcs_id('$Id$'); ?>
   <?php if ($user->isAuthenticated()) { ?>
   <li id="pt-userpage"><?= WikiLink($id, 'auto', HTML($sp,$id,$sp)) ?></li>
-  <li><?= HTML::a(array('href'=>'?auth[logout]=1'), $sp,_("Logout"),$sp) ?></li>
+  <li><?= HTML::a(array('href'=>'?auth[logout]=1'),$sp,_("Logout"),$sp) ?></li>
   <?php } else { ?>
-  <li id="pt-userpage"><?= WikiLink($id, 'auto', HTML($sp,$id,$sp)) ?></li>
-  <li id="pt-login"><?= HTML::a(array('href'=>'?auth[login]=1'), $sp,_("Login"),$sp) ?></a></li>
+  <!-- Login or Register -->
+  <li id="pt-login"><?= HTML::a(array('href'=>'?auth[login]=1'),$sp,_("Login"),$sp) ?></a></li>
 <?php } ?>
   </li>

Update of /cvsroot/phpwiki/phpwiki/themes/Sidebar/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5324/templates

Modified Files:
	navbar.tmpl 
Log Message:
Layout improvements

Index: navbar.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Sidebar/templates/navbar.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -2 -b -p -d -r1.10 -r1.11
--- navbar.tmpl	6 Apr 2005 06:41:05 -0000	1.10
+++ navbar.tmpl	13 Jan 2007 23:42:20 -0000	1.11
@@ -5,22 +5,12 @@
 ?>
 <!-- The top navigation/search bar -->
-<form action="<?= WikiURL(_("TitleSearch"))?>" target="_top"
-      method="get" accept-charset="<?=$charset?>" style="display:inline">
 <div id="navbuttons">
 <!-- &middot; ?= WikiLink(_("RecentChanges"), "button") ? -->
-<input type="hidden" name="auto_redirect" value="1" />
-<?php if (! USE_PATH_INFO) { ?>
-<input type="hidden" name="pagename" value="<?=_("TitleSearch")?>" />
-<?php } ?>
-<input type="text"  name="s" size="12" maxlength="256"
-             title='<?=_("Quick Search")?>'
-             onmouseover="window.status='<?=_("Quick Search")?>'; return true;"
-             onmouseout="window.status=''; return true;" /><? 
-// remove the class from the href AND img for the annoying box
-$button = Button(_("TitleSearch"));
-$button->setAttr('class', false);
-if (isset($button->_content[0])) $button->_content[0]->setAttr('class', false);
-echo $button->asXml();
-?><?=$SEP?><?= WikiLink(_("FindPage"), "button",_("Full Search")) ?>
+<?= Template("search",
+	     array('SEARCH_AFTER' => 
+		   HTML::button(array('type' => 'submit', 'id' => 'searchGoButton'),
+				HTML::img(array('src' => $WikiTheme->getImageURL("search"),
+						'alt' => 'search'))))) ?>
+<?=$SEP?><?= WikiLink(_("FindPage"), "button",_("Full Search")) ?>
 <?php 
 if (ENABLE_DISCUSSION_LINK) { // This requires Talk: map to end in "/Discussion"
@@ -39,3 +29,2 @@ if (ENABLE_DISCUSSION_LINK) { // This re
 <?php }
 $WikiTheme->setAutosplitWikiWords($split); ?></div>
-</form>
\ No newline at end of file

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2254

Modified Files:
	XmlElement.php 
Log Message:
More php-5.2.0 fixes __toString

Index: XmlElement.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/XmlElement.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -2 -b -p -d -r1.40 -r1.41
--- XmlElement.php	13 Jan 2007 23:28:56 -0000	1.40
+++ XmlElement.php	13 Jan 2007 23:34:49 -0000	1.41
@@ -429,4 +429,9 @@ class RawXml {
     }
 
+    /* php-5.2 magic */
+    function __toString () {
+        return $this->_xml;
+    }
+
     function asXML () {
         return $this->_xml;
@@ -497,4 +502,9 @@ class FormattedText {
         return call_user_func_array('sprintf', $args);
     }
+
+    /* php-5.2 magic */
+    function __toString () {
+        return $this->asString();
+    }
 }
 
@@ -616,4 +626,7 @@ function fmt ($fs /* , ... */) {
 
 // $Log$
+// Revision 1.41  2007/01/13 23:34:49  rurban
+// More php-5.2.0 fixes __toString
+//
 // Revision 1.40  2007/01/13 23:28:56  rurban
 // php-5.2.0 fix for string fallback: Provide the magic method __toString

Update of /cvsroot/phpwiki/phpwiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32421

Modified Files:
	XmlElement.php 
Log Message:
php-5.2.0 fix for string fallback: Provide the magic method __toString

Index: XmlElement.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/XmlElement.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -2 -b -p -d -r1.39 -r1.40
--- XmlElement.php	15 Aug 2006 13:36:23 -0000	1.39
+++ XmlElement.php	13 Jan 2007 23:28:56 -0000	1.40
@@ -133,13 +133,19 @@ class XmlContent
     }
 
+    /* php-5.2 magic */
+    function __toString () {
+        return $this->asString();
+    }
+
     function asString () {
         $val = '';
         foreach ($this->_content as $item) {
             if (is_object($item)) {
-                if (method_exists($item, 'asString'))
-                    $val .= $item->asString();
-                else
+                if (method_exists($item, 'asString')) {
+                    $val .= (string) $item->asString();
+                } else {
                     $val .= sprintf("==Object(%s)==", get_class($item));
             }
+            }
             else
                 $val .= (string) $item;
@@ -610,4 +616,7 @@ function fmt ($fs /* , ... */) {
 
 // $Log$
+// Revision 1.40  2007/01/13 23:28:56  rurban
+// php-5.2.0 fix for string fallback: Provide the magic method __toString
+//
 // Revision 1.39  2006/08/15 13:36:23  rurban
 // support iso-8859-2