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 78a014134a393a251b4bf974c4d0b86ada8fb4f2 (commit)
from 50760df7ba06336e4a0edb755a07524c71b32b99 (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=78a014134a393a251b4bf974c4d0b86ada8fb4f2
commit 78a014134a393a251b4bf974c4d0b86ada8fb4f2
Author: Marc-Etienne Vargenau <[email protected]>
Date: Mon Jun 20 11:22:08 2016 +0200
Use __construct
diff --git a/src/plugins/authcas/common/AuthCASPlugin.class.php
b/src/plugins/authcas/common/AuthCASPlugin.class.php
index 5dd9018..c30d32b 100644
--- a/src/plugins/authcas/common/AuthCASPlugin.class.php
+++ b/src/plugins/authcas/common/AuthCASPlugin.class.php
@@ -27,7 +27,7 @@ require_once $gfcommon.'include/AuthPlugin.class.php';
*
*/
class AuthCASPlugin extends ForgeAuthPlugin {
- function AuthCASPlugin () {
+ function __construct() {
global $gfconfig;
parent::__construct();
$this->name = "authcas";
@@ -97,7 +97,7 @@ server.");
<input type="hidden" name="return_to" value="' .
htmlspecialchars(stripslashes($return_to)) . '" />
<p><input type="submit" name="login" value="' . _('Login via CAS') . '" />
</p>
-</form>' ;
+</form>';
$params['html_snippets'][$this->name] = $result;
diff --git a/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
b/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
index 5e7c4fe..a57dcb6 100644
--- a/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
+++ b/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
@@ -26,7 +26,7 @@ require_once $gfcommon.'include/AuthPlugin.class.php';
*
*/
class AuthHTTPDPlugin extends ForgeAuthPlugin {
- function AuthHTTPDPlugin () {
+ function __construct() {
global $gfconfig;
parent::__construct();
$this->name = "authhttpd";
@@ -70,7 +70,7 @@ FusionForge, for instance where Kerberos is used.");
<input type="hidden" name="return_to" value="' .
htmlspecialchars(stripslashes($return_to)) . '" />
<p><input type="submit" name="login" value="' . _('Login via HTTP
authentication') . '" />
</p>
-</form>' ;
+</form>';
$params['html_snippets'][$this->name] = $result;
diff --git a/src/plugins/authldap/common/AuthLDAPPlugin.class.php
b/src/plugins/authldap/common/AuthLDAPPlugin.class.php
index 2f409db..2811b23 100644
--- a/src/plugins/authldap/common/AuthLDAPPlugin.class.php
+++ b/src/plugins/authldap/common/AuthLDAPPlugin.class.php
@@ -33,7 +33,7 @@ class AuthLDAPPlugin extends ForgeAuthPlugin {
protected $saved_password;
protected $saved_data;
- function AuthLDAPPlugin() {
+ function __construct() {
global $gfconfig;
parent::__construct();
$this->name = "authldap";
diff --git a/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php
b/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php
index 6c37ccf..02b558e 100644
--- a/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php
+++ b/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php
@@ -37,7 +37,7 @@ class AuthOpenIDPlugin extends ForgeAuthPlugin {
var $openid_identity;
- function AuthOpenIDPlugin () {
+ function __construct() {
global $gfconfig;
parent::__construct();
$this->name = "authopenid";
@@ -47,9 +47,9 @@ class AuthOpenIDPlugin extends ForgeAuthPlugin {
$this->_addHook("check_auth_session");
$this->_addHook("fetch_authenticated_user");
$this->_addHook("close_auth_session");
- $this->_addHook("usermenu") ;
- $this->_addHook("userisactivecheckbox") ; // The "use ..."
checkbox in user account
- $this->_addHook("userisactivecheckboxpost") ; //
+ $this->_addHook("usermenu");
+ $this->_addHook("userisactivecheckbox"); // The "use ..."
checkbox in user account
+ $this->_addHook("userisactivecheckboxpost"); //
$this->saved_login = '';
$this->saved_user = NULL;
@@ -159,11 +159,11 @@ Your OpenID identifier: <input type="text"
name="openid_identifier" />
// Change vs default
forge_define_config_item ('required', $this->name, 'no');
- forge_set_config_item_bool ('required', $this->name) ;
+ forge_set_config_item_bool ('required', $this->name);
// Change vs default
forge_define_config_item ('sufficient', $this->name, 'no');
- forge_set_config_item_bool ('sufficient', $this->name) ;
+ forge_set_config_item_bool ('sufficient', $this->name);
}
/**
diff --git a/src/plugins/authwebid/include/AuthWebIDPlugin.class.php
b/src/plugins/authwebid/include/AuthWebIDPlugin.class.php
index 2d9508b..b14da4e 100644
--- a/src/plugins/authwebid/include/AuthWebIDPlugin.class.php
+++ b/src/plugins/authwebid/include/AuthWebIDPlugin.class.php
@@ -42,7 +42,7 @@ class AuthWebIDPlugin extends ForgeAuthPlugin {
var $webid_identity;
- function AuthWebIDPlugin () {
+ function __construct() {
global $gfconfig;
parent::__construct();
$this->name = "authwebid";
@@ -52,9 +52,9 @@ class AuthWebIDPlugin extends ForgeAuthPlugin {
$this->_addHook("check_auth_session");
$this->_addHook("fetch_authenticated_user");
$this->_addHook("close_auth_session");
- $this->_addHook("usermenu") ;
- $this->_addHook("userisactivecheckbox") ; // The "use ..."
checkbox in user account
- $this->_addHook("userisactivecheckboxpost") ; //
+ $this->_addHook("usermenu");
+ $this->_addHook("userisactivecheckbox"); // The "use ..."
checkbox in user account
+ $this->_addHook("userisactivecheckboxpost"); //
$this->saved_login = '';
$this->saved_user = NULL;
@@ -66,7 +66,7 @@ class AuthWebIDPlugin extends ForgeAuthPlugin {
$this->declareConfigVars();
// The IdP to use is configured in the .ini file
- $this->delegate_webid_auth_to = forge_get_config
('delegate_webid_auth_to', $this->name);
+ $this->delegate_webid_auth_to =
forge_get_config('delegate_webid_auth_to', $this->name);
$this->idp_delegation_link =
forge_get_config('idp_delegation_link', $this->name);
}
@@ -268,7 +268,7 @@ class AuthWebIDPlugin extends ForgeAuthPlugin {
$error_msg = NULL;
// remove the 'pending:' prefix
$res = db_query_params('UPDATE plugin_authwebid_user_identities
SET webid_identity=$1 WHERE user_id =$2 AND webid_identity =$3',
- array
($webid_identity, $user_id, 'pending:'.$webid_identity)) ;
+ array
($webid_identity, $user_id, 'pending:'.$webid_identity));
if (!$res) {
$error_msg = sprintf(_('Cannot bind new identity: %s'),
db_error());
}
@@ -295,7 +295,7 @@ class AuthWebIDPlugin extends ForgeAuthPlugin {
$error_msg = _('WebID already pending binding');
}
$res = db_query_params('INSERT INTO
plugin_authwebid_user_identities (user_id, webid_identity) VALUES ($1,$2)',
- array ($user_id, $webid_identity)) ;
+ array ($user_id, $webid_identity));
if (!$res || db_affected_rows($res) < 1) {
$error_msg = sprintf(_('Cannot insert new
identity: %s'), db_error());
}
@@ -368,11 +368,11 @@ class AuthWebIDPlugin extends ForgeAuthPlugin {
// Change vs default
forge_define_config_item ('required', $this->name, 'no');
- forge_set_config_item_bool ('required', $this->name) ;
+ forge_set_config_item_bool ('required', $this->name);
// Change vs default
forge_define_config_item ('sufficient', $this->name, 'no');
- forge_set_config_item_bool ('sufficient', $this->name) ;
+ forge_set_config_item_bool ('sufficient', $this->name);
// Default delegated WebID IdP to use
forge_define_config_item ('delegate_webid_auth_to',
$this->name, 'auth.my-profile.eu');
diff --git a/src/plugins/sysauthldap/common/SysAuthLDAPPlugin.class.php
b/src/plugins/sysauthldap/common/SysAuthLDAPPlugin.class.php
index 0dccbff..7ffad4e 100644
--- a/src/plugins/sysauthldap/common/SysAuthLDAPPlugin.class.php
+++ b/src/plugins/sysauthldap/common/SysAuthLDAPPlugin.class.php
@@ -32,14 +32,14 @@ forge_define_config_item('bind_dn', 'sysauthldap',
'cn=admin,$sysauthldap/base_d
forge_define_config_item('password', 'sysauthldap', '');
setconfigfromenv ('sysauthldap', 'ldap_password',
- 'GForgePluginSysAuthLdapPasswd', NULL) ;
+ 'GForgePluginSysAuthLdapPasswd', NULL);
require_once $gfcommon.'include/SysAuthPlugin.class.php';
class SysAuthLDAPPlugin extends SysAuthPlugin {
- function SysAuthLDAPPlugin () {
+ function __construct() {
parent::__construct();
- $this->name = "sysauthldap" ;
+ $this->name = "sysauthldap";
$this->text = _("System authentication via LDAP");
$this->pkg_desc =
_("This plugin maintains data about users, groups and memberships in an
@@ -84,14 +84,14 @@ for other uses).");
function _parse_fromhost($s) {
$result = $s;
- if (preg_match ('/\b(fromhost:[^,]+)/', $s, $matches)) {
- $m = preg_replace ('/^fromhost:/','',$matches[0]);
+ if (preg_match('/\b(fromhost:[^,]+)/', $s, $matches)) {
+ $m = preg_replace('/^fromhost:/','',$matches[0]);
$r = array();
foreach (explode ('.', $m) as $i) {
$r[] = 'dc='.$i;
}
- $result = preg_replace ('/\b(fromhost:[^,]+)/',
+ $result = preg_replace('/\b(fromhost:[^,]+)/',
implode(',',$r),
$s);
}
diff --git a/src/plugins/sysauthpgsql/common/SysAuthPGSQLPlugin.class.php
b/src/plugins/sysauthpgsql/common/SysAuthPGSQLPlugin.class.php
index 12e6798..86f08c6 100644
--- a/src/plugins/sysauthpgsql/common/SysAuthPGSQLPlugin.class.php
+++ b/src/plugins/sysauthpgsql/common/SysAuthPGSQLPlugin.class.php
@@ -22,38 +22,38 @@
*/
class SysAuthPGSQLPlugin extends SysAuthPlugin {
- function SysAuthPGSQLPlugin () {
+ function __construct() {
parent::__construct();
- $this->name = "sysauthpgsql" ;
+ $this->name = "sysauthpgsql";
$this->text = "System authentication via PostgreSQL";
}
function user_create($params) {
- error_log ("user_create" . print_r($params, true));
+ error_log("user_create" . print_r($params, true));
}
function user_update($params) {
- error_log ("user_update" . print_r($params, true));
+ error_log("user_update" . print_r($params, true));
}
function user_delete($params) {
- error_log ("user_delete" . print_r($params, true));
+ error_log("user_delete" . print_r($params, true));
}
function group_create($params) {
- error_log ("group_create" . print_r($params, true));
+ error_log("group_create" . print_r($params, true));
}
function group_update($params) {
- error_log ("group_update" . print_r($params, true));
+ error_log("group_update" . print_r($params, true));
}
function group_delete($params) {
- error_log ("group_delete" . print_r($params, true));
+ error_log("group_delete" . print_r($params, true));
}
function group_update_members($params) {
- error_log ("group_update_members" . print_r($params, true));
+ error_log("group_update_members" . print_r($params, true));
}
}
-----------------------------------------------------------------------
Summary of changes:
src/plugins/authcas/common/AuthCASPlugin.class.php | 4 ++--
src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php | 4 ++--
src/plugins/authldap/common/AuthLDAPPlugin.class.php | 2 +-
.../authopenid/include/AuthOpenIDPlugin.class.php | 12 ++++++------
.../authwebid/include/AuthWebIDPlugin.class.php | 18 +++++++++---------
.../sysauthldap/common/SysAuthLDAPPlugin.class.php | 12 ++++++------
.../sysauthpgsql/common/SysAuthPGSQLPlugin.class.php | 18 +++++++++---------
7 files changed, 35 insertions(+), 35 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
