[Fusionforge-commits] FusionForge branch master updated. c8ddca0bc262fab2d3768af446e4196bbb42bd8b
Franck Villaume
nerville at fusionforge.org
Fri Nov 7 16:50:50 CET 2014
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 c8ddca0bc262fab2d3768af446e4196bbb42bd8b (commit)
via b88ac1597964e8df5e4f2961e8b8d07f5c674e8b (commit)
via d7171e07b36a0682f62a6e4938833e02131db1ec (commit)
via ea45afeed8c7578b90020144347bf83593d85efc (commit)
via 5c34c522e7f4da55fd7027632c29f7c0a1d2a942 (commit)
via a56039216b407bd8f4c3cffde3aadffcd6f27a86 (commit)
from e6b4a87c61e0e47735cf47dd072ae8ae49e71ca1 (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 -----------------------------------------------------------------
commit c8ddca0bc262fab2d3768af446e4196bbb42bd8b
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Fri Nov 7 16:49:17 2014 +0100
FRSPackage: clean up, fix monitor
diff --git a/src/common/frs/FRSPackage.class.php b/src/common/frs/FRSPackage.class.php
index 4fa0113..140d3f6 100644
--- a/src/common/frs/FRSPackage.class.php
+++ b/src/common/frs/FRSPackage.class.php
@@ -28,19 +28,21 @@ require_once $gfcommon.'include/Error.class.php';
require_once $gfcommon.'frs/FRSRelease.class.php';
require_once $gfcommon.'include/MonitorElement.class.php';
+$FRSPACKAGE_OBJ = array();
+
/**
* get_frs_packages - get all FRS packages for a specific project
*
* @param Group $Group
* @return array
*/
-function get_frs_packages($Group) {
+function &get_frs_packages($Group) {
$ps = array();
$res = db_query_params('SELECT * FROM frs_package WHERE group_id=$1',
- array($Group->getID())) ;
+ array($Group->getID()));
if (db_numrows($res) > 0) {
while($arr = db_fetch_array($res)) {
- $ps[]=new FRSPackage($Group, $arr['package_id'], $arr);
+ $ps[] = new FRSPackage($Group, $arr['package_id'], $arr);
}
}
return $ps;
@@ -53,7 +55,7 @@ function get_frs_packages($Group) {
* @param bool $data
* @return object the FRSPackage object
*/
-function frspackage_get_object($package_id, $data=false) {
+function &frspackage_get_object($package_id, $data = false) {
global $FRSPACKAGE_OBJ;
if (!isset($FRSPACKAGE_OBJ['_'.$package_id.'_'])) {
if ($data) {
@@ -66,8 +68,8 @@ function frspackage_get_object($package_id, $data=false) {
}
$data = db_fetch_array($res);
}
- $Group = group_get_object($data['group_id']);
- $FRSPACKAGE_OBJ['_'.$package_id.'_']= new FRSPackage($Group,$data['package_id'], $data);
+ $Group =& group_get_object($data['group_id']);
+ $FRSPACKAGE_OBJ['_'.$package_id.'_'] = new FRSPackage($Group, $data['package_id'], $data);
}
return $FRSPACKAGE_OBJ['_'.$package_id.'_'];
}
@@ -338,7 +340,7 @@ class FRSPackage extends Error {
return false;
}
$MonitorElementObject = new MonitorElement('frspackage');
- if (!$MonitorElementObject->disableMonitoringByUserId($this->getID(), $userid)) {
+ if (!$MonitorElementObject->disableMonitoringByUserId($this->getID(), user_getid())) {
$this->setError($MonitorElementObject->getErrorMessage());
return false;
}
@@ -545,7 +547,7 @@ class FRSPackage extends Error {
* @return integer release id
*/
public function getNewestReleaseID() {
- $result = db_query_params('SELECT MAX(release_id) AS release_id FROM frs_release WHERE package_id=$1',
+ $result = db_query_params('SELECT MAX(release_id) AS release_id FROM frs_release WHERE package_id = $1',
array($this->getID()));
if ($result && db_numrows($result) == 1) {
commit b88ac1597964e8df5e4f2961e8b8d07f5c674e8b
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Fri Nov 7 16:48:43 2014 +0100
use reference when needed
diff --git a/src/common/frs/FRSPackageFactory.class.php b/src/common/frs/FRSPackageFactory.class.php
index 2a33b6f..acc7ecd 100644
--- a/src/common/frs/FRSPackageFactory.class.php
+++ b/src/common/frs/FRSPackageFactory.class.php
@@ -77,7 +77,7 @@ class FRSPackageFactory extends Error {
* @param bool $status limite the search to active packages. Default is false.
* @return array The array of FRS objects.
*/
- function getFRSs($status = false) {
+ function &getFRSs($status = false) {
if (isset($this->FRSs) && is_array($this->FRSs)) {
return $this->FRSs;
}
@@ -87,7 +87,7 @@ class FRSPackageFactory extends Error {
foreach ($ids as $id) {
if (forge_check_perm('frs', $id, 'read')) {
- $this->FRSs[] = frspackage_get_object($id);
+ $this->FRSs[] =& frspackage_get_object($id);
}
}
return $this->FRSs;
diff --git a/src/common/frs/FRSRelease.class.php b/src/common/frs/FRSRelease.class.php
index cb12762..1b8fc00 100644
--- a/src/common/frs/FRSRelease.class.php
+++ b/src/common/frs/FRSRelease.class.php
@@ -33,7 +33,7 @@ require_once $gfcommon.'frs/FRSFile.class.php';
* @param array $data The result array, if it's passed in
* @return object FRSRelease object
*/
-function frsrelease_get_object($release_id, $data = array()) {
+function &frsrelease_get_object($release_id, $data = array()) {
global $FRSRELEASE_OBJ;
if (!isset($FRSRELEASE_OBJ['_'.$release_id.'_'])) {
if ($data) {
commit d7171e07b36a0682f62a6e4938833e02131db1ec
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Fri Nov 7 16:48:18 2014 +0100
frs action monitor: better error handling
diff --git a/src/common/frs/actions/monitor.php b/src/common/frs/actions/monitor.php
index 39bb93b..69a8418 100644
--- a/src/common/frs/actions/monitor.php
+++ b/src/common/frs/actions/monitor.php
@@ -82,6 +82,15 @@ if ($package_id) {
} else {
session_redirect($redirect_url);
}
+ } else {
+ $error_msg = $frsp->getErrorMessage();
+ if ($ajax) {
+ $result['html'] = $HTML->error_msg($error_msg);
+ echo json_encode($result);
+ exit;
+ } else {
+ session_redirect($redirect_url);
+ }
}
} else {
if ($frsp->stopMonitor()) {
@@ -96,6 +105,15 @@ if ($package_id) {
} else {
session_redirect($redirect_url);
}
+ } else {
+ $error_msg = $frsp->getErrorMessage();
+ if ($ajax) {
+ $result['html'] = $HTML->error_msg($error_msg);
+ echo json_encode($result);
+ exit;
+ } else {
+ session_redirect($redirect_url);
+ }
}
}
}
commit ea45afeed8c7578b90020144347bf83593d85efc
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Fri Nov 7 11:33:28 2014 +0100
frs: clean up
diff --git a/src/common/frs/actions/addfile.php b/src/common/frs/actions/addfile.php
index 209c953..e37cfa0 100644
--- a/src/common/frs/actions/addfile.php
+++ b/src/common/frs/actions/addfile.php
@@ -51,14 +51,14 @@ $ftp_filename = getStringFromRequest('ftp_filename');
$manual_filename = getStringFromRequest('manual_filename');
$docman_fileid = getIntFromRequest('docman_fileid');
-$frsp = new FRSPackage($g, $package_id);
+$frsp = frspackage_get_object($package_id);
if (!$frsp || !is_object($frsp)) {
exit_error(_('Could Not Get FRS Package'), 'frs');
} elseif ($frsp->isError()) {
exit_error($frsp->getErrorMessage(), 'frs');
}
-$frsr = new FRSRelease($frsp, $release_id);
+$frsr = frsrelease_get_object($release_id);
if (!$frsr || !is_object($frsr)) {
exit_error(_('Could Not Get FRS Release'), 'frs');
} elseif ($frsr->isError()) {
diff --git a/src/common/frs/actions/addrelease.php b/src/common/frs/actions/addrelease.php
index 9185e1f..8b28f3d 100644
--- a/src/common/frs/actions/addrelease.php
+++ b/src/common/frs/actions/addrelease.php
@@ -41,7 +41,7 @@ if (!forge_check_perm('frs', $package_id, 'release')) {
session_redirect('/frs/?group_id='.$group_id);
}
-$frsp = new FRSPackage($g, $package_id);
+$frsp = frspackage_get_object($package_id);
if (!$frsp || !is_object($frsp)) {
$error_msg = _('Could Not Get FRS Package');
session_redirect('/frs/?group_id='.$group_id.'&view=admin');
diff --git a/src/common/frs/actions/deletepackage.php b/src/common/frs/actions/deletepackage.php
index d537e65..b13c73c 100644
--- a/src/common/frs/actions/deletepackage.php
+++ b/src/common/frs/actions/deletepackage.php
@@ -38,7 +38,7 @@ if (!$package_id_strings) {
$result['format'] = 'multi';
foreach ($package_ids as $key => $package_id) {
if (forge_check_perm('frs', $package_id, 'admin')) {
- $frsp = new FRSPackage($g, $package_id);
+ $frsp = frspackage_get_object($package_id);
if (!$frsp || !is_object($frsp)) {
$result[$key]['html'] = $HTML->error_msg(_('Error Getting FRSPackage'));
} elseif ($frsp->isError()) {
diff --git a/src/common/frs/actions/editrelease.php b/src/common/frs/actions/editrelease.php
index e31ac43..7f4fc47 100644
--- a/src/common/frs/actions/editrelease.php
+++ b/src/common/frs/actions/editrelease.php
@@ -52,7 +52,7 @@ $exec_changes = true;
//
// Get the package
//
-$frsp = new FRSPackage($g, $package_id);
+$frsp = frspackage_get_object($package_id);
if (!$frsp || !is_object($frsp)) {
exit_error(_('Could Not Get FRS Package'), 'frs');
} elseif ($frsp->isError()) {
@@ -62,7 +62,7 @@ if (!$frsp || !is_object($frsp)) {
//
// Get the release
//
-$frsr = new FRSRelease($frsp,$release_id);
+$frsr = frsrelease_get_object$release_id);
if (!$frsr || !is_object($frsr)) {
exit_error(_('Could Not Get FRS Release'), 'frs');
} elseif ($frsr->isError()) {
diff --git a/src/common/frs/actions/monitor.php b/src/common/frs/actions/monitor.php
index 154e9fc..39bb93b 100644
--- a/src/common/frs/actions/monitor.php
+++ b/src/common/frs/actions/monitor.php
@@ -47,7 +47,7 @@ if (!forge_check_perm('frs', $package_id, 'read')) {
$redirect_url = getStringFromRequest('redirect_url', '/my/');
if ($package_id) {
- $frsp = new FRSPackage($g, $package_id);
+ $frsp = frspackage_get_object($package_id);
if (!$frsp || !is_object($frsp)) {
$error_msg = _('Error Getting FRSPackage');
if ($ajax) {
diff --git a/src/common/frs/actions/updatepackage.php b/src/common/frs/actions/updatepackage.php
index fdcea66..134775b 100644
--- a/src/common/frs/actions/updatepackage.php
+++ b/src/common/frs/actions/updatepackage.php
@@ -47,7 +47,7 @@ $status_id = getIntFromRequest('status_id');
$result['html'] = $HTML->error_msg(_('Missing package_id or package_name'));
if ($package_id && $package_name) {
- $frsp = new FRSPackage($g, $package_id);
+ $frsp = frspackage_get_object($package_id);
if (!$frsp || !is_object($frsp)) {
$result['html'] = $HTML->error_msg(_('Error Getting FRSPackage'));
echo json_encode($result);
diff --git a/src/common/frs/views/admin.php b/src/common/frs/views/admin.php
index edd27d5..09e7658 100644
--- a/src/common/frs/views/admin.php
+++ b/src/common/frs/views/admin.php
@@ -31,19 +31,13 @@ global $HTML; // html object
global $group_id; // id of group
global $g; // group object
global $permissionlevel;
+global $fpFactory;
if (!forge_check_perm('frs_admin', $group_id, 'read')) {
$warning_msg = _('FRS Access Denied');
session_redirect('/frs/?group_id='.$group_id);
}
-$fpFactory = new FRSPackageFactory($g);
-if (!$fpFactory || !is_object($fpFactory)) {
- exit_error(_('Could Not Get FRSPackageFactory'), 'frs');
-} elseif ($fpFactory->isError()) {
- exit_error($fpFactory->getErrorMessage(), 'frs');
-}
-
$FRSPackages = $fpFactory->getFRSs();
if (count($FRSPackages) > 0) {
diff --git a/src/www/frs/index.php b/src/www/frs/index.php
index 776682b..78146b3 100644
--- a/src/www/frs/index.php
+++ b/src/www/frs/index.php
@@ -31,6 +31,7 @@ require_once $gfcommon.'frs/FRSFile.class.php';
require_once $gfcommon.'frs/FRSPackage.class.php';
require_once $gfcommon.'frs/FRSPackageFactory.class.php';
require_once $gfcommon.'frs/FRSRelease.class.php';
+require_once $gfcommon.'frs/FRSReleaseFactory.class.php';
require_once $gfcommon.'reporting/report_utils.php';
require_once $gfcommon.'reporting/ReportDownloads.class.php';
require_once $gfcommon.'docman/DocumentManager.class.php';
commit 5c34c522e7f4da55fd7027632c29f7c0a1d2a942
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Fri Nov 7 11:17:34 2014 +0100
frs: clean up, use cache function, phpdoc, less code
diff --git a/src/common/frs/FRSPackageFactory.class.php b/src/common/frs/FRSPackageFactory.class.php
index 957333b..2a33b6f 100644
--- a/src/common/frs/FRSPackageFactory.class.php
+++ b/src/common/frs/FRSPackageFactory.class.php
@@ -87,7 +87,7 @@ class FRSPackageFactory extends Error {
foreach ($ids as $id) {
if (forge_check_perm('frs', $id, 'read')) {
- $this->FRSs[] = new FRSPackage($this->Group, $id);
+ $this->FRSs[] = frspackage_get_object($id);
}
}
return $this->FRSs;
@@ -109,15 +109,24 @@ class FRSPackageFactory extends Error {
$qpa = db_construct_qpa($qpa, 'ORDER BY package_id ASC');
$res = db_query_qpa($qpa);
- if (!$res) {
- return $result;
- }
- while ($arr = db_fetch_array($res)) {
- $result[] = $arr['package_id'];
+ if ($res) {
+ while ($arr = db_fetch_array($res)) {
+ $result[] = $arr['package_id'];
+ }
}
return $result;
}
+ /**
+ * getPermissionOfASpecificUser - get the max level of permission of the current user
+ *
+ * @return integer the value of permission
+ * 0 = none
+ * 1 = read
+ * 2 = file
+ * 3 = release
+ * 4 = admin
+ */
function getPermissionOfASpecificUser() {
$admin = false;
$release = false;
@@ -150,7 +159,7 @@ class FRSPackageFactory extends Error {
} elseif ($read) {
return 1; // read
}
- return null;
+ return 0;
}
}
commit a56039216b407bd8f4c3cffde3aadffcd6f27a86
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Fri Nov 7 11:14:34 2014 +0100
frs: use cache function
diff --git a/src/common/frs/FRSReleaseFactory.class.php b/src/common/frs/FRSReleaseFactory.class.php
index 29dc58d..3f16949 100644
--- a/src/common/frs/FRSReleaseFactory.class.php
+++ b/src/common/frs/FRSReleaseFactory.class.php
@@ -22,6 +22,7 @@
require_once $gfcommon.'include/Error.class.php';
require_once $gfcommon.'frs/FRSRelease.class.php';
+require_once $gfcommon.'frs/FRSPackage.class.php';
require_once $gfcommon.'frs/FRSPackageFactory.class.php';
class FRSReleaseFactory extends Error {
@@ -96,7 +97,7 @@ class FRSReleaseFactory extends Error {
foreach ($ids as $id) {
if (forge_check_perm('frs', $id, 'read')) {
- $frsp = new FRSPackage($this->Group, $id);
+ $frsp = frspackage_get_object($id);
$frspr = $frsp->getReleases();
$this->FRSRs = array_merge($frspr, $this->FRSRs);
}
@@ -121,7 +122,7 @@ class FRSReleaseFactory extends Error {
foreach ($ids as $id) {
if (forge_check_perm('frs', $id, 'read')) {
- $frsp = new FRSPackage($this->Group, $id);
+ $frsp = frspackage_get_object($id);
$frspnr_id = $frsp->getNewestReleaseID();
$frspnr = frsrelease_get_object($frspnr_id);
}
-----------------------------------------------------------------------
Summary of changes:
src/common/frs/FRSPackage.class.php | 18 ++++++++++--------
src/common/frs/FRSPackageFactory.class.php | 25 +++++++++++++++++--------
src/common/frs/FRSRelease.class.php | 2 +-
src/common/frs/FRSReleaseFactory.class.php | 5 +++--
src/common/frs/actions/addfile.php | 4 ++--
src/common/frs/actions/addrelease.php | 2 +-
src/common/frs/actions/deletepackage.php | 2 +-
src/common/frs/actions/editrelease.php | 4 ++--
src/common/frs/actions/monitor.php | 20 +++++++++++++++++++-
src/common/frs/actions/updatepackage.php | 2 +-
src/common/frs/views/admin.php | 8 +-------
src/www/frs/index.php | 1 +
12 files changed, 59 insertions(+), 34 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list