Added initial permissions check to filemanager, Added ability for sql-\>query to take arrays to allow for multiple sql language inputs ( First step towards sql.conversions removal )

This commit is contained in:
xevidos 2019-07-17 12:14:10 -04:00
parent 99fda757be
commit d0e51bf015
2 changed files with 17 additions and 4 deletions

View File

@ -23,7 +23,7 @@ $response = array(
"status" => "none", "status" => "none",
); );
if (!empty($_GET['action'])) { if( ! empty($_GET['action'] ) ) {
$action = $_GET['action']; $action = $_GET['action'];
} else { } else {
@ -39,7 +39,7 @@ if (!empty($_GET['action'])) {
// Ensure Project Has Been Loaded // Ensure Project Has Been Loaded
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
if ( ! isset( $_SESSION['project'] ) ) { if( ! isset( $_SESSION['project'] ) ) {
$_GET['action'] = 'get_current'; $_GET['action'] = 'get_current';
$_GET['no_return'] = 'true'; $_GET['no_return'] = 'true';
@ -60,10 +60,12 @@ if( isset( $_GET["path"] ) ) {
// Security Check // Security Check
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
if ( ! checkPath( $path ) ) { $access = Permissions::get_access( $_GET['path'] );
if ( ! Permissions::check_access( "read", $access ) ) {
$response["status"] = "error"; $response["status"] = "error";
$response["message"] = "Invalid Path"; $response["message"] = "Invalid access to path";
exit( json_encode( $response ) ); exit( json_encode( $response ) );
} }

View File

@ -388,6 +388,17 @@ class sql {
* exception * exception
*/ */
if( is_array( $query ) ) {
if( in_array( DBTYPE, array_keys( $query ) ) ) {
$query = $query[DBTYPE];
} else {
$query = $query["*"];
}
}
try { try {
$connection = $this->connect(); $connection = $this->connect();