From 8bfeb0cc52b482d008aa8419723d23c6a8da7016 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Tue, 8 Jul 2014 14:04:07 +0200 Subject: [PATCH 1/2] Translated using Weblate (Greek) Currently translated at 100.0% (2768 of 2768) --- po/el.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/el.po b/po/el.po index e8d87c171d..07c9e39829 100644 --- a/po/el.po +++ b/po/el.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-07-08 10:36+0200\n" +"PO-Revision-Date: 2014-07-08 14:04+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: Greek \n" "Language: el\n" @@ -1876,7 +1876,6 @@ msgid "Click to sort results by this column." msgstr "Πατήστε για ταξινόμηση των αποτελεσμάτων κατά αυτή τη στήλη." #: js/messages.php:345 -#, fuzzy #| msgid "" #| "Shift+Click to add this column to ORDER BY clause or to toggle ASC/DESC." #| "
- Control+CLick to remove column from ORDER BY clause" From 7089858ab0fccd844c22bf462b59c482602cdbaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 12 Jun 2014 10:06:20 +0200 Subject: [PATCH 2/2] Allow to use system phpseclib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- doc/vendors.rst | 3 ++- libraries/plugins/auth/AuthenticationCookie.class.php | 4 ++-- libraries/vendor_config.php | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/vendors.rst b/doc/vendors.rst index 94044f4d79..e24f23c606 100644 --- a/doc/vendors.rst +++ b/doc/vendors.rst @@ -31,4 +31,5 @@ libraries/php-gettext php-gettext library libraries/tcpdf tcpdf library, stripped down of not needed files - +libraries/phpseclib + portions of phpseclib library diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php index a3e05e6111..15c5414150 100644 --- a/libraries/plugins/auth/AuthenticationCookie.class.php +++ b/libraries/plugins/auth/AuthenticationCookie.class.php @@ -718,7 +718,7 @@ class AuthenticationCookie extends AuthenticationPlugin * if/then/else logic, however the include_once * call is costly */ - include_once "./libraries/phpseclib/Crypt/AES.php"; + include_once PHPSECLIB_INC_DIR . '/Crypt/AES.php'; $cipher = new Crypt_AES(CRYPT_AES_MODE_ECB); $cipher->setKey($secret); return base64_encode($cipher->encrypt($data)); @@ -750,7 +750,7 @@ class AuthenticationCookie extends AuthenticationPlugin $this->_blowfish_iv = base64_decode($_COOKIE['pma_mcrypt_iv'], true); } if (! function_exists('mcrypt_encrypt')) { - include_once "./libraries/phpseclib/Crypt/AES.php"; + include_once PHPSECLIB_INC_DIR . '/Crypt/AES.php'; $cipher = new Crypt_AES(CRYPT_AES_MODE_ECB); $cipher->setKey($secret); return $cipher->decrypt(base64_decode($encdata)); diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php index ea72b64746..0ba36b0b89 100644 --- a/libraries/vendor_config.php +++ b/libraries/vendor_config.php @@ -74,6 +74,11 @@ define('GETTEXT_INC', './libraries/php-gettext/gettext.inc'); */ define('TCPDF_INC', './libraries/tcpdf/tcpdf.php'); +/** + * Path to the phpseclib. Useful when you want to use system phpseclib. + */ +define('PHPSECLIB_INC_DIR', './libraries/phpseclib/'); + /** * Avoid referring to nonexistent files (causes warnings when open_basedir * is used)