[pLog-svn] r6439 - in plog/trunk: class/action/admin class/view/admin templates/admin templates/admin/chooser

mark at devel.lifetype.net mark at devel.lifetype.net
Sun May 4 05:25:24 EDT 2008


Author: mark
Date: 2008-05-04 05:25:24 -0400 (Sun, 04 May 2008)
New Revision: 6439

Modified:
   plog/trunk/class/action/admin/adminblogcategoriesaction.class.php
   plog/trunk/class/action/admin/admineditcommentsaction.class.php
   plog/trunk/class/action/admin/admineditfriendgroupsaction.class.php
   plog/trunk/class/action/admin/admineditfriendsaction.class.php
   plog/trunk/class/action/admin/admineditglobalarticlecategoriesaction.class.php
   plog/trunk/class/action/admin/admineditinboxprivatemessagesaction.class.php
   plog/trunk/class/action/admin/admineditlinkcategoriesaction.class.php
   plog/trunk/class/action/admin/admineditlinksaction.class.php
   plog/trunk/class/action/admin/admineditoutboxprivatemessagesaction.class.php
   plog/trunk/class/action/admin/admineditpostsaction.class.php
   plog/trunk/class/action/admin/adminresourcesaction.class.php
   plog/trunk/class/view/admin/adminarticlecategorieslistview.class.php
   plog/trunk/class/view/admin/adminsiteblogslistview.class.php
   plog/trunk/class/view/admin/adminsiteuserslistview.class.php
   plog/trunk/templates/admin/blogcategories.template
   plog/trunk/templates/admin/chooser/siteblogschooser.template
   plog/trunk/templates/admin/chooser/siteuserschooser.template
   plog/trunk/templates/admin/editarticlecategories.template
   plog/trunk/templates/admin/editcomments.template
   plog/trunk/templates/admin/editfriendgroups.template
   plog/trunk/templates/admin/editfriends.template
   plog/trunk/templates/admin/editinboxprivatemessages.template
   plog/trunk/templates/admin/editlinkcategories.template
   plog/trunk/templates/admin/editlinks.template
   plog/trunk/templates/admin/editoutboxprivatemessages.template
   plog/trunk/templates/admin/editposts.template
   plog/trunk/templates/admin/globalarticlecategories.template
   plog/trunk/templates/admin/resources.template
   plog/trunk/templates/admin/siteblogs.template
   plog/trunk/templates/admin/siteusers.template
Log:
Merge from LifeType 1.2 branch 6435:6437. (Manually patch these two commits to trunk, it is nightmare if we use svn to merge them, so many conflicts...

Modified: plog/trunk/class/action/admin/adminblogcategoriesaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminblogcategoriesaction.class.php	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/class/action/admin/adminblogcategoriesaction.class.php	2008-05-04 09:25:24 UTC (rev 6439)
@@ -15,7 +15,7 @@
 		
 		function perform()
 		{
-			$searchTerms = $this->_request->getValue( "searchTerms" );
+			$searchTerms = $this->_request->getFilteredValue( "searchTerms", new HtmlFilter());
 			$this->_view = new AdminBlogCategoriesListView( $this->_blogInfo, Array( "searchTerms" => $searchTerms ));
 			$this->setCommonData();
 		}

Modified: plog/trunk/class/action/admin/admineditcommentsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditcommentsaction.class.php	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/class/action/admin/admineditcommentsaction.class.php	2008-05-04 09:25:24 UTC (rev 6439)
@@ -35,7 +35,7 @@
         	$results["articleId"] = $this->_request->getValue( "articleId", null );
 			$results["showStatus"] = $this->_request->getValue( "showStatus" );
 			$results["showType"] = $this->_request->getValue( "showType", CommentsCommon::COMMENT_TYPE_ANY );	
-			$results["searchTerms"] = $this->_request->getFilteredvalue( "searchTerms", new HtmlSpecialCharsFilter());
+			$results["searchTerms"] = $this->_request->getFilteredValue( "searchTerms", new HtmlFilter());
 			
 			return( $results );
 		}

