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 00433651d6254cfcea2d5a2d5b3096d50cf0d9f2 (commit)
via e62b01d9861fb1263f1ff88151df358e247e590a (commit)
via 1ce38582390027c8c05fa2ff5bc6addaf65139e8 (commit)
from 6a30c7cafc4b4dfb7e705a89ecf71963b0013e0b (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=00433651d6254cfcea2d5a2d5b3096d50cf0d9f2
commit 00433651d6254cfcea2d5a2d5b3096d50cf0d9f2
Author: Franck Villaume <[email protected]>
Date: Fri Jul 8 19:28:02 2016 +0200
remove useless code
diff --git a/src/common/include/Group.class.php
b/src/common/include/Group.class.php
index 90c6cf9..d67071e 100644
--- a/src/common/include/Group.class.php
+++ b/src/common/include/Group.class.php
@@ -363,10 +363,6 @@ class Group extends FFError {
} elseif (!$SYS->sysUseUnixName($unix_name)) {
$this->setError(_('Unix name already taken.'));
return false;
- } elseif (db_numrows(db_query_params('SELECT group_id FROM
groups WHERE unix_group_name=$1',
- array($unix_name))) >
0) {
- $this->setError(_('Unix name already taken.'));
- return false;
} elseif (strlen($purpose)<10) {
$this->setError(_('Please describe your Registration
Project Purpose and Summarization in a more comprehensive manner.'));
return false;
@@ -1767,10 +1763,7 @@ class Group extends FFError {
if (!$perm || !is_object($perm)) {
$this->setPermissionDeniedError();
return false;
- } elseif ($perm->isError()) {
- $this->setPermissionDeniedError();
- return false;
- } elseif (!$perm->isSuperUser()) {
+ } elseif ($perm->isError() || !$perm->isSuperUser()) {
$this->setPermissionDeniedError();
return false;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e62b01d9861fb1263f1ff88151df358e247e590a
commit e62b01d9861fb1263f1ff88151df358e247e590a
Author: Franck Villaume <[email protected]>
Date: Fri Jul 8 19:27:45 2016 +0200
reorganize params in function DocumentVersion::create,
DocumentVersino::update
diff --git a/src/common/docman/Document.class.php
b/src/common/docman/Document.class.php
index 8c1448d..38f6a7b 100644
--- a/src/common/docman/Document.class.php
+++ b/src/common/docman/Document.class.php
@@ -205,7 +205,7 @@ class Document extends FFError {
}
$dv = new DocumentVersion($this);
- $idversion = $dv->create($docid, $title, $description,
$user_id, $filetype, $filename, $filesize, $kwords, 1, 1, $createtimestamp);
+ $idversion = $dv->create($docid, $title, $description,
$user_id, $filetype, $filename, $filesize, $kwords, $createtimestamp, 1, 1);
if (!$idversion) {
$this->setError($dv->getErrorMessage());
db_rollback();
@@ -878,14 +878,14 @@ class Document extends FFError {
if (isset($kwords)) {
$version_kwords = $kwords;
}
- $serial_id = $dv->create($this->getID(), $title,
$description, user_getid(), $filetype, $filename, $filesize, $version_kwords,
$version, $current_version, $updatetimestamp);
+ $serial_id = $dv->create($this->getID(), $title,
$description, user_getid(), $filetype, $filename, $filesize, $version_kwords,
$updatetimestamp, $version, $current_version);
if (!$serial_id) {
$this->setOnUpdateError(_('Error updating
document version')._(': ').$dv->getErrorMessage());
db_rollback();
return false;
}
} else {
- if ($dv->isError() || !$dv->update($version, $title,
$description, $filetype, $filename, $filesize, $current_version,
$updatetimestamp)) {
+ if ($dv->isError() || !$dv->update($version, $title,
$description, $filetype, $filename, $filesize, $updatetimestamp,
$current_version)) {
$this->setOnUpdateError(_('Error updating
document version')._(': ').$dv->getErrorMessage());
db_rollback();
return false;
diff --git a/src/common/docman/DocumentVersion.class.php
b/src/common/docman/DocumentVersion.class.php
index 7346cd4..fb97986 100644
--- a/src/common/docman/DocumentVersion.class.php
+++ b/src/common/docman/DocumentVersion.class.php
@@ -156,12 +156,12 @@ class DocumentVersion extends FFError {
* @param string $filename The name of the file
(content)
* @param int $filesize The size of the file
(content)
* @param string $kwords The parsed words of the
file (content)
+ * @param int $createtimetamp timestamp of creation
of this version
* @param int $version The version id to
create. Default is 1 (the first version)
* @param int $current_version Is it the current
version? Defaut is 1 (yes)
- * @param int $createtimetamp timestamp of creation
of this version
* return bool true on success
*/
- function create($docid, $title, $description, $created_by, $filetype,
$filename, $filesize, $kwords, $version = 1, $current_version = 1,
$createtimetamp) {
+ function create($docid, $title, $description, $created_by, $filetype,
$filename, $filesize, $kwords, $createtimetamp, $version = 1, $current_version
= 1) {
db_begin();
$res = db_query_params('INSERT INTO doc_data_version (docid,
title, description, created_by, filetype, filename, filesize, data_words,
version, current_version, createdate)
VALUES ($1, $2, $3, $4, $5, $6, $7, $8,
$9, $10, $11)',
@@ -202,7 +202,7 @@ class DocumentVersion extends FFError {
}
if ($this->getNumberOfVersions() == 1) {
$this->getMaxVersionData();
- $this->update($this->data_array['version'],
$this->data_array['title'], $this->data_array['description'],
$this->data_array['filetype'], $this->data_array['filename'],
$this->data_array['filesize'], 1, $this->data_array['updatedate']);
+ $this->update($this->data_array['version'],
$this->data_array['title'], $this->data_array['description'],
$this->data_array['filetype'], $this->data_array['filename'],
$this->data_array['filesize'], $this->data_array['updatedate'], 1);
}
db_commit();
db_free_result($res);
@@ -280,11 +280,11 @@ class DocumentVersion extends FFError {
* @param string $filetype The new filetype
* @param string $filename The new filename
* @param int $filesize The new filesize
- * @param int $current_version Is the current version
to set? Default is yes.
* @param int $updatetimestamp timestamp of this update
+ * @param int $current_version Is the current version
to set? Default is yes.
* @return bool true on success
*/
- function update($version, $title, $description, $filetype, $filename,
$filesize, $current_version = 1, $updatetimestamp) {
+ function update($version, $title, $description, $filetype, $filename,
$filesize, $updatetimestamp, $current_version = 1) {
db_begin();
$colArr = array('title', 'description', 'filetype', 'filename',
'filesize', 'current_version', 'updatedate');
$valArr = array(htmlspecialchars($title),
htmlspecialchars($description), $filetype, $filename, $filesize,
$current_version, $updatetimestamp);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1ce38582390027c8c05fa2ff5bc6addaf65139e8
commit 1ce38582390027c8c05fa2ff5bc6addaf65139e8
Author: Franck Villaume <[email protected]>
Date: Fri Jul 8 19:01:38 2016 +0200
remove debug log
diff --git a/src/www/frs/scripts/FRSController.js
b/src/www/frs/scripts/FRSController.js
index d8c2c90..d3634d8 100644
--- a/src/www/frs/scripts/FRSController.js
+++ b/src/www/frs/scripts/FRSController.js
@@ -41,9 +41,7 @@ FRSController.prototype =
jQuery('#maindiv >
.warning_msg').remove();
if (data.format ==
'multi') {
var arrayLength
= Object.keys(data).length;
-
console.log(arrayLength);
for (var i = 0;
i < arrayLength; i++) {
-
console.log(data[i]);
if
(typeof data[i].html != 'undefined') {
jQuery('#maindiv').prepend(data[i].html);
}
-----------------------------------------------------------------------
Summary of changes:
src/common/docman/Document.class.php | 6 +++---
src/common/docman/DocumentVersion.class.php | 10 +++++-----
src/common/include/Group.class.php | 9 +--------
src/www/frs/scripts/FRSController.js | 2 --
4 files changed, 9 insertions(+), 18 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
