Index: trunk/admin/install.php
===================================================================
diff -u -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 .= '
';
+ }
+ $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 -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 -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 @@

|
- 
|
+ 
|
Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -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 "Executing SelectLimit $sql Offset: $offset,$rows
\n";
$result = $this->adodbConnection->SelectLimit($sql, $rows,$offset);
}
@@ -1012,16 +1013,17 @@
}
$this->Clear();
-
+
if($this->debuglevel > 0)
{
- echo "This SQL: $sql
";
+ echo "This SQL: $sql
";
if( ($this->debuglevel > 1) && ($result->RecordCount() > 0) )
{
echo ''.print_r($result->GetRows(), true).'
';
$result->MoveFirst();
}
}
+ //echo "SQL: $sql
";
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).")
";
$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 -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 @@
- 
|
+ 
|
Index: trunk/kernel/parser.php
===================================================================
diff -u -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 -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 @@
-
- 
- :
-
-
- (Cats / Links 2)
+ " name="catlist[]">
+ ');">  " border="0" align="absMiddle">
+ ');"> :
+
+
+ (Cats / Items )
-
- (Added 02-12-2002)
-
+
+ (Added )
+
|
Index: trunk/admin/config/importlang_progress.php
===================================================================
diff -u -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))
{