Index: trunk/admin/install.php
===================================================================
diff -u -N -r616 -r640
--- trunk/admin/install.php	(.../install.php)	(revision 616)
+++ trunk/admin/install.php	(.../install.php)	(revision 640)
@@ -284,8 +284,17 @@
         }
     	$general_error .= "In-portal's Image Upload directory must be writable (".$pathtoroot."kernel/images/).";
         //die();
-    }    
+    } 
     
+    if(!is_writable($pathtoroot."kernel/images/pending"))
+    {
+        if ($general_error != '') {
+        	$general_error .= '<br /><br />';
+        }
+    	$general_error .= "In-portal's Pending Image Upload directory must be writable (".$pathtoroot."kernel/images/pending).";
+        //die();
+    } 
+    
     if(!is_writable($pathtoroot."admin/backupdata/"))
     {
         if ($general_error != '') {
@@ -844,6 +853,8 @@
         if(is_array($file))
         {
             move_uploaded_file($file["tmp_name"],$pathtoroot."themes/tmp.lic");
+            @chmod($pathtoroot."themes/tmp.lic", 0666);
+
             $fp = @fopen($pathtoroot."themes/tmp.lic","rb");
             if($fp)
             {
Index: trunk/kernel/include/image.php
===================================================================
diff -u -N -r289 -r640
--- trunk/kernel/include/image.php	(.../image.php)	(revision 289)
+++ trunk/kernel/include/image.php	(.../image.php)	(revision 640)
@@ -224,6 +224,7 @@
               $result = copy($file["tmp_name"],$destination);
           if($result)
           {  
+          	 @chmod($Dest_Dir.$filename, 0666);
              return $Dest_Dir.$filename;
           }
           else
@@ -386,6 +387,7 @@
         {        
           $this->DeleteLocalImage();
           move_uploaded_file($file,$this->Get("LocalPath"));
+          @chmod($this->Get("LocalPath"), 0666);
         }
     }
 
Index: trunk/themes/default/misc/right_loggedin.tpl
===================================================================
diff -u -N -r616 -r640
--- trunk/themes/default/misc/right_loggedin.tpl	(.../right_loggedin.tpl)	(revision 616)
+++ trunk/themes/default/misc/right_loggedin.tpl	(.../right_loggedin.tpl)	(revision 640)
@@ -51,7 +51,7 @@
 								<td colspan="2" class="bgr-path"><img src="img/s.gif" width="1" height="1" alt="" /><br /></td>
 							</tr>
 							<tr>
-								<td colspan="2"><img src="img/s.gif" width="190" height="10" alt="" /><br /></td>
+								<td colspan="2"><img src="img/s.gif" width="200" height="10" alt="" /><br /></td>
 							</tr>
 			        <inp:mod_include _Template="menu_my_items" />
 						</table>
Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -N -r568 -r640
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 568)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 640)
@@ -993,6 +993,7 @@
        	
         if($rows>-1 && $offset>-1)
         {
+        	//print_pre(debug_backtrace());
 	       	//echo "<b>Executing SelectLimit</b> $sql <b>Offset:</b> $offset,$rows<br>\n";
             $result = $this->adodbConnection->SelectLimit($sql, $rows,$offset);
         }
@@ -1012,16 +1013,17 @@
         }
        
         $this->Clear();
-      
+
         if($this->debuglevel > 0)
         {
-        	 echo "This SQL: $sql<br>";
+        	 echo "This SQL: $sql<br><br>";
         	 if( ($this->debuglevel > 1) && ($result->RecordCount() > 0) )
         	 {
         	 	echo '<pre>'.print_r($result->GetRows(), true).'</pre>';
         	 	$result->MoveFirst();
         	 }
        	}
+		//echo "SQL: $sql<br><br>";
         LogEntry("SQL Loop Start\n");
         $count = 0;
  
@@ -1463,7 +1465,7 @@
 	}
 	
 	function GetPageLimitSQL()
