Index: trunk/kernel/parser.php =================================================================== diff -u -r979 -r988 --- trunk/kernel/parser.php (.../parser.php) (revision 979) +++ trunk/kernel/parser.php (.../parser.php) (revision 988) @@ -521,7 +521,7 @@ $selected = ($val == $value)? "SELECTED" : ""; - if(strlen($attribs["_langtext"])) + if( getArrayValue($attribs,'_langtext') ) { $txt = language($attribs["_langtext"]); } @@ -843,15 +843,15 @@ { $ret .= "&Confirm=".$attribs["_confirmtemplate"]; } - if(strlen($Dest)) + /*if(strlen($Dest)) { $ret .= "&DestTemplate=$Dest"; } else - { + {*/ if(strlen($attribs["_confirmtemplate"])>0) $ret .="&DestTemplate=".$var_list["t"]; - } + //} if(strlen($attribs["_errortemplate"])>0) { @@ -2118,7 +2118,7 @@ } else $hasperm = TRUE; - if(!$hasperm && strlen($attribs["_deniedtemplate"])>0) + if(!$hasperm && getArrayValue($attribs,'_deniedtemplate') ) { $hasperm = TRUE; $attribs["_template"]=$attribs["_deniedtemplate"]; @@ -2419,7 +2419,7 @@ { global $var_list, $var_list_update, $m_var_list_update, $objCatList, $objSession; - $cat = $attribs["_category"]; + $cat = getArrayValue($attribs,'_category'); if(strlen($cat)) { if($cat=="NULL") @@ -2472,37 +2472,42 @@ } } - if ((int)$attribs["_matchallperms"]) + if ((int)getArrayValue($attribs,'_matchallperms')) { if (count($_AllPermsCount) != array_sum($_AllPermsCount)) $hasperm = FALSE; } - $text = $attribs["_text"]; - $plaintext = $attribs["_plaintext"]; - $denytext = $attribs["_denytext"]; - $plaindenytext = $attribs["_plaindenytext"]; - $nopermissions_status = (int)$attribs["_noperm"]? 1 : 0; + $text = getArrayValue($attribs,'_text'); + $plaintext = getArrayValue($attribs,'_plaintext'); + $denytext = getArrayValue($attribs,'_denytext'); + $plaindenytext = getArrayValue($attribs,'_plaindenytext'); + $nopermissions_status = (int)getArrayValue($attribs,'_noperm')? 1 : 0; - if(!strlen($denied)) - $denied = "login"; + //if(!strlen($denied)) $denied = "login"; - if (!$nopermissions_status) + if (!$nopermissions_status) { - if ($hasperm) - { - if (strlen($text) || strlen($plaintext)) - $ret = strlen($text)? language($text) : $plaintext; - else - $ret = "1"; - } - else - $ret = strlen($denytext)? language($denytext) : $plaindenytext; + if ($hasperm) + { + if (strlen($text) || strlen($plaintext)) + { + $ret = strlen($text)? language($text) : $plaintext; + } + else + { + $ret = "1"; + } + } + else + { + $ret = strlen($denytext)? language($denytext) : $plaindenytext; + } } elseif (!$hasperm) - { - $ret = "1"; - } + { + $ret = "1"; + } return $ret; } @@ -2648,7 +2653,7 @@ global $objConfig, $objCatList; $ado = &GetADODBConnection(); - + $ret=''; if(getArrayValue($attribs,'_local') && $objCatList->CurrentCategoryID() != 0) { $c =& $objCatList->GetItem($objCatList->CurrentCategoryID()); @@ -2659,23 +2664,18 @@ $sql .= "INNER JOIN ".GetTablePrefix()."CategoryItems ON (".GetTablePrefix()."Category.ResourceId=".GetTablePrefix()."CategoryItems.ItemResourceId) "; $sql .= "WHERE $catwhere LIMIT 1"; } - else + else + { $sql = "SELECT MAX(Modified) as ModDate FROM ".GetTablePrefix()."Category LIMIT 1"; + } $rs = $ado->Execute($sql); if($rs && ! $rs->EOF) { $mod = $rs->fields["ModDate"]; if($mod) { $part = strtolower(getArrayValue($attribs,'_part')); - if(strlen($part)) - { - $ret = ExtractDatePart($part,$mod); - } - else - { - $ret = LangDate($mod); - } + $ret = $part?ExtractDatePart($part,$mod):LangDate($mod); } } return $ret; @@ -2995,7 +2995,7 @@ global $objUsers, $objSession; $o = ""; - $userid = $attribs["_userid"]; + $userid = getArrayValue($attribs,'_userid'); if(!is_numeric($userid) || $userid=="0") $userid = $objSession->Get("PortalUserId");