Changeset 2516

Timestamp:

Sep 11, 2008, 3:20:25 AM (16 years ago)

Author:

rvelices

Message:

remove ws access table/partners functionality

Location:

trunk

Files:

• admin.php (modified) (1 diff)
• admin/include/functions_upgrade.php (modified) (1 diff)
• admin/template/yoga/admin.tpl (modified) (1 diff)
• admin/template/yoga/admin/ws_checker.tpl (deleted)
• admin/template/yoga/theme/admin/themeconf.inc.php (modified) (1 diff)
• admin/ws_checker.php (deleted)
• include/config_default.inc.php (modified) (1 diff)
• include/constants.php (modified) (1 diff)
• include/ws_functions.inc.php (modified) (5 diffs)
• install/db/75-database.php (added)
• install/upgrade_1.6.2.php (modified) (2 diffs)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/es_ES/admin.lang.php (modified) (2 diffs)
• language/fr_FR/admin.lang.php (modified) (1 diff)
• language/it_IT/admin.lang.php (modified) (1 diff)
• language/nl_NL/admin.lang.php (modified) (2 diffs)
• ws.php (modified) (2 diffs)

trunk/admin.php

@@ -97 +97 @@
     )
   );
-if ($conf['ws_access_control']) // Do we need to display ws_checker
-{
-  $template->assign('U_WS_CHECKER', $link_start.'ws_checker' );
-}
 
 //---------------------------------------------------------------- plugin menus

trunk/admin/include/functions_upgrade.php

@@ -72 +72 @@
   define('IMAGE_TAG_TABLE', $prefixeTable.'image_tag');
   define('PLUGINS_TABLE', $prefixeTable.'plugins');
-  define('WEB_SERVICES_ACCESS_TABLE', $prefixeTable.'ws_access');
   define('OLD_PERMALINKS_TABLE', $prefixeTable.'old_permalinks');
 }
 
 // Create empty local files to avoid log errors