Modified: plog/trunk/class/action/admin/admineditfriendgroupsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditfriendgroupsaction.class.php	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/class/action/admin/admineditfriendgroupsaction.class.php	2008-05-04 09:25:24 UTC (rev 6439)
@@ -16,6 +16,7 @@
         function AdminEditFriendGroupsAction( $actionInfo, $request )
         {
         	$this->AdminAction( $actionInfo, $request );
+        	$this->_searchTerms = $this->_request->getFilteredValue( "searchTerms", new HtmlFilter());
         }
 
         /**
@@ -24,8 +25,7 @@
         function perform()
         {
             // get all the friend groups
-			$searchTerms = $this->_request->getValue( "searchTerms" );
-            $this->_view = new AdminFriendGroupsListView( $this->_blogInfo, Array( "searchTerms" => $searchTerms ) );
+            $this->_view = new AdminFriendGroupsListView( $this->_blogInfo, Array( "searchTerms" => $this->_searchTerms ) );
             $this->setCommonData();
 
             // better to return true if everything fine
@@ -50,8 +50,7 @@
 					$this->_view->setResult( $myFriendGroups );
 				}
 				else {
-					$searchTerms = $this->_request->getValue( "searchTerms" );
-					$this->_view = new AjaxViewRenderer( new AdminFriendGroupsListView( $this->_blogInfo, Array( "searchTerms" => $searchTerms )));
+					$this->_view = new AjaxViewRenderer( new AdminFriendGroupsListView( $this->_blogInfo, Array( "searchTerms" => $this->_searchTerms )));
 					$this->_view->setSuccess( true );
 					$this->_view->setResultObject( "friendgroups" );
 				}

Modified: plog/trunk/class/action/admin/admineditfriendsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditfriendsaction.class.php	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/class/action/admin/admineditfriendsaction.class.php	2008-05-04 09:25:24 UTC (rev 6439)
@@ -24,7 +24,7 @@
 
  			// get the id of the group we'd like to load
         	$this->_groupId = $this->_request->getValue( "showGroup" );
-			$this->_searchTerms    = $this->_request->getValue( "searchTerms" );
+			$this->_searchTerms    = $this->_request->getFilteredValue( "searchTerms", new HtmlFilter());
         }
 
         /**

Modified: plog/trunk/class/action/admin/admineditglobalarticlecategoriesaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditglobalarticlecategoriesaction.class.php	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/class/action/admin/admineditglobalarticlecategoriesaction.class.php	2008-05-04 09:25:24 UTC (rev 6439)
@@ -24,7 +24,7 @@
         {
         	$this->AdminAction( $actionInfo, $request );
 			
-			$this->_searchTerms = $this->_request->getValue( "searchTerms" );
+			$this->_searchTerms = $this->_request->getFilteredValue( "searchTerms", new HtmlFilter());
 			
 			$this->requireAdminPermission( "view_global_categories" );
         }

Modified: plog/trunk/class/action/admin/admineditinboxprivatemessagesaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditinboxprivatemessagesaction.class.php	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/class/action/admin/admineditinboxprivatemessagesaction.class.php	2008-05-04 09:25:24 UTC (rev 6439)
@@ -16,6 +16,7 @@
         function AdminEditInboxPrivateMessagesAction( $actionInfo, $request )
         {
         	$this->AdminAction( $actionInfo, $request );
+        	$this->_searchTerms = $this->_request->getFilteredValue( "searchTerms", new HtmlFilter());
         }
 
         /**
@@ -23,8 +24,7 @@
          */
         function perform()
         {
-			$searchTerms = $this->_request->getValue( "searchTerms" );
-            $this->_view = new AdminInboxPrivateMessagesListView( $this->_blogInfo, Array( "searchTerms" => $searchTerms ) );
+            $this->_view = new AdminInboxPrivateMessagesListView( $this->_blogInfo, Array( "searchTerms" => $this->_searchTerms ) );
             $this->setCommonData();
 
             // better to return true if everything fine
@@ -42,15 +42,14 @@
 					
 					$privateMessageBoxes = new PrivateMessageBoxes();
 		            $privateMessageInbox = $privateMessageBoxes->getPrivateMessageInboxFromUserId( $this->_userInfo->getId() );
-		            $inboxPrivateMessages = $privateMessageInbox->getPrivateMessagesFromBox( $searchTerms );
+		            $inboxPrivateMessages = $privateMessageInbox->getPrivateMessagesFromBox( $this->_searchTerms );
 					
 					$this->_view = new AdminAjaxView( $this->_blogInfo );
 					$this->_view->setSuccess( true );
 					$this->_view->setResult( $inboxPrivateMessages );															
 				}
 				else {
-					$searchTerms = $this->_request->getValue( "searchTerms" );				
-					$this->_view = new AjaxViewRenderer( new AdminInboxPrivateMessagesListView( $this->_blogInfo, Array( "searchTerms" => $searchTerms )));
+					$this->_view = new AjaxViewRenderer( new AdminInboxPrivateMessagesListView( $this->_blogInfo, Array( "searchTerms" => $this->_searchTerms )));
 					$this->_view->setSuccess( true );
 					$this->_view->setResultObject( "privatemessages" );
 				}

