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 e17bde45c65488e06b3d24d928f880db67c5b43b (commit)
from c3d5df0c06705e9effd8b225d00f667d7dc14e0c (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=e17bde45c65488e06b3d24d928f880db67c5b43b
commit e17bde45c65488e06b3d24d928f880db67c5b43b
Author: Franck Villaume <[email protected]>
Date: Wed Aug 18 17:04:37 2021 +0200
clean-up: remove useless code & vars
diff --git a/src/common/include/System.class.php
b/src/common/include/System.class.php
index 6468529..d6e0e95 100644
--- a/src/common/include/System.class.php
+++ b/src/common/include/System.class.php
@@ -23,9 +23,6 @@
require_once $gfcommon.'include/FFError.class.php';
class System extends FFError {
- function __construct() {
- parent::__construct();
- }
/**
* sysUseUnixName() - Check if user/group used the unix_name
diff --git a/src/common/include/account.php b/src/common/include/account.php
index c80cc3e..a3daa5b 100644
--- a/src/common/include/account.php
+++ b/src/common/include/account.php
@@ -178,12 +178,11 @@ function account_groupnamevalid($name) {
* @return string A random character
*
*/
-function genchr(){
+function genchr() {
do {
$num = util_randnum(46, 122);
} while ( ( $num > 57 && $num < 65 ) || ( $num > 90 && $num < 97 ) );
- $char = chr($num);
- return $char;
+ return chr($num);
}
/**
diff --git a/src/common/include/config.php b/src/common/include/config.php
index 700a1ab..eb5e9fc 100644
--- a/src/common/include/config.php
+++ b/src/common/include/config.php
@@ -118,7 +118,6 @@ class FusionForgeConfig {
}
}
}
- return ;
}
function mark_as_bool ($section, $var) {
diff --git a/src/common/include/database-pgsql.php
b/src/common/include/database-pgsql.php
index e753148..58cdac7 100644
--- a/src/common/include/database-pgsql.php
+++ b/src/common/include/database-pgsql.php
@@ -110,9 +110,9 @@ function db_connect() {
define('SYS_DB_TROVE', $gfconn2);
define('SYS_DB_SEARCH', $gfconn2);
- $res = db_query_params ('SELECT set_config($1, $2, false)',
- array('default_text_search_config',
- forge_get_config('fti_config')));
+ db_query_params('SELECT set_config($1, $2, false)',
+ array('default_text_search_config',
+ forge_get_config('fti_config')));
// Register top-level "finally" handler to abort current
// transaction in case of error
@@ -123,10 +123,10 @@ function db_connect() {
* db_connect_if_needed - Set up the DB connection if it's unset
*/
function db_connect_if_needed() {
- global $gfconn;
- if (!isset ($gfconn)) {
- db_connect();
- }
+ global $gfconn;
+ if (!isset ($gfconn)) {
+ db_connect();
+ }
}
/**
@@ -135,11 +135,11 @@ function db_connect_if_needed() {
function db_reconnect() {
global $gfconn;
$gfconn =
pg_pconnect(pg_connectstring(forge_get_config('database_name'),
-
forge_get_config('database_user'),
-
forge_get_config('database_password'),
-
forge_get_config('database_host'),
-
forge_get_config('database_port')),
- PGSQL_CONNECT_FORCE_NEW);
+
forge_get_config('database_user'),
+
forge_get_config('database_password'),
+
forge_get_config('database_host'),
+
forge_get_config('database_port')),
+ PGSQL_CONNECT_FORCE_NEW);
return ($gfconn !== FALSE);
}
@@ -779,8 +779,7 @@ function db_int_array_to_any_clause($arr) {
$arr2[] = $cur;
}
}
- $res = '{'.implode(',', $arr2).'}';
- return $res;
+ return '{'.implode(',', $arr2).'}';
}
function db_string_array_to_any_clause($arr) {
@@ -788,8 +787,7 @@ function db_string_array_to_any_clause($arr) {
foreach ($arr as $cur) {
$arr2[] = pg_escape_string($cur);
}
- $res = '{"'.implode('","', $arr2).'"}';
- return $res;
+ return '{"'.implode('","', $arr2).'"}';
}
/**
diff --git a/src/common/include/system/LDAP.class.php
b/src/common/include/system/LDAP.class.php
index 4b54df8..b375859 100644
--- a/src/common/include/system/LDAP.class.php
+++ b/src/common/include/system/LDAP.class.php
@@ -25,9 +25,6 @@ require_once $gfcommon.'include/account.php';
require_once $gfcommon.'include/system/UNIX.class.php';
class LDAP extends UNIX {
- function __construct() {
- parent::__construct();
- }
/*
* Auxilary functions
diff --git a/src/common/include/system/NSSPGSQL.class.php
b/src/common/include/system/NSSPGSQL.class.php
index 419ff3d..10a081d 100644
--- a/src/common/include/system/NSSPGSQL.class.php
+++ b/src/common/include/system/NSSPGSQL.class.php
@@ -30,10 +30,6 @@ class NSSPGSQL extends System {
*/
var $UID_ADD = 20000;
- function __construct() {
- parent::__construct();
- }
-
/**
* sysCreateUser() - Create a user
*
diff --git a/src/common/include/system/UNIX.class.php
b/src/common/include/system/UNIX.class.php
index fa0484e..32043a8 100644
--- a/src/common/include/system/UNIX.class.php
+++ b/src/common/include/system/UNIX.class.php
@@ -31,10 +31,6 @@ class UNIX extends System {
*/
var $UID_ADD = 20000;
- function __construct() {
- parent::__construct();
- }
-
/**
* sysCreateUser() - Create a user
*
diff --git a/src/common/include/system/pgsql.class.php
b/src/common/include/system/pgsql.class.php
index 73122a5..78009c2 100644
--- a/src/common/include/system/pgsql.class.php
+++ b/src/common/include/system/pgsql.class.php
@@ -56,10 +56,6 @@ class pgsql extends System {
*/
var $GID_ADD_SCMRW = 50000;
- function __construct() {
- parent::__construct();
- }
-
/**
* sysUseUnixName() - Check if user/group used the unix_name
*
-----------------------------------------------------------------------
Summary of changes:
src/common/include/System.class.php | 3 ---
src/common/include/account.php | 5 ++---
src/common/include/config.php | 1 -
src/common/include/database-pgsql.php | 30 +++++++++++++---------------
src/common/include/system/LDAP.class.php | 3 ---
src/common/include/system/NSSPGSQL.class.php | 4 ----
src/common/include/system/UNIX.class.php | 4 ----
src/common/include/system/pgsql.class.php | 4 ----
8 files changed, 16 insertions(+), 38 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