-function create_empty_local_files() 
+function create_empty_local_files()
 {
-   $files = 
+   $files =
       array (
          PHPWG_ROOT_PATH . 'template-common/local-layout.css',

trunk/admin/template/yoga/admin.tpl

@@ -85 +85 @@
         <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
         <li><a href="{$U_ADVANCED_FEATURE}">{'Advanced_features'|@translate}</a></li>
-        {if isset($U_WS_CHECKER) }
-        <li><a href="{$U_WS_CHECKER}">{'web_services'|@translate}</a></li>
-        {/if}
         <li>
           {'Plugins'|@translate}

trunk/admin/template/yoga/theme/admin/themeconf.inc.php

@@ -40 +40 @@
       case 'maintenance':
       case 'advanced_feature':
-      case 'ws_checker':
       case 'plugins_list':
       case 'plugin':

trunk/include/config_default.inc.php

@@ -618 +618 @@
 // Maximum number of images to be returned foreach call to the web service
 $conf['ws_max_images_per_page'] = 500;
-
-// On Access control false / Admim Web Service need Php cURL extension
-// Controls are done on public basis or
-// if connected on member authorization basis
-$conf['ws_access_control'] = false;
-
-// Additionnal controls are made based on Web Service Access Table
-// Max returned rows number ( > 0 )
-$conf['ws_allowed_limit'] = array(1,2,3,5,10,25);
-
-// By default can be delayed by 0, 1, 2, 3, 5, 7, 14 or 30 days
-// 0 it's Now(), don't remove that one
-$conf['ws_postponed_start'] = array(0,1,2,3,5,7,14,30); /* In days */
-
-// By default 10, 5, 2, 1 year(s) or 6, 3, 1 month(s)
-// or 15, 10, 7, 5, 1, 0 day(s)
-// 0 it's temporary closed (Useful for one access)
-$conf['ws_durations'] = array(3650,1825,730,365,182,91,30,15,10,7,5,1,0);
 
 // +-----------------------------------------------------------------------+

trunk/include/constants.php

@@ -105 +105 @@
 if (!defined('PLUGINS_TABLE'))
   define('PLUGINS_TABLE', $prefixeTable.'plugins');
-if (!defined('WEB_SERVICES_ACCESS_TABLE'))
-  define('WEB_SERVICES_ACCESS_TABLE', $prefixeTable.'ws_access');
 if (!defined('OLD_PERMALINKS_TABLE'))
   define('OLD_PERMALINKS_TABLE', $prefixeTable.'old_permalinks');

trunk/include/ws_functions.inc.php

@@ -43 +43 @@
   }
 
-  if ( !$conf['ws_access_control'] )
-  {
-    return $res; // No controls are requested
-  }
-  $query = '
-SELECT * FROM '.WEB_SERVICES_ACCESS_TABLE."
- WHERE `name` = '$calling_partner_id'
-   AND NOW() <= end; ";
-  $result = pwg_query($query);
-  $row = mysql_fetch_assoc($result);
-  if ( empty($row) )
-  {
-    return new PwgError(403, 'Partner id does not exist or is expired');
-  }
-  if ( !empty($row['request'])
-      and strpos($methodName, $row['request'])==false
-      and strpos($methodName, 'session')==false
-      and strpos($methodName, 'getVersion')==false )
-  { // session and getVersion are allowed to diagnose any failure reason
-    return new PwgError(403, 'Method not allowed');
-  }
-
   return $res;
-}
-
-/**
- * ws_addControls
- * returns additionnal controls if requested
- * usable for 99% of Web Service methods
- *
- * - Args
- * $methodName: is the requested method
- * $partner: is the key
- * $tbl_name: is the alias_name in the query (sometimes called correlation name)
- *            null if !getting picture informations
- * - Logic
- * Access_control is not active: Return
- * Key is incorrect: Return 0 = 1 (False condition for MySQL)
- * One of Params doesn't match with type of request: return 0 = 1 again
- * Access list(id/cat/tag) is converted in expended image-id list
- * image-id list: converted to an in-where-clause
- *
- * The additionnal in-where-clause is return
- */
-function ws_addControls( $methodName, &$params, $tbl_name )
-{
-  global $conf, $calling_partner_id;
-  if ( !$conf['ws_access_control'] or !isset($calling_partner_id) )
-  {
-    return '1=1'; // No controls are requested
-  }
-
-// Is it an active Partner?
-  $query = '
-SELECT * FROM '.WEB_SERVICES_ACCESS_TABLE."
- WHERE `name` = '$calling_partner_id'
-   AND NOW() <= end; ";
-$result = pwg_query($query);
-  if ( mysql_num_rows( $result ) == 0 )
-  {
-    return '0=1'; // Unknown partner or Obsolate agreement
-  }
-
-  $row = mysql_fetch_array($result);
-
-// Overide general object limit
-  $params['per_page'] = $row['limit'];
-
-// Target restrict
-// 3 cases: list, cat or tag
-// Behind / we could found img-ids, cat-ids or tag-ids
-  $target = $row['access'];
-  if ( $target == '')
-  {
-    return '1=1'; // No controls are requested
-  }
-  list($type, $str_ids) = explode('/',$target); // Find type list
-
-// (array) 1,2,21,3,22,4,5,9-12,6,11,12,13,2,4,6,
-  $arr_ids = expand_id_list( explode( ',',$str_ids ) );
-  $addings = implode(',', $arr_ids);
-// (string) 1,2,3,4,5,6,9,10,11,12,13,21,22,
-  if ( $type == 'list')
-  {
-    return $tbl_name . 'id IN ( ' . $addings . ' ) ';
-  }
-
-  if ( $type == 'cat' )
-  {
-    $addings = implode(',', get_image_ids_for_cats($arr_ids));
-    return $tbl_name . 'id IN ( ' . $addings . ' ) ';
-  }
-
-  if ( $type == 'tag' )
-  {
-    $addings = implode(',', get_image_ids_for_tags($arr_ids, 'OR'));
-    return $tbl_name . 'id IN ( ' . $addings . ' ) ';
-  }
-  // Unmanaged new type?
-  return ' 0 = 1 '; // ???
 }
 
@@ -372 +273 @@
         ), null, true
       );
-    $where_clauses[] = ws_addControls( 'categories.getImages', $params, 'i.' );
 
     $order_by = ws_std_image_sql_order($params, 'i.');
@@ -610 +510 @@
       array('visible_images' => 'id'),
       ' AND'
-    ).' AND '.
-    ws_addControls( 'images.getInfo', $params, '' ).'
-LIMIT 1;';
+    ).'
+LIMIT 1';
 
   $image_row = mysql_fetch_assoc(pwg_query($query));
