Changeset ui,99

Show
Ignore:
Timestamp:
11/05/08 13:50:55 (2 years ago)
Author:
Aram Yeghikyan <eghikyan@gmail.com>
revision id:
eghikyan@gmail.com-20081105135055-ehaok28eptdy6ijj
branch-nick:
ui
Message:

crash fix

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • ui/classes/readers/vgreader.php

    r92 r99  
    2121    $this->validateUserInProps(); 
    2222 } 
    23  function getNameOfServer($serverId = FALSE){ 
     23 function getNameOfServer($serverId = FALSE, $flags = 0){ 
    2424    if(!$serverId){ 
    2525        return "unnamed"; 
    …… 
    3333    } 
    3434 } 
    35  function getNameOfDB($serverId = FALSE, $dbId = FALSE){ 
     35 function getNameOfDB($serverId = FALSE, $dbId = FALSE, $flags = 0){ 
    3636    if(!($serverId&&$dbId)){ 
    3737        return "unnamed"; 
    …… 
    4747    return "unnamed"; 
    4848 } 
    49  function getNameOfGroup($serverId = FALSE, $dbId = FALSE, $groupId = FALSE){ 
     49 function getNameOfGroup($serverId = FALSE, $dbId = FALSE, $groupId = FALSE, $flags = 0){ 
    5050    if(!($serverId&&$dbId&&$groupId)){ 
    5151        return "unnamed"; 
    …… 
    6565    return "unnamed"; 
    6666 } 
    67  function getNameOfChannel($serverId = FALSE, $dbId = FALSE, $groupId = FALSE, $channelId = FALSE){ 
     67 function getNameOfChannel($serverId = FALSE, $dbId = FALSE, $groupId = FALSE, $channelId = FALSE, $flags = 0){ 
    6868    if(!($serverId&&$dbId&&$groupId&&$channelId)){ 
    6969        return "unnamed"; 
    …… 
    236236 } 
    237237 
    238  function GetRawData(LOGGROUP $grp = NULL, $from = 0, $to = 0, DATAFilter $filter = NULL, &$filter_data = NULL) { 
     238 function GetRawData(LOGGROUP $grp = NULL, $from = 0, $to = 0, DATAFilter $filter = NULL, &$filter_data = NULL, $flags = 0) { 
    239239    $grp = $this->CheckGroup($grp); 
    240240    $gID = $grp->gid; 
    …… 
    251251    return $rdr->GetRawData($myGrp, $from, $to, $filter, $filter_data); 
    252252 } 
    253  function HaveData(LOGGROUP $grp = NULL, $from = 0, $to = 0){ 
    254     $grp = $this->CheckGroup($grp); 
     253 function HaveData(LOGGROUP $grp = NULL, $from = 0, $to = 0, $flags = 0){ 
     254    $grp = $this->CheckGroup($grp, $flags); 
    255255    $gID = $grp->gid; 
    256256    $maskManager = new MaskManagerClass($this->settings); 
    …… 
    263263    $req = new GROUPRequest($sngArray); 
    264264    $rdr = $req->CreateReader(); 
    265     $myGrp = $this->CreateGroup($sngArray); 
    266  
    267     return $rdr->HaveData($myGrp, $from, $to); 
     265    $myGrp = $this->CreateGroup($sngArray, $flags); 
     266 
     267    return $rdr->HaveData($myGrp, $from, $to, $flags = 0); 
    268268 } 
    269269 function GetDatabaseList($flags = 0){ 
    …… 
    277277            while(list($postfix, $value) = each($maskArray["postfixes"])){ 
    278278                $pathArray = $value["pathArray"]; 
    279                 if(!($this->serverExists($pathArray[0])&&$this->dBExists($pathArray[0], $pathArray[1])&&$this->groupExists($pathArray[0], $pathArray[1], $pathArray[2]))){ 
     279                if(!($this->serverExists($pathArray[0], $flags)&&$this->dBExists($pathArray[0], $pathArray[1], $flags)&&$this->groupExists($pathArray[0], $pathArray[1], $pathArray[2], $flags))){ 
    280280                    // problems with virtual group, something does not exists  
    281281                    //var_dump($this->serverExists($info["pathArray"][0])&&$this->dBExists($info["pathArray"][0], $info["pathArray"][1])&&$this->groupExists($info["pathArray"][0], $info["pathArray"][1], $info["pathArray"][2])); 
    …… 
    293293 } 
    294294 
    295  function GetRealGroupInfo(LOGGROUP $grp = NULL) { 
     295 function GetRealGroupInfo(LOGGROUP $grp = NULL, $flags = 0) { 
    296296    $grp = $this->CheckGroup($grp); 
    297297