Cleanup the indentation ... tabs and whitespace after the last pull request.

This commit is contained in:
markjcrane 2016-04-28 16:56:44 -06:00
parent f204f6189e
commit bc51cd7d1d
73 changed files with 242 additions and 244 deletions

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -26,7 +26,7 @@
//make sure that enum uses sofia internal in the enum.conf.xml file //make sure that enum uses sofia internal in the enum.conf.xml file
if ($domains_processed == 1) { if ($domains_processed == 1) {
$switch_conf_dir = $_SESSION['switch']['conf']['dir']; $switch_conf_dir = $_SESSION['switch']['conf']['dir'];
$file_contents = file_get_contents($switch_conf_dir."/autoload_configs/enum.conf.xml"); $file_contents = file_get_contents($switch_conf_dir."/autoload_configs/enum.conf.xml");
$file_contents_new = str_replace("service=\"E2U+SIP\" regex=\"sip:(.*)\" replace=\"sofia/\${use_profile}/\$1", "service=\"E2U+SIP\" regex=\"sip:(.*)\" replace=\"sofia/internal/\$1", $file_contents); $file_contents_new = str_replace("service=\"E2U+SIP\" regex=\"sip:(.*)\" replace=\"sofia/\${use_profile}/\$1", "service=\"E2U+SIP\" regex=\"sip:(.*)\" replace=\"sofia/internal/\$1", $file_contents);
if ($file_contents != $file_contents_new) { if ($file_contents != $file_contents_new) {

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -98,7 +98,7 @@ if ($domains_processed == 1) {
$array[$x]['default_setting_value'] = '0'; $array[$x]['default_setting_value'] = '0';
$array[$x]['default_setting_enabled'] = 'false'; $array[$x]['default_setting_enabled'] = 'false';
$array[$x]['default_setting_description'] = 'use non-default port if enabled and non-zero'; $array[$x]['default_setting_description'] = 'use non-default port if enabled and non-zero';
$x++; $x++;
$array[$x]['default_setting_category'] = 'email'; $array[$x]['default_setting_category'] = 'email';
$array[$x]['default_setting_subcategory'] = 'smtp_from'; $array[$x]['default_setting_subcategory'] = 'smtp_from';
$array[$x]['default_setting_name'] = 'var'; $array[$x]['default_setting_name'] = 'var';

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -49,7 +49,7 @@
$db_create = ''; $db_create = '';
$db_create_username = ''; $db_create_username = '';
$db_create_password = ''; $db_create_password = '';
$db = NULL; $db = NULL;
//detect the iso country code from the locale //detect the iso country code from the locale
//$locale = Locale::getDefault(); //$locale = Locale::getDefault();

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,17 +25,14 @@
*/ */
//check the permission //check the permission
if(defined('STDIN')) { if(defined('STDIN')) {
// $document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]); $document_root = str_replace("\\", "/", $_SERVER["PHP_SELF"]);
// preg_match("/^(.*)\/core\/.*$/", $document_root, $matches); preg_match("/^(.*)\/core\/.*$/", $document_root, $matches);
// $document_root = $matches[1]; $document_root = $matches[1];
// set_include_path($document_root); set_include_path($document_root);
$format = 'text'; //html, text
include "root.php";
require_once "resources/require.php"; require_once "resources/require.php";
$_SERVER["DOCUMENT_ROOT"] = $document_root;
// $_SERVER["DOCUMENT_ROOT"] = $document_root; $format = 'text'; //html, text
} }
else { else {
include "root.php"; include "root.php";

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -110,27 +110,27 @@ require_once "resources/require.php";
if (strlen(check_str($_REQUEST["domain_name"])) > 0) { if (strlen(check_str($_REQUEST["domain_name"])) > 0) {
$domain_name = check_str($_REQUEST["domain_name"]); $domain_name = check_str($_REQUEST["domain_name"]);
} }
if (isset($_SESSION["ldap"]["certpath"])) { if (isset($_SESSION["ldap"]["certpath"])) {
$s="LDAPTLS_CERT=" . $_SESSION["ldap"]["certpath"]["text"]; $s="LDAPTLS_CERT=" . $_SESSION["ldap"]["certpath"]["text"];
putenv($s); putenv($s);
} }
if (isset($_SESSION["ldap"]["certkey"])) { if (isset($_SESSION["ldap"]["certkey"])) {
$s="LDAPTLS_KEY=" . $_SESSION["ldap"]["certkey"]["text"]; $s="LDAPTLS_KEY=" . $_SESSION["ldap"]["certkey"]["text"];
putenv($s); putenv($s);
} }
$host=$_SESSION["ldap"]["server_host"]["text"]; $host=$_SESSION["ldap"]["server_host"]["text"];
$port=$_SESSION["ldap"]["server_port"]["numeric"]; $port=$_SESSION["ldap"]["server_port"]["numeric"];
$connect = ldap_connect($host) $connect = ldap_connect($host)
or die("Could not connect to the LDAP server."); or die("Could not connect to the LDAP server.");
//ldap_set_option($connect, LDAP_OPT_NETWORK_TIMEOUT, 10); //ldap_set_option($connect, LDAP_OPT_NETWORK_TIMEOUT, 10);
ldap_set_option($connect, LDAP_OPT_PROTOCOL_VERSION, 3); ldap_set_option($connect, LDAP_OPT_PROTOCOL_VERSION, 3);
//ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, 7); //ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, 7);
$bind_dn = $_SESSION["ldap"]["user_attribute"]["text"]."=".$username.",".$_SESSION["ldap"]["user_dn"]["text"]; $bind_dn = $_SESSION["ldap"]["user_attribute"]["text"]."=".$username.",".$_SESSION["ldap"]["user_dn"]["text"];
$bind_pw = $_REQUEST["password"]; $bind_pw = $_REQUEST["password"];
//Note: As of 4/16, the call below will fail randomly. Php debug reports ldap_bind //Note: As of 4/16, the call below will fail randomly. PHP debug reports ldap_bind
//called below with all arguments '*uninitialized*'. However, the debugger //called below with all arguments '*uninitialized*'. However, the debugger
//single-stepping just before the failing call correctly displays all the values. //single-stepping just before the failing call correctly displays all the values.
$bind = ldap_bind($connect, $bind_dn, $bind_pw ); $bind = ldap_bind($connect, $bind_dn, $bind_pw);
if ($bind) { if ($bind) {
$_SESSION['username'] = $username; $_SESSION['username'] = $username;
} }

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -460,7 +460,7 @@ if (!class_exists('schema')) {
//set the global variable //set the global variable
global $db, $upgrade_data_types, $text,$output_format; global $db, $upgrade_data_types, $text,$output_format;
if ($format=='') $format = $output_format; if ($format=='') $format = $output_format;
//get the db variables //get the db variables
$config = new config; $config = new config;

View File

@ -67,14 +67,15 @@ if (!class_exists('switch_settings')) {
} }
} }
{ //connect to event socket //connect to event socket
$esl = new event_socket; $esl = new event_socket;
$esl->connect($this->event_socket_ip_address, $this->event_socket_port, $this->event_socket_password); $esl->connect($this->event_socket_ip_address, $this->event_socket_port, $this->event_socket_password);
//run the api command //run the api command
$result = $esl->request('api global_getvar'); $result = $esl->request('api global_getvar');
} //close event socket
//close event socket
fclose($fp);
//set the result as a named array //set the result as a named array
$vars = array(); $vars = array();

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);

View File

@ -135,11 +135,11 @@
//prepare smtp server settings //prepare smtp server settings
// load default smtp settings // load default smtp settings
$smtp['host'] = (strlen($_SESSION['email']['smtp_host']['var'])?$_SESSION['email']['smtp_host']['var']:'127.0.0.1'); $smtp['host'] = (strlen($_SESSION['email']['smtp_host']['var'])?$_SESSION['email']['smtp_host']['var']:'127.0.0.1');
if (isset($_SESSION['email']['smtp_port'])) { if (isset($_SESSION['email']['smtp_port'])) {
$smtp['port'] = (int)$_SESSION['email']['smtp_port']['numeric']; $smtp['port'] = (int)$_SESSION['email']['smtp_port']['numeric'];
} else { } else {
$smtp['port'] = 0; $smtp['port'] = 0;
} }
$smtp['secure'] = $_SESSION['email']['smtp_secure']['var']; $smtp['secure'] = $_SESSION['email']['smtp_secure']['var'];
$smtp['auth'] = $_SESSION['email']['smtp_auth']['var']; $smtp['auth'] = $_SESSION['email']['smtp_auth']['var'];
$smtp['username'] = $_SESSION['email']['smtp_username']['var']; $smtp['username'] = $_SESSION['email']['smtp_username']['var'];
@ -178,17 +178,17 @@
include "resources/phpmailer/class.phpmailer.php"; include "resources/phpmailer/class.phpmailer.php";
include "resources/phpmailer/class.smtp.php"; include "resources/phpmailer/class.smtp.php";
$mail = new PHPMailer(); $mail = new PHPMailer();
if (isset($_SESSION['email']['method'])) { if (isset($_SESSION['email']['method'])) {
switch($_SESSION['email']['method']['text']) { switch($_SESSION['email']['method']['text']) {
case 'sendmail': $mail->IsSendmail(); break; case 'sendmail': $mail->IsSendmail(); break;
case 'qmail': $mail->IsQmail(); break; case 'qmail': $mail->IsQmail(); break;
case 'mail': $mail->IsMail(); break; case 'mail': $mail->IsMail(); break;
default: $mail->IsSMTP(); break; default: $mail->IsSMTP(); break;
} }
} else $mail->IsSMTP(); } else $mail->IsSMTP();
$mail->SMTPAuth = $smtp['auth']; $mail->SMTPAuth = $smtp['auth'];
$mail->Host = $smtp['host']; $mail->Host = $smtp['host'];
if ($smtp['port']!=0) $mail->Port=$smtp['port']; if ($smtp['port']!=0) $mail->Port=$smtp['port'];
if ($smtp['secure'] != '') { if ($smtp['secure'] != '') {
$mail->SMTPSecure = $smtp['secure']; $mail->SMTPSecure = $smtp['secure'];
} }

View File

@ -25,7 +25,7 @@
*/ */
// make sure the PATH_SEPARATOR is defined // make sure the PATH_SEPARATOR is defined
umask(2); umask(2);
if (!defined("PATH_SEPARATOR")) { if (!defined("PATH_SEPARATOR")) {
if (strpos($_ENV["OS"], "Win") !== false) { if (strpos($_ENV["OS"], "Win") !== false) {
define("PATH_SEPARATOR", ";"); define("PATH_SEPARATOR", ";");
@ -34,7 +34,7 @@
} }
} }
if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html'; if (!isset($output_format)) $output_format = (PHP_SAPI == 'cli') ? 'text' : 'html';
// make sure the document_root is set // make sure the document_root is set
$_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]); $_SERVER["SCRIPT_FILENAME"] = str_replace("\\", '/', $_SERVER["SCRIPT_FILENAME"]);