Modified: plog/trunk/class/action/admin/admineditlinkcategoriesaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditlinkcategoriesaction.class.php	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/class/action/admin/admineditlinkcategoriesaction.class.php	2008-05-04 09:25:24 UTC (rev 6439)
@@ -19,6 +19,7 @@
         function AdminEditLinkCategoriesAction( $actionInfo, $request )
         {
         	$this->AdminAction( $actionInfo, $request );
+        	$this->_searchTerms = $this->_request->getFilteredValue( "searchTerms", new HtmlFilter());
         }
 
         /**
@@ -27,8 +28,7 @@
         function perform()
         {
             // get all the link categories
-			$searchTerms = $this->_request->getValue( "searchTerms" );
-            $this->_view = new AdminLinkCategoriesListView( $this->_blogInfo, Array( "searchTerms" => $searchTerms ));
+            $this->_view = new AdminLinkCategoriesListView( $this->_blogInfo, Array( "searchTerms" => $this->_searchTerms ));
             $this->setCommonData();
 
             // better to return true if everything fine
@@ -56,10 +56,8 @@
 					$this->_view->setSuccess( true );
 					$this->_view->setResult( $blogLinkCategories );															
 				}
-				else {
-					
-					$searchTerms = $this->_request->getValue( "searchTerms" );				
-					$this->_view = new AjaxViewRenderer( new AdminLinkCategoriesListView( $this->_blogInfo, Array( "searchTerms" => $searchTerms )));
+				else {				
+					$this->_view = new AjaxViewRenderer( new AdminLinkCategoriesListView( $this->_blogInfo, Array( "searchTerms" => $this->_searchTerms )));
 					$this->_view->setSuccess( true );
 					$this->_view->setResultObject( "linkcategories" );
 				}

Modified: plog/trunk/class/action/admin/admineditlinksaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditlinksaction.class.php	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/class/action/admin/admineditlinksaction.class.php	2008-05-04 09:25:24 UTC (rev 6439)
@@ -38,7 +38,7 @@
 			
 			// get some information from the request			
         	$this->_categoryId = $this->_request->getValue( "showCategory" );		
-			$this->_searchTerms = $this->_request->getValue( "searchTerms" );					
+			$this->_searchTerms = $this->_request->getFilteredValue( "searchTerms", new HtmlFilter());
         }
 
         /**

Modified: plog/trunk/class/action/admin/admineditoutboxprivatemessagesaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditoutboxprivatemessagesaction.class.php	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/class/action/admin/admineditoutboxprivatemessagesaction.class.php	2008-05-04 09:25:24 UTC (rev 6439)
@@ -16,6 +16,7 @@
         function AdminEditOutboxPrivateMessagesAction( $actionInfo, $request )
         {
         	$this->AdminAction( $actionInfo, $request );
+        	$this->_searchTerms = $this->_request->getFilteredValue( "searchTerms", new HtmlFilter());
         }
 
         /**
@@ -23,8 +24,7 @@
          */
         function perform()
         {
-			$searchTerms = $this->_request->getValue( "searchTerms" );
-            $this->_view = new AdminOutboxPrivateMessagesListView( $this->_blogInfo, Array( "searchTerms" => $searchTerms ) );
+            $this->_view = new AdminOutboxPrivateMessagesListView( $this->_blogInfo, Array( "searchTerms" => $this->_searchTerms ) );
             $this->setCommonData();
 
             // better to return true if everything fine
@@ -42,15 +42,14 @@
 					
 					$privateMessageBoxes = new PrivateMessageBoxes();
 		            $privateMessageOutbox = $privateMessageBoxes->getPrivateMessageOutboxFromUserId( $this->_userInfo->getId() );
-		            $outboxPrivateMessages = $privateMessageOutbox->getPrivateMessagesFromBox( $searchTerms );
+		            $outboxPrivateMessages = $privateMessageOutbox->getPrivateMessagesFromBox( $this->_searchTerms );
 					
 					$this->_view = new AdminAjaxView( $this->_blogInfo );
 					$this->_view->setSuccess( true );
 					$this->_view->setResult( $outboxPrivateMessages );															
 				}
 				else {
-					$searchTerms = $this->_request->getValue( "searchTerms" );				
-					$this->_view = new AjaxViewRenderer( new AdminOutboxPrivateMessagesListView( $this->_blogInfo, Array( "searchTerms" => $searchTerms )));
+					$this->_view = new AjaxViewRenderer( new AdminOutboxPrivateMessagesListView( $this->_blogInfo, Array( "searchTerms" => $this->_searchTerms )));
 					$this->_view->setSuccess( true );
 					$this->_view->setResultObject( "privatemessages" );
 				}

