Changeset 1777

Timestamp:

Feb 3, 2007, 4:50:07 PM (17 years ago)

Author:

vdigital

Message:

Web Service:

• Delete functions_webserv.inc.php
• Activate $colling_partner_id in ws.php

Location:

trunk/include

Files:

• functions_webserv.inc.php (deleted)
• ws_functions.inc.php (modified) (10 diffs)

trunk/include/ws_functions.inc.php

@@ -52 +52 @@
 
 /**
- * ws_add_controls 
+ * ws_addControls
  * returns additionnal controls if requested
  * usable for 99% of Web Service methods 
  * 
  * - Args  
- * $method: is the requested method
+ * $methodName: is the requested method
  * $partner: is the key
  * $tbl_name: is the alias_name in the query (sometimes called correlation name)
@@ -70 +70 @@
  * The additionnal in-where-clause is return
  */       
-function ws_add_controls( $method, $tbl_name )
-{
-  global $conf, $partner;
+function ws_addControls( $methodName, $tbl_name )
+{
+  global $conf, $calling_partner_id, $params;
   if ( !$conf['ws_access_control'] )
   {
@@ -81 +81 @@
   $query = '
 SELECT * FROM '.WEB_SERVICES_ACCESS_TABLE."
- WHERE `name` = '$partner'
+ WHERE `name` = '$calling_partner_id'
    AND NOW() <= end; ";
 $result = pwg_query($query);
@@ -95 +95 @@
 // For generic you can say... tags. or categories. or images. maybe?
   $filter = $row['request'];
-  $request_method = substr($method, 0, strlen($filter)) ;
+  $request_method = substr($methodName, 0, strlen($filter)) ;
   if ( $filter !== $filter_method )
   {
     return ' 0 = 1'; // Unauthorized method request
   }
-
+// Overide general object limit   
+  $params['per_page'] = $row['limit'];
+  
 // Target restrict
 // 3 cases: list, cat or tag
@@ -248 +250 @@
 function ws_getVersion($params, &$service)
 {
-//  Needed for security reason... Maybe???
-//  $where_clause[] = 
-//          ws_add_controls( 'getVersion', null );
+//  TODO = Version availability is under control of $conf['show_version']
   return PHPWG_VERSION;
 }
@@ -310 +310 @@
       .')';
 
-//  Mandatory 
-//  $where_clause[] = 
-//          ws_add_controls( 'categories.getImages', 'i.' );
+    $where_clause[] =
+          ws_addControls( 'categories.getImages', 'i.' );
     
     $order_by = ws_std_image_sql_order($params, 'i.');
@@ -432 +431 @@
   }
 
-// To ONLY build external links maybe ???  
-//  $where_clause[] = 
-//          ws_add_controls( 'categories.getList', null );
-// Making links in a Blog...
-
   $query = '
 SELECT id, name, uppercats, global_rank,
@@ -482 +476 @@
     return new PwgError(WS_ERR_INVALID_PARAM, "Invalid image_id");
   }
-// Mandatory (No comment)  
-//  $where_clause[] = 
-//          ws_add_controls( 'images.getInfo', '' );  
+ 
   $query='
 SELECT * FROM '.IMAGES_TABLE.'
@@ -491 +483 @@
       array('visible_images' => 'id'),
       ' AND'
-    ).'
-LIMIT 1';
+    ).' AND '.
+    ws_addControls( 'images.getInfo', '' ).'
+LIMIT 1;';
 
   $image_row = mysql_fetch_assoc(pwg_query($query));
@@ -755 +748 @@
       );
     $where_clauses[] = 'id IN ('.implode(',',$image_ids).')';
-// Mandatory  
-//  $where_clause[] = 
-//          ws_add_controls( 'tags.getImages', '' );  
+    $where_clause[] =
+            ws_addControls( 'tags.getImages', 'i.' );
 
     $order_by = ws_std_image_sql_order($params);