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 7d6a34a2ee55db4dce8c03192c94cfda0d9c8239 (commit)
via d80d4c9eba02d54976e3a77fedc382b0eea3b7f7 (commit)
via 391f9a5483164dab94da97bfe4473421641c6b84 (commit)
via 5eabef6a25d297f97377675406053e78fb35b606 (commit)
via cd6a6632ca565fd6ce51dc57228f629ee4c46480 (commit)
via 20ebfccb1a995914fc1b0f81d563796a44212c71 (commit)
via b969ad14b3888a9476ba1f8b49db8ad46b19958b (commit)
via 0f5fb275d691c55d1f41c5c3028143f33e6f94a5 (commit)
via fd129ec8fdc772c23c11147acbb827ded1ea39f8 (commit)
via caa2a5e8c3c2e515f5abe829bb29c3f4bfcf9316 (commit)
via e9e6f7e6fc71aa23a623f45bceef8d45a3bdccb5 (commit)
via 295213deab5ff079e899ae0ed887a92f398e0366 (commit)
via f2569f8ec07e46dabd6faeeca3b6ecba04ba76e4 (commit)
via 9d71cfb821f54d199c636533078c132326b4ee41 (commit)
via c0e0a2a2212651d110dce20b14e4ace701dedf15 (commit)
via aca6cd13b5a290ebf5e45e4279cf3f18e47d0d39 (commit)
via 0706a992d517c5c44e70dfd13c1825c7d4ed586e (commit)
via 275517121e79fc382fba9a7afd9e6c695fd84111 (commit)
via 20e3962b55ba7c8f50f57ab46dc3990c925fb2e3 (commit)
via a1c2092f51982110a8e5a5631a79f887e892eb5f (commit)
via 7bd87c98719210f5b71c151009fbc025a5bae724 (commit)
via 753b81bf30d7811bdd45f0b4546551cc3d0a762d (commit)
via 8fb4da20bdb15af69991670ab61f15a6b3b0eab8 (commit)
via c12903c7b88155532e13924115529e24f68b3c6b (commit)
via 0e5354ad9ff13a5f303c7499cfb97ee35b37f349 (commit)
from 28ed358b8008ba53b0d20858792ca02536b2c0ff (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=7d6a34a2ee55db4dce8c03192c94cfda0d9c8239
commit 7d6a34a2ee55db4dce8c03192c94cfda0d9c8239
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 13:15:59 2021 +0200
add missing global var
diff --git a/src/www/survey/admin/show_results.php
b/src/www/survey/admin/show_results.php
index aafbf44..02d6475 100644
--- a/src/www/survey/admin/show_results.php
+++ b/src/www/survey/admin/show_results.php
@@ -138,6 +138,7 @@ $sh->footer();
* @param int $graph
*/
function showResult(&$SurveyHTML, &$Survey, &$Question, $show_comment=0,
$q_num="", $graph=0) {
+ global $HTML;
/* Get results */
$srf = new SurveyResponseFactory($Survey, $Question);
if (!$srf || !is_object($srf)) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=d80d4c9eba02d54976e3a77fedc382b0eea3b7f7
commit d80d4c9eba02d54976e3a77fedc382b0eea3b7f7
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 13:12:07 2021 +0200
add missing param
diff --git a/src/www/project/admin/editimages.php
b/src/www/project/admin/editimages.php
index 1929847..bf23e14 100644
--- a/src/www/project/admin/editimages.php
+++ b/src/www/project/admin/editimages.php
@@ -181,13 +181,9 @@ if (getStringFromRequest('submit')) {
$size = $input_file['size'];
if (db_result($res,0,'sum')+$size < $QUOTA) {
-
- store_file($id, $input_file);
-
+ store_file($id, $input_file, $is_logo);
} else {
-
$feedback .= _('.Sorry - you are over
your 1MB quota.');
-
}
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=391f9a5483164dab94da97bfe4473421641c6b84
commit 391f9a5483164dab94da97bfe4473421641c6b84
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 13:10:06 2021 +0200
remove double echo
diff --git a/src/www/people/editjob.php b/src/www/people/editjob.php
index 34b7c79..d61a591 100644
--- a/src/www/people/editjob.php
+++ b/src/www/people/editjob.php
@@ -178,7 +178,9 @@ if ($group_id && (forge_check_perm('project_admin',
$group_id))) {
<input type="submit" name="update_job" value="'._('Update
Descriptions').'" /></p>';
echo $HTML->closeForm();
//now show the list of desired skills
- echo '<p>'.people_edit_job_inventory($job_id,$group_id).'</p>';
+ echo '<p>';
+ people_edit_job_inventory($job_id,$group_id);
+ echo '</p>';
echo $HTML->openForm(array('action' => '/people/', 'method' =>
'post'));
echo '<input type="submit" name="submit"
value="'._('Finished').'" />';
echo $HTML->closeForm();
diff --git a/src/www/people/viewjob.php b/src/www/people/viewjob.php
index 36385d6..1daf882 100644
--- a/src/www/people/viewjob.php
+++ b/src/www/people/viewjob.php
@@ -88,7 +88,8 @@ if ($group_id && $job_id) {
<h2>'._('Required Skills').'</h2>';
//now show the list of desired skills
- echo people_show_job_inventory($job_id).'</td></tr></table>';
+ people_show_job_inventory($job_id);
+ echo '</td></tr></table>';
}
people_footer();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=5eabef6a25d297f97377675406053e78fb35b606
commit 5eabef6a25d297f97377675406053e78fb35b606
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 13:00:57 2021 +0200
remove unreachable code
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php
b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 923bbcc..894ddc2 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -573,7 +573,6 @@ some control over it to the project's administrator.");
xml_get_current_line_number($xml_parser));
db_rollback () ;
return false ;
- break;
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=cd6a6632ca565fd6ce51dc57228f629ee4c46480
commit cd6a6632ca565fd6ce51dc57228f629ee4c46480
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:58:33 2021 +0200
add missing global var
diff --git a/src/plugins/scmhook/library/scmsvn/commitTracker.class.php
b/src/plugins/scmhook/library/scmsvn/commitTracker.class.php
index 0bbd6ab..23dacb7 100644
--- a/src/plugins/scmhook/library/scmsvn/commitTracker.class.php
+++ b/src/plugins/scmhook/library/scmsvn/commitTracker.class.php
@@ -56,6 +56,7 @@ class SvnCommitTracker extends scmhook {
}
function artifact_extra_detail(&$params) {
+ global $HTML;
$DBResult = db_query_params('SELECT * FROM
plugin_scmhook_scmsvn_committracker_data_master,
plugin_scmhook_scmsvn_committracker_data_artifact
WHERE
plugin_scmhook_scmsvn_committracker_data_artifact.group_artifact_id = $1
AND
plugin_scmhook_scmsvn_committracker_data_master.holder_id =
plugin_scmhook_scmsvn_committracker_data_artifact.id
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=20ebfccb1a995914fc1b0f81d563796a44212c71
commit 20ebfccb1a995914fc1b0f81d563796a44212c71
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:56:36 2021 +0200
add missing global var. Remove init var.
diff --git a/src/plugins/scmhook/library/scmgit/commitTracker.class.php
b/src/plugins/scmhook/library/scmgit/commitTracker.class.php
index e6b6d2d..1014b96 100644
--- a/src/plugins/scmhook/library/scmgit/commitTracker.class.php
+++ b/src/plugins/scmhook/library/scmgit/commitTracker.class.php
@@ -76,7 +76,7 @@ class GitCommitTracker extends scmhook {
}
function task_extra_detail($params) {
- $return = '';
+ global $HTML;
$DBResult = db_query_params ('SELECT * FROM
plugin_scmhook_scmgit_committracker_data_master,
plugin_scmhook_scmgit_committracker_data_artifact
WHERE
plugin_scmhook_scmgit_committracker_data_artifact.project_task_id = $1
AND
plugin_scmhook_scmgit_committracker_data_master.holder_id =
plugin_scmhook_scmgit_committracker_data_artifact.id
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b969ad14b3888a9476ba1f8b49db8ad46b19958b
commit b969ad14b3888a9476ba1f8b49db8ad46b19958b
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:54:38 2021 +0200
fix wrong var
diff --git a/src/plugins/scmdarcs/common/DarcsPlugin.class.php
b/src/plugins/scmdarcs/common/DarcsPlugin.class.php
index 4c52519..567c748 100644
--- a/src/plugins/scmdarcs/common/DarcsPlugin.class.php
+++ b/src/plugins/scmdarcs/common/DarcsPlugin.class.php
@@ -442,7 +442,7 @@ over it to the project's administrator.");
$usr_deletes = array();
$toprepo = $this->getRootRepositories($group);
- $repo = $toprepo . '/' . $repo_name;
+ $repo = $toprepo . '/' . $project_reponame;
if (!is_dir($repo) || !is_dir("$repo/_darcs")) {
echo "No repository $repo\n";
return false;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0f5fb275d691c55d1f41c5c3028143f33e6f94a5
commit 0f5fb275d691c55d1f41c5c3028143f33e6f94a5
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:51:26 2021 +0200
fix init var
diff --git a/src/plugins/scmcpold/common/CpoldPlugin.class.php
b/src/plugins/scmcpold/common/CpoldPlugin.class.php
index a2f7acd..6ff0360 100644
--- a/src/plugins/scmcpold/common/CpoldPlugin.class.php
+++ b/src/plugins/scmcpold/common/CpoldPlugin.class.php
@@ -58,9 +58,9 @@ class CpoldPlugin extends SCMPlugin {
function getInstructionsForAnon ($project) {
$b = '<h2>';
$b .= _('Anonymous CPOLD Access');
- $b = '</h2>';
+ $b .= '</h2>';
$b .= '<p>';
- $b = sprintf (_('This project\'s CPOLD repository can be
accessed anonymously at %s.'),
+ $b .= sprintf (_('This project\'s CPOLD repository can be
accessed anonymously at %s.'),
util_make_link
('/anonscm/cpold/'.$project->getUnixName().'/',
util_make_url
('/anonscm/cpold/'.$project->getUnixName().'/'))) ;
$b .= '</p>';
@@ -71,7 +71,7 @@ class CpoldPlugin extends SCMPlugin {
if (session_loggedin()) {
$u = user_get_object(user_getid()) ;
$d = $u->getUnixName() ;
- $b .= '<h2>';
+ $b = '<h2>';
$b .= sprintf(_('Developer %s Access via SSH'),
'CPOLD');
$b .= '</h2>';
$b .= '<p>';
@@ -83,7 +83,7 @@ class CpoldPlugin extends SCMPlugin {
$b .= '</p>';
$b .= '<p><kbd>scp -r '.$d.'@' .
$this->getBoxForProject($project) . ':'. forge_get_config('repos_path',
'scmcpold') .'/'. $project->getUnixName().'/ .</kbd></p>' ;
} else {
- $b .= '<h2>';
+ $b = '<h2>';
$b .= sprintf(_('Developer %s Access via SSH'),
'CPOLD');
$b .= '</h2>';
$b .= '<p>';
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=fd129ec8fdc772c23c11147acbb827ded1ea39f8
commit fd129ec8fdc772c23c11147acbb827ded1ea39f8
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:50:00 2021 +0200
fix wrong vars
diff --git a/src/plugins/scmbzr/common/BzrPlugin.class.php
b/src/plugins/scmbzr/common/BzrPlugin.class.php
index 8bddac8..49f221b 100644
--- a/src/plugins/scmbzr/common/BzrPlugin.class.php
+++ b/src/plugins/scmbzr/common/BzrPlugin.class.php
@@ -513,11 +513,11 @@ over it to the project's administrator.");
$today = date ('Y-m-d') ;
$branch = $this->findMainBranch ($project) ;
if ($branch != '') {
- system ("bzr export
--root=$group_name-scm-$today --format=tar - $repo/$bname
|".forge_get_config('compression_method')."> $tmp/snapshot") ;
+ system ("bzr export
--root=$group_name-scm-$today --format=tar - $repo/$branch
|".forge_get_config('compression_method')."> $tmp/snapshot") ;
chmod ("$tmp/snapshot", 0644) ;
copy ("$tmp/snapshot", $snapshot) ;
unlink ("$tmp/snapshot") ;
- system ("rm -rf $tmp/$dir") ;
+ system ("rm -rf $tmp") ;
} else {
unlink ($snapshot) ;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=caa2a5e8c3c2e515f5abe829bb29c3f4bfcf9316
commit caa2a5e8c3c2e515f5abe829bb29c3f4bfcf9316
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:43:41 2021 +0200
remove unreachable code
diff --git
a/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
b/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
index 1d8f18c..5cac16e 100644
--- a/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
+++ b/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
@@ -263,7 +263,6 @@ EOS;
}
default: {
return $localFamily;
- break;
}
}
if ($res && db_numrows($res) > 0) {
@@ -640,7 +639,6 @@ EOS;
}
default: {
return false;
- break;
}
}
$res = db_query_qpa($qpa);
@@ -665,7 +663,6 @@ EOS;
}
default: {
return false;
- break;
}
}
$res = db_query_qpa($qpa);
@@ -828,11 +825,13 @@ EOS;
case 'globaladmin': {
session_require_global_perm('forge_admin');
site_admin_footer();
+ $returned = true;
break;
}
case 'admin':
default: {
site_project_footer();
+ $returned = true;
break;
}
}
@@ -966,8 +965,7 @@ EOS;
function is_child($group_id) {
if (count($this->getFamily($group_id, 'parent', true, 'any')) >
0) {
return true;
- } else {
- return false;
}
+ return false;
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e9e6f7e6fc71aa23a623f45bceef8d45a3bdccb5
commit e9e6f7e6fc71aa23a623f45bceef8d45a3bdccb5
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:30:10 2021 +0200
fix nb param and clean-up
diff --git a/src/plugins/projectimport/common/UploadedFiles.class.php
b/src/plugins/projectimport/common/UploadedFiles.class.php
index 784ecb2..3bac03d 100644
--- a/src/plugins/projectimport/common/UploadedFiles.class.php
+++ b/src/plugins/projectimport/common/UploadedFiles.class.php
@@ -392,23 +392,23 @@ class FileManagerPage {
$error_code = $uploaded_file['error'];
if ($error_code != UPLOAD_ERR_NO_FILE ) {
switch ($error_code) {
- case UPLOAD_ERR_INI_SIZE:
- $this->feedback(_('The uploaded file
exceeds the upload_max_filesize directive in php.ini'));
- case UPLOAD_ERR_FORM_SIZE:
- $this->feedback(_('The uploaded file
exceeds the MAX_FILE_SIZE directive that was specified in the HTML form'));
- case UPLOAD_ERR_PARTIAL:
- $this->feedback(_('The uploaded file
was only partially uploaded.'));
- /* case UPLOAD_ERR_NO_FILE:
- return 'No file was uploaded';*/
- case UPLOAD_ERR_NO_TMP_DIR:
- $this->feedback(_('Missing a temporary
folder.'));
- case UPLOAD_ERR_CANT_WRITE:
- $this->feedback(_('Failed to write file
to disk.'));
- case UPLOAD_ERR_EXTENSION:
- $this->feedback(_('File upload stopped
by extension.'));
- default:
- $this->feedback(_('Unknown upload error
%d', $error_code));
- }
+ case UPLOAD_ERR_INI_SIZE:
+ $this->feedback(_('The
uploaded file exceeds the upload_max_filesize directive in php.ini'));
+ case UPLOAD_ERR_FORM_SIZE:
+ $this->feedback(_('The
uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the
HTML form'));
+ case UPLOAD_ERR_PARTIAL:
+ $this->feedback(_('The
uploaded file was only partially uploaded.'));
+ /* case UPLOAD_ERR_NO_FILE:
+ return 'No file was uploaded';*/
+ case UPLOAD_ERR_NO_TMP_DIR:
+
$this->feedback(_('Missing a temporary folder.'));
+ case UPLOAD_ERR_CANT_WRITE:
+
$this->feedback(_('Failed to write file to disk.'));
+ case UPLOAD_ERR_EXTENSION:
+ $this->feedback(_('File
upload stopped by extension.'));
+ default:
+
$this->feedback(_('Unknown upload error:'), $error_code);
+ }
}
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=295213deab5ff079e899ae0ed887a92f398e0366
commit 295213deab5ff079e899ae0ed887a92f398e0366
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:22:25 2021 +0200
clean-up
diff --git a/src/plugins/globalsearch/common/globalsearch_edit_utils.php
b/src/plugins/globalsearch/common/globalsearch_edit_utils.php
index 41962d2..e05b32f 100644
--- a/src/plugins/globalsearch/common/globalsearch_edit_utils.php
+++ b/src/plugins/globalsearch/common/globalsearch_edit_utils.php
@@ -238,11 +238,11 @@ function globalsearch_admin_table_show () {
function globalsearch_status_name ($status_id) {
switch ($status_id) {
- case 1: return _('New'); break;
- case 2: return _('OK'); break;
- case 3: return _('Error fetching data'); break;
- case 4: return _('Error parsing data'); break;
- default: return _('Unknown status ID');
+ case 1: return _('New'); break;
+ case 2: return _('OK'); break;
+ case 3: return _('Error fetching data'); break;
+ case 4: return _('Error parsing data'); break;
+ default: return _('Unknown status ID');
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=f2569f8ec07e46dabd6faeeca3b6ecba04ba76e4
commit f2569f8ec07e46dabd6faeeca3b6ecba04ba76e4
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:22:10 2021 +0200
remove double echo
diff --git a/src/plugins/globalsearch/www/edit_assoc_sites.php
b/src/plugins/globalsearch/www/edit_assoc_sites.php
index 705f27f..3eab80f 100644
--- a/src/plugins/globalsearch/www/edit_assoc_sites.php
+++ b/src/plugins/globalsearch/www/edit_assoc_sites.php
@@ -64,6 +64,6 @@ switch ($function) {
}
}
-echo globalsearch_admin_table_show ();
+globalsearch_admin_table_show ();
$HTML->footer();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9d71cfb821f54d199c636533078c132326b4ee41
commit 9d71cfb821f54d199c636533078c132326b4ee41
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:19:36 2021 +0200
fix number of param
diff --git a/src/plugins/globalsearch/common/globalsearch_edit_utils.php
b/src/plugins/globalsearch/common/globalsearch_edit_utils.php
index 97154ef..41962d2 100644
--- a/src/plugins/globalsearch/common/globalsearch_edit_utils.php
+++ b/src/plugins/globalsearch/common/globalsearch_edit_utils.php
@@ -86,7 +86,7 @@ function globalsearch_admin_table_confirmdelete ($id) {
$link = db_result ($result, 0, 'link');
$onlysw = db_result ($result, 0, 'onlysw');
$enabled = db_result ($result, 0, 'enabled');
- $rank = db_result ($result, 0, 'rank', 1);
+ $rank = db_result ($result, 0, 'rank');
echo _('Are you sure you want to delete this associated
forge?') ;
echo '<table>';
@@ -134,7 +134,7 @@ function globalsearch_admin_table_edit ($id) {
$old_link = db_result ($result, 0, 'link');
$old_onlysw = db_result ($result, 0, 'onlysw');
$old_enabled = db_result ($result, 0, 'enabled');
- $old_rank = db_result ($result, 0, 'rank', 1);
+ $old_rank = db_result ($result, 0, 'rank');
echo _('Modify the associated forge below');
echo $HTML->openForm(array('name' => 'edit', 'action' =>
'/plugins/globalsearch/edit_assoc_sites.php?function=postedit&id='.$id,
'method' => 'post'));
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c0e0a2a2212651d110dce20b14e4ace701dedf15
commit c0e0a2a2212651d110dce20b14e4ace701dedf15
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:17:46 2021 +0200
remove unused code
diff --git a/src/plugins/globalactivity/include/globalactivityPlugin.class.php
b/src/plugins/globalactivity/include/globalactivityPlugin.class.php
index cace0ea..ec7438d 100644
--- a/src/plugins/globalactivity/include/globalactivityPlugin.class.php
+++ b/src/plugins/globalactivity/include/globalactivityPlugin.class.php
@@ -86,9 +86,6 @@ class globalactivityPlugin extends Plugin {
$tmp = $end;
$end = $begin;
$begin = $tmp;
- $tmp = $rendered_end;
- $rendered_end = $rendered_begin;
- $rendered_begin = $tmp;
}
if (forge_get_config('use_forum')) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=aca6cd13b5a290ebf5e45e4279cf3f18e47d0d39
commit aca6cd13b5a290ebf5e45e4279cf3f18e47d0d39
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:17:33 2021 +0200
fix missing return
diff --git a/src/plugins/compactpreview/include/CompactResource.class.php
b/src/plugins/compactpreview/include/CompactResource.class.php
index 3b05ece..3e920d3 100644
--- a/src/plugins/compactpreview/include/CompactResource.class.php
+++ b/src/plugins/compactpreview/include/CompactResource.class.php
@@ -74,7 +74,8 @@ class CompactResource {
class UserCompactResource extends CompactResource {
protected function getCssClass() {
- // TBD
+ // TBD, at least return an empty string
+ return '';
}
public function getResourceLink() {
@@ -129,11 +130,10 @@ class OslcUserCompactResource extends UserCompactResource
{
*
*/
class GroupCompactResource extends CompactResource {
-
protected function getCssClass() {
- // TBD
+ // TBD, at least return an empty string
+ return '';
}
-
}
class LocalGroupCompactResource extends GroupCompactResource {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0706a992d517c5c44e70dfd13c1825c7d4ed586e
commit 0706a992d517c5c44e70dfd13c1825c7d4ed586e
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:10:16 2021 +0200
add missing global var
diff --git a/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php
b/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php
index 0e00107..514bbec 100644
--- a/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php
+++ b/src/plugins/authopenid/include/AuthOpenIDPlugin.class.php
@@ -72,9 +72,9 @@ class AuthOpenIDPlugin extends ForgeAuthPlugin {
if (!$this->isRequired() && !$this->isSufficient()) {
return true;
}
+ global $HTML;
$return_to = $params['return_to'];
-
$result = html_e('p', array(), _('Cookies must be enabled past
this point.'));
$result .= $HTML->openForm(array('action' =>
'/plugins/'.$this->name.'/post-login.php', 'method' => 'get'));
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=275517121e79fc382fba9a7afd9e6c695fd84111
commit 275517121e79fc382fba9a7afd9e6c695fd84111
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:08:31 2021 +0200
add missing global var
diff --git a/src/plugins/authcas/common/AuthCASPlugin.class.php
b/src/plugins/authcas/common/AuthCASPlugin.class.php
index 63d6ca8..9d77b64 100644
--- a/src/plugins/authcas/common/AuthCASPlugin.class.php
+++ b/src/plugins/authcas/common/AuthCASPlugin.class.php
@@ -82,6 +82,7 @@ server.");
if (!$this->isRequired() && !$this->isSufficient()) {
return true;
}
+ global $HTML;
$return_to = $params['return_to'];
$this->initCAS();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=20e3962b55ba7c8f50f57ab46dc3990c925fb2e3
commit 20e3962b55ba7c8f50f57ab46dc3990c925fb2e3
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:06:35 2021 +0200
missing var
diff --git a/src/common/widget/Widget_ProjectScmStats.class.php
b/src/common/widget/Widget_ProjectScmStats.class.php
index 2f81a68..13737e1 100644
--- a/src/common/widget/Widget_ProjectScmStats.class.php
+++ b/src/common/widget/Widget_ProjectScmStats.class.php
@@ -43,6 +43,7 @@ class Widget_ProjectScmStats extends Widget {
function getContent() {
global $project;
+ $html_projectscmstats = '';
$project_plugins = $project->getPlugins();
foreach ($project_plugins as $value) {
$plugin_object = plugin_get_object($value);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=a1c2092f51982110a8e5a5631a79f887e892eb5f
commit a1c2092f51982110a8e5a5631a79f887e892eb5f
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:05:18 2021 +0200
fix global var position
diff --git a/src/common/widget/Widget_HomeLatestDiaryNotes.class.php
b/src/common/widget/Widget_HomeLatestDiaryNotes.class.php
index b366e25..9e66453 100644
--- a/src/common/widget/Widget_HomeLatestDiaryNotes.class.php
+++ b/src/common/widget/Widget_HomeLatestDiaryNotes.class.php
@@ -41,9 +41,9 @@ class Widget_HomeLatestDiaryNotes extends Widget {
}
function getContent() {
+ global $HTML;
$diaryFactory = new DiaryFactory();
if ($diaryFactory->hasNotes(1)) {
- global $HTML;
$content = $HTML->listTableTop();
$cells = array();
$cells[][] = _('Subject');
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7bd87c98719210f5b71c151009fbc025a5bae724
commit 7bd87c98719210f5b71c151009fbc025a5bae724
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 12:03:10 2021 +0200
remove unreachable code
diff --git a/src/common/tracker/actions/ajax.php
b/src/common/tracker/actions/ajax.php
index 4735a49..873861d 100644
--- a/src/common/tracker/actions/ajax.php
+++ b/src/common/tracker/actions/ajax.php
@@ -91,12 +91,10 @@ function get_formulas_results($group, $atid,
$extra_fields=array(), $status='',
if (!$at || !is_object($at)) {
$ret['message'] = _('ArtifactType could not be created');
return json_encode($ret);
- exit();
}
if ($at->isError()) {
$ret['message'] = $at->getErrorMessage();
return json_encode($ret);
- exit();
}
$expr = new ArtifactExpression();
@@ -111,32 +109,27 @@ function get_formulas_results($group, $atid,
$extra_fields=array(), $status='',
if ($expr->isError()) {
$ret['message'] = $expr->getErrorMessage()._(':').'
status=\''.$status.'\'';
return json_encode($ret);
- exit();
}
}
$expr->setConstant('assigned_to', $assigned_to);
if ($expr->isError()) {
$ret['message'] = $expr->getErrorMessage()._(':').'
assigned_to=\''.$assigned_to.'\'';
return json_encode($ret);
- exit();
}
$expr->setConstant('priority', $priority);
if ($expr->isError()) {
$ret['message'] = $expr->getErrorMessage()._(':').'
priority=\''.$priority.'\'';
return json_encode($ret);
- exit();
}
$expr->setConstant('summary', $summary);
if ($expr->isError()) {
$ret['message'] = $expr->getErrorMessage()._(':').'
summary=\''.$summary.'\'';
return json_encode($ret);
- exit();
}
$expr->setConstant('description', $description);
if ($expr->isError()) {
$ret['message'] = $expr->getErrorMessage()._(':').'
description=\''.$description.'\'';
return json_encode($ret);
- exit();
}
// Extra Fields
@@ -170,7 +163,6 @@ function get_formulas_results($group, $atid,
$extra_fields=array(), $status='',
if ($expr->isError()) {
$ret['message'] =
$expr->getErrorMessage()._(':').'
'.$extraField['alias'].'='.($type==ARTIFACT_EXTRAFIELDTYPE_INTEGER?'':'\'').$value.($type==ARTIFACT_EXTRAFIELDTYPE_INTEGER?'':'\'');
return json_encode($ret);
- exit();
}
}
}
@@ -182,12 +174,10 @@ function get_formulas_results($group, $atid,
$extra_fields=array(), $status='',
if (!$ef || !is_object($ef)) {
$ret['message'] = _('ArtifactExtraField could not be
created');
return json_encode($ret);
- exit();
}
if ($ef->isError()) {
$ret['message'] = $ef->getErrorMessage();
return json_encode($ret);
- exit();
}
$formula = $ef->getFormula();
if ($formula) {
@@ -197,7 +187,6 @@ function get_formulas_results($group, $atid,
$extra_fields=array(), $status='',
if ($expr->isError()) {
$ret['message'] =
$expr->getErrorMessage();
return json_encode($ret);
- exit();
}
$result [] = array(
'id'=>$extraField['extra_field_id'], 'value'=>$value,
'error'=>($expr->isError()?$expr->getErrorMessage():null));
}
@@ -210,7 +199,6 @@ function get_formulas_results($group, $atid,
$extra_fields=array(), $status='',
if ($expr->isError()) {
$ret['message'] =
$expr->getErrorMessage();
return
json_encode($ret);
- exit();
}
if ($value) {
$valueArr[]=$key;
@@ -226,7 +214,6 @@ function get_formulas_results($group, $atid,
$extra_fields=array(), $status='',
}
$ret['fields'] = $result;
return json_encode($ret);
- exit();
}
function add_parent($child_id, $parent_id) {
@@ -249,7 +236,6 @@ function add_parent($child_id, $parent_id) {
$ret['message'] = _('Unable to get artifact');
}
return json_encode($ret);
- exit();
}
function add_child($parent_id, $child_id) {
@@ -270,7 +256,6 @@ function add_child($parent_id, $child_id) {
$ret['message'] = _('Unable to get artifact');
}
return json_encode($ret);
- exit();
}
function remove_parent($child_id, $parent_id) {
@@ -282,5 +267,4 @@ function remove_parent($child_id, $parent_id) {
$ret['message'] = $child->getErrorMessage();
}
return json_encode($ret);
- exit();
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=753b81bf30d7811bdd45f0b4546551cc3d0a762d
commit 753b81bf30d7811bdd45f0b4546551cc3d0a762d
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 11:58:11 2021 +0200
fix parenthesis position
diff --git a/src/common/tracker/Artifact.class.php
b/src/common/tracker/Artifact.class.php
index 0f66153..80fd66f 100644
--- a/src/common/tracker/Artifact.class.php
+++ b/src/common/tracker/Artifact.class.php
@@ -2300,7 +2300,7 @@ class Artifact extends FFObject {
if ($this->getParent() == $parent_id) {
return true;
} else {
- $this->setError(_('Error')._(':').'
'.sprintf(_('Artifact $s has already a parent', $child_id)));
+ $this->setError(_('Error')._(':').'
'.sprintf(_('Artifact $s has already a parent'), $child_id));
return false;
}
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=8fb4da20bdb15af69991670ab61f15a6b3b0eab8
commit 8fb4da20bdb15af69991670ab61f15a6b3b0eab8
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 11:54:04 2021 +0200
fix wrong var
diff --git a/src/common/include/session.php b/src/common/include/session.php
index 902019b..3abd6bc 100644
--- a/src/common/include/session.php
+++ b/src/common/include/session.php
@@ -203,7 +203,7 @@ function session_login_valid($loginname, $passwd,
$allowpending = 0) {
$plugin_session_login_valid = false;
// Refuse login if not all the plugins are ok.
- foreach ($params['results'] as $p => $r) {
+ foreach ($hook_params['results'] as $p => $r) {
$plugin_session_login_valid = true;
if ($r == FORGE_AUTH_AUTHORITATIVE_ACCEPT) {
$seen_yes = true;
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c12903c7b88155532e13924115529e24f68b3c6b
commit c12903c7b88155532e13924115529e24f68b3c6b
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 11:52:37 2021 +0200
set default value for last param
diff --git a/src/common/include/html.php b/src/common/include/html.php
index 556c4fa..4da5a5a 100644
--- a/src/common/include/html.php
+++ b/src/common/include/html.php
@@ -133,7 +133,7 @@ function html_blankimage($height, $width) {
* @param array $args Any <img> tag parameters (i.e. 'border', 'alt',
etc...)
* @return string
*/
-function html_abs_image($url, $width, $height, $args) {
+function html_abs_image($url, $width, $height, $args = array()) {
$args['src'] = $url;
if (!isset($args['alt'])) {
$args['alt'] = '';
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0e5354ad9ff13a5f303c7499cfb97ee35b37f349
commit 0e5354ad9ff13a5f303c7499cfb97ee35b37f349
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Sat May 1 11:42:11 2021 +0200
fix wrong number of parameters
diff --git a/src/common/include/database-pgsql.php
b/src/common/include/database-pgsql.php
index 81c92e1..cb8e962 100644
--- a/src/common/include/database-pgsql.php
+++ b/src/common/include/database-pgsql.php
@@ -477,7 +477,7 @@ function db_commit($dbserver = NULL) {
if ($_sys_db_transaction_level == 0) {
echo "COMMIT underflow [$sysdebug_dberrors]<br />";
if ($sysdebug_dberrors)
- ffDebug("database", "db_commit underflow",
debug_string_backtrace(), 1);
+ ffDebug("database", "db_commit underflow",
debug_string_backtrace());
return false;
}
-----------------------------------------------------------------------
Summary of changes:
src/common/include/database-pgsql.php | 2 +-
src/common/include/html.php | 2 +-
src/common/include/session.php | 2 +-
src/common/tracker/Artifact.class.php | 2 +-
src/common/tracker/actions/ajax.php | 16 ----------
.../widget/Widget_HomeLatestDiaryNotes.class.php | 2 +-
src/common/widget/Widget_ProjectScmStats.class.php | 1 +
src/plugins/authcas/common/AuthCASPlugin.class.php | 1 +
.../authopenid/include/AuthOpenIDPlugin.class.php | 2 +-
.../include/CompactResource.class.php | 8 ++---
.../include/globalactivityPlugin.class.php | 3 --
.../common/globalsearch_edit_utils.php | 14 ++++-----
src/plugins/globalsearch/www/edit_assoc_sites.php | 2 +-
.../projectimport/common/UploadedFiles.class.php | 34 +++++++++++-----------
.../common/projects-hierarchyPlugin.class.php | 8 ++---
src/plugins/scmbzr/common/BzrPlugin.class.php | 4 +--
src/plugins/scmcpold/common/CpoldPlugin.class.php | 8 ++---
src/plugins/scmdarcs/common/DarcsPlugin.class.php | 2 +-
.../scmhook/library/scmgit/commitTracker.class.php | 2 +-
.../scmhook/library/scmsvn/commitTracker.class.php | 1 +
src/plugins/scmsvn/common/SVNPlugin.class.php | 1 -
src/www/people/editjob.php | 4 ++-
src/www/people/viewjob.php | 3 +-
src/www/project/admin/editimages.php | 6 +---
src/www/survey/admin/show_results.php | 1 +
25 files changed, 56 insertions(+), 75 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