Modified: plog/trunk/class/action/admin/admineditpostsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditpostsaction.class.php	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/class/action/admin/admineditpostsaction.class.php	2008-05-04 09:25:24 UTC (rev 6439)
@@ -51,7 +51,9 @@
 				
 			if( !$intVal->validate( $this->_request->getValue( "showMonth" )))
 				$this->_request->setValue( "showMonth", -1 );
-				
+
+			$this->_searchTerms = $this->_request->getFilteredValue( "searchTerms", new HtmlFilter());
+
 			return( true );
 		}
 
@@ -66,7 +68,7 @@
 												          "showStatus" => $this->_request->getValue( "showStatus" ),
 														  "showUser" => $this->_request->getValue( "showUser" ),
 														  "showMonth" => $this->_request->getValue( "showMonth" ),
-														  "searchTerms" => $this->_request->getValue( "searchTerms" ),
+														  "searchTerms" => $this->_searchTerms,
 														  "showLocation" => $this->_request->getValue( "showLocation" )));
             $this->setCommonData();
 
@@ -86,7 +88,7 @@
 			            	"showStatus" => $this->_request->getValue( "showStatus" ),
 							"showUser" => $this->_request->getValue( "showUser" ),
 							"showMonth" => $this->_request->getValue( "showMonth" ),
-							"searchTerms" => $this->_request->getValue( "searchTerms" ),
+							"searchTerms" => $this->_searchTerms,
 							"showLocation" => $this->_request->getValue( "showLocation" )));
 				// inform it to load the data
 				$articlesListView->loadArticles();

