iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Externalization of common functions of web service.

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@1670 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
vdigital
2006-12-16 12:14:59 +00:00
parent 3d32716fc5
commit 43399d359b
3 changed files with 10 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
admin/ws_checker.php
View File

@@ -25,106 +25,6 @@
// | USA. |
// +-----------------------------------------------------------------------+
// +-----------------------------------------------------------------------+
// | functions |
// +-----------------------------------------------------------------------+
// Function to migrate be useful for ws
function official_req()
{
return array(
'random' /* Random order */
, 'list' /* list on MBt & z0rglub request */
, 'maxviewed' /* hit > 0 and hit desc order */
, 'recent' /* recent = Date_available desc order */
, 'highrated' /* avg_rate > 0 and desc order */
, 'oldest' /* Date_available asc order */
, 'lessviewed' /* hit asc order */
, 'lowrated' /* avg_rate asc order */
, 'undescribed' /* description missing */
, 'unnamed' /* new name missing */
, 'portraits' /* width < height (portrait oriented) */
, 'landscapes' /* width > height (landscape oriented) */
, 'squares' /* width ~ height (square form) */
);
}
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;
}
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;
}
// Next evolution...
// Out of parameter WS management
// The remainer objective is to check

1
include/functions.inc.php
View File

@@ -34,6 +34,7 @@ include_once( PHPWG_ROOT_PATH .'include/functions_html.inc.php' );
include_once( PHPWG_ROOT_PATH .'include/functions_tag.inc.php' );
include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' );
include_once( PHPWG_ROOT_PATH .'include/functions_plugins.inc.php' );
include_once( PHPWG_ROOT_PATH .'include/functions_webserv.inc.php' );
//----------------------------------------------------------- generic functions

13
web_service.php
View File

@@ -120,11 +120,16 @@ if (isset($_SERVER["HTTP_REFERER"]) and
// FIXME
// FIXME// FIXME// FIXME// FIXME// FIXME// FIXME// FIXME// FIXME
// Check keywords
//
// Key and pos are correct
// &acc=cat/23,25-32&req=landscape&lim=5&tpl=myxml
// Check requested XML template
//
@@ -140,7 +145,7 @@ if (isset($_SERVER["HTTP_REFERER"]) and
// Old code below
//------------ Main security strategy ---------------------
$partner_id = 'default';