@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | * Calls sniff once and then caches |
17 | 17 | */ |
18 | 18 | function details() { |
19 | - if(!$this->details) $this->details = $this->sniff(); |
|
19 | + if (!$this->details) $this->details = $this->sniff(); |
|
20 | 20 | return $this->details; |
21 | 21 | } |
22 | 22 | |
@@ -26,16 +26,16 @@ discard block |
||
26 | 26 | function sniff() { |
27 | 27 | global $snifferFileContent; |
28 | 28 | |
29 | - if(!$snifferFileContent) $snifferFileContent = file_get_contents(PACKAGE_ROOT . 'src/sspak-sniffer.php'); |
|
29 | + if (!$snifferFileContent) $snifferFileContent = file_get_contents(PACKAGE_ROOT.'src/sspak-sniffer.php'); |
|
30 | 30 | |
31 | - $remoteSniffer = '/tmp/sspak-sniffer-' . rand(100000,999999) . '.php'; |
|
31 | + $remoteSniffer = '/tmp/sspak-sniffer-'.rand(100000, 999999).'.php'; |
|
32 | 32 | $this->uploadContent($snifferFileContent, $remoteSniffer); |
33 | 33 | |
34 | 34 | $result = $this->execSudo(array('/usr/bin/env', 'php', $remoteSniffer, $this->path)); |
35 | 35 | $this->unlink($remoteSniffer); |
36 | 36 | |
37 | 37 | $parsed = @unserialize($result['output']); |
38 | - if(!$parsed) throw new Exception("Could not parse sspak-sniffer content:\n{$result['output']}\n"); |
|
38 | + if (!$parsed) throw new Exception("Could not parse sspak-sniffer content:\n{$result['output']}\n"); |
|
39 | 39 | return $parsed; |
40 | 40 | } |
41 | 41 | |
@@ -44,19 +44,19 @@ discard block |
||
44 | 44 | * @param string $command Shell command, either a fully escaped string or an array |
45 | 45 | */ |
46 | 46 | function execSudo($command) { |
47 | - if($this->sudo) { |
|
48 | - if(is_array($command)) $command = $this->executor->commandArrayToString($command); |
|
47 | + if ($this->sudo) { |
|
48 | + if (is_array($command)) $command = $this->executor->commandArrayToString($command); |
|
49 | 49 | // Try running sudo without asking for a password |
50 | 50 | try { |
51 | - return $this->exec("sudo -n -u " . escapeshellarg($this->sudo) . " " . $command); |
|
51 | + return $this->exec("sudo -n -u ".escapeshellarg($this->sudo)." ".$command); |
|
52 | 52 | |
53 | 53 | // Otherwise capture SUDO password ourselves and pass it in through STDIN |
54 | - } catch(Exception $e) { |
|
54 | + } catch (Exception $e) { |
|
55 | 55 | echo "[sspak sudo] Enter your password: "; |
56 | - $stdin = fopen( 'php://stdin', 'r'); |
|
56 | + $stdin = fopen('php://stdin', 'r'); |
|
57 | 57 | $password = fgets($stdin); |
58 | 58 | |
59 | - return $this->exec("sudo -S -p '' -u " . escapeshellarg($this->sudo) . " " . $command, array('inputContent' => $password)); |
|
59 | + return $this->exec("sudo -S -p '' -u ".escapeshellarg($this->sudo)." ".$command, array('inputContent' => $password)); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | } else { |
@@ -75,8 +75,8 @@ discard block |
||
75 | 75 | |
76 | 76 | // Check the database type |
77 | 77 | $dbFunction = 'putdb_'.$details['db_type']; |
78 | - if(!method_exists($this,$dbFunction)) { |
|
79 | - throw new Exception("Can't process database type '" . $details['db_type'] . "'"); |
|
78 | + if (!method_exists($this, $dbFunction)) { |
|
79 | + throw new Exception("Can't process database type '".$details['db_type']."'"); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | // Extract DB direct from sspak file |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | $hostArg = ''; |
96 | 96 | $portArg = ''; |
97 | 97 | if (!empty($conf['db_server']) && $conf['db_server'] != 'localhost') { |
98 | - if (strpos($conf['db_server'], ':')!==false) { |
|
98 | + if (strpos($conf['db_server'], ':') !== false) { |
|
99 | 99 | // Handle "server:port" format. |
100 | 100 | $server = explode(':', $conf['db_server'], 2); |
101 | 101 | $hostArg = escapeshellarg("--host=".$server[0]); |
@@ -104,9 +104,9 @@ discard block |
||
104 | 104 | $hostArg = escapeshellarg("--host=".$conf['db_server']); |
105 | 105 | } |
106 | 106 | } |
107 | - $dbCommand = "create database if not exists `" . addslashes($conf['db_database']) . "`"; |
|
108 | - if($dropdb) { |
|
109 | - $dbCommand = "drop database if exists `" . addslashes($conf['db_database']) . "`; " . $dbCommand; |
|
107 | + $dbCommand = "create database if not exists `".addslashes($conf['db_database'])."`"; |
|
108 | + if ($dropdb) { |
|
109 | + $dbCommand = "drop database if exists `".addslashes($conf['db_database'])."`; ".$dbCommand; |
|
110 | 110 | } |
111 | 111 | |
112 | 112 | $this->exec("echo '$dbCommand' | mysql $usernameArg $passwordArg $hostArg $portArg"); |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | |
127 | 127 | // Create database if needed |
128 | 128 | $result = $this->exec("echo \"select count(*) from pg_catalog.pg_database where datname = $databaseArg\" | $passwordArg psql $usernameArg $hostArg $databaseArg -qt"); |
129 | - if(trim($result['output']) == '0') { |
|
129 | + if (trim($result['output']) == '0') { |
|
130 | 130 | $this->exec("$passwordArg createdb $usernameArg $hostArg $databaseArg"); |
131 | 131 | } |
132 | 132 | |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | function putassets($sspak) { |
139 | 139 | $details = $this->details(); |
140 | 140 | $assetsPath = $details['assets_path']; |
141 | - $assetsOldPath = $assetsPath . '.old'; |
|
141 | + $assetsOldPath = $assetsPath.'.old'; |
|
142 | 142 | |
143 | 143 | $assetsParentArg = escapeshellarg(dirname($assetsPath)); |
144 | 144 | |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | */ |
165 | 165 | function putgit($details) { |
166 | 166 | $this->exec(array('git', 'clone', $details['remote'], $this->path)); |
167 | - $this->exec("cd $this->path && git checkout " . escapeshellarg($details['branch'])); |
|
167 | + $this->exec("cd $this->path && git checkout ".escapeshellarg($details['branch'])); |
|
168 | 168 | return true; |
169 | 169 | } |
170 | 170 | } |