diff options
author | Felipe Figueroa <amenadiel@gmail.com> | 2018-03-15 02:02:10 +0300 |
---|---|---|
committer | Felipe Figueroa <amenadiel@gmail.com> | 2018-03-15 02:02:10 +0300 |
commit | 49270fe791619ba2d0dbf666cfa66ca80457dd44 (patch) | |
tree | 916738a0243836b5cfba76c470b083bd4e344ed1 /src/controllers/SqlController.php | |
parent | c2a9af3868f88a47497b88b0dbd3ac4994e01670 (diff) |
add package tag to controllers
Diffstat (limited to 'src/controllers/SqlController.php')
-rw-r--r-- | src/controllers/SqlController.php | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/src/controllers/SqlController.php b/src/controllers/SqlController.php index 5c8a5316..6676552a 100644 --- a/src/controllers/SqlController.php +++ b/src/controllers/SqlController.php @@ -8,13 +8,14 @@ namespace PHPPgAdmin\Controller; /** * Base controller class. + * * @package PHPPgAdmin */ class SqlController extends BaseController { public $controller_name = 'SqlController'; - public $query = ''; - public $subject = ''; + public $query = ''; + public $subject = ''; public $start_time; public $duration; @@ -34,11 +35,11 @@ class SqlController extends BaseController if (isset($_REQUEST['subject']) && 'history' == $_REQUEST['subject']) { // Or maybe we came from the history popup $_SESSION['sqlquery'] = $_SESSION['history'][$_REQUEST['server']][$_REQUEST['database']][$_GET['queryid']]['query']; - $this->query = $_SESSION['sqlquery']; + $this->query = $_SESSION['sqlquery']; } elseif (isset($_POST['query'])) { // Or maybe we came from an sql form $_SESSION['sqlquery'] = $_POST['query']; - $this->query = $_SESSION['sqlquery']; + $this->query = $_SESSION['sqlquery']; } else { echo 'could not find the query!!'; } @@ -89,9 +90,9 @@ class SqlController extends BaseController public function doDefault() { - $conf = $this->conf; - $this->misc = $this->misc; - $lang = $this->lang; + $conf = $this->conf; + $this->misc = $this->misc; + $lang = $this->lang; $_connection = $this->misc->getConnection(); try { @@ -102,8 +103,8 @@ class SqlController extends BaseController return $this->execute_query(); } catch (\PHPPgAdmin\ADOdbException $e) { - $message = $e->getMessage(); - $trace = $e->getTraceAsString(); + $message = $e->getMessage(); + $trace = $e->getTraceAsString(); $lastError = $_connection->getLastError(); $this->prtrace(['message' => $message, 'trace' => $trace, 'lastError' => $lastError]); @@ -113,10 +114,10 @@ class SqlController extends BaseController private function execute_script() { - $conf = $this->conf; - $misc = $this->misc; - $lang = $this->lang; - $data = $this->misc->getDatabaseAccessor(); + $conf = $this->conf; + $misc = $this->misc; + $lang = $this->lang; + $data = $this->misc->getDatabaseAccessor(); $_connection = $this->misc->getConnection(); /** @@ -139,7 +140,7 @@ class SqlController extends BaseController echo '<th class="data">', $misc->printVal(pg_fieldname($rs, $k)), '</th>'; } - $i = 0; + $i = 0; $row = pg_fetch_row($rs); while (false !== $row) { $id = (0 == ($i % 2) ? '1' : '2'); @@ -188,7 +189,7 @@ class SqlController extends BaseController $rs = $data->conn->Execute($this->query); - echo '<form method="post" id="sqlform" action="' . $_SERVER['REQUEST_URI'] . '">'; + echo '<form method="post" id="sqlform" action="'.$_SERVER['REQUEST_URI'].'">'; echo '<textarea width="90%" name="query" id="query" rows="5" cols="100" resizable="true">'; echo htmlspecialchars($this->query); @@ -245,7 +246,7 @@ class SqlController extends BaseController // May as well try to time the query if (null !== $this->start_time) { list($usec, $sec) = explode(' ', microtime()); - $end_time = ((float) $usec + (float) $sec); + $end_time = ((float) $usec + (float) $sec); // Get duration in milliseconds, round to 3dp's $this->duration = number_format(($end_time - $this->start_time) * 1000, 3); } @@ -261,8 +262,8 @@ class SqlController extends BaseController echo "<p>{$lang['strsqlexecuted']}</p>\n"; $navlinks = []; - $fields = [ - 'server' => $_REQUEST['server'], + $fields = [ + 'server' => $_REQUEST['server'], 'database' => $_REQUEST['database'], ]; @@ -272,11 +273,11 @@ class SqlController extends BaseController // Return if (isset($_REQUEST['return'])) { - $urlvars = $this->misc->getSubjectParams($_REQUEST['return']); + $urlvars = $this->misc->getSubjectParams($_REQUEST['return']); $navlinks['back'] = [ - 'attr' => [ + 'attr' => [ 'href' => [ - 'url' => $urlvars['url'], + 'url' => $urlvars['url'], 'urlvars' => $urlvars['params'], ], ], @@ -286,9 +287,9 @@ class SqlController extends BaseController // Edit $navlinks['alter'] = [ - 'attr' => [ + 'attr' => [ 'href' => [ - 'url' => 'database.php', + 'url' => 'database.php', 'urlvars' => array_merge($fields, [ 'action' => 'sql', ]), @@ -302,9 +303,9 @@ class SqlController extends BaseController // Report views don't set a schema, so we need to disable create view in that case if (isset($_REQUEST['schema'])) { $navlinks['createview'] = [ - 'attr' => [ + 'attr' => [ 'href' => [ - 'url' => 'views.php', + 'url' => 'views.php', 'urlvars' => array_merge($fields, [ 'action' => 'create', ]), @@ -319,9 +320,9 @@ class SqlController extends BaseController } $navlinks['download'] = [ - 'attr' => [ + 'attr' => [ 'href' => [ - 'url' => 'dataexport.php', + 'url' => 'dataexport.php', 'urlvars' => $fields, ], ], |