Przeglądaj źródła

added suport for featureID param in WFS File

Piotr Labudda 9 lat temu
rodzic
commit
fcb2050e8c

+ 2 - 2
SE/se-lib/ProcesHelper.php

@@ -512,7 +512,7 @@ SQL;
 		--		and zp.`DESC`='{$dbName}'
 				and zp.`TYPE` in('DATABASE_MYSQL','DATABASE','BAZA_DANYCH')
 		";
-		DBG::_('DBG_SQL', '1', "sql", $sql, __CLASS__, __FUNCTION__, __LINE__);
+		DBG::_('DBG_SQL', '>1', "sql", $sql, __CLASS__, __FUNCTION__, __LINE__);
 		$res = $db->query($sql);
 		if ($res) {
 			$zasobObj = $db->fetch($res);
@@ -528,7 +528,7 @@ SQL;
 			where z.`TYPE`='KOMORKA'
 				and z.`PARENT_ID`={$id}
 		";
-		if('1' == V::get('DBG_SQL', '', $_GET)){echo'<pre style="max-height:200px;overflow:auto;border:1px solid green;text-align:left;">sql (' . __CLASS__ . '::' . __FUNCTION__ . ':' . __LINE__ . '): ';print_r($sql);echo'</pre>';}
+		DBG::_('DBG_SQL', '>1', "sql", $sql, __CLASS__, __FUNCTION__, __LINE__);
 		$res = $db->query($sql);
 		while ($r = $db->fetch($res)) {
 			$fldsInfo[$r->DESC] = $r;

+ 5 - 3
SE/se-lib/Schema/FileStorageAcl.php

@@ -119,6 +119,10 @@ class Schema_FileStorageAcl extends Core_AclBase {
 
     $sqlTblName = FileStorage::getTableName();
     $sqlUserLogin = User::getLogin();
+    $sqlWhere = "1=1";
+    // $sqlWhere .= " and t.`A_RECORD_CREATE_AUTHOR` = '{$sqlUserLogin}' ";// TODO: Acl to read file
+    $sqlWhere .= $sqlWhereAddOgcFilter;
+    if ($pk = V::get('primaryKey', 0, $params, 'int')) $sqlWhere .= " and t.`ID` = {$pk} ";
     $rows = array_map(function($row) {
       $wfsItem = array();
       $wfsItem['id'] = $row['ID'];
@@ -149,9 +153,7 @@ class Schema_FileStorageAcl extends Core_AclBase {
     		, t.A_CLASSIFIED
     		, INET_NTOA(t.A_USER_IP) as IP
     	from `{$sqlTblName}` t
-      where 1=1
-      -- and t.`A_RECORD_CREATE_AUTHOR` = '{$sqlUserLogin}'
-        {$sqlWhereAddOgcFilter}
+      where {$sqlWhere}
     	order by ID DESC
     	limit {$sqlLimit} offset {$sqlOffset}
     "));