@@ -1184 +1083 @@
       );
     $where_clauses[] = 'id IN ('.implode(',',$image_ids).')';
-    $where_clauses[] = ws_addControls( 'tags.getImages', $params, 'i.' );
 
     $order_by = ws_std_image_sql_order($params);
@@ -1267 +1165 @@
 }
 
-
-/**
- * expand_id_list($ids) convert a human list expression to a full ordered list
- * example : expand_id_list( array(5,2-3,2) ) returns array( 2, 3, 5)
- * */
-function expand_id_list($ids)
-{
-  $tid = array();
-  foreach ( $ids as $id )
-  {
-    if ( is_numeric($id) )
-    {
-      $tid[] = (int) $id;
-    }
-    else
-    {
-      $range = explode( '-', $id );
-      if ( is_numeric($range[0]) and is_numeric($range[1]) )
-      {
-        $from = min($range[0],$range[1]);
-        $to = max($range[0],$range[1]);
-        for ($i = $from; $i <= $to; $i++)
-        {
-          $tid[] = (int) $i;
-        }
-      }
-    }
-  }
-  $result = array_unique ($tid); // remove duplicates...
-  sort ($result);
-  return $result;
-}
-
-
-/**
- * converts a cat-ids array in image-ids array
- * FIXME Function which should already exist somewhere else
- * */
-function get_image_ids_for_cats($cat_ids)
-{
-  $cat_list = implode(',', $cat_ids);
-  $ret_ids = array();
-  $query = '
-  SELECT DISTINCT image_id
-    FROM '.IMAGE_CATEGORY_TABLE.'
-  WHERE category_id in ('.$cat_list.')
-  ;';
-  return array_from_query($query, 'image_id');
-}
-
 ?>

trunk/install/upgrade_1.6.2.php

@@ -170 +170 @@
 ;",
 
+/* TABLE DROPPED BEFORE Butterfly/Piwigo release - see later DROP IF EXISTS
 "
 CREATE TABLE `".PREFIX_TABLE."ws_access` (
@@ -183 +184 @@
   UNIQUE KEY `ws_access_ui1` (`name`)
 ) TYPE=MyISAM COMMENT='Access for Web Services'
-;",
+;",*/
 
 "

trunk/language/en_UK/admin.lang.php

@@ -466 +466 @@
 $lang['Advanced_features'] = 'Advanced features';
 $lang['Elements_not_linked'] = 'Not linked elements';
-$lang['web_services'] = 'Web services ';
-$lang['title_wscheck'] = ' Access management ';
-$lang['ws_failed_upd'] = ' -> <strong>Uncompleted demand</strong> ';
-$lang['ws_success_upd'] = ' -> Successfully completed ';
-$lang['ws_adding_legend'] = '  Add a new partner access to Web Services ';
-$lang['ws_update_legend'] = '  Revoke / Update selected partner access ';
-$lang['ws_delete_legend'] = '  Revoke selected partner access ';
-$lang['ws_Methods'] = ' Methods ';
-$lang['ws_KeyName'] = ' Partner ';
-$lang['ws_Access'] = ' Access ';
-$lang['ws_Start'] = ' Start ';
-$lang['ws_End'] = ' End ';
-$lang['ws_Request'] = ' Request ';
-$lang['ws_Limit'] = ' Limit ';
-$lang['ws_Comment'] = ' Comment ';
-$lang['Modify End from Now +'] = 'Modify End from Now + ';
-$lang['Delete'] = ' Remove ';
-$lang['Confidential partner key'] = 'Confidential partner key';
-$lang['Basis of access key calculation'] = 'Basis of access key calculation';
-$lang['Target'] = 'Target';
-$lang['Access: see help text for more'] = 'Access: see help text for more';
-$lang['Facultative and restrictive option'] = 'Facultative and restrictive option';
-$lang['Postponed availability in days'] = 'Postponed availability in days';
-$lang['Duration in days'] = 'Duration in days';
-$lang['Restrict access to'] = 'Restrict access to';
-$lang['Returned images limit'] = 'Returned images limit';
-$lang['Comment to identify your partner clearly'] = 'Comment to identify your partner clearly';
-$lang['Add this access definition'] = 'Add this access definition';
-$lang['Web Services availability duration in days'] = 'Web Services availability duration in days';
-$lang['Web Services under control'] = 'Piwigo Web Services are fully operationals and all requests are under control.';
 $lang['special_admin_menu'] = 'Specials';
 $lang['Duplicates'] = 'Files with same name in more than one physical category';

