From fdffe42bdc703a9f2391c77ae0256c33a3eac935 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Thu, 11 Sep 2008 01:20:25 +0000
Subject: remove ws access table/partners functionality

git-svn-id: http://piwigo.org/svn/trunk@2516 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/include/functions_upgrade.php               |   5 +-
 admin/template/yoga/admin.tpl                     |   3 -
 admin/template/yoga/admin/ws_checker.tpl          | 215 --------------
 admin/template/yoga/theme/admin/themeconf.inc.php |   1 -
 admin/ws_checker.php                              | 334 ----------------------
 5 files changed, 2 insertions(+), 556 deletions(-)
 delete mode 100644 admin/template/yoga/admin/ws_checker.tpl
 delete mode 100644 admin/ws_checker.php

(limited to 'admin')

diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php
index 7e9a93aef..06bba375a 100644
--- a/admin/include/functions_upgrade.php
+++ b/admin/include/functions_upgrade.php
@@ -71,14 +71,13 @@ function prepare_conf_upgrade()
   define('TAGS_TABLE', $prefixeTable.'tags');
   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',
          PHPWG_ROOT_PATH . 'template/yoga/local-layout.css'
diff --git a/admin/template/yoga/admin.tpl b/admin/template/yoga/admin.tpl
index 7aae91c39..7aba18541 100644
--- a/admin/template/yoga/admin.tpl
+++ b/admin/template/yoga/admin.tpl
@@ -84,9 +84,6 @@ jQuery().ready(function(){ldelim}
         <li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
         <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}
           <ul {* TODO conditional class="scroll" *}>
