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 e7bcba66d57410e8d46c732edc5ccef721e479f6 (commit)
from a4bdf7672f3b93aaa5303fc503817b9996f1d7fe (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=e7bcba66d57410e8d46c732edc5ccef721e479f6
commit e7bcba66d57410e8d46c732edc5ccef721e479f6
Author: Marc-Etienne Vargenau <[email protected]>
Date: Mon Apr 24 13:29:37 2017 +0200
Whitespace
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index 1e9da3f..d2bac7d 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -1282,7 +1282,7 @@ control over it to the project's administrator.");
$u = user_get_object(user_getid());
$d = $u->getUnixName();
}
-
+
$results = array();
if ($unix_group_name) {
$res = db_query_params("SELECT unix_group_name,
groups.group_id FROM groups
@@ -1370,7 +1370,7 @@ control over it to the project's administrator.");
JOIN users ON (scm_personal_repos.user_id=users.user_id)
WHERE groups.status=$1 AND group_plugin.plugin_id=$2
AND users.status=$3
ORDER BY unix_group_name, user_name", array('A',
$this->getID(), 'A'));
- }
+ }
while ($arr = db_fetch_array($res)) {
if (!forge_check_perm('scm', $arr['group_id'], 'read'))
{
continue;
@@ -1465,7 +1465,7 @@ control over it to the project's administrator.");
while ($arr = db_fetch_array($res)) {
$lastactivities[$arr['repository_id']] = $arr['last'];
}
-
+
foreach ($repos as $rdata) {
$since = "";
if (array_key_exists($rdata['rid'], $lastactivities)) {
diff --git a/src/plugins/scmgit/libexec/gitlog.php
b/src/plugins/scmgit/libexec/gitlog.php
index 873d3e4..1fb1f00 100644
--- a/src/plugins/scmgit/libexec/gitlog.php
+++ b/src/plugins/scmgit/libexec/gitlog.php
@@ -69,7 +69,7 @@ if ($mode == 'date_range') {
if (!ctype_digit($limit))
die('Invalid limit');
$options = "--max-count=$limit";
-
+
if ($mode == 'latest_user') {
$email = $_GET['email'];
$realname = $_GET['realname'];
diff --git a/src/plugins/scmhook/cronjobs/updateScmRepo.php
b/src/plugins/scmhook/cronjobs/updateScmRepo.php
index 45072b1..ccdda46 100755
--- a/src/plugins/scmhook/cronjobs/updateScmRepo.php
+++ b/src/plugins/scmhook/cronjobs/updateScmRepo.php
@@ -138,7 +138,7 @@ function install_hooks($params) {
$returnvalue = false;
break;
}
-
+
if ($returnvalue) {
cron_debug("INFO hooks updated for project
".$group->getUnixName());
} else {
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 5d99b5c..c1041d6 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -745,7 +745,7 @@ some control over it to the project's administrator.");
$u = user_get_object(user_getid());
$d = $u->getUnixName();
}
-
+
$results = array();
if ($unix_group_name) {
$res = db_query_params("SELECT unix_group_name,
groups.group_id FROM groups
@@ -757,7 +757,7 @@ some control over it to the project's administrator.");
JOIN group_plugin ON
(groups.group_id=group_plugin.group_id)
WHERE groups.status=$1 AND group_plugin.plugin_id=$2
ORDER BY unix_group_name", array('A', $this->getID()));
- }
+ }
while ($arr = db_fetch_array($res)) {
if (!forge_check_perm('scm', $arr['group_id'], 'read'))
{
continue;
@@ -826,7 +826,7 @@ some control over it to the project's administrator.");
while ($arr = db_fetch_array($res)) {
$lastactivities[$arr['repository_id']] = $arr['last'];
}
-
+
foreach ($repos as $rdata) {
$since = "";
if (array_key_exists($rdata['rid'], $lastactivities)) {
diff --git a/src/plugins/wiki/cronjobs/create_groups.php
b/src/plugins/wiki/cronjobs/create_groups.php
index 3402302..a37da89 100755
--- a/src/plugins/wiki/cronjobs/create_groups.php
+++ b/src/plugins/wiki/cronjobs/create_groups.php
@@ -89,7 +89,7 @@ while ( $row = db_fetch_array($res) ) {
$params['template_groups'] = $template_groups;
$params['name'] = $name;
$params['groups_dir'] = $groups_dir;
-
+
util_sudo_effective_user($file_owner,
"populate_initial_wiki",
$params);
diff --git a/src/utils/filter-sql-dump.php b/src/utils/filter-sql-dump.php
index 25aa83f..42ba15a 100755
--- a/src/utils/filter-sql-dump.php
+++ b/src/utils/filter-sql-dump.php
@@ -34,7 +34,7 @@ foreach (parse_sql_file($file) as $q) {
if (preg_match('/^SET/', $q)) continue;
if (preg_match('/^\\\connect/', $q)) continue;
if (preg_match('/^SELECT pg_catalog.setval/', $q)) continue;
-
+
$ignored_insert_tables = array('artifact_extra_field_elements',
'artifact_extra_field_list',
'database_changes',
diff --git a/src/www/include/expression.php b/src/www/include/expression.php
index c2c5a5e..0674ea9 100644
--- a/src/www/include/expression.php
+++ b/src/www/include/expression.php
@@ -170,16 +170,16 @@ class Expression {
}
return $output;
}
-
+
// ===================== HERE BE INTERNAL METHODS ====================\\
-
+
// Convert infix to postfix notation
function nfx($expr) {
$index = 0;
$stack = new ExpressionStack ();
$output = array (); // postfix form of expression, to be passed
to pfx()
$expr = trim ($expr);
-
+
$ops = array ('+', '-', '*', '/', '^', '_', '%', '>', '<',
'>=', '<=', '==', '!=', '=~', '&&', '||', '!', '?', ':', '?:');
$ops_r = array ('+' => 0, '-' => 0, '*' => 0, '/' => 0, '^' =>
1, '_' => 0, '%' => 0, '>' => 0, '<' => 0, '>=' => 0, '<=' => 0, '==' => 0,
'!=' => 0, '=~' => 0, '&&' => 0, '||' => 0, '!' => 0, '?' => 1, ':' => 0, '?:'
=> 0); // right-associative operator?
// $ops_p =
array('+'=>4,'-'=>4,'*'=>4,'/'=>4,'_'=>4,'%'=>4,'^'=>5,'>'=>2,'<'=>2,
@@ -194,7 +194,7 @@ class Expression {
'^' => 6, '!' => 6); // operator precedence
$expecting_op = false; // we use this in syntax-checking the
expression
// and
determining when a - is a negation
-
+
/*
* we allow all characters because of strings
* if (preg_match("%[^\w\s+*^\/()\.,-<>=&~|!\"\\\\/]%", $expr,
$matches)) { // make sure the characters are all good
@@ -246,7 +246,7 @@ class Expression {
$output [] = $pop; // pop stuff
off the stack into the output
} else {
$op = '?:';
- break;
+ break;
}
}
// many thanks:
http://en.wikipedia.org/wiki/Reverse_Polish_notation#The_algorithm_in_detail
@@ -380,7 +380,7 @@ class Expression {
}
return $output;
}
-
+
// evaluate postfix notation
function pfx($tokens, $vars = array()) {
$binaryOperator = array ('+', '-', '*', '/', '^', '<', '>',
'<=', '>=', '==', '&&', '||', '!=', '=~', '%');
@@ -456,7 +456,7 @@ class Expression {
break;
case '=~' :
$value = @preg_match ( $op2,
$op1, $match );
-
+
if (! is_int ( $value )) {
return $this->trigger (
"Invalid regex " . json_encode ( $op2 ) );
}
@@ -560,7 +560,7 @@ class Expression {
return $this->trigger ( "internal error" );
return $stack->pop ();
}
-
+
// trigger an error, but nicely, if need be
function trigger($msg) {
$this->last_error = $msg;
-----------------------------------------------------------------------
Summary of changes:
src/plugins/scmgit/common/GitPlugin.class.php | 6 +++---
src/plugins/scmgit/libexec/gitlog.php | 2 +-
src/plugins/scmhook/cronjobs/updateScmRepo.php | 2 +-
src/plugins/scmsvn/common/SVNPlugin.class.php | 6 +++---
src/plugins/wiki/cronjobs/create_groups.php | 2 +-
src/utils/filter-sql-dump.php | 2 +-
src/www/include/expression.php | 16 ++++++++--------
7 files changed, 18 insertions(+), 18 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