trunk/language/es_ES/admin.lang.php

@@ -339 +339 @@
 $lang['properties'] = 'Propiedades';
 $lang['public'] = 'público';
-$lang['purge history'] = 'purgar la reseña histórica';
 $lang['purge never used notification feeds'] = 'Purgar los flujos jamás utilizados de notificación';
 $lang['purge sessions'] = 'Purgar las sesiones';
@@ -467 +466 @@
 $lang['Advanced_features'] = 'Funciones avanzadas';
 $lang['Elements_not_linked'] = 'Elementos no atados';
-$lang['web_services'] = 'Servicios Web ';
-$lang['title_wscheck'] = ' Gestión de los accesos ';
-$lang['ws_failed_upd'] = ' -> <strong>Operación no realizada</strong> ';
-$lang['ws_success_upd'] = ' -> Acción realizada correctamente ';
-$lang['ws_adding_legend'] = '  Añadido de un acceso compañero a los Servicios Web ';
-$lang['ws_update_legend'] = '  Suprimir / Modificar el acceso del compañero seleccionado ';
-$lang['ws_delete_legend'] = '  Suprimir definitivamente el acceso del compañero seleccionado ';
-$lang['ws_Methods'] = ' Métodos ';
-$lang['ws_KeyName'] = ' Compañero ';
-$lang['ws_Access'] = ' Accesso ';
-$lang['ws_Start'] = ' Principio ';
-$lang['ws_End'] = ' Fin ';
-$lang['ws_Request'] = 'Demanda';
-$lang['ws_Limit'] = ' Límite ';
-$lang['ws_Comment'] = ' Comentario ';
-$lang['Modify End from Now +'] = 'Modificar el Fin por este instante + ';
-$lang['Delete'] = ' Retirada ';
-$lang['Confidential partner key'] = 'Llave confidencial';
-$lang['Basis of access key calculation'] = 'Base de cálculo de la llave';
-$lang['Target'] = 'Blanco';
-$lang['Access: see help text for more'] = 'Acceso : ver la ayuda en línea';
-$lang['Facultative and restrictive option'] = 'Opción facultativa y restrictiva';
-$lang['Postponed availability in days'] = 'Saldo de disponibilidad en días';
-$lang['Duration in days'] = 'Durada en días';
-$lang['Restrict access to'] = 'Acceso restringindo a';
-$lang['Returned images limit'] = 'Límite de transmision';
-$lang['Comment to identify your partner clearly'] = 'Comentario que le permite identificar a su compañero fácilmente';
-$lang['Add this access definition']= 'Añadir esta definición de acceso';
-$lang['Web Services availability duration in days'] = 'Duración de abertura de los Servicios Web en días';
-$lang['Web Services under control'] = 'Los Servicios Web de Piwigo totalmente son operativos y todas las demandas son controladas.';
 $lang['special_admin_menu'] = 'Clases de matemáticas superiores';
-$lang['note_check_exif'] = '%s debe ser puesto a "false" en su fichero config_local.inc.php porque el extejo no es sostenido.';
-$lang['note_check_more_info'] = 'Vaya sobre %s or %s para más informaciones.';
-$lang['note_check_more_info_forum'] = 'el foro';
-$lang['note_check_more_info_wiki'] = 'el wiki';
 $lang['Duplicates'] = 'Ficheros que llevan el mismo nombre en varias categorías físicas';
 

trunk/language/fr_FR/admin.lang.php

@@ -466 +466 @@
 $lang['Advanced_features'] = 'Fonctions avancées';
 $lang['Elements_not_linked'] = 'Eléments non liés';