Modified: plog/trunk/class/action/admin/adminresourcesaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminresourcesaction.class.php	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/class/action/admin/adminresourcesaction.class.php	2008-05-04 09:25:24 UTC (rev 6439)
@@ -54,7 +54,7 @@
         function perform()
         {
             $this->_albumId = $this->_request->getValue( "albumId", 0 );
-			$this->_searchTerms = $this->_request->getValue( "searchTerms" );
+			$this->_searchTerms = $this->_request->getFilteredValue( "searchTerms", new HtmlFilter());
 			$this->_locationId = $this->_request->getValue( "showLocation", -1 );
 
 			$errorMessage = $this->checkFolders();

Modified: plog/trunk/class/view/admin/adminarticlecategorieslistview.class.php
===================================================================
--- plog/trunk/class/view/admin/adminarticlecategorieslistview.class.php	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/class/view/admin/adminarticlecategorieslistview.class.php	2008-05-04 09:25:24 UTC (rev 6439)
@@ -39,7 +39,7 @@
 			// get the page too
 			$this->_page = $this->getCurrentPageFromRequest();
 			
-			$this->_searchTerms = HttpVars::getRequestValue( "searchTerms" );			
+			$this->_searchTerms = $this->_request->getFilteredValue( "searchTerms", new HtmlFilter());
 						
 			// retrieve the categories in an paged fashion
 			$totalCategories = $categories->getBlogNumCategories( $this->_blogInfo->getId(), true, $this->_searchTerms );

Modified: plog/trunk/class/view/admin/adminsiteblogslistview.class.php
===================================================================
--- plog/trunk/class/view/admin/adminsiteblogslistview.class.php	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/class/view/admin/adminsiteblogslistview.class.php	2008-05-04 09:25:24 UTC (rev 6439)
@@ -58,7 +58,7 @@
             // we need to get all the blogs
 			// get the data itself
 			$this->_status = $this->getStatusFromRequest();
-			$this->_searchTerms = HttpVars::getRequestValue( "searchTerms" );
+			$this->_searchTerms = $this->_request->getFilteredValue( "searchTerms", new HtmlFilter());
 			$blogs = new Blogs();
             $siteBlogs = $blogs->getAllBlogs( $this->_status, ALL_BLOG_CATEGORIES, $this->_searchTerms, $this->_page, DEFAULT_ITEMS_PER_PAGE );
 //			print("search terms = ".$this->_searchTerms);

Modified: plog/trunk/class/view/admin/adminsiteuserslistview.class.php
===================================================================
--- plog/trunk/class/view/admin/adminsiteuserslistview.class.php	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/class/view/admin/adminsiteuserslistview.class.php	2008-05-04 09:25:24 UTC (rev 6439)
@@ -67,7 +67,7 @@
 			// get the current page
 			$this->_page = $this->getCurrentPageFromRequest();
 			$this->_status = $this->getStatusFromRequest();
-			$this->_searchTerms = HttpVars::getRequestValue( "searchTerms");
+			$this->_searchTerms = $this->_request->getFilteredValue( "searchTerms", new HtmlFilter());
 			
         	// get the users of the blog
             $users = new Users();

Modified: plog/trunk/templates/admin/blogcategories.template
===================================================================
--- plog/trunk/templates/admin/blogcategories.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/blogcategories.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -12,7 +12,7 @@
    <div class="list_nav_option">
    <label for="search">{$locale->tr("search_terms")}</label>
    <br />
-   <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+   <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
    </div>   
    
    <div class="list_nav_option">

Modified: plog/trunk/templates/admin/chooser/siteblogschooser.template
===================================================================
--- plog/trunk/templates/admin/chooser/siteblogschooser.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/chooser/siteblogschooser.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -18,7 +18,7 @@
    <div class="list_nav_option">
    <label for="search">{$locale->tr("search_terms")}</label>
    <br />
-   <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+   <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
    </div>   
    
    <div class="list_nav_option">

Modified: plog/trunk/templates/admin/chooser/siteuserschooser.template
===================================================================
--- plog/trunk/templates/admin/chooser/siteuserschooser.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/chooser/siteuserschooser.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -26,7 +26,7 @@
    <div class="list_nav_option">
    <label for="search">{$locale->tr("search_terms")}</label>
    <br />
-   <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+   <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
    </div>   
    
    <div class="list_nav_option">

Modified: plog/trunk/templates/admin/editarticlecategories.template
===================================================================
--- plog/trunk/templates/admin/editarticlecategories.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/editarticlecategories.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -11,7 +11,7 @@
    <div class="list_nav_option">
    <label for="search">{$locale->tr("search_terms")}</label>
    <br />
-   <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+   <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
    </div>   
    
    <div class="list_nav_option">

Modified: plog/trunk/templates/admin/editcomments.template
===================================================================
--- plog/trunk/templates/admin/editcomments.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/editcomments.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -32,7 +32,7 @@
                     <div class="list_nav_option">
                     <label for="search">{$locale->tr("search_terms")}</label>
                     <br />
-                    <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+                    <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
                     </div>					
 					
                     <div class="list_nav_option">

Modified: plog/trunk/templates/admin/editfriendgroups.template
===================================================================
--- plog/trunk/templates/admin/editfriendgroups.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/editfriendgroups.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -9,7 +9,7 @@
    <div class="list_nav_option">
    <label for="search">{$locale->tr("search_terms")}</label>
    <br />
-   <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+   <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
    </div>
    <div class="list_nav_option">
     <br />

Modified: plog/trunk/templates/admin/editfriends.template
===================================================================
--- plog/trunk/templates/admin/editfriends.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/editfriends.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -19,7 +19,7 @@
   <div class="list_nav_option">
     <label for="search">{$locale->tr("search_terms")}</label>
     <br />
-    <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+    <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
   </div>
   <div class="list_nav_option">
     <br />

Modified: plog/trunk/templates/admin/editinboxprivatemessages.template
===================================================================
--- plog/trunk/templates/admin/editinboxprivatemessages.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/editinboxprivatemessages.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -12,7 +12,7 @@
    <div class="list_nav_option">
    <label for="search">{$locale->tr("search_terms")}</label>
    <br />
-   <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+   <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
    </div>
 
    <div class="list_nav_option">

Modified: plog/trunk/templates/admin/editlinkcategories.template
===================================================================
--- plog/trunk/templates/admin/editlinkcategories.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/editlinkcategories.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -9,7 +9,7 @@
    <div class="list_nav_option">
    <label for="search">{$locale->tr("search_terms")}</label>
    <br />
-   <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+   <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
    </div>   
    <div class="list_nav_option">
     <br />

Modified: plog/trunk/templates/admin/editlinks.template
===================================================================
--- plog/trunk/templates/admin/editlinks.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/editlinks.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -22,7 +22,7 @@
    <div class="list_nav_option">
        <label for="search">{$locale->tr("search_terms")}</label>
        <br />
-       <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+       <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
    </div>
       
    <div class="list_nav_option">

Modified: plog/trunk/templates/admin/editoutboxprivatemessages.template
===================================================================
--- plog/trunk/templates/admin/editoutboxprivatemessages.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/editoutboxprivatemessages.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -12,7 +12,7 @@
    <div class="list_nav_option">
    <label for="search">{$locale->tr("search_terms")}</label>
    <br />
-   <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+   <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
    </div>
 
    <div class="list_nav_option">

Modified: plog/trunk/templates/admin/editposts.template
===================================================================
--- plog/trunk/templates/admin/editposts.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/editposts.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -81,7 +81,7 @@
                     <div class="list_nav_option">
                     <label for="search">{$locale->tr("search_terms")}</label>
                     <br />
-                    <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+                    <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
                     </div>
 
                     <div class="list_nav_option">

Modified: plog/trunk/templates/admin/globalarticlecategories.template
===================================================================
--- plog/trunk/templates/admin/globalarticlecategories.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/globalarticlecategories.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -13,7 +13,7 @@
    <div class="list_nav_option">
    <label for="search">{$locale->tr("search_terms")}</label>
    <br />
-   <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+   <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
    </div>   
    
    <div class="list_nav_option">

Modified: plog/trunk/templates/admin/resources.template
===================================================================
--- plog/trunk/templates/admin/resources.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/resources.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -39,7 +39,7 @@
    <div class="list_nav_option">
    <label for="search">{$locale->tr("search_terms")}</label>
    <br />
-   <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+   <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
    </div>
    <div class="list_nav_option">
     <br />

Modified: plog/trunk/templates/admin/siteblogs.template
===================================================================
--- plog/trunk/templates/admin/siteblogs.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/siteblogs.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -20,7 +20,7 @@
    <div class="list_nav_option">
    <label for="search">{$locale->tr("search_terms")}</label>
    <br />
-   <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+   <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
    </div>   
    
    <div class="list_nav_option">

Modified: plog/trunk/templates/admin/siteusers.template
===================================================================
--- plog/trunk/templates/admin/siteusers.template	2008-05-04 08:45:51 UTC (rev 6438)
+++ plog/trunk/templates/admin/siteusers.template	2008-05-04 09:25:24 UTC (rev 6439)
@@ -30,7 +30,7 @@
    <div class="list_nav_option">
    <label for="search">{$locale->tr("search_terms")}</label>
    <br />
-   <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
+   <input type="text" name="searchTerms" value="{$searchTerms|escape:"html"}" size="15" id="search" />
    </div>   
    
    <div class="list_nav_option">



More information about the pLog-svn mailing list