diff --git a/admin/template/yoga/admin/ws_checker.tpl b/admin/template/yoga/admin/ws_checker.tpl
deleted file mode 100644
index 51782da15..000000000
--- a/admin/template/yoga/admin/ws_checker.tpl
+++ /dev/null
@@ -1,215 +0,0 @@
-{* $Id$ *}
-
-<div class="titrePage">
-  <h2>{'title_wscheck'|@translate} - {'web_services'|@translate}</h2>
-</div>
-
-{if !empty($update_results)}
-<ul>
-  {foreach from=$update_results item=result}
-  <li>$result</li>
-  {/foreach}
-</ul>
-{/if}
-
-{* Add Access *}
-<form method="post" name="adding_access" action="{$F_STATUS_ACTION}">
-  <!-- Current Default -->
-  <fieldset>
-    <legend>{'ws_adding_legend'|@translate}</legend>
-    <table>
-    {* Access key *}
-      <tr>
-        <td>
-          <label for="KeyName">{'Confidential partner key'|@translate} </label>
-        </td>
-        <td>
-          <input type="text" maxlength="35" size="35" name="add_partner"
-            id="add_partner" value="{$F_ADD_PARTNER}"
-            title="{'Basis of access key calculation'|@translate}" />
-        </td>
-      </tr>
-
-    {* Target (cat/ids, tag/ids, or list/ids ids=id,id-id,...) *}
-      <tr>
-        <td>
-          <label for="Access">{'Target'|@translate}</label>
-        </td>
-        <td>
-          <input type="text" maxlength="128" size="35" name="add_target"
-            id="add_target" value="{$F_ADD_ACCESS}"
-            title="{'Facultative and restrictive option'|@translate}" />
-          <i><small> ({'Access: see help text for more'|@translate})
-          </small></i>
-        </td>
-      </tr>
-
-    {* Restricted access to specific request *}
-      <tr>
-        <td>
-          <label for="add_request">{'Restrict access to'|@translate}</label>
-        </td>
-        <td>
-          <select name="add_request" id="add_request" style="width: 18em"  
-            onfocus="this.className='focus';" 
-            onblur="this.className='nofocus';">
-            <option value=""></option>
-            {html_options values=$add_requests output=$add_requests}
-          </select> 
-          <i><small> ({'ws_Methods'|@translate})</small></i>
-        </td>
-      </tr>
-
-     {* Limit number of images information to be return *}
-     <tr>
-        <td>
-          <label for="add_limit">{'Returned images limit'|@translate}</label>
-        </td>
-        <td>
-          <select name="add_limit" id="add_limit" style="width: 10em"  
-            onfocus="this.className='focus';" 
-            onblur="this.className='nofocus';">
-            {html_options values=$add_limits output=$add_limits}
-          </select>
-        </td>
-      </tr>
-
-    {* Open service is postponed by n days *}
-    {* In comment currently
-      <tr>
-        <td>
-          <label for="add_start">{'Postponed availability in days'|@translate}</label>
-        </td>
-        <td>
-          <select name="add_start" id="add_start" style="width: 10em" 
-            onfocus="this.className='focus';" 
-            onblur="this.className='nofocus';">
-            <!-- BEGIN add_start -->
-            <option value="{add_start.VALUE}"
-              {add_start.SELECTED}>{add_start.CONTENT}
-            </option> 
-            <!-- END add_start -->
-          </select>
-        </td>
-      </tr>
-    *}
-
-    {* Opened service only for n days *}
-      <tr>
-        <td>
-          <label for="add_end">{'Duration in days'|@translate}</label>
-        </td>
-        <td>
-          <select name="add_end" id="add_end" style="width: 10em"  
-            onfocus="this.className='focus';" 
-            onblur="this.className='nofocus';">
-            {html_options values=$add_ends output=$add_ends}
-          </select>
-        </td>
-      </tr>
-
-    {* Idendify your partner (name / website / phone) as you want *}
-      <tr>
-        <td>
-          <label for="add_Comment">{'ws_Comment'|@translate}</label>
-          <br />
-        </td>
-        <td>
-          <textarea name="add_comment" id="add_comment" 
-            rows="4" cols="80">{'Comment to identify your partner clearly'|@translate}</textarea>  
-        </td>
-      </tr>
-
-    {* Add submit button *}
-      <tr>
-        <td>
-        </td>
-        <td>
-          <input class="submit" type="submit" name="wsa_submit" style="width: 10em; padding-top: 3px;"
-            value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED} 
-            title="{'Add this access definition'|@translate}" />
-        </td>
-      </tr>      
-    </table>
-  </fieldset>
-</form>
-
-{if !empty($access_list)}
-<!-- Access list -->
-<form method="post" name="preferences" action="{$F_STATUS_ACTION}">
-  <input type="hidden" name="partner_prev" value="{$F_PREV_PARTNER}">
-  <input type="hidden" name="request_prev" value="{$F_PREV_REQUEST}">
-  <input type="hidden" name="high_prev" value="{$F_PREV_HIGH}">
-  <input type="hidden" name="normal_prev" value="{$F_PREV_NORMAL}">
-  <input type="hidden" name="order_prev" value="{$F_PREV_ORDER}">
-  <input type="hidden" name="dir5n_prev" value="{$F_PREV_DIR5N}">
-  <!-- Delete / Update Selected -->
-  <fieldset>
-    <legend>{'ws_update_legend'|@translate}</legend>
-    <table class="table2">
-      <tr class="throw">
-        <th>&nbsp;</th>
-        <th>{'ws_KeyName'|@translate}</th>
-        <th>{'ws_Access'|@translate}</th>
-        <th>{'ws_End'|@translate}</th>
-        <th>{'ws_Request'|@translate}</th>
-        <th>{'ws_Limit'|@translate}</th>
-        <th>{'ws_Comment'|@translate}</th>
-      </tr>
-      {foreach from=$access_list item=access name=access_loop}
-      <tr class="{if $smarty.foreach.access_loop.index is odd}row1{else}row2{/if}">
-        <td>
-          <input type="radio" name="selection" 
-            value="{$access.ID}" id="selection-{$access.ID}">
-        </td>
-        <td><label for="selection-{$access.ID}">{$access.NAME}</label></td>
-        <td>{$access.TARGET}</td>
-        <td>{$access.END}</td>
-        <td>{$access.REQUEST}</td>
-        <td>{$access.LIMIT}</td>
-        <td>{$access.COMMENT}</td>
-      </tr>
-      {/foreach}
-    </table>
-
-    <table>   
-    <tr>    
-    <td>
-    {'ws_delete_legend'|@translate}
-    </td>
-    <td>
-    <input type="radio" name="delete_confirmation" 
-      value="true">
-    <input class="submit" type="submit" name="wsX_submit" style="width: 10em; padding-top: 3px;"
-      value="{'Delete'|@translate}" {$TAG_INPUT_ENABLED}>
-    </td>
-    </tr>
-    </table>
-    <hr>    
-    <table>
-    <tr>
-    <td>
-    <span class="property">
-      <label for="upd_end">{'Modify End from Now +'|@translate} </label>
-    </span> 
-    <select name="upd_end" id="upd_end"  style="width: 10em" 
-      onfocus="this.className='focus';" 
-      onblur="this.className='nofocus';">
-      {html_options values=$add_ends output=$add_ends}
-    </select> 
-    <input class="submit" type="submit" name="wsu_submit" style="width: 10em; padding-top: 3px;"
-       value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>
-    </td>
-    <td>
-    <i><small> ({'Web Services availability duration in days'|@translate})</small></i>
-    </td>
-    </tr>
-    </table>
-
-  </fieldset>
-</form>
-{/if}
-
-{if isset($WS_STATUS)}
-    <h3>{$WS_STATUS}</h3>
-{/if}
diff --git a/admin/template/yoga/theme/admin/themeconf.inc.php b/admin/template/yoga/theme/admin/themeconf.inc.php
index 61c090ebf..41e07b449 100644
--- a/admin/template/yoga/theme/admin/themeconf.inc.php
+++ b/admin/template/yoga/theme/admin/themeconf.inc.php
@@ -39,7 +39,6 @@ function selected_admin_menu()
       case 'history':
       case 'maintenance':
       case 'advanced_feature':
