Index: trunk/kernel/admin_templates/tree.tpl =================================================================== diff -u -N -r4603 -r4614 --- trunk/kernel/admin_templates/tree.tpl (.../tree.tpl) (revision 4603) +++ trunk/kernel/admin_templates/tree.tpl (.../tree.tpl) (revision 4614) @@ -59,7 +59,7 @@  ');">In-Portal v - Index: trunk/core/kernel/utility/http_query.php =================================================================== diff -u -N -r4576 -r4614 --- trunk/core/kernel/utility/http_query.php (.../http_query.php) (revision 4576) +++ trunk/core/kernel/utility/http_query.php (.../http_query.php) (revision 4614) @@ -749,6 +749,8 @@ } else { +// $value = iconv('UTF-8', 'windows-1257', $value); + if( get_magic_quotes_gpc() ) $value = stripslashes($value); if(!$this->Admin) $value = htmlspecialchars($value); $array[$key] = $value; @@ -757,7 +759,7 @@ } return $array; } - + /** * Returns all $_GET array excluding system parameters, that are not allowed to be passed through generated urls * Index: trunk/admin/category/permcacheupdate.php =================================================================== diff -u -N -r4446 -r4614 --- trunk/admin/category/permcacheupdate.php (.../permcacheupdate.php) (revision 4446) +++ trunk/admin/category/permcacheupdate.php (.../permcacheupdate.php) (revision 4614) @@ -174,11 +174,13 @@ // $this->SetStack($data); } } + function getDonePercent() { if(!$this->totalCats)return 0; return intval( round( $this->doneCats / $this->totalCats * 100 ) ); } + function getData() { $sql='SELECT data FROM '.$this->table; @@ -193,6 +195,7 @@ $this->Stack = & new clsRecursionStack(); } + function setData() { $tmp=Array @@ -207,9 +210,12 @@ $sql='INSERT '.$this->table.' SET data="'.addslashes(serialize($tmp)).'"'; $this->conn->Execute($sql); } + function initData() { - $sql='CREATE TABLE '.$this->table.'(data LONGTEXT)'; + $this->clearData(); // drop table before starting anyway + + $sql = 'CREATE TABLE '.$this->table.'(data LONGTEXT)'; $this->conn->Execute($sql); $sql='SELECT COUNT(*) as count FROM '.GetTablePrefix().'Category'; @@ -218,6 +224,7 @@ $this->doneCats=0; } + function clearData() { $sql='DROP TABLE IF EXISTS '.$this->table; @@ -277,6 +284,7 @@ return $this->Stack->Count() > 0; } } + function UpdateCachedPath(&$data) { $fields_hash = Array( 'CachedNavbar' => implode('>', $data['title']), @@ -347,10 +355,11 @@ function QueryPermissions(&$data) { + // don't search for section "view" permissions here :) $sql = sprintf('SELECT ipc.PermissionConfigId, ip.GroupId, ip.PermissionValue FROM '.GetTablePrefix().'Permissions AS ip LEFT JOIN '.GetTablePrefix().'PermissionConfig AS ipc ON ipc.PermissionName = ip.Permission - WHERE CatId = %s AND Permission LIKE "%%.VIEW"', + WHERE (CatId = %s) AND (Permission LIKE "%%.VIEW") AND (ipc.PermissionConfigId IS NOT NULL)', $data['current_id']); $rs = $this->conn->Execute($sql);