-$lang['web_services'] = 'Services Web ';
-$lang['title_wscheck'] = ' Gestion des accès ';
-$lang['ws_failed_upd'] = ' -> <strong>Opération non réalisée</strong> ';
-$lang['ws_success_upd'] = ' -> Action réalisée correctement ';
-$lang['ws_adding_legend'] = '  Ajout d\'un accès partenaire aux Services Web ';
-$lang['ws_update_legend'] = '  Supprimer / Modifier l\'accès du partenaire sélectionné ';
-$lang['ws_delete_legend'] = '  Supprimer définitivement l\'accès du partenaire sélectionné ';
-$lang['ws_Methods'] = ' Méthodes ';
-$lang['ws_KeyName'] = ' Partenaire ';
-$lang['ws_Access'] = ' Access ';
-$lang['ws_Start'] = ' Début ';
-$lang['ws_End'] = ' Fin ';
-$lang['ws_Request'] = 'Requête';
-$lang['ws_Limit'] = ' Limite ';
-$lang['ws_Comment'] = ' Commentaire ';
-$lang['Modify End from Now +'] = 'Modifier la Fin par cet instant + ';
-$lang['Delete'] = ' Retrait ';
-$lang['Confidential partner key'] = 'Clé confidentielle';
-$lang['Basis of access key calculation'] = 'Base de calcul de la clé';
-$lang['Target'] = 'Cible';
-$lang['Access: see help text for more'] = 'Accès: voir l\'aide en ligne';
-$lang['Facultative and restrictive option'] = 'Option facultative et restrictive';
-$lang['Postponed availability in days'] = 'Report de disponibilité en jours';
-$lang['Duration in days'] = 'Durée en jours';
-$lang['Restrict access to'] = 'Accès restreint à';
-$lang['Returned images limit'] = 'Limite de transmision';
-$lang['Comment to identify your partner clearly'] = 'Commentaire vous permettant d\'identifier votre partenaire facilement';
-$lang['Add this access definition']= 'Ajouter cette définition d\'accès';
-$lang['Web Services availability duration in days'] = 'Durée d\'ouverture des Services Web en jours';
-$lang['Web Services under control'] = 'Les Services Web de Piwigo sont totalement operationnels et toutes les requêtes sont contrôlées.';
 $lang['special_admin_menu'] = 'Spéciales';
 $lang['Duplicates'] = 'Fichiers portant le même nom dans plusieurs catégories physiques';

trunk/language/it_IT/admin.lang.php

@@ -466 +466 @@
 $lang['Advanced_features'] = 'Funzioni avanzate';
 $lang['Elements_not_linked'] = 'Elementi sciolti';
-$lang['web_services'] = 'Servizzi Web ';
-$lang['title_wscheck'] = ' Gestione degli accessi ';
-$lang['ws_failed_upd'] = ' -> <strong>Operazione non efettuata</strong> ';
-$lang['ws_success_upd'] = ' -> Operazione realizzata correttamente ';
-$lang['ws_adding_legend'] = '  Aggiungere un nuovo accesso partner ai Servizi Web ';
-$lang['ws_update_legend'] = '  Cancellare / Modificare l\'accesso del partner selezionato ';
-$lang['ws_delete_legend'] = '  Cancellare definitivamente l\'accesso del partner selezionato ';
-$lang['ws_Methods'] = ' Methods ';
-$lang['ws_KeyName'] = ' Partner ';
-$lang['ws_Access'] = ' Access ';
-$lang['ws_Start'] = ' Inizzio ';
-$lang['ws_End'] = ' Fine ';
-$lang['ws_Request'] = ' Selezione ';
-$lang['ws_Limit'] = ' Limite ';
-$lang['ws_Comment'] = ' Commento ';
-$lang['Modify End from Now +'] = 'Modificare la Fine da quest\'instante + ';
-$lang['Delete'] = ' Togliere ';
-$lang['Confidential partner key'] = 'Chiave confidentiale';
-$lang['Basis of access key calculation'] = 'Base di calcolo della chiave';
-$lang['Target'] = 'Target';
-$lang['Access: see help text for more'] = 'Accesso: vedere aiuto on line';
-$lang['Facultative and restrictive option'] = 'Opzione facoltativa e restrittiva';
-$lang['Postponed availability in days'] = 'Disponibilità posposta in giorni';
-$lang['Duration in days'] = 'Durata in giorni';
-$lang['Restrict access to'] = 'Accesso limitato a';
-$lang['Returned images limit'] = 'Limite di trasferimento';
-$lang['Comment to identify your partner clearly'] = 'Commento che vi permetterà di identificare il vostro partner facilmente';
-$lang['Add this access definition']= 'Aggiungere questa definizione d\'accesso';
-$lang['Web Services availability duration in days'] = 'Durata d\'appertura dei Servizzi Web in giorni';
-$lang['Web Services under control'] = 'I Servizzi Web di Piwigo sono totalmente operativi e tutte le selezioni sono controllate.';
 $lang['special_admin_menu'] = 'Speciale';
 $lang['Duplicates'] = 'File con stesso nome in più di una categoria fisica';

