aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2008-03-07 02:07:55 +0000
committerrvelices <rv-github@modusoptimus.com>2008-03-07 02:07:55 +0000
commit5a7723ff10ee2b01770542b2b5726cdfb8769e4a (patch)
tree75c44637d12d9eeaef8fa80ddca680b554d17d17
parent111a34e5814410be7cf17675d89687c4f420ab8a (diff)
- some more smarty migration (admin upload ws_checker profile and plugin)
git-svn-id: http://piwigo.org/svn/trunk@2260 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/upload.php24
-rw-r--r--admin/ws_checker.php202
-rw-r--r--template/yoga/admin/plugin.tpl6
-rw-r--r--template/yoga/admin/profile.tpl6
-rw-r--r--template/yoga/admin/upload.tpl68
-rw-r--r--template/yoga/admin/ws_checker.tpl170
6 files changed, 194 insertions, 282 deletions
diff --git a/admin/upload.php b/admin/upload.php
index 9bc0f5067..55e774de4 100644
--- a/admin/upload.php
+++ b/admin/upload.php
@@ -2,7 +2,7 @@
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | file : $Id$
// | last update : $Date$
@@ -143,7 +143,7 @@ $template->set_filenames(array('upload'=>'admin/upload.tpl'));
// TabSheet initialization
waiting_tabsheet();
-$template->assign_vars(array(
+$template->assign(array(
'F_ACTION'=>str_replace( '&', '&amp;', $_SERVER['REQUEST_URI'])
));
@@ -156,7 +156,6 @@ $query.= " WHERE validated = 'false'";
$query.= ' ORDER BY storage_category_id';
$query.= ';';
$result = pwg_query( $query );
-$i = 0;
while ( $row = mysql_fetch_array( $result ) )
{
if ( !isset( $cat_names[$row['storage_category_id']] ) )
@@ -169,13 +168,9 @@ while ( $row = mysql_fetch_array( $result ) )
get_cat_display_name($cat['upper_names']);
}
$preview_url = PHPWG_ROOT_PATH.$cat_names[$row['storage_category_id']]['dir'].$row['file'];
- $class='row1';
- if ( $i++ % 2== 0 ) $class='row2';
- $template->assign_block_vars(
- 'picture',
+ $tpl_var =
array(
- 'WAITING_CLASS'=>$class,
'CATEGORY_IMG'=>$cat_names[$row['storage_category_id']]['display_name'],
'ID_IMG'=>$row['id'],
'DATE_IMG' => date('Y-m-d H:i:s', $row['date']),
@@ -186,7 +181,6 @@ while ( $row = mysql_fetch_array( $result ) )
'PREVIEW_URL_IMG'=>$preview_url,
'UPLOAD_EMAIL'=>get_email_address_as_display_text($row['mail_address']),
'UPLOAD_USERNAME'=>$row['username']
- )
);
// is there an existing associated thumnail ?
@@ -198,26 +192,20 @@ while ( $row = mysql_fetch_array( $result ) )
$url = $cat_names[$row['storage_category_id']]['dir'];
$url.= 'thumbnail/'.$thumbnail;
- $template->assign_block_vars(
- 'picture.thumbnail',
+ $tpl_var['thumbnail'] =
array(
'PREVIEW_URL_TN_IMG' => $url,
'FILE_TN_IMG' =>
(strlen($thumbnail) > 10) ?
(substr($thumbnail, 0, 10)).'...' : $thumbnail,
'FILE_TN_TITLE' => $thumbnail
- )
);
}
-
+ $template->append('pictures', $tpl_var);
array_push($list, $row['id']);
}
-$template->assign_vars(
- array(
- 'LIST' => implode(',', $list)
- )
- );
+$template->assign('LIST',implode(',', $list) );
//----------------------------------------------------------- sending html code
$template->assign_var_from_handle('ADMIN_CONTENT', 'upload');
diff --git a/admin/ws_checker.php b/admin/ws_checker.php
index 6a5efb4fc..e50f17fdf 100644
--- a/admin/ws_checker.php
+++ b/admin/ws_checker.php
@@ -2,10 +2,9 @@
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
-// | branch : BSF (Best So Far)
-// | file : $RCSfile$
+// | file : $Id$
// | last update : $Date$
// | last modifier : $Author$
// | revision : $Revision$
@@ -154,11 +153,9 @@ VALUES (' . "
pwg_query($query);
$chk_partner = $add_partner;
- $template->assign_block_vars(
- 'update_result',
- array(
- 'UPD_ELEMENT'=> l10n('ws_adding_legend').l10n('ws_success_upd'),
- )
+ $template->append(
+ 'update_results',
+ l10n('ws_adding_legend').l10n('ws_success_upd')
);
}
@@ -176,18 +173,14 @@ if (isset($_POST['wsu_submit']))
SET '.$settxt.'
WHERE id = '.$uid.'; ';
pwg_query($query);
- $template->assign_block_vars(
- 'update_result',
- array(
- 'UPD_ELEMENT'=> l10n('ws_update_legend').l10n('ws_success_upd'),
- )
+ $template->append(
+ 'update_results',
+ l10n('ws_update_legend').l10n('ws_success_upd')
);
} else {
- $template->assign_block_vars(
- 'update_result',
- array(
- 'UPD_ELEMENT'=> l10n('ws_update_legend').l10n('ws_failed_upd'),
- )
+ $template->append(
+ 'update_results',
+ l10n('ws_update_legend').l10n('ws_failed_upd')
);
}
}
@@ -202,19 +195,14 @@ if (isset($_POST['wsX_submit']))
$query = 'DELETE FROM '.WEB_SERVICES_ACCESS_TABLE.'
WHERE id = '.$uid.'; ';
pwg_query($query);
- $template->assign_block_vars(
- 'update_result',
- array(
- 'UPD_ELEMENT'=> l10n('ws_delete_legend').l10n('ws_success_upd'),
- )
+ $template->append(
+ 'update_results',
+ l10n('ws_delete_legend').l10n('ws_success_upd')
);
} else {
- $template->assign_block_vars(
- 'update_result',
- array(
- 'UPD_ELEMENT'=> l10n('Not selected / Not confirmed')
- .l10n('ws_failed_upd'),
- )
+ $template->append(
+ 'update_results',
+ l10n('Not selected / Not confirmed').l10n('ws_failed_upd')
);
}
}
@@ -252,23 +240,14 @@ $template->set_filenames(
)
);
-$selected = 'selected="selected"';
-$num=0;
-if ( $acc_list > 0 )
-{
- $template->assign_block_vars(
- 'acc_list', array() );
-}
// Access List
while ($row = mysql_fetch_array($result))
{
- $num++;
$chk_partner = ( $chk_partner == '' ) ? $row['name'] : $chk_partner;
- $template->assign_block_vars(
- 'acc_list.access',
+ $template->append(
+ 'access_list',
array(
- 'CLASS' => ($num % 2 == 1) ? 'row1' : 'row2',
'ID' => $row['id'],
'NAME' =>
(is_adviser()) ? '*********' : $row['name'],
@@ -277,45 +256,17 @@ while ($row = mysql_fetch_array($result))
'REQUEST' => $row['request'],
'LIMIT' => $row['limit'],
'COMMENT' => $row['comment'],
- 'SELECTED' => '',
)
);
}
-$template->assign_block_vars(
- 'add_request',
- array(
- 'VALUE'=> '',
- 'CONTENT' => '',
- 'SELECTED' => $selected,
- )
-);
-foreach ($req_type_list as $value) {
-
- $template->assign_block_vars(
- 'add_request',
- array(
- 'VALUE'=> $value,
- 'CONTENT' => $value,
- 'SELECTED' => '',
- )
- );
-}
+$template->assign('add_requests', $req_type_list);
-foreach ($conf['ws_allowed_limit'] as $value) {
- $template->assign_block_vars(
- 'add_limit',
- array(
- 'VALUE'=> $value,
- 'CONTENT' => $value,
- 'SELECTED' => ($conf['ws_allowed_limit'][0] == $value) ? $selected:'',
- )
- );
-}
+$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) {
+/*foreach ($conf['ws_postponed_start'] as $value) {
$template->assign_block_vars(
'add_start',
array(
@@ -324,75 +275,58 @@ foreach ($conf['ws_postponed_start'] as $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)
-foreach ($conf['ws_durations'] as $value) {
- $template->assign_block_vars(
- 'add_end',
- array(
- 'VALUE'=> $value,
- 'CONTENT' => $value,
- 'SELECTED' => ($conf['ws_durations'][3] == $value) ? $selected:'',
- )
- );
- if ( $acc_list > 0 )
- {
- $template->assign_block_vars(
- 'acc_list.upd_end',
- array(
- 'VALUE'=> $value,
- 'CONTENT' => $value,
- 'SELECTED' => ($conf['ws_durations'][3] == $value) ? $selected:'',
- )
- );
- }
-}
+$template->assign('add_ends', $conf['ws_durations']);
+
if ( $chk_partner !== '' )
{
- $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 = 'PhpWebGallery 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 = 'PhpWebGallery 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 = 'PhpWebGallery 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 = 'PhpWebGallery Web Services returned an unexpected HTTP '
- . 'status of:' . $status_code[0];
+ 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 = 'PhpWebGallery 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 = 'PhpWebGallery 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 = 'PhpWebGallery 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 = 'PhpWebGallery Web Services returned an unexpected HTTP '
+ . 'status of:' . $status_code[0];
+ }
}
- $template->assign_block_vars(
- 'acc_list.ws_status',
- array(
- 'VALUE'=> $ws_status,
- )
- );
+ else
+ {
+ $ws_status = 'Cannot check - curl not installed';
+ }
+ $template->assign( 'WS_STATUS', $ws_status );
}
//----------------------------------------------------------- sending html code
diff --git a/template/yoga/admin/plugin.tpl b/template/yoga/admin/plugin.tpl
index 8a10b02cf..5a0a1fbe7 100644
--- a/template/yoga/admin/plugin.tpl
+++ b/template/yoga/admin/plugin.tpl
@@ -1,7 +1,7 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
<div class="titrePage">
- <h2>{PLUGIN_TITLE}</h2>
+ <h2>{$PLUGIN_TITLE}</h2>
</div>
-{PLUGIN_ADMIN_CONTENT}
+{$PLUGIN_ADMIN_CONTENT}
diff --git a/template/yoga/admin/profile.tpl b/template/yoga/admin/profile.tpl
index 383841a79..f6326319c 100644
--- a/template/yoga/admin/profile.tpl
+++ b/template/yoga/admin/profile.tpl
@@ -1,6 +1,6 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
<div class="titrePage">
- <h2>{lang:Profile}</h2>
+ <h2>{'Profile'|@translate}</h2>
</div>
-{PROFILE_CONTENT}
+{$PROFILE_CONTENT}
diff --git a/template/yoga/admin/upload.tpl b/template/yoga/admin/upload.tpl
index 755e5ac35..419a01ec0 100644
--- a/template/yoga/admin/upload.tpl
+++ b/template/yoga/admin/upload.tpl
@@ -1,51 +1,53 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
<div class="titrePage">
- <h2>{lang:waiting} {TABSHEET_TITLE}</h2>
- {TABSHEET}
+ <h2>{'waiting'|@translate} {$TABSHEET_TITLE}</h2>
+ {$TABSHEET}
</div>
-<h3>{lang:title_upload}</h3>
+<h3>{'title_upload'|@translate}</h3>
-<form action="{F_ACTION}" method="post" id="waiting">
- <table style="width:100%;" >
+<form action="{$F_ACTION}" method="post" id="waiting">
+ <table style="width:99%;" >
<tr class="throw">
- <th style="width:20%;">{lang:category}</th>
- <th style="width:20%;">{lang:date}</th>
- <th style="width:20%;">{lang:file}</th>
- <th style="width:20%;">{lang:thumbnail}</th>
- <th style="width:20%;">{lang:Author}</th>
+ <th style="width:20%;">{'category'|@translate}</th>
+ <th style="width:20%;">{'date'|@translate}</th>
+ <th style="width:20%;">{'file'|@translate}</th>
+ <th style="width:20%;">{'thumbnail'|@translate}</th>
+ <th style="width:20%;">{'Author'|@translate}</th>
<th style="width:1px;">&nbsp;</th>
</tr>
- <!-- BEGIN picture -->
- <tr>
- <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">{picture.CATEGORY_IMG}</td>
- <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">{picture.DATE_IMG}</td>
- <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
- <a href="{picture.PREVIEW_URL_IMG}" title="{picture.FILE_TITLE}">{picture.FILE_IMG}</a>
+
+ {if not empty($pictures) }
+ {foreach from=$pictures item=picture name=picture_loop}
+ <tr class="{if $smarty.foreach.picture_loop.index is odd}row1{else}row2{/if}">
+ <td style="white-space:nowrap;">{$picture.CATEGORY_IMG}</td>
+ <td style="white-space:nowrap;">{$picture.DATE_IMG}</td>
+ <td style="white-space:nowrap;">
+ <a href="{$picture.PREVIEW_URL_IMG}" title="{$picture.FILE_TITLE}">{$picture.FILE_IMG}</a>
</td>
- <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
- <!-- BEGIN thumbnail -->
- <a href="{picture.thumbnail.PREVIEW_URL_TN_IMG}" title="{picture.thumbnail.FILE_TN_TITLE}">{picture.thumbnail.FILE_TN_IMG}</a>
- <!-- END thumbnail -->
+ <td style="white-space:nowrap;">
+ {if not empty($picture.thumbnail) }
+ <a href="{$picture.thumbnail.PREVIEW_URL_TN_IMG}" title="{$picture.thumbnail.FILE_TN_TITLE}">{$picture.thumbnail.FILE_TN_IMG}</a>
+ {/if}
</td>
- <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
- <a href="mailto:{picture.UPLOAD_EMAIL}">{picture.UPLOAD_USERNAME}</a>
+ <td style="white-space:nowrap;">
+ <a href="mailto:{$picture.UPLOAD_EMAIL}">{$picture.UPLOAD_USERNAME}</a>
</td>
- <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
- <label><input type="radio" name="action-{picture.ID_IMG}" value="validate" /> {lang:Validate}</label>
- <label><input type="radio" name="action-{picture.ID_IMG}" value="reject" /> {lang:Reject}</label>
+ <td style="white-space:nowrap;">
+ <label><input type="radio" name="action-{$picture.ID_IMG}" value="validate" /> {'Validate'|@translate}</label>
+ <label><input type="radio" name="action-{$picture.ID_IMG}" value="reject" /> {'Reject'|@translate}</label>
</td>
</tr>
- <!-- END picture -->
+ {/foreach}
+ {/if}
</table>
<p class="bottomButtons">
- <input type="hidden" name="list" value="{LIST}" />
- <input class="submit" type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}/>
- <input class="submit" type="submit" name="validate-all" value="{lang:Validate All}" {TAG_INPUT_ENABLED}/>
- <input class="submit" type="submit" name="reject-all" value="{lang:Reject All}" {TAG_INPUT_ENABLED}/>
- <input class="submit" type="reset" value="{lang:Reset}" />
+ <input type="hidden" name="list" value="{$LIST}" />
+ <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}/>
+ <input class="submit" type="submit" name="validate-all" value="{'Validate All'|@translate}" {$TAG_INPUT_ENABLED}/>
+ <input class="submit" type="submit" name="reject-all" value="{'Reject All'|@translate}" {$TAG_INPUT_ENABLED}/>
+ <input class="submit" type="reset" value="{'Reset'|@translate}" />
</p>
</form>
diff --git a/template/yoga/admin/ws_checker.tpl b/template/yoga/admin/ws_checker.tpl
index b61d75176..cce3c7f49 100644
--- a/template/yoga/admin/ws_checker.tpl
+++ b/template/yoga/admin/ws_checker.tpl
@@ -1,93 +1,87 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id$ -->
+{* $Id$ *}
<div class="titrePage">
<ul class="categoryActions">
- <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+ <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
</ul>
- <h2>{lang:title_wscheck} - {lang:web_services}</h2>
+ <h2>{'title_wscheck'|@translate} - {'web_services'|@translate}</h2>
</div>
-<!-- BEGIN update_result -->
+{if !empty($update_results)}
<ul>
- {update_result.UPD_ELEMENT}
+ {foreach from=$update_results item=result}
+ <li>$result</li>
+ {/foreach}
</ul>
-<!-- END update_result -->
+{/if}
-<!-- Add Access -->
-<form method="post" name="adding_access" action="{F_STATUS_ACTION}">
+{* Add Access *}
+<form method="post" name="adding_access" action="{$F_STATUS_ACTION}">
<!-- Current Default -->
<fieldset>
- <legend>{lang:ws_adding_legend}</legend>
+ <legend>{'ws_adding_legend'|@translate}</legend>
<table>
- <!-- Access key -->
+ {* Access key *}
<tr>
<td>
- <label for="KeyName">{lang:Confidential partner key} </label>
+ <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="{lang:Basis of access key calculation}" />
+ 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,...) -->
+ {* Target (cat/ids, tag/ids, or list/ids ids=id,id-id,...) *}
<tr>
<td>
- <label for="Access">{lang:Target}</label>
+ <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="{lang:Facultative and restrictive option}" />
- <i><small> ({lang:Access: see help text for more})
+ 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 -->
+ {* Restricted access to specific request *}
<tr>
<td>
- <label for="add_request">{lang:Restrict access to}</label>
+ <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';">
- <!-- BEGIN add_request -->
- <option value="{add_request.VALUE}"
- {add_request.SELECTED}>{add_request.CONTENT}
- </option>
- <!-- END add_request -->
+ <option value=""></option>
+ {html_options values=$add_requests output=$add_requests}
</select>
- <i><small> ({lang:ws_Methods})</small></i>
+ <i><small> ({'ws_Methods'|@translate})</small></i>
</td>
</tr>
- <!-- Limit number of images information to be return -->
+ {* Limit number of images information to be return *}
<tr>
<td>
- <label for="add_limit">{lang:Returned images limit}</label>
+ <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';">
- <!-- BEGIN add_limit -->
- <option value="{add_limit.VALUE}"
- {add_limit.SELECTED}>{add_limit.CONTENT}
- </option>
- <!-- END add_limit -->
+ {html_options values=$add_limits output=$add_limits}
</select>
</td>
</tr>
- <!-- Open service is postponed by n days -->
- <!-- In comment currently
+ {* Open service is postponed by n days *}
+ {* In comment currently
<tr>
<td>
- <label for="add_start">{lang:Postponed availability in days}</label>
+ <label for="add_start">{'Postponed availability in days'|@translate}</label>
</td>
<td>
<select name="add_start" id="add_start" style="width: 10em"
@@ -100,100 +94,97 @@
<!-- END add_start -->
</select>
</td>
- </tr> -->
+ </tr>
+ *}
- <!-- Opened service only for n days -->
+ {* Opened service only for n days *}
<tr>
<td>
- <label for="add_end">{lang:Duration in days}</label>
+ <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';">
- <!-- BEGIN add_end -->
- <option value="{add_end.VALUE}"
- {add_end.SELECTED}>{add_end.CONTENT}
- </option>
- <!-- END add_end -->
+ {html_options values=$add_ends output=$add_ends}
</select>
</td>
</tr>
- <!-- Idendify your partner (name / website / phone) as you want -->
+ {* Idendify your partner (name / website / phone) as you want *}
<tr>
<td>
- <label for="add_Comment">{lang:ws_Comment}</label>
+ <label for="add_Comment">{'ws_Comment'|@translate}</label>
<br />
</td>
<td>
<textarea name="add_comment" id="add_comment"
- rows="4" cols="80">{lang:Comment to identify your partner clearly}</textarea>
+ rows="4" cols="80">{'Comment to identify your partner clearly'|@translate}</textarea>
</td>
</tr>
- <!-- Add submit button -->
+ {* Add submit button *}
<tr>
<td>
</td>
<td>
<input class="submit" type="submit" name="wsa_submit" style="width: 10em; padding-top: 3px;"
- value="{lang:Submit}" {TAG_INPUT_ENABLED}
- title="{lang:Add this access definition}" />
+ value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}
+ title="{'Add this access definition'|@translate}" />
</td>
</tr>
</table>
</fieldset>
</form>
-<!-- BEGIN acc_list -->
+{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}">
+<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>{lang:ws_update_legend}</legend>
+ <legend>{'ws_update_legend'|@translate}</legend>
<table class="table2">
<tr class="throw">
<th>&nbsp;</th>
- <th>{lang:ws_KeyName}</th>
- <th>{lang:ws_Access}</th>
- <th>{lang:ws_End}</th>
- <th>{lang:ws_Request}</th>
- <th>{lang:ws_Limit}</th>
- <th>{lang:ws_Comment}</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>
- <!-- BEGIN access -->
- <tr class="{acc_list.access.CLASS}">
+ {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="{acc_list.access.ID}" id="selection-{acc_list.access.ID}">
- </td>
- <td><label for="selection-{acc_list.access.ID}">{acc_list.access.NAME}</label></td>
- <td>{acc_list.access.TARGET}</td>
- <td>{acc_list.access.END}</td>
- <td>{acc_list.access.REQUEST}</td>
- <td>{acc_list.access.LIMIT}</td>
- <td>{acc_list.access.COMMENT}</td>
+ 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>
- <!-- END user -->
+ {/foreach}
</table>
<table>
<tr>
<td>
- {lang:ws_delete_legend}
+ {'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="{lang:Delete}" {TAG_INPUT_ENABLED}>
+ value="{'Delete'|@translate}" {$TAG_INPUT_ENABLED}>
</td>
</tr>
</table>
@@ -202,29 +193,26 @@
<tr>
<td>
<span class="property">
- <label for="upd_end">{lang:Modify End from Now +} </label>
+ <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';">
- <!-- BEGIN upd_end -->
- <option value="{acc_list.upd_end.VALUE}" {acc_list.upd_end.SELECTED}>
- {acc_list.upd_end.CONTENT}
- </option>
- <!-- END upd_end -->
+ {html_options values=$add_ends output=$add_ends}
</select>
<input class="submit" type="submit" name="wsu_submit" style="width: 10em; padding-top: 3px;"
- value="{lang:Submit}" {TAG_INPUT_ENABLED}>
+ value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}>
</td>
<td>
- <i><small> ({lang:Web Services availability duration in days})</small></i>
+ <i><small> ({'Web Services availability duration in days'|@translate})</small></i>
</td>
</tr>
</table>
</fieldset>
</form>
-<!-- BEGIN ws_status -->
- <h3>{acc_list.ws_status.VALUE}</h3>
-<!-- END ws_status -->
-<!-- END acc_list -->
+{/if}
+
+{if isset($WS_STATUS)}
+ <h3>{$WS_STATUS}</h3>
+{/if}