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 1c9911eb643ad87ecbd467a10b70b4268d7d40a5 (commit)
from feccb3ba1d2242ed5953f2f63682b9754a35dff2 (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=1c9911eb643ad87ecbd467a10b70b4268d7d40a5
commit 1c9911eb643ad87ecbd467a10b70b4268d7d40a5
Author: Franck Villaume <[email protected]>
Date: Wed May 19 12:57:10 2021 +0200
clean-up: consistent return, curly braces
diff --git a/src/common/tracker/actions/effort_units.php
b/src/common/tracker/actions/effort_units.php
index 3a83ae4..4591ee8 100644
--- a/src/common/tracker/actions/effort_units.php
+++ b/src/common/tracker/actions/effort_units.php
@@ -239,10 +239,10 @@ function show_units(&$effortUnitSet){
$unitFactory = new EffortUnitFactory($effortUnitSet);
if (!$unitFactory || !is_object($unitFactory)) {
echo $HTML->error_msg(_('Error creating EffortUnitFactory'));
- return;
+ return false;
} elseif ($unitFactory->isError()) {
echo $HTML->error_msg($unitFactory->getErrorMessage());
- return;
+ return false;
}
$units = $unitFactory->getUnits();
if ($unitFactory->isError()) {
diff --git a/src/plugins/forumml/www/forumml_utils.php
b/src/plugins/forumml/www/forumml_utils.php
index 72245ac..dade697 100644
--- a/src/plugins/forumml/www/forumml_utils.php
+++ b/src/plugins/forumml/www/forumml_utils.php
@@ -614,7 +614,7 @@ function plugin_forumml_replace_attachment($id_message,
$group_id, $list, $id_pa
$replace_parts[] = $url;
}
}
- if (count($replace_parts) > 0) {
+ if (!empty($replace_parts)) {
$body = str_replace($search_parts, $replace_parts, $body);
}
}
@@ -678,7 +678,7 @@ function plugin_forumml_process_mail($plug,$reply=false) {
$feedback .=_('Invalid Email Address')._(': ').$err;
} else {
// add list of cc users to mail mime
- if (count($cc_array) > 0) {
+ if (!empty($cc_array)) {
$cc_list = implode(',',$cc_array);
$mail->setCc($cc_list,true);
}
diff --git a/src/plugins/oauthprovider/www/request_tokens.php
b/src/plugins/oauthprovider/www/request_tokens.php
index fef6323..f11cbb4 100644
--- a/src/plugins/oauthprovider/www/request_tokens.php
+++ b/src/plugins/oauthprovider/www/request_tokens.php
@@ -29,23 +29,23 @@ require_once 'checks.php';
$user_id = user_getid();
-if(oauthprovider_CheckForgeAdmin()) {
+if (oauthprovider_CheckForgeAdmin()) {
$t_tokens = OauthAuthzRequestToken::load_all();
-}elseif($type=='group') {
- if(oauthprovider_CheckAdmin()==0) {
+} elseif ($type=='group') {
+ if (oauthprovider_CheckAdmin()==0) {
$proj_admin = true;
- }else {
+ } else {
oauthprovider_CheckGroup();
$proj_admin = false;
}
$temp_tokens = OauthAuthzRequestToken::load_all();
- foreach($temp_tokens as $temp_token) {
+ foreach ($temp_tokens as $temp_token) {
$role =
RBACEngine::getInstance()->getRoleById($temp_token->getRoleId());
- if((isset($role))&&($role->getHomeProject()->getID() == $id))
{
+ if ((isset($role))&&($role->getHomeProject()->getID() == $id))
{
$t_tokens[] = $temp_token;
}
}
-}else {
+} else {
oauthprovider_CheckUser();
$t_tokens = OauthAuthzRequestToken::load_all($user_id);
}
@@ -61,60 +61,62 @@ $headers = array(
'DELETE'
);
-if(count($t_tokens)>0) {
+if (!empty($t_tokens)) {
echo $HTML->boxTop(_('Request Tokens'));
echo $HTML->listTableTop($headers);
$i=0;
- foreach( $t_tokens as $t_token ) {
+ foreach ( $t_tokens as $t_token ) {
$consumer = OauthAuthzConsumer::load($t_token->getConsumerId());
echo '<tr>';
- if(forge_check_global_perm ('forge_admin')) {
+ if (forge_check_global_perm ('forge_admin')) {
echo
'<td>'.util_make_link('/plugins/'.$pluginname.'/consumer_manage.php?consumer_id='
. $t_token->getConsumerId(), $consumer->getName()).'</td>';
- }else {
+ } else {
echo '<td>'.$consumer->getName().'</td>';
}
echo '<td>'.$t_token->key.'</td>';
echo '<td>'.$t_token->secret.'</td>';
- if($t_token->getAuthorized()==1) $auth = 'Yes';
- else $auth = 'No';
+ if ($t_token->getAuthorized()==1) {
+ $auth = 'Yes';
+ } else {
+ $auth = 'No';
+ }
echo '<td>'.$auth.'</td>';
$role_id =$t_token->getRoleId();
- if($role_id!=0) {
+ if ($role_id!=0) {
//echo 'Roleid: '.$role_id;
$role =
RBACEngine::getInstance()->getRoleById($role_id);
//print_r($role);
echo '<td>'.$role->getName().'</td>';
- }else {
+ } else {
echo '<td>'.'---'.'</td>';
}
- if($t_token->getUserId() > 0 ) {
+ if ($t_token->getUserId() > 0 ) {
$user_object = user_get_object($t_token->getUserId());
- $user = $user_object->getRealName().'
('.$user_object->getUnixName().')';
- } else {
- $user = "-";
+ $user = $user_object->getRealName().'
('.$user_object->getUnixName().')';
+ } else {
+ $user = "-";
}
echo '<td>'.$user.'</td>';
echo '<td>'.date(DATE_RFC822, $t_token->gettime_stamp())
.'</td>';
- if(forge_check_global_perm ('forge_admin')) {
+ if (forge_check_global_perm ('forge_admin')) {
echo
'<td>'.util_make_link('/plugins/'.$pluginname.'/token_delete.php?token_id=' .
$t_token->getId() . '&token_type=request' .
'&plugin_oauthprovider_token_delete_token='.form_generate_key(),
_('Delete')).'</td>';
- }elseif($type == 'group') {
- if(($proj_admin)||($t_token->getUserId() == $user_id)) {
+ } elseif($type == 'group') {
+ if (($proj_admin)||($t_token->getUserId() == $user_id))
{
echo
'<td>'.util_make_link('/plugins/'.$pluginname.'/token_delete.php?token_id=' .
$t_token->getId() . '&token_type=request' .
'&plugin_oauthprovider_token_delete_token='.form_generate_key(),
_('Delete')).'</td>';
- }else {
+ } else {
echo '<td>'.'</td>';
}
- }else {
+ } else {
echo
'<td>'.util_make_link('/plugins/'.$pluginname.'/token_delete.php?token_id=' .
$t_token->getId() . '&token_type=request' .
'&plugin_oauthprovider_token_delete_token='.form_generate_key(),
_('Delete')).'</td>';
}
echo '</tr>';
$i++;
-
}
echo $HTML->listTableBottom();
echo $HTML->boxBottom();
-}else {
+} else {
echo '<p>'. _('No request tokens were found!').'</p>';
}
-----------------------------------------------------------------------
Summary of changes:
src/common/tracker/actions/effort_units.php | 4 +-
src/plugins/forumml/www/forumml_utils.php | 4 +-
src/plugins/oauthprovider/www/request_tokens.php | 54 ++++++++++++------------
3 files changed, 32 insertions(+), 30 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
