This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.0 has been updated
via 63ba40d790b2ab4e3ab53c370f5e20af8ff35391 (commit)
from 9ce891579c60b9724bb34f50101f59075a694659 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 63ba40d790b2ab4e3ab53c370f5e20af8ff35391
Author: Franck Villaume <[email protected]>
Date: Sun Apr 19 19:39:23 2015 +0200
use HTML helpers
diff --git a/src/plugins/authbuiltin/common/AuthBuiltinPlugin.class.php
b/src/plugins/authbuiltin/common/AuthBuiltinPlugin.class.php
index d75cfcc..fd7afb8 100644
--- a/src/plugins/authbuiltin/common/AuthBuiltinPlugin.class.php
+++ b/src/plugins/authbuiltin/common/AuthBuiltinPlugin.class.php
@@ -65,7 +65,7 @@ class AuthBuiltinPlugin extends ForgeAuthPlugin {
$result = '';
$result .= html_e('p', array(), _('Cookies must be enabled past
this point.'), false);
- $result .= $HTML->openForm(array('action' =>
util_make_uri('/plugins/authbuiltin/post-login.php'), 'method' => 'post'));
+ $result .= $HTML->openForm(array('action' =>
util_make_uri('/plugins/'.$this->name.'/post-login.php'), 'method' => 'post'));
$result .= html_e('input', array('type' => 'hidden', 'name' =>
'form_key', 'value' => form_generate_key()));
$result .= html_e('input', array('type' => 'hidden', 'name' =>
'return_to', 'value' => htmlspecialchars(stripslashes($return_to))));
$result .= html_ao('p');
diff --git a/src/plugins/authldap/common/AuthLDAPPlugin.class.php
b/src/plugins/authldap/common/AuthLDAPPlugin.class.php
index ce7d34b..1ba0c30 100644
--- a/src/plugins/authldap/common/AuthLDAPPlugin.class.php
+++ b/src/plugins/authldap/common/AuthLDAPPlugin.class.php
@@ -198,6 +198,7 @@ into the FusionForge database.");
}
function displayAuthForm(&$params) {
+ global $HTML;
if (!$this->isRequired() && !$this->isSufficient()) {
return true;
}
@@ -206,18 +207,16 @@ into the FusionForge database.");
$result = '';
- $result .= '<p>';
- $result .= _('Cookies must be enabled past this point.');
- $result .= '</p>';
-
- $result .= '<form action="' .
util_make_url('/plugins/authldap/post-login.php') . '" method="post">
-<input type="hidden" name="form_key" value="' . form_generate_key() . '"/>
-<input type="hidden" name="return_to" value="' .
htmlspecialchars(stripslashes($return_to)) . '" />
-<p>';
- $result .= _('LDAP Login name:');
- $result .= '<br /><input type="text" name="form_loginname"
value="' . htmlspecialchars(stripslashes($loginname)) . '" /></p><p>' .
_('Password') . _(':') . '<br /><input type="password" name="form_pw"
/></p><p><input type="submit" name="login" value="' . _('Login') . '" />
-</p>
-</form>';
+ $result .= html_e('p', array(), _('Cookies must be enabled past
this point.'));
+ $result .= $HTML->openForm(array('action' =>
util_make_uri('/plugins/'.$this->name.'/post-login.php'), 'method' => 'post'));
+ $result .= html_e('input', array('type' => 'hidden', 'name' =>
'form_key', 'value' => form_generate_key()));
+ $result .= html_e('input', array('type' => 'hidden', 'name' =>
'return_to', 'value' => htmlspecialchars(stripslashes($return_to))));
+ $result .= html_e('p', array(), _('Login Name')._(':').
+ html_e('br').html_e('input',
array('type' => 'text', 'name' => 'form_loginname', 'value' =>
htmlspecialchars(stripslashes($loginname)), 'required' => 'required')));
+ $result .= html_e('p', array(), _('Password')._(':').
+ html_e('br').html_e('input',
array('type' => 'password', 'name' => 'form_pw', 'required' => 'required')));
+ $result .= html_e('p', array(), html_e('input', array('type' =>
'submit', 'name' => 'login', 'value' => _('Login'))), false);
+ $result .= $HTML->closeForm();
$params['html_snippets'][$this->name] = $result;
}
-----------------------------------------------------------------------
Summary of changes:
.../authbuiltin/common/AuthBuiltinPlugin.class.php | 2 +-
.../authldap/common/AuthLDAPPlugin.class.php | 23 ++++++++++----------
2 files changed, 12 insertions(+), 13 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
