makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12804] Hide Jabber from UCP & member search when disabled

Browse source 
PHPBB3-12804
This commit is contained in:
PayBas 2014-07-07 08:59:38 +02:00
parent 0bec9897d7
commit c5b4d0afb7
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/ucp/ucp_profile.php
View file

@ -393,8 +393,9 @@ class ucp_profile
} }
$template->assign_vars(array( $template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '', 'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'JABBER' => $data['jabber'], 'S_JABBER_ENABLED' => ($config['jab_enable']) ? true : false,
'JABBER' => $data['jabber'],
)); ));
// Get additional profile fields and assign them to the template block var 'profile_fields' // Get additional profile fields and assign them to the template block var 'profile_fields'

1
phpBB/memberlist.php
View file

@ -1286,6 +1286,7 @@ switch ($mode)
'S_IP_SEARCH_ALLOWED' => ($auth->acl_getf_global('m_info')) ? true : false, 'S_IP_SEARCH_ALLOWED' => ($auth->acl_getf_global('m_info')) ? true : false,
'S_EMAIL_SEARCH_ALLOWED'=> ($auth->acl_get('a_user')) ? true : false, 'S_EMAIL_SEARCH_ALLOWED'=> ($auth->acl_get('a_user')) ? true : false,
'S_JABBER_ENABLED' => ($config['jab_enable']) ? true : false,
'S_IN_SEARCH_POPUP' => ($form && $field) ? true : false, 'S_IN_SEARCH_POPUP' => ($form && $field) ? true : false,
'S_SEARCH_USER' => ($mode == 'searchuser' || ($mode == '' && $submit)), 'S_SEARCH_USER' => ($mode == 'searchuser' || ($mode == '' && $submit)),
'S_FORM_NAME' => $form, 'S_FORM_NAME' => $form,

18
phpBB/styles/prosilver/template/memberlist_search.html
View file

@ -29,18 +29,20 @@
<dd><input type="text" name="email" id="email" value="{EMAIL}" class="inputbox" /></dd> <dd><input type="text" name="email" id="email" value="{EMAIL}" class="inputbox" /></dd>
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_JABBER_ENABLED -->
<dl> <dl>
<dt><label for="jabber">{L_JABBER}:</label></dt> <dt><label for="jabber">{L_JABBER}:</label></dt>
<dd><input type="text" name="jabber" id="jabber" value="{JABBER}" class="inputbox" /></dd> <dd><input type="text" name="jabber" id="jabber" value="{JABBER}" class="inputbox" /></dd>
</dl> </dl>
<dl> <!-- ENDIF -->
<dt><label for="search_group_id">{L_GROUP}{L_COLON}</label></dt> <dl>
<dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd> <dt><label for="search_group_id">{L_GROUP}{L_COLON}</label></dt>
</dl> <dd><select name="search_group_id" id="search_group_id">{S_GROUP_SELECT}</select></dd>
<dl> </dl>
<dt><label for="sk" class="label3">{L_SORT_BY}{L_COLON}</label></dt> <dl>
<dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd> <dt><label for="sk" class="label3">{L_SORT_BY}{L_COLON}</label></dt>
</dl> <dd><select name="sk" id="sk">{S_SORT_OPTIONS}</select> <select name="sd">{S_ORDER_SELECT}</select></dd>
</dl>
</fieldset> </fieldset>
<fieldset class="fields1 column2"> <fieldset class="fields1 column2">

2
phpBB/styles/prosilver/template/ucp_profile_profile_info.html
View file

@ -20,10 +20,12 @@
</dd> </dd>
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_JABBER_ENABLED -->
<dl> <dl>
<dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt> <dt><label for="jabber">{L_UCP_JABBER}{L_COLON}</label></dt>
<dd><input type="email" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd> <dd><input type="email" name="jabber" id="jabber" maxlength="255" value="{JABBER}" class="inputbox" /></dd>
</dl> </dl>
<!-- ENDIF -->
<!-- BEGIN profile_fields --> <!-- BEGIN profile_fields -->
<dl> <dl>
<dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label> <dt><label<!-- IF profile_fields.FIELD_ID --> for="{profile_fields.FIELD_ID}"<!-- ENDIF -->>{profile_fields.LANG_NAME}{L_COLON}<!-- IF profile_fields.S_REQUIRED --> *<!-- ENDIF --></label>