diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 14:59:43 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 14:59:43 -0500 |
| commit | b5651c0289054f2f4453806200506968241f9a82 (patch) | |
| tree | bf154136da6d4968660491d761e855ab57ab47b3 /phpBB/adm | |
| parent | 86b910692aa1d441c4113294cebe9a12c1d25180 (diff) | |
| parent | 64308f41b054d11ae267a58e04821b7b1e31af91 (diff) | |
| download | forums-b5651c0289054f2f4453806200506968241f9a82.tar forums-b5651c0289054f2f4453806200506968241f9a82.tar.gz forums-b5651c0289054f2f4453806200506968241f9a82.tar.bz2 forums-b5651c0289054f2f4453806200506968241f9a82.tar.xz forums-b5651c0289054f2f4453806200506968241f9a82.zip | |
Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into develop
# By Joseph Warner
# Via Joseph Warner
* remotes/Hardolaf/ticket/11626:
[ticket/11626] Remove last reference to template in ldap
[ticket/11626] Remove LDAP dependency on template
[ticket/11626] Make identifier uppercase per style requirements
[ticket/11626] Change the identifier template file in the template
[ticket/11626] Call method only one time per provider
[ticket/11626] Change interface to match functionality
[ticket/11626] Include the template file in acp_board
[ticket/11626] LDAP Auth ACP Template File
[ticket/11626] Create get_acp_template method for auth providers
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_board.html | 2 | ||||
| -rw-r--r-- | phpBB/adm/style/auth_provider_ldap.html | 32 |
2 files changed, 33 insertions, 1 deletions
diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index 6b8ceb3ef6..1a09c4eee6 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -34,7 +34,7 @@ <!-- IF S_AUTH --> <!-- BEGIN auth_tpl --> - {auth_tpl.TPL} + <!-- INCLUDE {auth_tpl.TEMPLATE_FILE} --> <!-- END auth_tpl --> <!-- ENDIF --> diff --git a/phpBB/adm/style/auth_provider_ldap.html b/phpBB/adm/style/auth_provider_ldap.html new file mode 100644 index 0000000000..81afa44373 --- /dev/null +++ b/phpBB/adm/style/auth_provider_ldap.html @@ -0,0 +1,32 @@ +<dl> + <dt><label for="ldap_server">{L_LDAP_SERVER}{L_COLON}</label><br /><span>{L_LDAP_SERVER_EXPLAIN}</span></dt> + <dd><input type="text" id="ldap_server" size="40" name="config[ldap_server]" value="{AUTH_LDAP_SERVER}" /></dd> +</dl> +<dl> + <dt><label for="ldap_port">{L_LDAP_PORT}{L_COLON}</label><br /><span>{L_LDAP_PORT_EXPLAIN}</span></dt> + <dd><input type="text" id="ldap_port" size="40" name="config[ldap_port]" value="{AUTH_LDAP_PORT}" /></dd> +</dl> +<dl> + <dt><label for="ldap_dn">{L_LDAP_DN}{L_COLON}</label><br /><span>{L_LDAP_DN_EXPLAIN}</span></dt> + <dd><input type="text" id="ldap_dn" size="40" name="config[ldap_base_dn]" value="{AUTH_LDAP_BASE_DN}" /></dd> +</dl> +<dl> + <dt><label for="ldap_uid">{L_LDAP_UID}{L_COLON}</label><br /><span>{L_LDAP_UID_EXPLAIN}</span></dt> + <dd><input type="text" id="ldap_uid" size="40" name="config[ldap_uid]" value="{AUTH_LDAP_UID}" /></dd> +</dl> +<dl> + <dt><label for="ldap_user_filter">{L_LDAP_USER_FILTER}{L_COLON}</label><br /><span>{L_LDAP_USER_FILTER_EXPLAIN}</span></dt> + <dd><input type="text" id="ldap_user_filter" size="40" name="config[ldap_user_filter]" value="{AUTH_LDAP_USER_FILTER}" /></dd> +</dl> +<dl> + <dt><label for="ldap_email">{L_LDAP_EMAIL}{L_COLON}</label><br /><span>{L_LDAP_EMAIL_EXPLAIN}</span></dt> + <dd><input type="email" id="ldap_email" size="40" name="config[ldap_email]" value="{AUTH_LDAP_EMAIL}" /></dd> +</dl> +<dl> + <dt><label for="ldap_user">{L_LDAP_USER}{L_COLON}</label><br /><span>{L_LDAP_USER_EXPLAIN}</span></dt> + <dd><input type="text" id="ldap_user" size="40" name="config[ldap_user]" value="{AUTH_LDAP_USER}" /></dd> +</dl> +<dl> + <dt><label for="ldap_password">{L_LDAP_PASSWORD}{L_COLON}</label><br /><span>{L_LDAP_PASSWORD_EXPLAIN}</span></dt> + <dd><input type="password" id="ldap_password" size="40" name="config[ldap_password]" value="{AUTH_LDAP_PASSWORD}" autocomplete="off" /></dd> +</dl> |