Subversion Repositories ALCASAR

Rev

Rev 2775 | Rev 3037 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log

Rev 2775 Rev 2976
Line 55... Line 55...
55 
                        $this->_output[trim($ups_name).'@'.trim($ups)] = $temp;
 55 
                        $this->_output[trim($ups_name).'@'.trim($ups)] = $temp;
56 
                    }
 56 
                    }
57 
                }
 57 
                }
58 
            }
 58 
            }
59 
        } else { //use default if address and port not defined
 59 
        } else { //use default if address and port not defined
- 
 
 60 
            if (!defined('PSI_EMU_HOSTNAME')) {
60 
            CommonFunctions::executeProgram('upsc', '-l', $output, PSI_DEBUG);
 61 
                CommonFunctions::executeProgram('upsc', '-l', $output, PSI_DEBUG);
- 
 
 62 
            } else {
- 
 
 63 
                CommonFunctions::executeProgram('upsc', '-l '.PSI_EMU_HOSTNAME, $output, PSI_DEBUG);
- 
 
 64 
            }
61 
            $ups_names = preg_split("/\n/", $output, -1, PREG_SPLIT_NO_EMPTY);
 65 
            $ups_names = preg_split("/\n/", $output, -1, PREG_SPLIT_NO_EMPTY);
62 
            foreach ($ups_names as $ups_name) {
 66 
            foreach ($ups_names as $ups_name) {
63 
                CommonFunctions::executeProgram('upsc', trim($ups_name), $temp, PSI_DEBUG);
 67 
                CommonFunctions::executeProgram('upsc', trim($ups_name), $temp, PSI_DEBUG);
64 
                if (! empty($temp)) {
 68 
                if (! empty($temp)) {
65 
                    $this->_output[trim($ups_name)] = $temp;
 69 
                    $this->_output[trim($ups_name)] = $temp;