@@ -55,7 +55,7 @@ |
||
55 | 55 | $db = MDB2::singleton(DB_DSN); |
56 | 56 | $result = $db->query('SELECT * FROM module'); |
57 | 57 | if (PEAR::isError($result)) { |
58 | - die($result->getMessage() . $result->getUserInfo()); |
|
58 | + die($result->getMessage().$result->getUserInfo()); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | $this->assertTrue(is_array($this->handler->getModules(MDB2::singleton(DB_DSN)))); |
@@ -5,11 +5,11 @@ discard block |
||
5 | 5 | define('DB_PASS', $GLOBALS['db_password']); |
6 | 6 | define('DB_USER', $GLOBALS['db_username']); |
7 | 7 | define('DB_NAME', $GLOBALS['db_name']); |
8 | -define('DB_DSN', 'mysql://'.DB_USER.':'.DB_PASS.'@'.DB_HOST.'/' . DB_NAME); |
|
9 | -define('PATH_ROOT', dirname(__FILE__) . '/../../src/'); |
|
10 | -define('PATH_INCLUDE_CONFIG', PATH_ROOT . 'Intraface/config/'); |
|
11 | -define('PATH_INCLUDE_MODULE', PATH_ROOT . 'Intraface/modules/'); |
|
12 | -define('PATH_INCLUDE_SHARED', PATH_ROOT . 'Intraface/shared/'); |
|
8 | +define('DB_DSN', 'mysql://'.DB_USER.':'.DB_PASS.'@'.DB_HOST.'/'.DB_NAME); |
|
9 | +define('PATH_ROOT', dirname(__FILE__).'/../../src/'); |
|
10 | +define('PATH_INCLUDE_CONFIG', PATH_ROOT.'Intraface/config/'); |
|
11 | +define('PATH_INCLUDE_MODULE', PATH_ROOT.'Intraface/modules/'); |
|
12 | +define('PATH_INCLUDE_SHARED', PATH_ROOT.'Intraface/shared/'); |
|
13 | 13 | define('CONNECTION_INTERNET', 'ONLINE'); |
14 | 14 | |
15 | 15 | if (!file_exists($GLOBALS['path_upload'])) { |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | define('FILE_VIEWER', ''); |
22 | 22 | define('PATH_WWW', ''); |
23 | 23 | define('IMAGE_LIBRARY', 'GD'); |
24 | -define('XMLRPC_SERVER_URL', 'http://privatekeyshouldbereplaced:something@' . $GLOBALS['xmlrpc_server_url']); |
|
24 | +define('XMLRPC_SERVER_URL', 'http://privatekeyshouldbereplaced:something@'.$GLOBALS['xmlrpc_server_url']); |
|
25 | 25 | |
26 | 26 | if (!file_exists($GLOBALS['test_path_temp'])) { |
27 | 27 | mkdir($GLOBALS['test_path_temp']); |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | |
30 | 30 | // Directory to move files to temporary in tests |
31 | 31 | define('TEST_PATH_TEMP', $GLOBALS['test_path_temp']); |
32 | -require_once dirname(__FILE__) . '/../../vendor/autoload.php'; |
|
33 | -set_include_path(dirname(__FILE__) . '/' . PATH_SEPARATOR . dirname(__FILE__) . '/../../vendor/intraface/error/src/' . PATH_SEPARATOR . dirname(__FILE__) . '/../../vendor/troelskn/konstrukt/lib/' . PATH_SEPARATOR . PATH_ROOT. PATH_SEPARATOR . get_include_path()); |
|
32 | +require_once dirname(__FILE__).'/../../vendor/autoload.php'; |
|
33 | +set_include_path(dirname(__FILE__).'/'.PATH_SEPARATOR.dirname(__FILE__).'/../../vendor/intraface/error/src/'.PATH_SEPARATOR.dirname(__FILE__).'/../../vendor/troelskn/konstrukt/lib/'.PATH_SEPARATOR.PATH_ROOT.PATH_SEPARATOR.get_include_path()); |
|
34 | 34 | |
35 | 35 | $db = MDB2::singleton(DB_DSN); |
36 | 36 | $db->setOption('debug', 0); |
@@ -101,7 +101,7 @@ |
||
101 | 101 | |
102 | 102 | protected function getClient() |
103 | 103 | { |
104 | - require_once dirname(__FILE__) . '/../../../install/Install.php'; |
|
104 | + require_once dirname(__FILE__).'/../../../install/Install.php'; |
|
105 | 105 | |
106 | 106 | if (!defined('SERVER_STATUS')) { |
107 | 107 | define('SERVER_STATUS', 'TEST'); |
@@ -2,8 +2,8 @@ |
||
2 | 2 | require 'common.php'; |
3 | 3 | |
4 | 4 | $mail = new Zend_Mail_Storage_Imap(array('host' => 'xxx', |
5 | - 'user' => 'xxx', |
|
6 | - 'password' => 'xxx')); |
|
5 | + 'user' => 'xxx', |
|
6 | + 'password' => 'xxx')); |
|
7 | 7 | |
8 | 8 | $analyzer = new Intraface_modules_newsletter_BounceAnalyzer; |
9 | 9 |
@@ -65,7 +65,7 @@ |
||
65 | 65 | function isIdentifierUnique($identifier) |
66 | 66 | { |
67 | 67 | $this->db = & MDB2::singleton(DB_DSN); |
68 | - $res =& $this->db->query("SELECT id FROM intranet WHERE identifier='".$this->db->escape($identifier, 'string')."' AND id != " . $this->db->escape($this->id, 'integer')); |
|
68 | + $res = & $this->db->query("SELECT id FROM intranet WHERE identifier='".$this->db->escape($identifier, 'string')."' AND id != ".$this->db->escape($this->id, 'integer')); |
|
69 | 69 | if ($res->numRows() > 0) { |
70 | 70 | return false; |
71 | 71 | } |