@@ -66,25 +66,25 @@ class AuthLdap(object):
:param username: username
:param password: password
"""
from rhodecode.lib.helpers import chop_at
uid = chop_at(username, "@%s" % self.LDAP_SERVER_ADDRESS)
dn = self.AUTH_DN % (uid, self.BASE_DN)
log.debug("Authenticating %r at %s", dn, self.LDAP_SERVER)
if "," in username:
raise LdapUsernameError("invalid character in username: ,")
try:
ldap.set_option(ldap.OPT_X_TLS_CACERTFILE, '/etc/openldap/cacerts')
ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, '/etc/openldap/cacerts')
ldap.set_option(ldap.OPT_NETWORK_TIMEOUT, 10)
server = ldap.initialize(self.LDAP_SERVER)
if self.ldap_version == 2:
server.protocol = ldap.VERSION2
else:
server.protocol = ldap.VERSION3
if self.LDAP_BIND_DN and self.LDAP_BIND_PASS:
server.simple_bind_s(self.AUTH_DN % (self.LDAP_BIND_DN,
self.BASE_DN),
self.LDAP_BIND_PASS)
@@ -41,22 +41,23 @@
%for cnt,user in enumerate(c.users_list):
%if user.name !='default':
<tr class="parity${cnt%2}">
<td><div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(user.email,24)}"/> </div></td>
<td>${h.link_to(user.username,h.url('edit_user', id=user.user_id))}</td>
<td>${user.name}</td>
<td>${user.lastname}</td>
<td>${h.bool2icon(user.active)}</td>
<td>${h.bool2icon(user.admin)}</td>
<td>${h.bool2icon(user.is_ldap)}</td>
<td>
${h.form(url('user', id=user.user_id),method='delete')}
${h.submit('remove','delete',id="remove_user_%s" % user.user_id,class_="delete_icon action_button")}
${h.submit('remove_','delete',id="remove_user_%s" % user.user_id,
class_="delete_icon action_button",onclick="return confirm('Confirm to delete this user');")}
${h.end_form()}
</td>
</tr>
%endif
%endfor
</table>
</div>
</%def>
@@ -560,25 +560,25 @@ E.onDOMReady(function(e){
plot.subscribe("plothover", plothover);
YAHOO.util.Event.on(choiceContainer.getElementsByTagName("input"), "click", plotchoiced, [data, initial_ranges]);
}
SummaryPlot(${c.ts_min},${c.ts_max},${c.commit_data|n},${c.overview_data|n});
</script>
<div class="box">
<div class="title">
<div class="breadcrumbs">${h.link_to(_('Last ten changes'),h.url('shortlog_home',repo_name=c.repo_name))}</div>
<div class="breadcrumbs">${h.link_to(_('Shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}</div>
<div class="table">
<div id="shortlog_data">
<%include file='../shortlog/shortlog_data.html'/>
##%if c.repo_changesets:
## ${h.link_to(_('show more'),h.url('changelog_home',repo_name=c.repo_name))}
##%endif
Status change: