[Mapbender-commits] r9187 - trunk/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: syed
Date: 2015-05-04 02:48:47 -0700 (Mon, 04 May 2015)
New Revision: 9187

Modified:
   trunk/mapbender/http/php/mb_list_wmc_local_data.php
Log:
modify the sql for the new datatable

Modified: trunk/mapbender/http/php/mb_list_wmc_local_data.php
===================================================================
--- trunk/mapbender/http/php/mb_list_wmc_local_data.php	2015-05-04 09:03:49 UTC (rev 9186)
+++ trunk/mapbender/http/php/mb_list_wmc_local_data.php	2015-05-04 09:48:47 UTC (rev 9187)
@@ -19,26 +19,28 @@
 require_once(dirname(__FILE__)."/../php/mb_validateSession.php");
 
 $user_id = Mapbender::session()->get("mb_user_id");
+// @TODO: select on has_local_data...
+$sql = 'select a.wmc_serial_id, a.wmc_local_data_public, a.wmc_title, a.wmc_timestamp, a.wmc_local_data_size,'.
+       ' a.fkey_user_id, termsofuse.symbollink from mb_user_wmc a left join termsofuse on termsofuse.termsofuse_id'.
+       ' = a.wmc_local_data_fkey_termsofuse_id where wmc_has_local_data = 1 and'.
+       '(fkey_user_id = $1 or wmc_local_data_public = 1);';
 
-$sql = 'select a.wmc_id, a.wmc_local_data_public, a.wmc_title, a.wmc_timestamp, a.wmc_local_data_size, termsofuse.symbollink from mb_user_wmc a left join termsofuse on termsofuse.termsofuse_id = a.wmc_local_data_fkey_termsofuse_id where wmc_has_local_data = 1 and (fkey_user_id = $1 or wmc_local_data_public = 1);';
-
 $v = array($user_id);
 $t = array("i");
 $res = db_prep_query($sql, $v, $t);
 $wmcs = array();
-while($row = db_fetch_array($res)){
+while ($row = db_fetch_array($res)) {
     $wmc = array();
-    $wmc[] = $row['wmc_id'];
+    $wmc[] = $row['wmc_serial_id'];
     $wmc[] = $row['wmc_title'];
     $wmc[] = $row['wmc_timestamp'];
     $wmc[] = $row['symbollink'];
     $wmc[] = $row['wmc_local_data_public'] == 1;
     $wmc[] = $row['wmc_local_data_size'];
+    $wmc[] = $row['fkey_user_id'];
     $wmcs[] = $wmc;
 }
 
 header("Content-Type: application/json");
 
 echo(json_encode($wmcs));
-
-?>