Commits

Zhang Huangbin  committed 8b09955

Sync.

  • Participants
  • Parent commits 013c4a7

Comments (0)

Files changed (3)

File controllers/ldap/basic.py

 from controllers import base
 from libs import __url_iredadmin_ldap_latest__, __version__
 from libs import iredutils, languages
-from libs.ldaplib import auth, admin as adminlib, ldaputils, connUtils, attrs
+from libs.ldaplib import auth, admin as adminlib, ldaputils
 
 cfg = web.iredconfig
 session = web.config.get('_session')
                         'a': cfg.general.get('webmaster', session.get('username', '')),
                         'v': __version__,
                         'host': getfqdn(),
+                        'backend': cfg.general.get('backend', ''),
                     }
 
                     url = __url_iredadmin_ldap_latest__ + '?' + urlencode(urlInfo)

File controllers/mysql/basic.py

 import web
 from libs import __url_iredadmin_mysql_latest__, __version__
 from libs import iredutils, languages
-from libs.mysql import core, decorators, admin as adminlib
+from libs.mysql import core, decorators
 
 cfg = web.iredconfig
 session = web.config.get('_session')
                         'a': cfg.general.get('webmaster', session.get('username', '')),
                         'v': __version__,
                         'host': getfqdn(),
+                        'backend': cfg.general.get('backend', ''),
                     }
 
                     url = __url_iredadmin_mysql_latest__ + '?' + urlencode(urlInfo)

File templates/default/ldap/user/profile.html

         display_input_phone,
         display_account_status,
         display_reset_password,
-        displayedInGlobalAddressBook,
         display_button_submit,
         with context
         %}
         <div class="columns clear">
             <div class="col2-3">
                 {{ display_account_status(accountStatus) }}
-                {{ displayedInGlobalAddressBook(enabledService=enabledService) }}
 
                 <div class="bt-space10"></div>
                 {{ display_input_cn(cn) }}
 
         </div>{#-- .columns --#}
 
-        <div class="rule"></div>
-
     {% elif profile_type == 'password' %}
 
         {{ display_reset_password(