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 c997b0aa0d493720f09c5675fa53c8d8c08afd66 (commit)
from 833e22b78ed60b21627c52ee86a42764ad72c0b1 (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=c997b0aa0d493720f09c5675fa53c8d8c08afd66
commit c997b0aa0d493720f09c5675fa53c8d8c08afd66
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Jul 8 11:14:23 2016 +0200
else if --> elseif
diff --git a/src/common/include/FFError.class.php
b/src/common/include/FFError.class.php
index d4b2188..ef0ba12 100644
--- a/src/common/include/FFError.class.php
+++ b/src/common/include/FFError.class.php
@@ -137,10 +137,11 @@ class FFError {
*/
function setInvalidEmailError($adr=false){
$e = _('Invalid Email Address');
- if ($adr)
+ if ($adr) {
$e .= " '" . htmlspecialchars($adr) . "'";
- else if ($adr !== false)
+ } elseif ($adr !== false) {
$e .= ' ' . _('(none given)');
+ }
$this->setError($e, ERROR__INVALID_EMAIL_ERROR);
}
diff --git a/src/common/include/RBAC.php b/src/common/include/RBAC.php
index 09e184a..33cd22b 100644
--- a/src/common/include/RBAC.php
+++ b/src/common/include/RBAC.php
@@ -867,7 +867,7 @@ abstract class BaseRole extends FFError {
// new permission
db_execute('insert_into_pfo_role_setting',
array($role_id, $sect,
$refid, $value));
- } else if ($this->perms_array[$sect][$refid] !=
$value) {
+ } elseif ($this->perms_array[$sect][$refid] !=
$value) {
// changed permission
db_execute('update_pfo_role_setting',
array($role_id, $sect,
$refid, $value));
diff --git a/src/common/tracker/actions/browse.php
b/src/common/tracker/actions/browse.php
index 251bf9c..d219577 100644
--- a/src/common/tracker/actions/browse.php
+++ b/src/common/tracker/actions/browse.php
@@ -663,12 +663,12 @@ if ($art_arr && $art_cnt > 0) {
}
echo '<td>' . $value .'</td>';
- } else if ($f == '_votes') {
+ } elseif ($f == '_votes') {
$v = $art_arr[$i]->getVotes();
echo html_e('td', array(), $v[0], false);
- } else if ($f == '_voters') {
+ } elseif ($f == '_voters') {
echo html_e('td', array(), $voters, false);
- } else if ($f == '_votage') {
+ } elseif ($f == '_votage') {
$v = $art_arr[$i]->getVotes();
echo html_e('td', array(), $v[2], false);
} else {
diff --git a/src/common/tracker/actions/tracker.php
b/src/common/tracker/actions/tracker.php
index a4f494f..98c6839 100644
--- a/src/common/tracker/actions/tracker.php
+++ b/src/common/tracker/actions/tracker.php
@@ -565,7 +565,7 @@ switch (getStringFromRequest('func')) {
$ah = new ArtifactHtml($ath, $aid);
if (!$ah || !is_object($ah)) {
exit_error(_('Artifact Could Not Be Created'),
'tracker');
- } else if ($ah->isError()) {
+ } elseif ($ah->isError()) {
exit_error($ah->getErrorMessage(), 'tracker');
}
if ($ah->castVote(false)) {
@@ -583,7 +583,7 @@ switch (getStringFromRequest('func')) {
$ah = new ArtifactHtml($ath, $aid);
if (!$ah || !is_object($ah)) {
exit_error(_('Artifact Could Not Be Created'),
'tracker');
- } else if ($ah->isError()) {
+ } elseif ($ah->isError()) {
exit_error($ah->getErrorMessage(), 'tracker');
}
if ($ah->castVote()) {
diff --git a/src/common/valid/ValidFactory.class.php
b/src/common/valid/ValidFactory.class.php
index 472629a..b97a1be 100644
--- a/src/common/valid/ValidFactory.class.php
+++ b/src/common/valid/ValidFactory.class.php
@@ -142,7 +142,7 @@ class Valid_File extends Valid {
function isEmptyValue($file) {
if(!is_array($file)) {
return false;
- } elseif(parent::isEmptyValue($file['name'])) {
+ } elseif (parent::isEmptyValue($file['name'])) {
return false;
}
return true;
@@ -177,7 +177,7 @@ class ValidFactory {
function getInstance($validator, $key = null) {
if (is_a($validator, 'Valid')) {
return $validator;
- } else if(is_string($validator) &&
class_exists('Valid_'.$validator)) {
+ } elseif(is_string($validator) &&
class_exists('Valid_'.$validator)) {
$validator_classname = 'Valid_'.$validator;
$v = new $validator_classname($key);
return $v;
diff --git a/src/www/admin/grouplist.php b/src/www/admin/grouplist.php
index edf2f51..6ef4d29 100644
--- a/src/www/admin/grouplist.php
+++ b/src/www/admin/grouplist.php
@@ -81,7 +81,7 @@ if ($usingplugin) {
array(strtolower($usingplugin)));
$qpa = db_construct_qpa($qpa, ' ORDER BY '.$sqlsortorder);
$res = db_query_qpa($qpa);
-} else if ($group_name_search != '') {
+} elseif ($group_name_search != '') {
$filter='&group_name_search='.$group_name_search;
echo html_e('p', array(), _('Projects that begin with').'
'.html_e('strong', array(), $group_name_search));
$res = db_query_params('SELECT
group_name,register_time,unix_group_name,groups.group_id,groups.is_template,status,license_name,COUNT(DISTINCT(pfo_user_role.user_id))
AS members FROM groups LEFT OUTER JOIN pfo_role ON
pfo_role.home_group_id=groups.group_id LEFT OUTER JOIN pfo_user_role ON
pfo_user_role.role_id=pfo_role.role_id, licenses WHERE license_id=license AND
lower(group_name) LIKE $1 GROUP BY
group_name,register_time,unix_group_name,groups.group_id,groups.is_template,status,license_name
ORDER BY '.$sqlsortorder,
diff --git a/src/www/scm/viewvc.php b/src/www/scm/viewvc.php
index e735e67..850485d 100644
--- a/src/www/scm/viewvc.php
+++ b/src/www/scm/viewvc.php
@@ -150,7 +150,7 @@ if (count($exploded_content) > 1) {
$content_type = $matches[2];
if (isset($matches[4])) $charset = $matches[4];
// we'll validate content-type or transcode body below
- } else if (preg_match('/^Transfer-Encoding: chunked/',
$header)) {
+ } elseif (preg_match('/^Transfer-Encoding: chunked/', $header))
{
// curl already de-chuncked the body
} else {
header($header);
diff --git a/src/www/snippet/delete.php b/src/www/snippet/delete.php
index 96c0a35..90012f5 100644
--- a/src/www/snippet/delete.php
+++ b/src/www/snippet/delete.php
@@ -51,7 +51,7 @@ if (session_loggedin()) {
echo $HTML->error_msg(_('Error: package version not
found.'));
snippet_footer();
exit;
- } else if (!forge_check_global_perm('forge_admin')
+ } elseif (!forge_check_global_perm('forge_admin')
and db_result($result,0,'submitted_by') !=
user_getid()) {
echo $HTML->error_msg(_('Error: Only the creator of a
package version can delete snippets from it.'));
snippet_footer();
@@ -87,7 +87,7 @@ if (session_loggedin()) {
echo $HTML->error_msg(_('Error: That snippet does not
exist.'));
snippet_footer();
exit;
- } else if (!forge_check_global_perm('forge_admin')
+ } elseif (!forge_check_global_perm('forge_admin')
and db_result($result,0,'submitted_by') !=
user_getid()) {
echo $HTML->error_msg(_('Error: Only the creator of a
snippet can delete it.'));
snippet_footer();
@@ -127,7 +127,7 @@ if (session_loggedin()) {
echo $HTML->error_msg(_('Error: package version not
found.'));
snippet_footer();
exit;
- } else if (!forge_check_global_perm('forge_admin')
+ } elseif (!forge_check_global_perm('forge_admin')
and db_result($result,0,'submitted_by') !=
user_getid()) {
echo $HTML->error_msg(_('Error: Only the creator of a
package version can delete it.'));
snippet_footer();
diff --git a/src/www/top/toplist.php b/src/www/top/toplist.php
index 7b49a60..f5c0baa 100644
--- a/src/www/top/toplist.php
+++ b/src/www/top/toplist.php
@@ -36,14 +36,12 @@ if ($type == 'pageviews_proj') {
$res_top = $stats->getTopPageViews();
$title = sprintf(_('Top Weekly Project Pageviews at *.%1$s (from
impressions of %2$s logo)'), forge_get_config('web_host'), forge_get_config
('forge_name'));
$column1 = _('Page Views');
-}
-else if ($type == 'forumposts_week') {
+} elseif ($type == 'forumposts_week') {
$res_top = $stats->getTopMessagesPosted();
$title = _('Top Forum Post Counts');
$column1 = _('Posts');
-}
// default to downloads
-else {
+} else {
$res_top = $stats->getTopDownloads();
$title = _('Top Downloads');
$column1 = _('Downloads');
diff --git a/src/www/top/topusers.php b/src/www/top/topusers.php
index 2045899..227350e 100644
--- a/src/www/top/topusers.php
+++ b/src/www/top/topusers.php
@@ -84,14 +84,11 @@ while ($row_top = db_fetch_array($res_top)) {
$diff = $row_top["old_ranking"] - $row_top["ranking"];
if (!$row_top["old_ranking"] || !$row_top["ranking"]) {
print _('N/A');
- }
- else if ($diff == 0) {
+ } elseif ($diff == 0) {
print _('Same');
- }
- else if ($diff > 0) {
+ } elseif ($diff > 0) {
print "<span class=\"up\"".sprintf(_('Up %s'), $diff)."</span>";
- }
- else if ($diff < 0) {
+ } elseif ($diff < 0) {
print "<span class=\"down\">".sprintf(_('Down %s'),
(0-$diff))."</span>";
}
-----------------------------------------------------------------------
Summary of changes:
src/common/include/FFError.class.php | 5 +++--
src/common/include/RBAC.php | 2 +-
src/common/tracker/actions/browse.php | 6 +++---
src/common/tracker/actions/tracker.php | 4 ++--
src/common/valid/ValidFactory.class.php | 4 ++--
src/www/admin/grouplist.php | 2 +-
src/www/scm/viewvc.php | 2 +-
src/www/snippet/delete.php | 6 +++---
src/www/top/toplist.php | 6 ++----
src/www/top/topusers.php | 9 +++------
10 files changed, 21 insertions(+), 25 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
