Changeset 1760


Ignore:
Timestamp:
Jan 27, 2007, 7:52:20 PM (17 years ago)
Author:
vdigital
Message:

Web Service Revise ws_checker and ws_functions.inc.php

(Next steps:

  • Restrict Method need to be more generic maybe
  • Delete functions_webserv.inc.php
  • Activate $partner in ws.php
  • Include checked access in tools
  • ...)
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin.php

    r1727 r1760  
    115115    )
    116116  );
    117 if ($conf['allow_web_services'])
     117if ($conf['ws_access_control']) // Do we need to display ws_checker
    118118{
    119119  $template->assign_block_vars(
  • trunk/admin/ws_checker.php

    r1758 r1760  
    33// | PhpWebGallery - a PHP based picture gallery                           |
    44// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
    5 // | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net |
     5// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
    66// +-----------------------------------------------------------------------+
    77// | branch        : BSF (Best So Far)
     
    6363// Check $_post (Some values are commented - maybe a future use)
    6464$add_partner = htmlspecialchars( $_POST['add_partner'], ENT_QUOTES);
    65 $add_access = check_target( $_POST['add_access']) ;
    66 $add_start = 0; // ( is_numeric($_POST['add_start']) ) ? $_POST['add_start']:0;
     65$add_target = check_target( $_POST['add_target']) ;
    6766$add_end = ( is_numeric($_POST['add_end']) ) ? $_POST['add_end']:0;
    68 $add_request = ( ctype_alpha($_POST['add_request']) ) ?
    69   $_POST['add_request']:'';
     67$add_request = htmlspecialchars( $_POST['add_request'], ENT_QUOTES);
    7068$add_high = 'true'; // ( $_POST['add_high'] == 'true' ) ? 'true':'false';
    7169$add_normal = 'true'; // ( $_POST['add_normal'] == 'true' ) ? 'true':'false';
     
    8078  `high` , `normal` , `limit` , `comment` )
    8179VALUES (' . "
    82   '$add_partner', '$add_access',
    83   ADDDATE( NOW(), INTERVAL $add_start DAY),
     80  '$add_partner', '$add_target',
     81  NOW(),
    8482  ADDDATE( NOW(), INTERVAL $add_end DAY),
    8583  '$add_request', '$add_high', '$add_normal', '$add_limit', '$add_comment' );";
     
    208206       'NAME'             =>
    209207         (is_adviser()) ? '*********' : $row['name'],       
    210        'ACCESS'           => $row['access'],
    211        'START'            => $row['start'],
     208       'TARGET'           => $row['access'],
    212209       'END'              => $row['end'],
    213        'FORCE'            => $row['request'],
    214        'HIGH'             => $row['high'],
    215        'NORMAL'           => $row['normal'],
     210       'REQUEST'          => $row['request'],
    216211       'LIMIT'            => $row['limit'],
    217212       'COMMENT'          => $row['comment'],
     
    235230     array(
    236231       'VALUE'=> $value,
    237        'CONTENT' => $lang['ws_'.$value],
     232       'CONTENT' => $value,
    238233       'SELECTED' => '',
    239234     )
  • trunk/include/ws_functions.inc.php

    r1759 r1760  
    822822function official_req()
    823823{
    824 return array(
    825     'random'                              /* Random order */
    826   , 'list'               /* list on MBt & z0rglub request */
    827   , 'maxviewed'             /* hit > 0 and hit desc order */
    828   , 'recent'        /* recent = Date_available desc order */
    829   , 'highrated'            /* avg_rate > 0 and desc order */
    830   , 'oldest'                  /* Date_available asc order */
    831   , 'lessviewed'                         /* hit asc order */
    832   , 'lowrated'                      /* avg_rate asc order */
    833   , 'undescribed'                  /* description missing */
    834   , 'unnamed'                         /* new name missing */
    835   , 'portraits'     /* width < height (portrait oriented) */
    836   , 'landscapes'   /* width > height (landscape oriented) */
    837   , 'squares'             /* width ~ height (square form) */
    838 );
     824  $official = array(                  /* Requests are limited to             */
     825      'categories.'                          /* all categories. methods */
     826    , 'categories.getImages'                 /* <= see */
     827    , 'categories.getList'                   /* <= see */
     828    , 'images.'                              /* all images. methods */
     829    , 'images.getInfo'                       /* <= see */
     830    , 'tags.'                                /* all tags. methods */
     831    , 'tags.getImages'                       /* <= see */
     832    , 'tags.getList'                         /* <= see */
     833  );
     834  if (function_exists('local_req')) {
     835     $local = local_req();
     836     return array_merge( $official, $local );
     837  }
     838  return $official;
    839839}
    840840
  • trunk/language/en_UK.iso-8859-1/admin.lang.php

    r1755 r1760  
    502502//  $lang['ws_default_legend'] = '  Assumed defaults parameters in any missing cases ';
    503503//  $lang['ws_default'] = ' Default ';
    504 //  $lang['ws_request'] = ' Request (Demand type) ';
     504$lang['ws_Methods'] = ' Methods ';
    505505//  $lang['ws_requested_nbr'] = ' Number of images per request ';
    506506$lang['ws_random'] = 'Random';                                /* Random order */
  • trunk/language/fr_FR.iso-8859-1/admin.lang.php

    r1755 r1760  
    501501//  $lang['ws_default_legend'] = '  Valeurs par défaut en situation de paramètre manquant ';
    502502//  $lang['ws_default'] = ' Défauts ';
    503 //  $lang['ws_request'] = ' Requête (Type de demande) ';
     503$lang['ws_Methods'] = ' Méthodes ';
    504504//  $lang['ws_requested_nbr'] = ' Nombre d\'images renvoyées ';
    505505$lang['ws_random'] = 'Aléatoires';                            /* Random order */
  • trunk/template/yoga/admin/ws_checker.tpl

    r1745 r1760  
    3838        </td>
    3939        <td>
    40           <input type="text" maxlength="128" size="35" name="add_access"
    41             id="add_access" value="{F_ADD_ACCESS}"
     40          <input type="text" maxlength="128" size="35" name="add_target"
     41            id="add_target" value="{F_ADD_ACCESS}"
    4242            title="{lang:Facultative and restrictive option}" />
    4343          <i><small> ({lang:Access: see help text for more})
     
    6161            <!-- END add_request -->
    6262          </select>
    63           <i><small> ({lang:ws_Request})</small></i>
     63          <i><small> ({lang:ws_Methods})</small></i>
    6464        </td>
    6565      </tr>
     
    201201        <th>{lang:ws_KeyName}</th>
    202202        <th>{lang:ws_Access}</th>
    203         <!-- <th>{lang:ws_Start}</th> -->
    204203        <th>{lang:ws_End}</th>
    205204        <th>{lang:ws_Request}</th>
    206         <!-- <th>{lang:ws_High}</th> -->
    207         <!-- <th>{lang:ws_Normal}</th> -->
    208205        <th>{lang:ws_Limit}</th>
    209206        <th>{lang:ws_Comment}</th>
     
    216213        </td>
    217214        <td><label for="selection-{acc_list.access.ID}">{acc_list.access.NAME}</label></td>
    218         <td>{acc_list.access.ACCESS}</td>
    219         <!-- <td>{acc_list.access.START}</td> -->
     215        <td>{acc_list.access.TARGET}</td>
    220216        <td>{acc_list.access.END}</td>
    221         <td>{acc_list.access.FORCE}</td>
    222         <!-- <td>{acc_list.access.HIGH}</td> -->
    223         <!-- <td>{acc_list.access.NORMAL}</td> -->
     217        <td>{acc_list.access.REQUEST}</td>
    224218        <td>{acc_list.access.LIMIT}</td>
    225219        <td>{acc_list.access.COMMENT}</td>
Note: See TracChangeset for help on using the changeset viewer.