Skip to content

Fix and updates #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
avshatalov48 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix and updates #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c0ab1a
Изменение подключения к БД: dbconn.php => .settings.php
avshatalov48 Dec 2, 2021
b6e8ad1
Обновление Adminer MySQL и плагинов
avshatalov48 Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions admin/uniplug_sqladminer_admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ function adminer_object() {
include_once $_SERVER['DOCUMENT_ROOT'] . "/bitrix/modules/uniplug.sqladminer/vendor/plugins/dump-json.php";
include_once $_SERVER['DOCUMENT_ROOT'] . "/bitrix/modules/uniplug.sqladminer/vendor/plugins/version-noverify.php";

include($_SERVER['DOCUMENT_ROOT'] . '/bitrix/php_interface/dbconn.php');
/** @var string $DBHost */
/** @var string $DBLogin */
/** @var string $DBName */
/** @var string $DBPassword */
$arIncSets = include($_SERVER['DOCUMENT_ROOT'] . '/bitrix/.settings.php');
$arSets = $arIncSets['connections']['value']['default'];
$DBHost = $arSets['host'];
$DBLogin = $arSets['login'];
$DBPassword = $arSets['password'];
$DBName = $arSets['database'];

global $APPLICATION;

Expand Down
6 changes: 3 additions & 3 deletions install/version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?
$arModuleVersion = array(
"VERSION" => "1.0.11",
"VERSION_DATE" => "2018-03-02 17:07:46"
"VERSION" => "1.0.13",
"VERSION_DATE" => "2021-12-02 09:35:00"
);
?>
?>
1,152 changes: 584 additions & 568 deletions vendor/adminer-mysql.php
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions vendor/plugins/dump-bz2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

/** Dump to Bzip2 format
* @link http://www.adminer.org/plugins/#use
* @link https://www.adminer.org/plugins/#use
* @uses bzopen(), tempnam("")
* @author Jakub Vrana, http://www.vrana.cz/
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
* @author Jakub Vrana, https://www.vrana.cz/
* @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
*/
class AdminerDumpBz2 {
/** @access protected */
Expand Down
8 changes: 4 additions & 4 deletions vendor/plugins/dump-date.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

/** Include current date and time in export filename
* @link http://www.adminer.org/plugins/#use
* @author Jakub Vrana, http://www.vrana.cz/
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
* @link https://www.adminer.org/plugins/#use
* @author Jakub Vrana, https://www.vrana.cz/
* @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
*/
class AdminerDumpDate {

Expand Down
10 changes: 5 additions & 5 deletions vendor/plugins/dump-json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?php

/** Dump to JSON format
* @link http://www.adminer.org/plugins/#use
* @author Jakub Vrana, http://www.vrana.cz/
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
* @link https://www.adminer.org/plugins/#use
* @author Jakub Vrana, https://www.vrana.cz/
* @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
*/
class AdminerDumpJson {
/** @access protected */
Expand All @@ -14,7 +14,7 @@ function dumpFormat() {
return array('json' => 'JSON');
}

function dumpTable($table, $style, $is_view = false) {
function dumpTable($table, $style, $is_view = 0) {
if ($_POST["format"] == "json") {
return true;
}
Expand Down
8 changes: 4 additions & 4 deletions vendor/plugins/dump-zip.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php

/** Dump to ZIP format
* @link http://www.adminer.org/plugins/#use
* @link https://www.adminer.org/plugins/#use
* @uses ZipArchive, tempnam("")
* @author Jakub Vrana, http://www.vrana.cz/
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
* @author Jakub Vrana, https://www.vrana.cz/
* @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
* @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
*/
class AdminerDumpZip {
/** @access protected */
Expand Down
Loading