Changeset 1459
- Timestamp:
- Jul 11, 2006, 10:56:51 PM (18 years ago)
- Location:
- branches/branch-1_6
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/branch-1_6/admin/notification_by_mail.php
r1409 r1459 172 172 ); 173 173 174 array_push($page['infos'], sprintf(l10n('nbm_user_x_added'), $nbm_user['username'], $nbm_user['mail_address'])); 174 array_push 175 ( 176 $page['infos'], 177 sprintf( 178 l10n('nbm_user_x_added'), 179 $nbm_user['username'], 180 get_email_address_as_display_text($nbm_user['mail_address']) 181 ) 182 ); 175 183 } 176 184 … … 580 588 ) ? 'selected="selected"' : '', 581 589 'VALUE' => $nbm_user['check_key'], 582 'OPTION' => $nbm_user['username'].'['. $nbm_user['mail_address'].']'590 'OPTION' => $nbm_user['username'].'['.get_email_address_as_display_text($nbm_user['mail_address']).']' 583 591 )); 584 592 } … … 622 630 ) ? '' : 'checked="checked"', 623 631 'USERNAME'=> $nbm_user['username'], 624 'EMAIL' => $nbm_user['mail_address'],632 'EMAIL' => get_email_address_as_display_text($nbm_user['mail_address']), 625 633 'LAST_SEND'=> $nbm_user['last_send'] 626 634 )); -
branches/branch-1_6/admin/rating.php
r1333 r1459 75 75 } 76 76 77 if (isset($_GET['del']) )77 if (isset($_GET['del']) and !is_adviser()) 78 78 { 79 79 $del_params = urldecode( $_GET['del'] ); -
branches/branch-1_6/admin/site_manager.php
r1249 r1459 163 163 $page['site'] = $_GET['site']; 164 164 } 165 if (isset($_GET['action']) and isset($page['site']) )165 if (isset($_GET['action']) and isset($page['site']) and !is_adviser()) 166 166 { 167 167 $query = ' -
branches/branch-1_6/admin/site_update.php
r1295 r1459 112 112 $general_failure = false; 113 113 } 114 114 115 // shall we simulate only 115 if ( isset($_POST['simulate']) and $_POST['simulate'] == 1)116 if ((isset($_POST['simulate']) and $_POST['simulate'] == 1) or is_adviser()) 116 117 { 117 118 $simulate = true; -
branches/branch-1_6/admin/user_list.php
r1249 r1459 824 824 'USERNAME' => $local_user['username'], 825 825 'STATUS' => $lang['user_status_'.$local_user['status']].(($local_user['adviser'] == 'true') ? ' ['.$lang['adviser'].']' : ''), 826 'EMAIL' => isset($local_user['email']) ? $local_user['email']: '',826 'EMAIL' => isset($local_user['email']) ? get_email_address_as_display_text($local_user['email']) : '', 827 827 'GROUPS' => $groups_string, 828 828 'PROPERTIES' => (isset($local_user['enabled_high']) and ($local_user['enabled_high'] == 'true')) ? $lang['is_high_enabled'] : $lang['is_high_disabled'] -
branches/branch-1_6/admin/waiting.php
r1235 r1459 196 196 (substr($row['file'], 0, 10)).'...' : $row['file'], 197 197 'PREVIEW_URL_IMG'=>$preview_url, 198 'UPLOAD_EMAIL'=> $row['mail_address'],198 'UPLOAD_EMAIL'=>get_email_address_as_display_text($row['mail_address']), 199 199 'UPLOAD_USERNAME'=>$row['username'] 200 200 ) -
branches/branch-1_6/include/functions_user.inc.php
r1332 r1459 648 648 return ($user['adviser'] == 'true'); 649 649 } 650 651 /* 652 * Return mail address as display text 653 * @return string 654 */ 655 function get_email_address_as_display_text($email_address) 656 { 657 global $conf; 658 659 if (is_adviser()) 660 { 661 return 'adviser.mode@'.$_SERVER['SERVER_NAME']; 662 } 663 else 664 { 665 return $email_address; 666 } 667 } 668 650 669 ?> -
branches/branch-1_6/template/yoga/admin/rating.tpl
r1445 r1459 59 59 <td><b>{image.rate.USER}</b></td> 60 60 <td><span class="date">{image.rate.DATE}</span></td> 61 <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>61 <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> 62 62 </tr> 63 63 <!-- END rate --> -
branches/branch-1_6/template/yoga/admin/site_manager.tpl
r1293 r1459 25 25 <input type="hidden" name="no_check" value="1"/> 26 26 <input type="hidden" name="galleries_url" value="{local_listing.URL}" /> 27 <input type="submit" name="submit" value="{lang:submit}" />27 <input type="submit" name="submit" value="{lang:submit}" {TAG_INPUT_ENABLED} /> 28 28 </p> 29 29 </form> … … 43 43 <!-- BEGIN delete --> 44 44 [<a href="{sites.site.delete.U_DELETE}" onclick="return confirm('{lang:Are you sure?}');" 45 title="{lang:site_delete_hint}" >{lang:site_delete}</a>]45 title="{lang:site_delete_hint}" {TAG_INPUT_ENABLED}>{lang:site_delete}</a>] 46 46 <!-- END delete --> 47 47 <!-- BEGIN remote --> 48 48 <br> 49 [<a href="{sites.site.remote.U_TEST}" title="{lang:remote_site_test_hint}" >{lang:remote_site_test}</a>]50 [<a href="{sites.site.remote.U_GENERATE}" title="{lang:remote_site_generate_hint}" >{lang:remote_site_generate}</a>]51 [<a href="{sites.site.remote.U_CLEAN}" title="{lang:remote_site_clean_hint}" >{lang:remote_site_clean}</a>]49 [<a href="{sites.site.remote.U_TEST}" title="{lang:remote_site_test_hint}" {TAG_INPUT_ENABLED}>{lang:remote_site_test}</a>] 50 [<a href="{sites.site.remote.U_GENERATE}" title="{lang:remote_site_generate_hint}" {TAG_INPUT_ENABLED}>{lang:remote_site_generate}</a>] 51 [<a href="{sites.site.remote.U_CLEAN}" title="{lang:remote_site_clean_hint}" {TAG_INPUT_ENABLED}>{lang:remote_site_clean}</a>] 52 52 <!-- END remote --> 53 53 </td></tr>
Note: See TracChangeset
for help on using the changeset viewer.