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 26724d8703613f1056ab253b16a76808d34f5812 (commit)
via 15a64b836a70ad1fbc1a7e8e18b3237c210de897 (commit)
via e93b1f7b4df0c6145c2762e1671081b3d1a8adf4 (commit)
from a0ab57d9b63faa7a0e589463c9db7f286addd851 (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=26724d8703613f1056ab253b16a76808d34f5812
commit 26724d8703613f1056ab253b16a76808d34f5812
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Thu May 20 19:36:30 2021 +0200
fix wrong var or uninitialized var
diff --git a/src/plugins/aselectextauth/common/Aselect.class.php
b/src/plugins/aselectextauth/common/Aselect.class.php
index d07ee13..b348166 100644
--- a/src/plugins/aselectextauth/common/Aselect.class.php
+++ b/src/plugins/aselectextauth/common/Aselect.class.php
@@ -22,36 +22,36 @@
class ASelect {
var $username;
var $organization;
- var $attributes=array();
+ var $attributes = array();
var $ticket;
function __construct() {
- if(isset($_COOKIE['aselectuid'])){
+ if (isset($_COOKIE['aselectuid'])) {
$this->username = $_COOKIE['aselectuid'];
} else {
$this->username = '';
}
- if(isset($_COOKIE['aselectorganization'])){
+ if (isset($_COOKIE['aselectorganization'])) {
$this->organization = $_COOKIE['aselectorganization'];
} else {
$this->organization = '';
}
- if(isset($_COOKIE['aselectattributes'])){
+ if (isset($_COOKIE['aselectattributes'])) {
$a = explode('&', $_COOKIE['aselectattributes']);
$i = 0;
while ($i < count($a)) {
$b = explode('=', $a[$i]);
-
$this->$attributes[htmlspecialchars(urldecode($b[0]))] =
htmlspecialchars(urldecode($b[1]));
+
$this->attributes[htmlspecialchars(urldecode($b[0]))] =
htmlspecialchars(urldecode($b[1]));
$i++;
}
} else {
//nothing to be done here yet.
}
- if(isset($_COOKIE['aselectticket'])){
+ if (isset($_COOKIE['aselectticket'])) {
$this->ticket = $_COOKIE['aselectticket'];
} else {
$this->ticket = '';
diff --git a/src/plugins/globalsearch/common/globalsearch_stats_boxes.php
b/src/plugins/globalsearch/common/globalsearch_stats_boxes.php
index 3766175..bb19b17 100644
--- a/src/plugins/globalsearch/common/globalsearch_stats_boxes.php
+++ b/src/plugins/globalsearch/common/globalsearch_stats_boxes.php
@@ -43,13 +43,12 @@ function show_globalsearch_stats_boxes() {
function globalsearch_box() {
global $gwords, $gexact, $otherfreeknowledge, $HTML;
- $return = _('Search in other associated forges')._(':').html_e('br').
- $HTML->openForm(array('method' => 'post', 'action' =>
'/plugins/globalsearch/')).
- '<input width="100%" type="text" name="gwords" value="'.$gwords.'"/>
- <input type="submit" name="Search" value="'._("Search").'" /><br/>
- <input type="checkbox" name="otherfreeknowledge" value="1"'.(
$otherfreeknowledge ? ' checked' : ' unchecked' ).'>'._('Extend search to
include non-software projects').'<br/>
- <input type="checkbox" name="gexact" value="1"'.( $gexact ? ' checked'
: ' unchecked' ).'>'._("Require all words").$HTML->closeForm();
- return $return;
+ return _('Search in other associated forges')._(':').html_e('br').
+ $HTML->openForm(array('method' => 'post', 'action' =>
'/plugins/globalsearch/')).
+ '<input width="100%" type="text" name="gwords"
value="'.$gwords.'"/>
+ <input type="submit" name="Search" value="'._("Search").'"
/><br/>
+ <input type="checkbox" name="otherfreeknowledge" value="1"'.(
$otherfreeknowledge ? ' checked' : ' unchecked' ).'>'._('Extend search to
include non-software projects').'<br/>
+ <input type="checkbox" name="gexact" value="1"'.( $gexact ? '
checked' : ' unchecked' ).'>'._("Require all words").$HTML->closeForm();
}
/**
@@ -73,12 +72,12 @@ function show_top_n_assocsites($num_assocsites) {
return _('No stats available.')." ".db_error();
}
- $return .= "<div align=\"left\"><table>";
+ $return = '<div align="left"><table>';
while ($row_topdown = db_fetch_array($res_top_n_assoc)) {
if ($row_topdown['numprojects'] > 0) {
$return .= "<tr><td><a href=\"$row_topdown[link]/\">";
$return .= $row_topdown[title]."</a></td>";
- $return .= "<td><div align=\"right\">".
number_format($row_topdown[numprojects], 0);
+ $return .= '<td><div
align="right">'.number_format($row_topdown[numprojects], 0);
$return .= " "._('projects')."</div></td></tr>\n";
}
}
diff --git a/src/plugins/oauthconsumer/www/checks.php
b/src/plugins/oauthconsumer/www/checks.php
index a628915..afb528d 100644
--- a/src/plugins/oauthconsumer/www/checks.php
+++ b/src/plugins/oauthconsumer/www/checks.php
@@ -11,7 +11,7 @@ require_once $gfwww.'include/pre.php';
$pluginname = 'oauthconsumer';
// the header that displays for the user portion of the plugin
function oauthconsumer_User_Header($params) {
- global $DOCUMENT_ROOT,$HTML, $user_id, $pluginname;
+ global $HTML, $user_id, $pluginname;
$params['toptab']=$pluginname;
$params['user']=$user_id;
site_user_header($params);
@@ -46,7 +46,7 @@ function oauthconsumer_CheckUser() {
}
//displays the page header
- oauthconsumer_User_Header(array('title'=>'Personal page for
OAuth','pagename'=>"$pluginname",'sectionvals'=>array($realuser->getUnixName())));
+ oauthconsumer_User_Header(array('title' => _('Personal page for
OAuth'), 'pagename' => $pluginname, 'sectionvals' =>
array($realuser->getUnixName())));
}
@@ -54,12 +54,12 @@ function oauthconsumer_CheckUser() {
* checks whether the user is a forge admin
*/
function oauthconsumer_CheckForgeAdmin() {
-
+ global $pluginname;
if(! forge_check_global_perm ('forge_admin')) {
return false;
}
- oauthconsumer_User_Header(array('title'=>'Admin page for
OAuthConsumer','pagename'=>"$pluginname"));
+ oauthconsumer_User_Header(array('title' => _('Admin page for
OAuthConsumer'),'pagename' => $pluginname));
return true;
}
@@ -67,11 +67,11 @@ function oauthconsumer_CheckForgeAdmin() {
* checks whether the user is a forge admin and exits
*/
function oauthconsumer_CheckForgeAdminExit() {
-
+ global $pluginname;
if(! forge_check_global_perm ('forge_admin')) {
exit_error("Access Denied, You are not a forge Admin",
'oauthconsumer');
}
- oauthconsumer_User_Header(array('title'=>'Admin page for
OAuthConsumer','pagename'=>"$pluginname"));
+ oauthconsumer_User_Header(array('title' => _('Admin page for
OAuthConsumer'),'pagename' => $pluginname));
}
diff --git a/src/plugins/scmcvs/common/CVSPlugin.class.php
b/src/plugins/scmcvs/common/CVSPlugin.class.php
index d945175..6f2a243 100644
--- a/src/plugins/scmcvs/common/CVSPlugin.class.php
+++ b/src/plugins/scmcvs/common/CVSPlugin.class.php
@@ -251,7 +251,7 @@ over it to the project's administrator.");
return false;
}
system ("mkdir -p $locks_dir") ;
- system ("chgrp $unix_group $locks_dir") ;
+ system ("chgrp $rw_unix_group $locks_dir") ;
system ("chmod 3777 $locks_dir") ;
$cvs_binary_version = get_cvs_binary_version();
diff --git a/src/plugins/scmhook/library/scmgit/hooks/committracker/post.php
b/src/plugins/scmhook/library/scmgit/hooks/committracker/post.php
index a605084..1848bc6 100755
--- a/src/plugins/scmhook/library/scmgit/hooks/committracker/post.php
+++ b/src/plugins/scmhook/library/scmgit/hooks/committracker/post.php
@@ -88,13 +88,14 @@ function getInvolvedTasks($Log) {
function getLog($Input) {
$Lines = explode("\n", $Input);
$ii = count($Lines);
- $Logging=false;
+ $Logging = false;
+ $Log = '';
for ( $i=0; $i < $ii ; $i++ ) {
if ($Logging==true) {
- $Log.=$Lines[$i]."\n";
+ $Log .= $Lines[$i]."\n";
}
- if ($Lines[$i]=='Log Message:') {
- $Logging=true;
+ if ($Lines[$i] == 'Log Message:') {
+ $Logging = true;
}
}
return trim($Log);
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=15a64b836a70ad1fbc1a7e8e18b3237c210de897
commit 15a64b836a70ad1fbc1a7e8e18b3237c210de897
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Thu May 20 17:04:35 2021 +0200
do not use parenthesis when echo
diff --git a/src/common/include/html.php b/src/common/include/html.php
index bc8f7a4..17bfb0c 100644
--- a/src/common/include/html.php
+++ b/src/common/include/html.php
@@ -1277,7 +1277,7 @@ function site_user_header($params) {
$arr_attr[] = array('title' => _('Register a new project in
forge, following the workflow.'));
}
- echo ($HTML->printSubMenu($arr_t, $arr_l, $arr_attr));
+ echo $HTML->printSubMenu($arr_t, $arr_l, $arr_attr);
if (plugin_hook_listeners("usermenu") > 0) {
echo $HTML->subMenuSeparator();
}
diff --git a/src/common/tracker/actions/detail.php
b/src/common/tracker/actions/detail.php
index 47301d6..87bb025 100644
--- a/src/common/tracker/actions/detail.php
+++ b/src/common/tracker/actions/detail.php
@@ -213,7 +213,7 @@ if ($group->usesPM()) {
<?php if (session_loggedin() && ($ah->getSubmittedBy() ==
user_getid())) {
echo $HTML->listTableTop(); ?>
<tr><td>
- <strong><?php echo _('Attach Files')._(':');
?></strong> <?php echo('('._('max upload size')._(':
').human_readable_bytes(util_get_maxuploadfilesize()).')') ?><br />
+ <strong><?php echo _('Attach Files')._(':');
?></strong> <?php echo '('._('max upload size')._(':
').human_readable_bytes(util_get_maxuploadfilesize()).')'; ?><br />
<input type="file" name="input_file0" /><br />
<input type="file" name="input_file1" /><br />
<input type="file" name="input_file2" /><br />
diff --git a/src/common/tracker/actions/mod-limited.php
b/src/common/tracker/actions/mod-limited.php
index 1d5d233..2837525 100644
--- a/src/common/tracker/actions/mod-limited.php
+++ b/src/common/tracker/actions/mod-limited.php
@@ -243,7 +243,7 @@ if ($group->usesPM()) {
<div id="tabber-attachments" class="tabbertab">
<?php echo $HTML->listTableTop(); ?>
<tr><td colspan="2">
- <?php echo _('Attach Files')._(':'); ?> <?php echo('('._('max
upload size')._(': ').human_readable_bytes(util_get_maxuploadfilesize()).')')
?><br />
+ <?php echo _('Attach Files')._(':'); ?> <?php echo '('._('max
upload size')._(': ').human_readable_bytes(util_get_maxuploadfilesize()).')';
?><br />
<input type="file" name="input_file0" size="30" /><br />
<input type="file" name="input_file1" size="30" /><br />
<input type="file" name="input_file2" size="30" /><br />
diff --git a/src/common/tracker/actions/mod.php
b/src/common/tracker/actions/mod.php
index 1ce46bb..b6f4873 100644
--- a/src/common/tracker/actions/mod.php
+++ b/src/common/tracker/actions/mod.php
@@ -321,7 +321,7 @@ if ($group->usesPM()) {
<div id="tabber-attachments" class="tabbertab">
<?php echo $HTML->listTableTop(); ?>
<tr><td colspan="2">
- <strong><?php echo _('Attach Files')._(':'); ?></strong> <?php
echo('('._('max upload size')._(':
').human_readable_bytes(util_get_maxuploadfilesize()).')') ?><br />
+ <strong><?php echo _('Attach Files')._(':'); ?></strong> <?php echo
'('._('max upload size')._(':
').human_readable_bytes(util_get_maxuploadfilesize()).')'; ?><br />
<input type="file" name="input_file0" size="30" /><br />
<input type="file" name="input_file1" size="30" /><br />
<input type="file" name="input_file2" size="30" /><br />
diff --git a/src/plugins/oauthconsumer/www/providers.php
b/src/plugins/oauthconsumer/www/providers.php
index 8b6ec5d..6e2092a 100644
--- a/src/plugins/oauthconsumer/www/providers.php
+++ b/src/plugins/oauthconsumer/www/providers.php
@@ -16,17 +16,17 @@ if (count($providers)>0) {
$i = 0;
foreach( $providers as $provider ) { ?>
<tr>
- <td class="center"><?php echo ( $provider->get_name() ) ?></td>
- <td class="center"><?php echo ( $provider->get_description() )
?></td>
- <td class="center"><?php echo ( $provider->get_consumer_key() )
?></td>
+ <td class="center"><?php echo $provider->get_name(); ?></td>
+ <td class="center"><?php echo $provider->get_description(); ?></td>
+ <td class="center"><?php echo $provider->get_consumer_key();
?></td>
<?php if($admin_access) { ?>
- <td class="center"><?php echo (
$provider->get_consumer_secret() ) ?></td>
- <?php }else { ?>
+ <td class="center"><?php echo
$provider->get_consumer_secret(); ?></td>
+ <?php } else { ?>
<td class="center">*****************</td>
<?php } ?>
- <td class="center"><?php echo (
$provider->get_request_token_url() ) ?></td>
- <td class="center"><?php echo ( $provider->get_authorize_url()
) ?></td>
- <td class="center"><?php echo (
$provider->get_access_token_url() ) ?></td>
+ <td class="center"><?php echo
$provider->get_request_token_url(); ?></td>
+ <td class="center"><?php echo $provider->get_authorize_url();
?></td>
+ <td class="center"><?php echo
$provider->get_access_token_url(); ?></td>
<?php
if ($admin_access) { ?>
<td class="center">
diff --git a/src/plugins/oauthprovider/www/consumer_manage.php
b/src/plugins/oauthprovider/www/consumer_manage.php
index 25687ed..70f4398 100644
--- a/src/plugins/oauthprovider/www/consumer_manage.php
+++ b/src/plugins/oauthprovider/www/consumer_manage.php
@@ -51,32 +51,32 @@ $t_consumer = OauthAuthzConsumer::load( $f_consumer_id );
<tr>
<td class="category"><?php echo _('Name') ?></td>
-<td colspan="2"><?php echo ( $t_consumer->getName() ) ?></td>
+<td colspan="2"><?php echo $t_consumer->getName(); ?></td>
</tr>
<tr>
<td class="category"><?php echo _('URL') ?></td>
-<td colspan="2"><?php echo ( $t_consumer->getUrl() ) ?></td>
+<td colspan="2"><?php echo $t_consumer->getUrl(); ?></td>
</tr>
<tr>
<td class="category"><?php echo _('Description') ?></td>
-<td colspan="2"><?php echo ( $t_consumer->getDesc() ) ?></td>
+<td colspan="2"><?php echo $t_consumer->getDesc(); ?></td>
</tr>
<tr>
<td class="category"><?php echo _('Email') ?></td>
-<td colspan="2"><?php echo ( $t_consumer->getEmail() ) ?></td>
+<td colspan="2"><?php echo $t_consumer->getEmail(); ?></td>
</tr>
<tr>
<td class="category"><?php echo _('Key') ?></td>
-<td colspan="2"><?php echo ( $t_consumer->key ) ?></td>
+<td colspan="2"><?php echo $t_consumer->key; ?></td>
</tr>
<tr>
<td class="category"><?php echo _('Secret') ?></td>
-<td colspan="2"><?php echo ( $t_consumer->secret ) ?></td>
+<td colspan="2"><?php echo $t_consumer->secret; ?></td>
</tr>
<tr>
diff --git a/src/plugins/oauthprovider/www/consumer_update_page.php
b/src/plugins/oauthprovider/www/consumer_update_page.php
index b6d4e94..ebe5d20 100644
--- a/src/plugins/oauthprovider/www/consumer_update_page.php
+++ b/src/plugins/oauthprovider/www/consumer_update_page.php
@@ -42,7 +42,7 @@ $i=0;
<br/>
<form action="consumer_update.php" method="post">
<?php echo '<input type="hidden"
name="plugin_oauthprovider_consumer_update_token"
value="'.form_generate_key().'"/>' ?>
-<input type="hidden" name="consumer_id" value="<?php echo $t_consumer->getId()
?>"/>
+<input type="hidden" name="consumer_id" value="<?php echo
$t_consumer->getId(); ?>"/>
<table class="width60" align="center" cellspacing="1">
<tr>
@@ -52,32 +52,32 @@ $i=0;
<tr>
<td class="category"><?php echo _('Name') ?></td>
-<td><input name="consumer_name" maxlength="128" size="40" value="<?php echo (
$t_consumer->getName() ) ?>"/></td>
+<td><input name="consumer_name" maxlength="128" size="40" value="<?php echo
$t_consumer->getName(); ?>"/></td>
</tr>
<tr>
<td class="category"><?php echo _('URL') ?></td>
-<td><input name="consumer_url" maxlength="250" size="40" value="<?php echo (
$t_consumer->getUrl() ) ?>"/></td>
+<td><input name="consumer_url" maxlength="250" size="40" value="<?php echo
$t_consumer->getUrl(); ?>"/></td>
</tr>
<tr>
<td class="category"><?php echo _('Description') ?></td>
-<td><input name="consumer_desc" maxlength="250" size="40" value="<?php echo (
$t_consumer->getDesc() ) ?>"/></td>
+<td><input name="consumer_desc" maxlength="250" size="40" value="<?php echo
$t_consumer->getDesc(); ?>"/></td>
</tr>
<tr>
<td class="category"><?php echo _('Email') ?></td>
-<td><input name="consumer_email" maxlength="250" size="40" value="<?php echo (
$t_consumer->getEmail() ) ?>"/></td>
+<td><input name="consumer_email" maxlength="250" size="40" value="<?php echo
$t_consumer->getEmail(); ?>"/></td>
</tr>
<tr>
<td class="category"><?php echo _('Key') ?></td>
-<td><input name="consumer_key" readonly="readonly" maxlength="250" size="40"
value="<?php echo ( $t_consumer->key ) ?>"/></td>
+<td><input name="consumer_key" readonly="readonly" maxlength="250" size="40"
value="<?php echo $t_consumer->key; ?>"/></td>
</tr>
<tr>
<td class="category"><?php echo _('Secret') ?></td>
-<td><input name="consumer_secret" readonly="readonly" maxlength="250"
size="40" value="<?php echo ( $t_consumer->secret ) ?>"/></td>
+<td><input name="consumer_secret" readonly="readonly" maxlength="250"
size="40" value="<?php echo $t_consumer->secret; ?>"/></td>
</tr>
<tr>
diff --git
a/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
b/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
index 3e61d6e..ce88a17 100644
--- a/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
+++ b/src/plugins/projects-hierarchy/common/projects-hierarchyPlugin.class.php
@@ -120,7 +120,7 @@ _('Organise projects hierarchically, relation type 1-n.');
$hierarMenuAttr[] =
array('title' => _('Browse per hierarchy. Projects can share relationship
between projects, as father and sons'));
$hierarMenuUrl[] =
'/softwaremap/trove_list.php?cat=c';
$hierarMenuUrl[] =
'/softwaremap/trove_list.php?cat=h';
- echo
($HTML->subMenu($hierarMenuTitle, $hierarMenuUrl, $hierarMenuAttr));
+ echo
$HTML->subMenu($hierarMenuTitle, $hierarMenuUrl, $hierarMenuAttr);
}
}
$returned = true;
diff --git a/src/www/survey/admin/question.php
b/src/www/survey/admin/question.php
index 1487776..56c7679 100644
--- a/src/www/survey/admin/question.php
+++ b/src/www/survey/admin/question.php
@@ -108,7 +108,7 @@ if (getStringFromRequest('delete')=="Y" && $question_id) {
/* Show Add/Modify form
* If $question is null it is add form, otherwise modify
*/
-echo($sh->showAddQuestionForm($sq));
+echo $sh->showAddQuestionForm($sq);
/* Show existing questions (if any)
*/
@@ -117,12 +117,7 @@ $sqs = $sqf->getSurveyQuestions();
if (!$sqs) {
echo $HTML->information(_('No questions found'));
} else {
- echo($sh->showQuestions($sqs));
+ echo $sh->showQuestions($sqs);
}
$sh->footer();
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git a/src/www/survey/admin/show_results.php
b/src/www/survey/admin/show_results.php
index 02d6475..299649b 100644
--- a/src/www/survey/admin/show_results.php
+++ b/src/www/survey/admin/show_results.php
@@ -122,7 +122,7 @@ $ss = & $sf->getSurveys();
if (!$ss) {
echo $HTML->information(_('No Survey Question is found'));
} else {
- echo($sh->showSurveys($ss, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1));
+ echo $sh->showSurveys($ss, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1);
}
$sh->footer();
@@ -147,11 +147,6 @@ function showResult(&$SurveyHTML, &$Survey, &$Question,
$show_comment=0, $q_num=
echo $HTML->error_msg(_('Error'). $srf->getErrorMessage());
} else {
/* Show result in HTML*/
- echo ($SurveyHTML->showResult($srf, $show_comment, $q_num,
$graph));
+ echo $SurveyHTML->showResult($srf, $show_comment, $q_num,
$graph);
}
}
-
-// Local Variables:
-// mode: php
-// c-file-style: "bsd"
-// End:
diff --git a/src/www/survey/admin/survey.php b/src/www/survey/admin/survey.php
index 44fdfbe..066a406 100644
--- a/src/www/survey/admin/survey.php
+++ b/src/www/survey/admin/survey.php
@@ -92,7 +92,7 @@ if ($s->isError()) {
$title = $survey_id ? _('Edit a Survey') : _('Add a Survey');
$sh->header(array('title'=>$title, 'modal'=>1));
-echo ($sh->showAddSurveyForm($s));
+echo $sh->showAddSurveyForm($s);
/* Show list of Survey */
$sf = new SurveyFactory($g);
@@ -100,7 +100,7 @@ $ss = & $sf->getSurveys();
if (!$ss) {
echo $HTML->information(_('No Survey is found'));
} else {
- echo($sh->showSurveys($ss, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1));
+ echo $sh->showSurveys($ss, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1);
}
$sh->footer();
diff --git a/src/www/survey/include/SurveyHTML.class.php
b/src/www/survey/include/SurveyHTML.class.php
index 2348586..ba0d22a 100644
--- a/src/www/survey/include/SurveyHTML.class.php
+++ b/src/www/survey/include/SurveyHTML.class.php
@@ -585,7 +585,7 @@ class SurveyHTML extends FFError {
$ret.=$Question->getQuestion().'</strong><br />';
$results = $sr->getResults();
if ($sr->isError()){
- echo ($sr->getErrorMessage());
+ echo $sr->getErrorMessage();
}
$totalCount = $sr->getNumberOfSurveyResponses();
diff --git a/src/www/survey/index.php b/src/www/survey/index.php
index 031b0a6..e9cb80b 100644
--- a/src/www/survey/index.php
+++ b/src/www/survey/index.php
@@ -58,7 +58,7 @@ if (!$ss) {
echo $HTML->information(_('No Survey is found'));
} else {
echo '<p>' . _('Select a survey to vote') . '</p>';
- echo($sh->showSurveys($ss, 0, 0, 1, 1, 1, 0));
+ echo $sh->showSurveys($ss, 0, 0, 1, 1, 1, 0);
}
$sh->footer();
diff --git a/src/www/survey/survey.php b/src/www/survey/survey.php
index c3ba15a..c59c6a4 100644
--- a/src/www/survey/survey.php
+++ b/src/www/survey/survey.php
@@ -57,7 +57,7 @@ if (!$survey_id) {
echo $HTML->error_msg(_('For some reason, the Project ID or Survey ID
did not make it to this page'));
} else {
plugin_hook("blocks", "survey_".$s->getTitle());
- echo($sh->showSurveyForm($s));
+ echo $sh->showSurveyForm($s);
}
$sh->footer();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e93b1f7b4df0c6145c2762e1671081b3d1a8adf4
commit e93b1f7b4df0c6145c2762e1671081b3d1a8adf4
Author: Franck Villaume <franck.villa...@trivialdev.com>
Date: Thu May 20 16:03:22 2021 +0200
clean-up: remove double definition
diff --git a/src/www/themes/css/fusionforge.css
b/src/www/themes/css/fusionforge.css
index 3b93d72..ec8b80c 100644
--- a/src/www/themes/css/fusionforge.css
+++ b/src/www/themes/css/fusionforge.css
@@ -70,10 +70,6 @@ table.listing tbody tr:nth-child(odd),
text-decoration: none;
}
-.important {
- font-weight: bold;
-}
-
.next {
font-family: arial,helvetica, sans-serif;
font-size: small;
@@ -334,9 +330,6 @@ p.information {
border: 1px solid;
margin: 15px 0;
padding: 10px 10px 10px 10px;
-}
-
-p.information {
border-color: blue;
background-color: #bde5f8;
}
diff --git a/src/www/themes/funky/css/theme.css
b/src/www/themes/funky/css/theme.css
index a9bd09c..3ca27db 100644
--- a/src/www/themes/funky/css/theme.css
+++ b/src/www/themes/funky/css/theme.css
@@ -350,7 +350,7 @@ header .skipLink:focus {
.innertabs .tabGenerator {
font-weight: bold;
border-collapse: collapse;
- height: 20px;
+ height: 100%;
}
.innertabs .tabGenerator tbody {
@@ -392,9 +392,9 @@ header .skipLink:focus {
background-color: white;
text-shadow: 1px 1px white;
}
-
.innertabs .tabGenerator .tg-middle span span {
- display: block;
+ display: inline;
+ vertical-align: middle;
text-align:center;
height: auto;
margin: 0;
@@ -421,15 +421,12 @@ header .skipLink:focus {
color: black;
}
-.innertabs .tabGenerator{
- height: 100%;
-}
.innertabs .tabGenerator tr,
.innertabs .tabGenerator .tg-middle,
.innertabs .tabGenerator .tg-middle a,
.innertabs .tabGenerator .tg-middle span {
- display:flex;
- flex-direction:row;
+ display:flex;
+ flex-direction:row;
width:100%;
transition-property: background;
transition-duration: 0.3s;
@@ -440,23 +437,17 @@ header .skipLink:focus {
.innertabs .tabGenerator td a {
width: 100%;
}
-.innertabs .tabGenerator .tg-middle span span {
- display: inline;
- vertical-align: middle;
-}
+
.innertabs .tabGenerator td a:hover {
- background: white;
- color: black;
- height: auto;
+ background: white;
+ color: black;
+ height: auto;
}
.innertabs .tabGenerator .tg-middle span.selected span {
background: none;
text-shadow: 1px 1px white;
color: black;
height: auto;
-}
-
-.innertabs .tabGenerator .tg-middle span.selected span {
background-color: white;
text-shadow: 1px 1px white;
}
@@ -468,46 +459,46 @@ header .skipLink:focus {
.topTab, a.topTab, a.topTab:visited, a.topTab:hover,
.topTabSelected, a.topTabSelected, a.topTabSelected:visited,
a.topTabSelected:hover {
- text-decoration: none;
- font-weight: bold;
- color: rgb(68, 68, 68);
- font-family: arial, helvetica, sans-serif;
- font-size: 0.9em;
+ text-decoration: none;
+ font-weight: bold;
+ color: rgb(68, 68, 68);
+ font-family: arial, helvetica, sans-serif;
+ font-size: 0.9em;
}
.bottomTab, a.bottomTab, a.bottomTab:visited, a.bottomTab:hover {
- text-decoration: none;
- font-weight: bold;
- color: white;
- font-family: arial, helvetica, sans-serif;
- font-size: 0.9em;
+ text-decoration: none;
+ font-weight: bold;
+ color: white;
+ font-family: arial, helvetica, sans-serif;
+ font-size: 0.9em;
}
.bottomTabSelected, a.bottomTabSelected, a.bottomTabSelected:visited,
a.bottomTabSelected:hover {
- text-decoration: none;
- font-weight: bold;
- color: rgb(68, 68, 68);
- font-family: arial, helvetica, sans-serif;
- font-size: 0.9em;
+ text-decoration: none;
+ font-weight: bold;
+ color: rgb(68, 68, 68);
+ font-family: arial, helvetica, sans-serif;
+ font-size: 0.9em;
}
.topLeft {
- vertical-align: top;
- text-align: left;
+ vertical-align: top;
+ text-align: left;
}
.middleRight {
- vertical-align: middle;
- text-align: right;
+ vertical-align: middle;
+ text-align: right;
}
.pane {
- color: rgb(112, 112, 112);
- background-color: white;
+ color: rgb(112, 112, 112);
+ background-color: white;
}
.field-holder {
- clear: both;
+ clear: both;
}
/* Boxes (top / middle / bottom)
@@ -544,12 +535,12 @@ a.topTabSelected:hover {
.box-middle {
- margin: 0;
- padding-left: 18px;
- padding-top: 2px;
- padding-bottom: 2px;
- color: #808080;
- font-weight: bold;
+ margin: 0;
+ padding-left: 18px;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ color: #808080;
+ font-weight: bold;
}
-----------------------------------------------------------------------
Summary of changes:
src/common/include/html.php | 2 +-
src/common/tracker/actions/detail.php | 2 +-
src/common/tracker/actions/mod-limited.php | 2 +-
src/common/tracker/actions/mod.php | 2 +-
.../aselectextauth/common/Aselect.class.php | 12 ++--
.../common/globalsearch_stats_boxes.php | 17 +++--
src/plugins/oauthconsumer/www/checks.php | 12 ++--
src/plugins/oauthconsumer/www/providers.php | 16 ++---
src/plugins/oauthprovider/www/consumer_manage.php | 12 ++--
.../oauthprovider/www/consumer_update_page.php | 14 ++--
.../common/projects-hierarchyPlugin.class.php | 2 +-
src/plugins/scmcvs/common/CVSPlugin.class.php | 2 +-
.../library/scmgit/hooks/committracker/post.php | 9 +--
src/www/survey/admin/question.php | 9 +--
src/www/survey/admin/show_results.php | 9 +--
src/www/survey/admin/survey.php | 4 +-
src/www/survey/include/SurveyHTML.class.php | 2 +-
src/www/survey/index.php | 2 +-
src/www/survey/survey.php | 2 +-
src/www/themes/css/fusionforge.css | 7 --
src/www/themes/funky/css/theme.css | 83 ++++++++++------------
21 files changed, 98 insertions(+), 124 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
Fusionforge-commits@lists.fusionforge.org
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
