mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-05-11 10:56:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolved Issue ID 0000456, 0000457, 0000459, 0000465:

Browse source 
o Fix bugs adviser mode



git-svn-id: http://piwigo.org/svn/trunk@1458 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub 2006-07-11 20:51:24 +00:00
parent cfcb489cfa
commit 8a7fff22b0
9 changed files with 42 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
admin/notification_by_mail.php
View file

@ -171,7 +171,15 @@ order by
)
);
array_push($page['infos'], sprintf(l10n('nbm_user_x_added'), $nbm_user['username'], $nbm_user['mail_address']));
array_push
(
$page['infos'],
sprintf(
l10n('nbm_user_x_added'),
$nbm_user['username'],
get_email_address_as_display_text($nbm_user['mail_address'])
)
);
}
// Insert new nbm_users
@ -579,7 +587,7 @@ switch ($page['mode'])
: (isset($_POST['trueify']) and isset($_POST['cat_false']) and in_array($nbm_user['check_key'], $_POST['cat_false']))
) ? 'selected="selected"' : '',
'VALUE' => $nbm_user['check_key'],
'OPTION' => $nbm_user['username'].'['.$nbm_user['mail_address'].']'
'OPTION' => $nbm_user['username'].'['.get_email_address_as_display_text($nbm_user['mail_address']).']'
));
}
@ -621,7 +629,7 @@ switch ($page['mode'])
!in_array($nbm_user['check_key'], $_POST['send_selection']) // not selected
) ? '' : 'checked="checked"',
'USERNAME'=> $nbm_user['username'],
'EMAIL' => $nbm_user['mail_address'],
'EMAIL' => get_email_address_as_display_text($nbm_user['mail_address']),
'LAST_SEND'=> $nbm_user['last_send']
));
}

2
admin/rating.php
View file

@ -74,7 +74,7 @@ if (isset($_GET['users']))
}
}
if (isset($_GET['del']))
if (isset($_GET['del']) and !is_adviser())
{
$del_params = urldecode( $_GET['del'] );
parse_str($del_params, $vars);

2
admin/site_manager.php
View file

@ -162,7 +162,7 @@ if (isset($_GET['site']) and is_numeric($_GET['site']))
{
$page['site'] = $_GET['site'];
}
if (isset($_GET['action']) and isset($page['site']) )
if (isset($_GET['action']) and isset($page['site']) and !is_adviser())
{
$query = '
SELECT galleries_url

3
admin/site_update.php
View file

@ -111,8 +111,9 @@ if (isset($_POST['submit']))
{
$general_failure = false;
}
// shall we simulate only
if (isset($_POST['simulate']) and $_POST['simulate'] == 1)
if ((isset($_POST['simulate']) and $_POST['simulate'] == 1) or is_adviser())
{
$simulate = true;
}

2
admin/user_list.php
View file

@ -823,7 +823,7 @@ foreach ($page['filtered_users'] as $num => $local_user)
'U_PERM' => $perm_url.$local_user['id'],
'USERNAME' => $local_user['username'],
'STATUS' => $lang['user_status_'.$local_user['status']].(($local_user['adviser'] == 'true') ? ' ['.$lang['adviser'].']' : ''),
'EMAIL' => isset($local_user['email']) ? $local_user['email'] : '',
'EMAIL' => isset($local_user['email']) ? get_email_address_as_display_text($local_user['email']) : '',
'GROUPS' => $groups_string,
'PROPERTIES' => (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true')) ? $lang['is_high_enabled'] : $lang['is_high_disabled']
)

2
admin/waiting.php
View file

@ -195,7 +195,7 @@ while ( $row = mysql_fetch_array( $result ) )
(strlen($row['file']) > 10) ?
(substr($row['file'], 0, 10)).'...' : $row['file'],
'PREVIEW_URL_IMG'=>$preview_url,
'UPLOAD_EMAIL'=>$row['mail_address'],
'UPLOAD_EMAIL'=>get_email_address_as_display_text($row['mail_address']),
'UPLOAD_USERNAME'=>$row['username']
)
);

19
include/functions_user.inc.php
View file

@ -647,4 +647,23 @@ function is_adviser()
return ($user['adviser'] == 'true');
}
/*
* Return mail address as display text
* @return string
*/
function get_email_address_as_display_text($email_address)
{
global $conf;
if (is_adviser())
{
return 'adviser.mode@'.$_SERVER['SERVER_NAME'];
}
else
{
return $email_address;
}
}
?>

2
template/yoga/admin/rating.tpl
View file

@ -58,7 +58,7 @@
<td>{image.rate.RATE}</td>
<td><b>{image.rate.USER}</b></td>
<td><span class="date">{image.rate.DATE}</span></td>
<td><a href="{image.rate.U_DELETE}"><img src="{themeconf:icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{lang:delete}]"/></a></td>
<td><a href="{image.rate.U_DELETE}" {TAG_INPUT_ENABLED}><img src="{themeconf:icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{lang:delete}]"/></a></td>
</tr>
<!-- END rate -->
<!-- END image -->

10
template/yoga/admin/site_manager.tpl
View file

@ -24,7 +24,7 @@
{lang:remote_site_local_create}:
<input type="hidden" name="no_check" value="1"/>
<input type="hidden" name="galleries_url" value="{local_listing.URL}" />
<input type="submit" name="submit" value="{lang:submit}"/>
<input type="submit" name="submit" value="{lang:submit}" {TAG_INPUT_ENABLED} />
</p>
</form>
<!-- END create -->
@ -42,13 +42,13 @@
[<a href="{sites.site.U_SYNCHRONIZE}" title="{lang:site_synchronize_hint}">{lang:site_synchronize}</a>]
<!-- BEGIN delete -->
[<a href="{sites.site.delete.U_DELETE}" onclick="return confirm('{lang:Are you sure?}');"
title="{lang:site_delete_hint}">{lang:site_delete}</a>]
title="{lang:site_delete_hint}" {TAG_INPUT_ENABLED}>{lang:site_delete}</a>]
<!-- END delete -->
<!-- BEGIN remote -->
<br>
[<a href="{sites.site.remote.U_TEST}" title="{lang:remote_site_test_hint}">{lang:remote_site_test}</a>]
[<a href="{sites.site.remote.U_GENERATE}" title="{lang:remote_site_generate_hint}">{lang:remote_site_generate}</a>]
[<a href="{sites.site.remote.U_CLEAN}" title="{lang:remote_site_clean_hint}">{lang:remote_site_clean}</a>]
[<a href="{sites.site.remote.U_TEST}" title="{lang:remote_site_test_hint}" {TAG_INPUT_ENABLED}>{lang:remote_site_test}</a>]
[<a href="{sites.site.remote.U_GENERATE}" title="{lang:remote_site_generate_hint}" {TAG_INPUT_ENABLED}>{lang:remote_site_generate}</a>]
[<a href="{sites.site.remote.U_CLEAN}" title="{lang:remote_site_clean_hint}" {TAG_INPUT_ENABLED}>{lang:remote_site_clean}</a>]
<!-- END remote -->
</td></tr>
<!-- END site -->