gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor file_listing functions to static methods

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
This commit is contained in:
Maurício Meneghini Fauth 2017-09-11 22:58:58 -03:00
parent 360d0ad62e
commit e555b77946
9 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/classes/Display/Export.php
View File

@ -1002,7 +1002,6 @@ class Export
$GLOBALS['single_table'] = $_REQUEST['single_table'];
}
include_once './libraries/file_listing.lib.php';
include_once './libraries/plugin_interface.lib.php';
/* Scan for plugins */

1
libraries/classes/Display/Import.php
View File

@ -650,7 +650,6 @@ class Import
public static function getImportDisplay($import_type, $db, $table, $max_upload_size)
{
global $SESSION_KEY;
include_once './libraries/file_listing.lib.php';
include_once './libraries/plugin_interface.lib.php';
list(

106
libraries/classes/FileListing.php Normal file
View File

@ -0,0 +1,106 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Functions for listing directories
*
* @package PhpMyAdmin
*/
namespace PhpMyAdmin;
/**
* PhpMyAdmin\FileListing class
*
* @package PhpMyAdmin
*/
class FileListing
{
/**
* Returns array of filtered file names
*
* @param string $dir directory to list
* @param string $expression regular expression to match files
*
* @return array sorted file list on success, false on failure
*/
public static function getDirContent($dir, $expression = '')
{
if (!@file_exists($dir) || !($handle = @opendir($dir))) {
return false;
}
$result = array();
if (substr($dir, -1) != '/') {
$dir .= '/';
}
while ($file = @readdir($handle)) {
if (@is_file($dir . $file)
&& ! @is_link($dir . $file)
&& ($expression == '' || preg_match($expression, $file))
) {
$result[] = $file;
}
}
closedir($handle);
asort($result);
return $result;
}
/**
* Returns options of filtered file names
*
* @param string $dir directory to list
* @param string $extensions regular expression to match files
* @param string $active currently active choice
*
* @return array sorted file list on success, false on failure
*/
public static function getFileSelectOptions($dir, $extensions = '', $active = '')
{
$list = self::getDirContent($dir, $extensions);
if ($list === false) {
return false;
}
$result = '';
foreach ($list as $val) {
$result .= '<option value="' . htmlspecialchars($val) . '"';
if ($val == $active) {
$result .= ' selected="selected"';
}
$result .= '>' . htmlspecialchars($val) . '</option>' . "\n";
}
return $result;
}
/**
* Get currently supported decompressions.
*
* @return string separated list of extensions usable in self::getDirContent
*/
public static function supportedDecompressions()
{
global $cfg;
$compressions = '';
if ($cfg['GZipDump'] && @function_exists('gzopen')) {
if (!empty($compressions)) {
$compressions .= '|';
}
$compressions .= 'gz';
}
if ($cfg['BZipDump'] && @function_exists('bzopen')) {
if (!empty($compressions)) {
$compressions .= '|';
}
$compressions .= 'bz2';
}
if ($cfg['ZipDump'] && @function_exists('gzinflate')) {
if (!empty($compressions)) {
$compressions .= '|';
}
$compressions .= 'zip';
}
return $compressions;
}
}

3
libraries/classes/InsertEdit.php
View File

@ -8,6 +8,7 @@
namespace PhpMyAdmin;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\FileListing;
use PhpMyAdmin\Message;
use PhpMyAdmin\Plugins\TransformationsPlugin;
use PhpMyAdmin\Relation;
@ -1237,7 +1238,7 @@ class InsertEdit
*/
public static function getSelectOptionForUpload($vkey, $column)
{
$files = PMA_getFileSelectOptions(
$files = FileListing::getFileSelectOptions(
Util::userDir($GLOBALS['cfg']['UploadDir'])
);

5
libraries/classes/Util.php
View File

@ -9,6 +9,7 @@ namespace PhpMyAdmin;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\FileListing;
use PhpMyAdmin\Message;
use PhpMyAdmin\Plugins\ImportPlugin;
use PhpMyAdmin\Response;
@ -3385,14 +3386,14 @@ class Util
}
$matcher = '@\.(' . $extensions . ')(\.('
. PMA_supportedDecompressions() . '))?$@';
. FileListing::supportedDecompressions() . '))?$@';
$active = (isset($GLOBALS['timeout_passed']) && $GLOBALS['timeout_passed']
&& isset($GLOBALS['local_import_file']))
? $GLOBALS['local_import_file']
: '';
$files = PMA_getFileSelectOptions(
$files = FileListing::getFileSelectOptions(
self::userDir($uploaddir),
$matcher,
$active

97
libraries/file_listing.lib.php
View File

@ -1,97 +0,0 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* Functions for listing directories
*
* @package PhpMyAdmin
*/
/**
* Returns array of filtered file names
*
* @param string $dir directory to list
* @param string $expression regular expression to match files
*
* @return array sorted file list on success, false on failure
*/
function PMA_getDirContent($dir, $expression = '')
{
if (!@file_exists($dir) || !($handle = @opendir($dir))) {
return false;
}
$result = array();
if (substr($dir, -1) != '/') {
$dir .= '/';
}
while ($file = @readdir($handle)) {
if (@is_file($dir . $file)
&& ! @is_link($dir . $file)
&& ($expression == '' || preg_match($expression, $file))
) {
$result[] = $file;
}
}
closedir($handle);
asort($result);
return $result;
}
/**
* Returns options of filtered file names
*
* @param string $dir directory to list
* @param string $extensions regular expression to match files
* @param string $active currently active choice
*
* @return array sorted file list on success, false on failure
*/
function PMA_getFileSelectOptions($dir, $extensions = '', $active = '')
{
$list = PMA_getDirContent($dir, $extensions);
if ($list === false) {
return false;
}
$result = '';
foreach ($list as $val) {
$result .= '<option value="' . htmlspecialchars($val) . '"';
if ($val == $active) {
$result .= ' selected="selected"';
}
$result .= '>' . htmlspecialchars($val) . '</option>' . "\n";
}
return $result;
}
/**
* Get currently supported decompressions.
*
* @return string separated list of extensions usable in PMA_getDirContent
*/
function PMA_supportedDecompressions()
{
global $cfg;
$compressions = '';
if ($cfg['GZipDump'] && @function_exists('gzopen')) {
if (!empty($compressions)) {
$compressions .= '|';
}
$compressions .= 'gz';
}
if ($cfg['BZipDump'] && @function_exists('bzopen')) {
if (!empty($compressions)) {
$compressions .= '|';
}
$compressions .= 'bz2';
}
if ($cfg['ZipDump'] && @function_exists('gzinflate')) {
if (!empty($compressions)) {
$compressions .= '|';
}
$compressions .= 'zip';
}
return $compressions;
}

5
libraries/sql_query_form.lib.php
View File

@ -18,11 +18,6 @@ if (! defined('PHPMYADMIN')) {
exit;
}
/**
*
*/
require_once './libraries/file_listing.lib.php'; // used for file listing
/**
* return HTML for the sql query boxes
*

4
tbl_change.php
View File

@ -37,10 +37,6 @@ list(
if (!empty($unsaved_values) && count($rows) < count($unsaved_values)) {
$rows = array_fill(0, count($unsaved_values), false);
}
/**
* file listing
*/
require_once 'libraries/file_listing.lib.php';
/**
* Defines the url to return to in case of error in a sql statement

2
test/classes/InsertEditTest.php
View File

@ -1214,7 +1214,7 @@ class InsertEditTest extends \PHPUnit_Framework_TestCase
/**
* This condition should be tested, however, it gives an undefined function
* PMA_getFileSelectOptions error:
* PhpMyAdmin\FileListing::getFileSelectOptions error:
* $GLOBALS['cfg']['UploadDir'] = true;
*
*/