diff options
| author | Amenadiel <amenadiel@gmail.com> | 2017-07-20 23:46:03 +0300 |
|---|---|---|
| committer | Amenadiel <amenadiel@gmail.com> | 2017-07-20 23:46:03 +0300 |
| commit | eeb2a6d58cfd43fe5bd5481863f71acb949f8aa8 (patch) | |
| tree | 003e5199d62cdc9faa0f46828b3d5524a06c8aee | |
| parent | e5f0db5f5ee809ec8e3490b211b3c1bdb387779a (diff) | |
| parent | 1efdd1538da93cd4db0013e396126a2fa6bdd744 (diff) | |
Merge branch 'release/6.0.0-beta.12'v6.0.0-beta.12
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | composer.lock | 4 | ||||
| -rw-r--r-- | index.php | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | temp/twigcache/.gitignore | 0 |
7 files changed, 20 insertions, 12 deletions
@@ -9,4 +9,6 @@ config.inc.php.matching config.inc.php.pstn_db vendor -npm-debug.log
\ No newline at end of file +npm-debug.log +logs +info.php
\ No newline at end of file @@ -2,7 +2,7 @@ VERSION = $(shell cat composer.json | sed -n 's/.*"version": "\([^"]*\)",/\1/p') SHELL = /usr/bin/env bash -default: clean fix-permissions install +default: clean fix-permissions update .PHONY: default fix-permissions install version: @@ -28,7 +28,7 @@ update: git clean -fd git checkout . git pull - composer install + composer install --no-dev update_version: @echo "Current version is " ${VERSION} @@ -1,7 +1,8 @@ -# phppgadmin -the premier web-based administration tool for postgresql +# phpPgAdmin6 -This is a fork of [phpPgAdmin](https://github.com/phppgadmin/phppgadmin) that implements **a lot of changes** +PHP Based administration tool for PostgreSQL. Runs on PHP 7+ and Postgres 9.6+. + +This is a fork of [phppgadmin](https://github.com/phppgadmin/phppgadmin) that implements **a lot of changes** ### v6.0.0-alpha1 diff --git a/composer.json b/composer.json index 98b51337..476b1029 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { - "name": "huasofoundries/phppgadmin", - "version": "6.0.0-beta.11", + "name": "HuasoFoundries/phpPgAdmin6", + "version": "6.0.0-beta.12", "description": "Like phpmyadmin but for postgres", "type": "project", "license": "MIT", diff --git a/composer.lock b/composer.lock index 9b36b2df..ac07e22d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "fb869ccfc9b44dcec7bf5f9bb537e31b", - "content-hash": "8e245fb7a6a49233a45a7f0b709e3f4e", + "hash": "a7338c59308e8ea1f1d3e00013d54856", + "content-hash": "ed8852c20c539f96a24449caefc12d1c", "packages": [ { "name": "adodb/adodb-php", @@ -65,7 +65,12 @@ $app->post('/redirect[/{subject}]', function ($request, $response, $args) use ($ $app->get('/', function ($request, $response, $args) use ($msg) { $uri = $request->getUri(); - list($base, $query_string) = explode('?', $uri->getQuery()); + $base_and_qs = explode('?', $uri->getQuery()); + + $query_string = ''; + if (count($base_and_qs) >= 2) { + $query_string = '?' . $base_and_qs[1]; + } $viewVars = $this->lang; $viewVars['appName'] = $this->get('settings')['appName']; @@ -79,7 +84,7 @@ $app->get('/', function ($request, $response, $args) use ($msg) { $viewVars['cols'] = $this->conf['left_width'] . ',*'; $template = 'iframe_view.twig'; } - $url = '/src/views/' . $subject . '.php?' . $query_string; + $url = '/src/views/' . $subject . '.php' . $query_string; $viewVars['url'] = $url; return $this->view->render($response, $template, $viewVars); diff --git a/temp/twigcache/.gitignore b/temp/twigcache/.gitignore index c96a04f0..c96a04f0 100644..100755 --- a/temp/twigcache/.gitignore +++ b/temp/twigcache/.gitignore |