Use protected visibility

diff --git a/plugins/designs.php b/plugins/designs.php
index 4300dd400f44cd7a88d8da37d2b2b07eb9c19820..29e69d0714be882f9e8d57cce055b672ea91fc18 100644 (file)
--- a/plugins/designs.php
+++ b/plugins/designs.php
@@ -7,8 +7,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerDesigns {
-       /** @access protected */
-       var $designs;
+       protected $designs;
 
        /**
        * @param array URL in key, name in value

diff --git a/plugins/dump-bz2.php b/plugins/dump-bz2.php
index 19d20855674c5de2e623a50f9e39cdaa0f23ef3d..47351abcff431720b822077d73915796b2b66608 100644 (file)
--- a/plugins/dump-bz2.php
+++ b/plugins/dump-bz2.php
@@ -8,8 +8,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerDumpBz2 {
-       /** @access protected */
-       var $filename, $fp;
+       protected $filename, $fp;
 
        function dumpOutput() {
                if (!function_exists('bzopen')) {

diff --git a/plugins/dump-json.php b/plugins/dump-json.php
index 5923038512ad5c496ab66636faa9db763cafb193..a295e3dcd90660d8ba62faa94b59683786780f74 100644 (file)
--- a/plugins/dump-json.php
+++ b/plugins/dump-json.php
@@ -7,8 +7,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerDumpJson {
-       /** @access protected */
-       var $database = false;
+       protected $database = false;
 
        function dumpFormat() {
                return array('json' => 'JSON');

diff --git a/plugins/dump-php.php b/plugins/dump-php.php
index e0ef30fa7da549f5f09a565299e946b28b28e02c..c1e36a2d6342466b9c398c718d6a91ad295c4468 100644 (file)
--- a/plugins/dump-php.php
+++ b/plugins/dump-php.php
@@ -6,8 +6,8 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerDumpPhp {
-       var $output = array();
-       var $shutdown_callback = false;
+       protected $output = array();
+       protected $shutdown_callback = false;
 
        function dumpFormat() {
                return array('php' => 'PHP');

diff --git a/plugins/dump-xml.php b/plugins/dump-xml.php
index 1ab9be04e283c42ed27338b0aaa7f73941d905a2..b983cfad7adbb1480f60ef0dbe2f79d3350ccfd4 100644 (file)
--- a/plugins/dump-xml.php
+++ b/plugins/dump-xml.php
@@ -7,8 +7,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerDumpXml {
-       /** @access protected */
-       var $database = false;
+       protected $database = false;
 
        function dumpFormat() {
                return array('xml' => 'XML');

diff --git a/plugins/dump-zip.php b/plugins/dump-zip.php
index 0c573364decd5abac942a66e7a4f1481c82f93b0..ac450aa209dd49048a60a6441f60a28659cdf1f9 100644 (file)
--- a/plugins/dump-zip.php
+++ b/plugins/dump-zip.php
@@ -8,8 +8,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerDumpZip {
-       /** @access protected */
-       var $filename, $data;
+       protected $filename, $data;
 
        function dumpOutput() {
                if (!class_exists('ZipArchive')) {

diff --git a/plugins/edit-calendar.php b/plugins/edit-calendar.php
index be53c576e103f27f720c82515037324d3340e875..d6a052d28a6895c2204a2df6e74a7c1384774572 100644 (file)
--- a/plugins/edit-calendar.php
+++ b/plugins/edit-calendar.php
@@ -9,8 +9,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerEditCalendar {
-       /** @access protected */
-       var $prepend, $langPath;
+       protected $prepend, $langPath;
 
        /**
        * @param string text to append before first calendar usage

diff --git a/plugins/edit-foreign.php b/plugins/edit-foreign.php
index 2e4236f64d6b5bf3257d4bec175deaf337bba246..df8ed64d04f93386f09658082ae2e51ee2e6adf2 100644 (file)
--- a/plugins/edit-foreign.php
+++ b/plugins/edit-foreign.php
@@ -7,10 +7,10 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerEditForeign {
-       var $_limit;
+       protected $limit;
 
        function __construct($limit = 0) {
-               $this->_limit = $limit;
+               $this->limit = $limit;
        }
 
        function editInput($table, $field, $attrs, $value) {
@@ -30,8 +30,8 @@ class AdminerEditForeign {
                                        if (preg_match('~binary~', $field["type"])) {
                                                $column = "HEX($column)";
                                        }
-                                       $options = array("" => "") + Adminer\get_vals("SELECT $column FROM " . Adminer\table($target) . " ORDER BY 1" . ($this->_limit ? " LIMIT " . ($this->_limit + 1) : ""));
-                                       if ($this->_limit && count($options) - 1 > $this->_limit) {
+                                       $options = array("" => "") + Adminer\get_vals("SELECT $column FROM " . Adminer\table($target) . " ORDER BY 1" . ($this->limit ? " LIMIT " . ($this->limit + 1) : ""));
+                                       if ($this->limit && count($options) - 1 > $this->limit) {
                                                return;
                                        }
                                }

diff --git a/plugins/email-table.php b/plugins/email-table.php
index c7e9c912962148e02073de7b79ce1720a28107ee..d5bc22b156634642694c3de375a33d429d132869 100644 (file)
--- a/plugins/email-table.php
+++ b/plugins/email-table.php
@@ -7,8 +7,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerEmailTable {
-       /** @access protected */
-       var $table, $id, $title, $subject, $message;
+       protected $table, $id, $title, $subject, $message;
 
        /**
        * @param string quoted table name

diff --git a/plugins/file-upload.php b/plugins/file-upload.php
index d611ec897b623825e0a64545c84ebfb4a2f41539..ee60154d9ef291596d221eb7d1e04b64fe460e24 100644 (file)
--- a/plugins/file-upload.php
+++ b/plugins/file-upload.php
@@ -8,8 +8,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerFileUpload {
-       /** @access protected */
-       var $uploadPath, $displayPath, $extensions;
+       protected $uploadPath, $displayPath, $extensions;
 
        /**
        * @param string prefix for uploading data (create writable subdirectory for each table containing uploadable fields)

diff --git a/plugins/frames.php b/plugins/frames.php
index e4130370b17b1a9784a25485ac5ae85a74c926fa..c025d27e2d9ddaa6fbb5991e4971abfce33e5efe 100644 (file)
--- a/plugins/frames.php
+++ b/plugins/frames.php
@@ -7,8 +7,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerFrames {
-       /** @access protected */
-       var $sameOrigin;
+       protected $sameOrigin;
 
        /**
        * @param bool allow running from the same origin only

diff --git a/plugins/login-ip.php b/plugins/login-ip.php
index 0b367da25ee94f51fcfc397648f12a3f6f3f4cb3..2e6d8fa631c2672b65ff1050ad795162900621ff 100644 (file)
--- a/plugins/login-ip.php
+++ b/plugins/login-ip.php
@@ -7,10 +7,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerLoginIp {
-       /** @access protected */
-       var $ips;
-       /** @access protected */
-       var $forwarded_for;
+       protected $ips, $forwarded_for;
 
        /** Set allowed IP addresses
        * @param array IP address prefixes

diff --git a/plugins/login-otp.php b/plugins/login-otp.php
index b25ea1d909856eec8e90e50c40109737a3761768..bfe07b1d8fb89099ceabdc7999b71835688d5834 100644 (file)
--- a/plugins/login-otp.php
+++ b/plugins/login-otp.php
@@ -7,8 +7,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerLoginOtp {
-       /** @access protected */
-       var $secret;
+       protected $secret;
 
        /**
        * @param string decoded secret, e.g. base64_decode("SECRET")

diff --git a/plugins/login-password-less.php b/plugins/login-password-less.php
index 360a23e005c6c5da29a0c3f0f21d30b72ee98047..9f6d7bbb778069ff0141d64f01104d650c691445 100644 (file)
--- a/plugins/login-password-less.php
+++ b/plugins/login-password-less.php
@@ -7,8 +7,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerLoginPasswordLess {
-       /** @access protected */
-       var $password_hash;
+       protected $password_hash;
 
        /** Set allowed password
        * @param string result of password_hash

diff --git a/plugins/login-servers.php b/plugins/login-servers.php
index c992a693e31c77a5973df82d111dd106d3e0691a..5cad6f2e10d6565f7231f8aaeebd168aeeb5be85 100644 (file)
--- a/plugins/login-servers.php
+++ b/plugins/login-servers.php
@@ -7,8 +7,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerLoginServers {
-       /** @access protected */
-       var $servers;
+       protected $servers;
 
        /** Set supported servers
        * @param array [$description => ["server" => , "driver" => "server|pgsql|sqlite|..."]]

diff --git a/plugins/login-ssl.php b/plugins/login-ssl.php
index ca8c9323ddc2a791ba8ba11b245b955cc855c8af..a641a7b4f5d13556c1de30c20d39cb9a74ef930e 100644 (file)
--- a/plugins/login-ssl.php
+++ b/plugins/login-ssl.php
@@ -7,8 +7,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerLoginSsl {
-       /** @access protected */
-       var $ssl;
+       protected $ssl;
 
        /**
        * @param array

diff --git a/plugins/login-table.php b/plugins/login-table.php
index 051b2cff6847e03ca0e83bc914aa555e2ec61b78..48ac08f533d65bbdb0aa08bb72106f81640064b4 100644 (file)
--- a/plugins/login-table.php
+++ b/plugins/login-table.php
@@ -16,8 +16,7 @@ CREATE TABLE login (
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerLoginTable {
-       /** @access protected */
-       var $database;
+       protected $database;
 
        /** Set database of login table
        * @param string

diff --git a/plugins/plugin.php b/plugins/plugin.php
index ccef2f20c54656c2643a78c8843c387c4b6f04d4..551a15f7f40c34ac3bc2d8de94f6e86d5b7f9911 100644 (file)
--- a/plugins/plugin.php
+++ b/plugins/plugin.php
@@ -7,8 +7,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerPlugin extends Adminer\Adminer {
-       /** @access protected */
-       var $plugins;
+       protected $plugins;
 
        /** Register plugins
        * @param array object instances or null to register all classes starting by 'Adminer'

diff --git a/plugins/slugify.php b/plugins/slugify.php
index 6331db35202dd334907c833a1773de33e7dbb22a..f15ab554f3e468d914b86f3210aab5751a7f63f4 100644 (file)
--- a/plugins/slugify.php
+++ b/plugins/slugify.php
@@ -7,8 +7,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerSlugify {
-       /** @access protected */
-       var $from, $to;
+       protected $from, $to;
 
        /**
        * @param string find these characters ...

diff --git a/plugins/sql-log.php b/plugins/sql-log.php
index 9a7468966ca75abd59eba36d38e0da95af101e40..8e6322254dc1d6b9ed9a61203eef8a1c4229d677 100644 (file)
--- a/plugins/sql-log.php
+++ b/plugins/sql-log.php
@@ -7,8 +7,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerSqlLog {
-       /** @access protected */
-       var $filename;
+       protected $filename;
 
        /**
        * @param string defaults to "$database.sql"

diff --git a/plugins/tinymce.php b/plugins/tinymce.php
index 64bc017f93e1f91de147ac9c1d222fd671b8ea49..2bb109f88e3f6434e89ff70dda1f6a512d293a72 100644 (file)
--- a/plugins/tinymce.php
+++ b/plugins/tinymce.php
@@ -8,8 +8,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerTinymce {
-       /** @access protected */
-       var $path;
+       protected $path;
 
        /**
        * @param string

diff --git a/plugins/wymeditor.php b/plugins/wymeditor.php
index 0502aee96f7e888090cfcbf773f9123a6c3f1c12..146e759337795dbfe3c30bee1acbea133c811863 100644 (file)
--- a/plugins/wymeditor.php
+++ b/plugins/wymeditor.php
@@ -8,8 +8,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerWymeditor {
-       /** @access protected */
-       var $scripts, $options;
+       protected $scripts, $options;
 
        /**
        * @param array