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 949d6ca18c6ef021934aab6aed9a2d09dc6f1055 (commit)
via 23de146e1286264c521c88ec8beaddf6eea2172d (commit)
via 3b971c56dce46cbf3ff32cf4287a63e99f8ccfad (commit)
from d487a43ea2ad4dcffee0c5661ba697d0b4da1b96 (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=949d6ca18c6ef021934aab6aed9a2d09dc6f1055
commit 949d6ca18c6ef021934aab6aed9a2d09dc6f1055
Author: Franck Villaume <[email protected]>
Date: Thu Jul 13 11:38:04 2017 +0000
enable ftp group access cron
diff --git a/src/common/include/System.class.php
b/src/common/include/System.class.php
index 7e966ed..6468529 100644
--- a/src/common/include/System.class.php
+++ b/src/common/include/System.class.php
@@ -72,6 +72,7 @@ class System extends FFError {
} else {
$systasksq = new SysTasksQ();
$systasksq->add(SYSTASK_CORE, 'HOMEDIR', null,
$user_id);
+ $systasksq->add(SYSTASK_CORE, 'FTP_ACCESS', null,
$user_id);
return true;
}
}
diff --git a/src/common/include/cron_utils.php
b/src/common/include/cron_utils.php
index 6e89c04..82755fc 100644
--- a/src/common/include/cron_utils.php
+++ b/src/common/include/cron_utils.php
@@ -47,6 +47,7 @@ $cron_arr = array(
'SCM_REPO' => 'scm/create_scm_repos.php', # 27
28 => 'scm/gather_scm_stats.php',
'WEB_VHOSTS' => 'web-vhosts/create_vhosts.php', # 30
+ 'FTP_ACCESS' => 'ftp/ftp_create_group_access.php' #31
);
# 13 => 'cvs.php',
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=23de146e1286264c521c88ec8beaddf6eea2172d
commit 23de146e1286264c521c88ec8beaddf6eea2172d
Author: Franck Villaume <[email protected]>
Date: Thu Jul 13 11:37:25 2017 +0000
space & tabs
diff --git a/src/common/include/RBAC.php b/src/common/include/RBAC.php
index 6f047fa..267770a 100644
--- a/src/common/include/RBAC.php
+++ b/src/common/include/RBAC.php
@@ -197,7 +197,7 @@ abstract class BaseRole extends FFError {
return group_get_objects(array_unique($ids));
}
- function linkProject ($project) { // From the PFO spec
+ function linkProject($project) { // From the PFO spec
global $SYS;
$hp = $this->getHomeProject();
if ($hp != NULL && $hp->getID() == $project->getID()) {
diff --git a/src/common/include/system/pgsql.class.php
b/src/common/include/system/pgsql.class.php
index 854429c..6c9c2de 100644
--- a/src/common/include/system/pgsql.class.php
+++ b/src/common/include/system/pgsql.class.php
@@ -108,21 +108,21 @@ class pgsql extends System {
if (!$user) {
return false;
} else {
- $res = db_query_params ('UPDATE users SET
- unix_uid=user_id+$1,
- unix_status=$2
- WHERE user_id=$3',
- array ($this->UID_ADD,
- 'A',
- $user_id)) ;
- if (!$res) {
- $this->setError('Error:
Cannot Update User UID/GID: '.db_error());
- return false;
+ $res = db_query_params('UPDATE users SET
+ unix_uid = user_id+$1,
+ unix_status = $2
+ WHERE user_id = $3',
+ array($this->UID_ADD,
+ 'A',
+ $user_id));
+ if (!$res) {
+ $this->setError(_('Error')._(': ')._('Cannot
Update User UID/GID')._(': ').db_error());
+ return false;
}
- $res1 = db_query_params ('DELETE FROM nss_usergroups
WHERE user_id=$1',
- array ($user_id)) ;
+ $res1 = db_query_params('DELETE FROM nss_usergroups
WHERE user_id = $1',
+ array($user_id));
if (!$res1) {
- $this->setError('Error: Cannot Delete Group
Member(s): '.db_error());
+ $this->setError(_('Error')._(': ')._('Cannot
Delete Group Member(s)')._(': ').db_error());
return false;
}
@@ -132,13 +132,13 @@ class pgsql extends System {
}
foreach ($user->getRoles() as $r) {
foreach ($r->getLinkedProjects() as $p) {
- if (forge_check_perm_for_user ($user,
'scm', $p->getID(), 'write')) {
- $pids[] = $p->getID() ;
+ if (forge_check_perm_for_user($user,
'scm', $p->getID(), 'write')) {
+ $pids[] = $p->getID();
}
}
}
foreach (array_unique($pids) as $pid) {
- $this->sysGroupAddUser($pid, $user_id) ;
+ $this->sysGroupAddUser($pid, $user_id);
}
}
return parent::sysCreateUser($user_id);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3b971c56dce46cbf3ff32cf4287a63e99f8ccfad
commit 3b971c56dce46cbf3ff32cf4287a63e99f8ccfad
Author: Franck Villaume <[email protected]>
Date: Thu Jul 13 11:36:25 2017 +0000
add initial standard cron error handling
diff --git a/src/cronjobs/ftp/ftp_create_group_access.php
b/src/cronjobs/ftp/ftp_create_group_access.php
index d1726ef..18dcf23 100755
--- a/src/cronjobs/ftp/ftp_create_group_access.php
+++ b/src/cronjobs/ftp/ftp_create_group_access.php
@@ -25,6 +25,7 @@ require_once $gfcommon.'include/pre.php';
require $gfcommon.'include/cron_utils.php';
$users = array();
+$err = '';
$ftp_dir = forge_get_config('ftp_upload_dir');
$home_dir = forge_get_config('homedir_prefix');
@@ -72,3 +73,6 @@ function execute($cmd) {
// print_debug ("res= ".$res);
return $res;
}
+
+cron_entry(31, $err);
+
-----------------------------------------------------------------------
Summary of changes:
src/common/include/RBAC.php | 2 +-
src/common/include/System.class.php | 1 +
src/common/include/cron_utils.php | 1 +
src/common/include/system/pgsql.class.php | 32 ++++++++++++++--------------
src/cronjobs/ftp/ftp_create_group_access.php | 4 ++++
5 files changed, 23 insertions(+), 17 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