trunk/language/nl_NL/admin.lang.php

@@ -339 +339 @@
 $lang['properties'] = 'Eigenschappen';
 $lang['public'] = 'publiek';
-$lang['purge history'] = 'verwijder geschiedenis';
 $lang['purge never used notification feeds'] = 'verwijder nimmer gebruikte meldingen';
 $lang['purge sessions'] = 'verwijder sessies';
@@ -467 +466 @@
 $lang['Advanced_features'] = 'Geavanceerde functies';
 $lang['Elements_not_linked'] = 'Niet gelinkte elementen';
-$lang['web_services'] = 'Web services ';
-$lang['title_wscheck'] = ' Toegangsbeheer';
-$lang['ws_failed_upd'] = ' -> <strong>Niet voltooide eis</strong> ';
-$lang['ws_success_upd'] = ' -> Succesvol afgerond ';
-$lang['ws_adding_legend'] = '  Voeg een nieuwe partner toegang toe aan Web Services ';
-$lang['ws_update_legend'] = '  Ongedaan maken / bijwerken geselecteerde partner toegangaccess ';
-$lang['ws_delete_legend'] = '  Maak geselecteerde partner toegang ongedaan';
-$lang['ws_Methods'] = ' Methode ';
-$lang['ws_KeyName'] = ' Partner ';
-$lang['ws_Access'] = ' Toegang ';
-$lang['ws_Start'] = ' Start ';
-$lang['ws_End'] = ' Eind ';
-$lang['ws_Request'] = ' Vraag ';
-$lang['ws_Limit'] = ' Limiet ';
-$lang['ws_Comment'] = ' Commentaar ';
-$lang['Modify End from Now +'] = 'Verander eind vanaf hier + ';
-$lang['Delete'] = ' Verwijderen ';
-$lang['Confidential partner key'] = 'Vertrouwelijke partner sleutel';
-$lang['Basis of access key calculation'] = 'Basis van de toegangssleutel berekening';
-$lang['Target'] = 'Doel';
-$lang['Access: see help text for more'] = 'Toegang: Zie help tekst voor meer info';
-$lang['Facultative and restrictive option'] = 'Facultatieve en restrictieve optie ';
-$lang['Postponed availability in days'] = 'Uitgestelde beschikbaarheid in dagen';
-$lang['Duration in days'] = 'Duur in dagen';
-$lang['Restrict access to'] = 'Beperk toegang tot';
-$lang['Returned images limit'] = 'Teruggekeerde beeldengrens';
-$lang['Comment to identify your partner clearly'] = 'Commentaar om je partner te identificeren';
-$lang['Add this access definition'] = 'Toevoegen toegangs defenitie';
-$lang['Web Services availability duration in days'] = 'Web Services beschikbaar in aantal dagen';
-$lang['Web Services under control'] = 'Piwigo Web Services zijn volledig operationeel en alle verzoeken worden uitgevoerd.';
 $lang['special_admin_menu'] = 'Speciaal';
-$lang['note_check_exif'] = '%s moet ingesteld zijn op false in je config_local.inc.php omdat exif niet ondersteund wordt.';
-$lang['note_check_more_info'] = 'Ga naar %s of %s voor meer informatie.';
-$lang['note_check_more_info_forum'] = 'het forum';
-$lang['note_check_more_info_wiki'] = 'de wiki';
 $lang['Duplicates'] = 'Bestanden met de zelfde naam in meer dan één physieke categorie';
 

trunk/ws.php

@@ -129 +129 @@
       'Returns elements for the corresponding query search.'
     );
-  
+
   $service->addMethod(
     'pwg.images.setPrivacyLevel',
@@ -193 +193 @@
 add_event_handler('ws_invoke_allowed', 'ws_isInvokeAllowed', EVENT_HANDLER_PRIORITY_NEUTRAL, 3);
 
-$calling_partner_id = '';
 $requestFormat = null;
 $responseFormat = null;
 
-if ( isset($_GET['partner']) )
-{
-  $calling_partner_id = $_GET['partner'];
-}
 if ( isset($_GET['format']) )
 {