-      case 'ws_checker':
       case 'plugins_list':
       case 'plugin':
         return 5;
diff --git a/admin/ws_checker.php b/admin/ws_checker.php
deleted file mode 100644
index 7da8fac10..000000000
--- a/admin/ws_checker.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Piwigo - a PHP based picture gallery                                  |
-// +-----------------------------------------------------------------------+
-// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
-// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
-// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
-// +-----------------------------------------------------------------------+
-// | This program is free software; you can redistribute it and/or modify  |
-// | it under the terms of the GNU General Public License as published by  |
-// | the Free Software Foundation                                          |
-// |                                                                       |
-// | This program is distributed in the hope that it will be useful, but   |
-// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
-// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
-// | General Public License for more details.                              |
-// |                                                                       |
-// | You should have received a copy of the GNU General Public License     |
-// | along with this program; if not, write to the Free Software           |
-// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
-// | USA.                                                                  |
-// +-----------------------------------------------------------------------+
-
-// Next evolution... 
-// Out of parameter WS management
-// The remainer objective is to check 
-//  -  Does Web Service working properly?
-//  -  Does any access return something really?
-//     Give a way to check to the webmaster...
-// These questions are one of module name explanations (checker).
-
-if((!defined("PHPWG_ROOT_PATH")) or (!$conf['allow_web_services']))
-{
-  die('Hacking attempt!');
-}
-include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
-include_once(PHPWG_ROOT_PATH.'include/ws_functions.inc.php');
-
-/**
- * official_req returns the managed requests list in array format
- * FIXME A New list need to be build for ws_checker.php
- * returns array of authrorized request/methods
- * */
-function official_req()
-{
-  $official = array(                  /* Requests are limited to             */
-      'categories.'                          /* all categories. methods */
-    , 'categories.getImages'
-    , 'categories.getList'
-    , 'images.'                              /* all images. methods */
-    , 'images.getInfo'
-    , 'images.addComment'
-    , 'images.search'
-    , 'tags.'                                /* all tags. methods */
-    , 'tags.getImages'
-    , 'tags.getList'
-  );
-  if (function_exists('local_req')) {
-     $local = local_req();
-     return array_merge( $official, $local );
-  }
-  return $official;
-}
-
-/**
- * check_target($string) verifies and corrects syntax of target parameter
- * example : check_target(cat/23,24,24,24,25,27) returns cat/23-25,27
- * */
-function check_target($list)
-{
-  if ( $list !== '' )
-  {
-    $type = explode('/',$list); // Find type list
-    if ( !in_array($type[0],array('list','cat','tag') ) )
-    {
-      $type[0] = 'list'; // Assume an id list
-    }
-    $ids = explode( ',',$type[1] );
-    $list = $type[0] . '/';
-
-    // 1,2,21,3,22,4,5,9-12,6,11,12,13,2,4,6,
-
-    $result = expand_id_list( $ids );
-
-    // 1,2,3,4,5,6,9,10,11,12,13,21,22,
-    // I would like
-    // 1-6,9-13,21-22
-    $serial[] = $result[0]; // To be shifted
-    foreach ($result as $k => $id)
-    {
-      $next_less_1 = (isset($result[$k + 1]))? $result[$k + 1] - 1:-1;
-      if ( $id == $next_less_1 and end($serial)=='-' )
-      { // nothing to do
-      }
-      elseif ( $id == $next_less_1 )
-      {
-        $serial[]=$id;
-        $serial[]='-';
-      }
-      else
-      {
-        $serial[]=$id;  // end serie or non serie
-      }
-    }
-    $null = array_shift($serial); // remove first value
-    $list .= array_shift($serial); // add the real first one
-    $separ = ',';
-    foreach ($serial as $id)
-    {
-      $list .= ($id=='-') ? '' : $separ . $id;
-      $separ = ($id=='-') ? '-':','; // add comma except if hyphen
-    }
-  }
-  return $list;
-}
-
-// +-----------------------------------------------------------------------+
-// | Check Access and exit when user status is not ok                      |
-// +-----------------------------------------------------------------------+
-check_status(ACCESS_ADMINISTRATOR);
-
-// accepted queries
-$req_type_list = official_req();
-
-//--------------------------------------------------------- update informations
-$chk_partner = '';
-// Is a new access required?
-
-if (isset($_POST['wsa_submit']))
-{
-// Check $_post (Some values are commented - maybe a future use)
-$add_partner = htmlspecialchars( $_POST['add_partner'], ENT_QUOTES);
-$add_target = check_target( $_POST['add_target']) ;
-$add_end = ( is_numeric($_POST['add_end']) ) ? $_POST['add_end']:0;
-$add_request = htmlspecialchars( $_POST['add_request'], ENT_QUOTES);
-$add_limit = ( is_numeric($_POST['add_limit']) ) ? $_POST['add_limit']:1; 
-$add_comment = htmlspecialchars( $_POST['add_comment'], ENT_QUOTES);
-if ( strlen($add_partner) < 8 )
-{ // TODO What? Complete with some MD5...
-}
-  $query = '
-INSERT INTO '.WEB_SERVICES_ACCESS_TABLE.' 
-( `name` , `access` , `start` , `end` , `request` , `limit` , `comment` )
-VALUES (' . "
-  '$add_partner', '$add_target',
-  NOW(), 
-  ADDDATE( NOW(), INTERVAL $add_end DAY),
-  '$add_request', '$add_limit', '$add_comment' );";
-
-  pwg_query($query);
-  $chk_partner = $add_partner;
-  
-  $template->append(
-    'update_results',
-    l10n('ws_adding_legend').l10n('ws_success_upd')
-  );
-}
-
-// Next, Update selected access
-if (isset($_POST['wsu_submit']))
-{
-  $upd_end = ( is_numeric($_POST['upd_end']) ) ? $_POST['upd_end']:0;
-  $settxt = ' end = ADDDATE(NOW(), INTERVAL '. $upd_end .' DAY)';
-
-  if ((isset($_POST['selection'])) and (trim($settxt) != ''))
-  {
-    $uid = (int) $_POST['selection'];
-    $query = '
-    UPDATE '.WEB_SERVICES_ACCESS_TABLE.' 
-    SET '.$settxt.'
-    WHERE id = '.$uid.'; ';
-    pwg_query($query);
-    $template->append(
-      'update_results',
-      l10n('ws_update_legend').l10n('ws_success_upd')
-    );
-  } else {
-    $template->append(
-      'update_results',
-      l10n('ws_update_legend').l10n('ws_failed_upd')
-    );
-  }
-}
-// Next, Delete selected access
-
-if (isset($_POST['wsX_submit']))
-{
-  if ((isset($_POST['delete_confirmation']))
-   and (isset($_POST['selection'])))
-  {
-    $uid = (int) $_POST['selection'];
-    $query = 'DELETE FROM '.WEB_SERVICES_ACCESS_TABLE.'
-               WHERE id = '.$uid.'; ';
-    pwg_query($query);
-    $template->append(
-      'update_results',
-      l10n('ws_delete_legend').l10n('ws_success_upd')
-    );
-  } else {
-    $template->append(
-      'update_results',
-      l10n('Not selected / Not confirmed').l10n('ws_failed_upd')
-    );
-  } 
-}
-
-
-
-$template->assign(
-  array(
-    'U_HELP' => get_root_url().'popuphelp.php?page=web_service',    
-    )
-  );
-
-// Build where
-$where = '';
-$order = ' ORDER BY `id` DESC' ;
-
-$query = '
-SELECT *
-  FROM '.WEB_SERVICES_ACCESS_TABLE.'
-WHERE 1=1  '
-.$where.
-' '
-.$order.
-';';
-$result = pwg_query($query);
-$acc_list = mysql_num_rows($result);
-$result = pwg_query($query);
-// +-----------------------------------------------------------------------+
-// |                             template init                             |
-// +-----------------------------------------------------------------------+
-
-$template->set_filenames(
-  array(
-    'ws_checker' => 'admin/ws_checker.tpl'
-    )
-  );
-
-
-// Access List
-while ($row = mysql_fetch_array($result))
-{
-  $chk_partner = ( $chk_partner == '' ) ? $row['name'] : $chk_partner;
-  $template->append(
-    'access_list',
-     array(
-       'ID'               => $row['id'],
-       'NAME'             => 
-         (is_adviser()) ? '*********' : $row['name'],       
-       'TARGET'           => $row['access'],
-       'END'              => $row['end'],
-       'REQUEST'          => $row['request'],
-       'LIMIT'            => $row['limit'],
-       'COMMENT'          => $row['comment'],
-     )
-  );
-}
-
-$template->assign('add_requests', $req_type_list);
-
-$template->assign('add_limits', $conf['ws_allowed_limit'] );
-
-// Postponed Start Date 
-// By default 0, 1, 2, 3, 5, 7, 14 or 30 days
-/*foreach ($conf['ws_postponed_start'] as $value) {
-  $template->assign_block_vars(
-    'add_start',
-     array(
-       'VALUE'=> $value,
-       'CONTENT' => $value,
-       'SELECTED' => ($conf['ws_postponed_start'][0] == $value) ? $selected:'',
-     )
-  );
-}*/
-
-// Durations (Allowed Web Services Period)
-// By default 10, 5, 2, 1 year(s) or 6, 3, 1 month(s) or 15, 10, 7, 5, 1, 0 day(s)
-$template->assign('add_ends', $conf['ws_durations']);
-
-if ( $chk_partner !== '' )
-{
-  if (function_exists('curl_init'))
-  {
-    $request = get_absolute_root_url().'ws.php?method=pwg.getVersion&format=rest&'
-             . "partner=$chk_partner" ;
-    $session = curl_init($request);
-    curl_setopt ($session, CURLOPT_POST, true);
-    curl_setopt($session, CURLOPT_HEADER, true);
-    curl_setopt($session, CURLOPT_RETURNTRANSFER, true);
-    $response = curl_exec($session);
-    curl_close($session);
-    $status_code = array();
-    preg_match('/\d\d\d/', $response, $status_code);
-    switch( $status_code[0] ) {
-      case 200:
-        $ws_status = l10n('Web Services under control');
-        break;
-      case 503:
-        $ws_status = 'Piwigo Web Services failed and returned an '
-                   . 'HTTP status of 503. Service is unavailable. An internal '
-                   . 'problem prevented us from returning data to you.';
-        break;
-      case 403:
-        $ws_status = 'Piwigo Web Services failed and returned an '
-                   . 'HTTP status of 403. Access is forbidden. You do not have '
-                   . 'permission to access this resource, or are over '
-                   . 'your rate limit.';
-        break;
-      case 400:
-        // You may want to fall through here and read the specific XML error
-        $ws_status = 'Piwigo Web Services failed and returned an '
-                   . 'HTTP status of 400. Bad request. The parameters passed '
-                   . 'to the service did not match as expected. The exact '
-                   . 'error is returned in the XML response.';
-        break;
-      default:
-        $ws_status = 'Piwigo Web Services returned an unexpected HTTP '
-                   . 'status of:' . $status_code[0];
-    }
-  }
-  else
-  {
-    $ws_status = 'Cannot check - curl not installed';
-  }
-  $template->assign( 'WS_STATUS', $ws_status );
-}
-
-//----------------------------------------------------------- sending html code
-
-$template->assign_var_from_handle('ADMIN_CONTENT', 'ws_checker');
-
-include_once(PHPWG_ROOT_PATH.'include/ws_core.inc.php');
-?>
-- 
cgit v1.2.3