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, master has been updated
via 013706e1f7e45dfce09dd497e1453d7f4a291722 (commit)
from 37d03d9db38157a3385d85f1dab8e1d1ac2ed231 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=013706e1f7e45dfce09dd497e1453d7f4a291722
commit 013706e1f7e45dfce09dd497e1453d7f4a291722
Author: Franck Villaume <[email protected]>
Date: Sun Mar 5 10:21:44 2017 +0100
clean up
diff --git a/src/common/include/AuthPlugin.class.php
b/src/common/include/AuthPlugin.class.php
index 02a5e4d..458579e 100644
--- a/src/common/include/AuthPlugin.class.php
+++ b/src/common/include/AuthPlugin.class.php
@@ -61,7 +61,7 @@ abstract class ForgeAuthPlugin extends Plugin {
// no default implementation, but see
AuthBuiltinPlugin::displayAuthForm()
// $params can be passed with a 'return_to' attribute
// it should return an HTML dialog appened to passed
$params['html_snippets']
- // it may return a redirection URL appened to
$params['transparent_redirect_urls']
+ // it may return a redirection URL appened to
$params['transparent_redirect_urls']
$this->displayAuthForm($params);
break;
case 'display_create_user_form':
@@ -99,7 +99,7 @@ abstract class ForgeAuthPlugin extends Plugin {
protected $saved_user;
/**
- * Is there a valid session?
+ * checkAuthSession - Is there a valid session?
*
* @param array $params
* @return FORGE_AUTH_AUTHORITATIVE_ACCEPT,
FORGE_AUTH_AUTHORITATIVE_REJECT or FORGE_AUTH_NOT_AUTHORITATIVE
@@ -195,7 +195,7 @@ abstract class ForgeAuthPlugin extends Plugin {
}
/**
- * Sets the session cookie according to the user in $this->saved_user
+ * setSessionCookie - Sets the session cookie according to the user in
$this->saved_user
*/
protected function setSessionCookie() {
if($this->saved_user) {
@@ -205,7 +205,7 @@ abstract class ForgeAuthPlugin extends Plugin {
}
/**
- * Start a new session for a user
+ * startSession - Start a new session for a user
*
* @param string $username
* @return boolean
diff --git a/src/common/include/session.php b/src/common/include/session.php
index 110f691..5d06352 100644
--- a/src/common/include/session.php
+++ b/src/common/include/session.php
@@ -337,7 +337,7 @@ function session_issecure() {
* @param string $name Name of cookie
* @param string $value Value of cookie
* @param string $domain Domain scope (default '')
- * @param int $expiration Expiration time in UNIX seconds
(default 0)
+ * @param int $expiration Expiration time in UNIX seconds
(default 0)
*/
function session_set_cookie($name, $value, $domain='', $expiration=0) {
session_cookie($name, $value, $domain, $expiration);
diff --git a/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
b/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
index b583739..dd0f2c4 100644
--- a/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
+++ b/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
@@ -29,7 +29,6 @@ require_once $gfcommon.'include/AuthPlugin.class.php';
*/
class AuthHTTPDPlugin extends ForgeAuthPlugin {
function __construct() {
- global $gfconfig;
parent::__construct();
$this->name = "authhttpd";
$this->text = _("HTTPD authentication");
@@ -52,8 +51,8 @@ FusionForge, for instance where Kerberos is used.");
/**
* Display a form to input credentials
- * @param unknown_type $params
- * @return boolean
+ * @param array $params
+ * @return boolean
*/
function displayAuthForm(&$params) {
global $HTML;
@@ -76,8 +75,8 @@ FusionForge, for instance where Kerberos is used.");
}
/**
- * Is there a valid session?
- * @param unknown_type $params
+ * checkAuthSession - Is there a valid session?
+ * @param array $params
*/
function checkAuthSession(&$params) {
$this->saved_user = NULL;
@@ -112,8 +111,8 @@ FusionForge, for instance where Kerberos is used.");
}
/**
- * What FFUser is logged in?
- * @param unknown_type $params
+ * fetchAuthUser - What FFUser is logged in?
+ * @param array $params
*/
function fetchAuthUser(&$params) {
if ($this->saved_user && $this->isSufficient()) {
diff --git a/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php
b/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php
index 132071f..3065d25 100644
--- a/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php
+++ b/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php
@@ -80,7 +80,7 @@ class AuthOpenIDPlugin extends ForgeAuthPlugin {
$result .= $HTML->openForm(array('action' =>
'/plugins/'.$this->name.'/post-login.php', 'method' => 'get'));
$result .= '<input type="hidden" name="form_key" value="' .
form_generate_key() . '"/>
<input type="hidden" name="return_to" value="' .
htmlspecialchars(stripslashes($return_to)) . '" />
-Your OpenID identifier: <input type="text" name="openid_identifier" />
+'._('Your OpenID identifier')._(': ').'<input type="text"
name="openid_identifier" />
<input type="submit" name="login" value="' . _('Login via OpenID') . '" />';
$result .= $HTML->closeForm();
@@ -88,9 +88,9 @@ Your OpenID identifier: <input type="text"
name="openid_identifier" />
}
- /**
+ /**
* Is there a valid session?
- * @param unknown_type $params
+ * @param array $params
*/
function checkAuthSession(&$params) {
diff --git a/src/plugins/authopenid/www/index.php
b/src/plugins/authopenid/www/index.php
index f78fdeb..a3ebed5 100644
--- a/src/plugins/authopenid/www/index.php
+++ b/src/plugins/authopenid/www/index.php
@@ -62,8 +62,7 @@ try {
array ($u->getID(),
$plugin->openid->identity)) ;
if (!$res || db_affected_rows($res) < 1) {
- $error_msg = sprintf(_('Cannot insert
new identity: %s'),
- db_error());
+ $error_msg = _('Cannot insert new
identity')._(': ').db_error();
} else {
$feedback = _('Identity successfully
added');
$openid_identity = 'http://';
@@ -79,14 +78,14 @@ try {
// called to add a new identity
if (getStringFromRequest('addidentity') != '') {
if ($openid_identity == '' || $openid_identity == 'http://') {
- $error_msg = _('Error: Missing URL for the new identity');
+ $error_msg = _('Error')._(': ')._('Missing URL for the new
identity');
} elseif (!util_check_url($openid_identity)) {
- $error_msg = _('Error: Malformed URL (only http, https and ftp
allowed)');
+ $error_msg = _('Error')._(': ')._('Malformed URL (only http,
https and ftp allowed)');
} else {
$res = db_query_params('SELECT openid_identity FROM
plugin_authopenid_user_identities WHERE openid_identity =$1',
array($openid_identity));
if ($res && db_numrows($res) > 0) {
- $error_msg = _('Error: identity already used by a forge
user.');
+ $error_msg = _('Error')._(': ')._('identity already
used by a forge user.');
} else {
// TODO : redirect and check that the identity is
authorized for the user
@@ -112,7 +111,7 @@ if (getStringFromRequest('addidentity') != '') {
$res = db_query_params('DELETE FROM plugin_authopenid_user_identities
WHERE user_id=$1 AND openid_identity=$2',
array($u->getID(), $openid_identity));
if (!$res || db_affected_rows($res) < 1) {
- $error_msg = sprintf(_('Cannot delete identity: %s'),
db_error());
+ $error_msg = _('Cannot delete identity')._(': ').db_error();
}
else {
$feedback = _('Identity successfully deleted');
-----------------------------------------------------------------------
Summary of changes:
src/common/include/AuthPlugin.class.php | 8 ++++----
src/common/include/session.php | 2 +-
src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php | 13 ++++++-------
src/plugins/authopenid/include/AuthOpenIDPlugin.class.php | 6 +++---
src/plugins/authopenid/www/index.php | 11 +++++------
5 files changed, 19 insertions(+), 21 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