-	{
+	{ 
 		global $objConfig;
 		$limit = NULL;
 		if($this->EnablePaging)
@@ -1493,13 +1495,13 @@
 	{
 		$Start = 0;
 		if($this->EnablePaging)
-		{
+		{ 
 			if($this->Page < 1) $this->Page = 1;
 			$PerPage = $this->GetPerPage();
 			$Start = ($this->Page - 1) * $PerPage;
 		}
 		else 
-		{
+		{ 
 			if((int)$this->MaxListCount == 0) $Start = -1;
 		}
 		return $Start;
@@ -1527,7 +1529,7 @@
 	   	  return parent::Query_Item($sql);
     	}
     	else 
-    	{
+    	{ 
     		//echo "page fix pre (class: ".get_class($this).")<br>";
     		$this->QueryItemCount = QueryCount($sql); // must get total item count before fixing
     		$this->FixInvalidPage($fix_method);
Index: trunk/themes/default/misc/right_login.tpl
===================================================================
diff -u -N -r616 -r640
--- trunk/themes/default/misc/right_login.tpl	(.../right_login.tpl)	(revision 616)
+++ trunk/themes/default/misc/right_login.tpl	(.../right_login.tpl)	(revision 640)
@@ -66,7 +66,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td><img src="img/s.gif" width="1" height="1" alt="" /><br /></td>
+		<td><img src="img/s.gif" width="218" height="1" alt="" /><br /></td>
 	</tr>
 </table>
 <!-- end login box -->
Index: trunk/kernel/parser.php
===================================================================
diff -u -N -r635 -r640
--- trunk/kernel/parser.php	(.../parser.php)	(revision 635)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 640)
@@ -3245,7 +3245,6 @@
         $ret = TableCount($table,$where,0);
         $CountVal[$item->Get("ItemType")]=(int)$ret;
     }
-      
     
     return $ret;
 }
Index: trunk/admin/templates/cat_search_element.tpl
===================================================================
diff -u -N -r13 -r640
--- trunk/admin/templates/cat_search_element.tpl	(.../cat_search_element.tpl)	(revision 13)
+++ trunk/admin/templates/cat_search_element.tpl	(.../cat_search_element.tpl)	(revision 640)
@@ -1,16 +1,16 @@
 <TD>
 <div inportaltype="categories">
-  <input type="checkbox"  value="<inp:cat_id/>" name="catlist[]">
-  <a href="javascript:AdminCatNav('<inp:cat_link_admin/>');"><img src="<inp:cat_admin_icon/>" border="0" align="absMiddle"></a><span class="priority"><sup><inp:cat_priority/></sup></span>
-  <a class="link" href="javascript:AdminCatNav('<inp:cat_link_admin/>');"><b><inp:cat_name/></b></a>:
-  <span class="cat_pick"><inp:cat_pick/></SPAN> 
-  <span class="cat_new"><inp:cat_new/></SPAN> 
-  <span class="cats_stats">(Cats <inp:subcat_count/> / Links 2)</span>
+  <input type="checkbox"  value="<inp:cat _field="id"/>" name="catlist[]">
+  <a href="javascript:AdminCatNav('<inp:cat _field="link_admin"/>');"><img src="<inp:cat _field="admin_icon"/>" border="0" align="absMiddle"></a><span class="priority"><sup><inp:cat _field="priority"/></sup></span>
+  <a class="link" href="javascript:AdminCatNav('<inp:cat _field="link_admin"/>');"><b><inp:cat _field="name"/></b></a>:
+  <span class="cat_pick"><inp:cat _field="pick"/></SPAN> 
+  <span class="cat_new"><inp:cat _field="new"/></SPAN> 
+  <span class="cats_stats">(Cats <inp:cat _Field="subcatcount" /> / Items <inp:cat _field="totalitems"/>)</span>
   <br>
   <div style="padding-left:3px">
-  <span class="cat_desc"><inp:cat_desc/></SPAN><br>
-  <span class="cats_stats">(Added 02-12-2002)</span><br>
-  <span class="cat_fullpath"><inp:cat_fullpath/></span>
+  <span class="cat_desc"><inp:cat _field="description"/></SPAN><br>
+  <span class="cats_stats">(Added <inp:cat _field="date" />)</span><br>
+  <span class="cat_fullpath"><inp:cat _field="fullpath"/></span>
   </div>
 </div>
 </TD>
Index: trunk/admin/config/importlang_progress.php
===================================================================
diff -u -N -r534 -r640
--- trunk/admin/config/importlang_progress.php	(.../importlang_progress.php)	(revision 534)
+++ trunk/admin/config/importlang_progress.php	(.../importlang_progress.php)	(revision 640)
@@ -109,6 +109,8 @@
        if((int)$file["size"]>0)
        {                        
           move_uploaded_file($file["tmp_name"],$pathtoroot.$admin."/export/".$file["name"]);
+          @chmod($pathtoroot.$admin."/export/".$file["name"], 0666);
+          
           $filename = $pathtoroot.$admin."/export/".$file["name"];
           if(file_exists($filename))
           {