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 2de1d6ba7c7e966bc9ca43912a69e096876961da (commit)
via 657e6be0320d8ec6eff65d2d8242eb1d3220f6a2 (commit)
from 529a0a5d3ad8cbaca7c1eddb263686fa852cb21c (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=2de1d6ba7c7e966bc9ca43912a69e096876961da
commit 2de1d6ba7c7e966bc9ca43912a69e096876961da
Author: Franck Villaume <[email protected]>
Date: Sat Jul 1 11:29:18 2017 +0200
coding style: else if vs. elseif
diff --git a/src/plugins/admssw/include/admsswPlugin.class.php
b/src/plugins/admssw/include/admsswPlugin.class.php
index 825d316..b0a782b 100644
--- a/src/plugins/admssw/include/admsswPlugin.class.php
+++ b/src/plugins/admssw/include/admsswPlugin.class.php
@@ -131,7 +131,7 @@ projects on /projects URLs with content-negotiation
$params['return'][] = '<link rel="alternate"
type="application/rdf+xml" title="ADMS.SW RDF Data" href="'. util_make_url
("/projects") .'"/>';
$params['return'][] = '<link rel="alternate"
type="text/turtle" title="ADMS.SW RDF Data" href="'. util_make_url
("/projects") .'"/>';
}
- else if($script_name == '/projects') {
+ elseif($script_name == '/projects') {
$params['return'][] = '<link rel="alternate"
type="application/rdf+xml" title="ADMS.SW RDF Data" href="'. util_make_url
($php_self) .'"/>';
$params['return'][] = '<link rel="alternate"
type="text/turtle" title="ADMS.SW RDF Data" href="'. util_make_url ($php_self)
.'"/>';
}
diff --git a/src/plugins/blocks/common/blocksPlugin.class.php
b/src/plugins/blocks/common/blocksPlugin.class.php
index 58cafb9..6f724ba 100644
--- a/src/plugins/blocks/common/blocksPlugin.class.php
+++ b/src/plugins/blocks/common/blocksPlugin.class.php
@@ -168,7 +168,7 @@ control over it to the project's administrator.");
require_once
'common/widget/WidgetLayoutManager.class.php';
$params['fusionforge_widgets'][] =
'plugin_blocks_project_summary';
return true;
- } else if ($params['owner_type'] ==
WidgetLayoutManager::OWNER_TYPE_HOME) {
+ } elseif ($params['owner_type'] ==
WidgetLayoutManager::OWNER_TYPE_HOME) {
$params['fusionforge_widgets'][] =
'plugin_blocks_home_summary';
return true;
}
diff --git a/src/plugins/mediawiki/common/mediawikiPlugin.class.php
b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
index 22cc455..4cdc04e 100644
--- a/src/plugins/mediawiki/common/mediawikiPlugin.class.php
+++ b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
@@ -410,9 +410,9 @@ _('This plugin allows each project to embed Mediawiki under
a tab.');
$title = 'Mediawiki ';
if ($recentchanges['type'] ==
'new') {
$title .= _('new
element created')._(': ');
- } else if
($recentchanges['type'] == 'edit') {
+ } elseif
($recentchanges['type'] == 'edit') {
$title .= _('modified
element')._(': ');
- } else if
($recentchanges['type'] == 'log') {
+ } elseif
($recentchanges['type'] == 'log') {
$title .= _('stored
element')._(': ');
}
$title .=
$recentchanges['title'];
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index bf6be31..29fcbf9 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -300,7 +300,7 @@ control over it to the project's administrator.");
if ($params['user_id']) {
$repo_user =
user_get_object($params['user_id']);
$repo =
$project->getUnixName().'/users/'.$repo_user->getUnixName().'.git';
- } else if ($params['extra']) {
+ } elseif ($params['extra']) {
$repo =
$project->getUnixName().'/'.$params['extra'].'.git';
} else {
$repo =
$project->getUnixName().'/'.$project->getUnixName().'.git';
diff --git a/src/plugins/scmgit/libexec/gitlog.php
b/src/plugins/scmgit/libexec/gitlog.php
index 1fb1f00..e7026bb 100644
--- a/src/plugins/scmgit/libexec/gitlog.php
+++ b/src/plugins/scmgit/libexec/gitlog.php
@@ -64,7 +64,7 @@ if ($mode == 'date_range') {
if (!ctype_digit($end_time))
die('Invalid end time');
$options = "--since=@$start_time --until=@$end_time";
-} else if ($mode == 'latest' or $mode == 'latest_user') {
+} elseif ($mode == 'latest' or $mode == 'latest_user') {
$limit = $_GET['limit'];
if (!ctype_digit($limit))
die('Invalid limit');
diff --git a/src/plugins/scmsvn/libexec/svnlog.php
b/src/plugins/scmsvn/libexec/svnlog.php
index 08a28f0..3949b14 100644
--- a/src/plugins/scmsvn/libexec/svnlog.php
+++ b/src/plugins/scmsvn/libexec/svnlog.php
@@ -67,7 +67,7 @@ if ($mode == 'date_range') {
$d1 = date('Y-m-d', $start_time - 80000);
$d2 = date('Y-m-d', $end_time + 80000);
$options = "-r '{".$d2."}:{".$d1."}'";
-} else if ($mode == 'latest' or $mode == 'latest_user') {
+} elseif ($mode == 'latest' or $mode == 'latest_user') {
$limit = $_GET['limit'];
if (!ctype_digit($limit))
die('Invalid limit');
diff --git a/src/post-install.d/db/upgrade.php
b/src/post-install.d/db/upgrade.php
index cd696c5..a0b70e7 100755
--- a/src/post-install.d/db/upgrade.php
+++ b/src/post-install.d/db/upgrade.php
@@ -105,7 +105,7 @@ if ($argc == 2) {
if ($argv[1] == 'all') {
// Upgrade activated plugins.
$plugins = get_installed_plugins();
- } else if (in_array($argv[1], $activated_plugins)) {
+ } elseif (in_array($argv[1], $activated_plugins)) {
// Upgrade a specific plugin, if activated
$plugins[] = $argv[1];
}
diff --git a/src/utils/plugin_pkg_desc.php b/src/utils/plugin_pkg_desc.php
index 822cb99..72e8107 100644
--- a/src/utils/plugin_pkg_desc.php
+++ b/src/utils/plugin_pkg_desc.php
@@ -67,7 +67,7 @@ if ($method == 'deb') {
echo " .\n";
echo " $desc\n";
-} else if ($method == 'rpm') {
+} elseif ($method == 'rpm') {
$shortdesc_prefix = ucfirst($shortdesc_prefix); // rpmlint
summary-not-capitalized
echo "Summary: {$shortdesc_prefix} - {$plugin->text}\n";
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=657e6be0320d8ec6eff65d2d8242eb1d3220f6a2
commit 657e6be0320d8ec6eff65d2d8242eb1d3220f6a2
Author: Franck Villaume <[email protected]>
Date: Sat Jul 1 11:28:52 2017 +0200
move block code at right place, remove unused var
diff --git a/src/www/activity/index.php b/src/www/activity/index.php
index 895104b..2492cd7 100644
--- a/src/www/activity/index.php
+++ b/src/www/activity/index.php
@@ -227,10 +227,15 @@ echo $HTML->closeForm();
$j = 0;
$last_day = 0;
foreach ($results as $arr) {
- $docmanerror = 0;
if (!$ffactivity->check_perm_for_activity($arr,
$cached_perms)) {
continue;
}
+
+ $displayinfo = $ffactivity->getDisplayInfo($arr);
+ if (!$displayinfo) {
+ continue;
+ }
+
if (!$displayTableTop) {
$theader = array();
$theader[] = _('Time');
@@ -241,11 +246,6 @@ echo $HTML->closeForm();
$displayTableTop = 1;
}
- $displayinfo = $ffactivity->getDisplayInfo($arr);
- if (!$displayinfo) {
- continue;
- }
-
if ($last_day != strftime($date_format,
$arr['activity_date'])) {
echo '<tr class="tableheading"><td
colspan="3">'.strftime($date_format, $arr['activity_date']).'</td></tr>';
$last_day=strftime($date_format,
$arr['activity_date']);
-----------------------------------------------------------------------
Summary of changes:
src/plugins/admssw/include/admsswPlugin.class.php | 2 +-
src/plugins/blocks/common/blocksPlugin.class.php | 2 +-
src/plugins/mediawiki/common/mediawikiPlugin.class.php | 4 ++--
src/plugins/scmgit/common/GitPlugin.class.php | 2 +-
src/plugins/scmgit/libexec/gitlog.php | 2 +-
src/plugins/scmsvn/libexec/svnlog.php | 2 +-
src/post-install.d/db/upgrade.php | 2 +-
src/utils/plugin_pkg_desc.php | 2 +-
src/www/activity/index.php | 12 ++++++------
9 files changed, 15 insertions(+), 15 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
