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 d0fee4bd3d700ac4ea70a86844db27d00fcb7b3a (commit)
via 35f99aced93afce1cc9aa27eadf0842905789975 (commit)
via e4b934c107409b7592a1f9beb221c37336d09d78 (commit)
from 00433651d6254cfcea2d5a2d5b3096d50cf0d9f2 (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=d0fee4bd3d700ac4ea70a86844db27d00fcb7b3a
commit d0fee4bd3d700ac4ea70a86844db27d00fcb7b3a
Author: Franck Villaume <[email protected]>
Date: Sat Jul 9 13:58:40 2016 +0200
use HTML helpers
diff --git
a/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
b/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
index 01565d2..f8c0f54 100644
--- a/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
+++ b/src/common/widget/Widget_HomeDetailActivityMostActiveProjectWeek.class.php
@@ -117,12 +117,7 @@ class Widget_HomeDetailActivityMostActiveProjectWeek
extends Widget {
break;
}
case 'taskopen':
- case 'taskclose': {
- $icon =
html_image('ic/taskman20w.png','','',array('alt'=>_('Tasks')));
- $url =
util_make_link('/pm/task.php?func=detailtask&project_task_id='.$activity['subref_id'].'&group_id='.$activity['group_id'].'&group_project_id='.$activity['ref_id'],_('Tasks').'
'.$activity['description']);
- break;
- }
-
+ case 'taskclose':
case 'taskdelete': {
$icon =
html_image('ic/taskman20w.png','','',array('alt'=>_('Tasks')));
$url =
util_make_link('/pm/task.php?func=detailtask&project_task_id='.$activity['subref_id'].'&group_id='.$activity['group_id'].'&group_project_id='.$activity['ref_id'],_('Tasks').'
'.$activity['description']);
@@ -161,7 +156,9 @@ class Widget_HomeDetailActivityMostActiveProjectWeek
extends Widget {
continue;
}
if ($last_day != strftime($date_format,
$activity['activity_date'])) {
- echo '<tr class="tableheading"><td
colspan="4">'.strftime($date_format, $activity['activity_date']).'</td></tr>';
+ $cells = array();
+ $cells[] = array(strftime($date_format,
$activity['activity_date']), 'colspan' => 4);
+ echo $HTML->multiTableRow(array('class'
=> 'tableheading'), $cells, true);
$last_day=strftime($date_format,
$activity['activity_date']);
}
$cells = array();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=35f99aced93afce1cc9aa27eadf0842905789975
commit 35f99aced93afce1cc9aa27eadf0842905789975
Author: Franck Villaume <[email protected]>
Date: Sat Jul 9 13:58:22 2016 +0200
remove duplicated code
diff --git a/src/common/widget/Widget.class.php
b/src/common/widget/Widget.class.php
index 6d66902..ed88e5c 100644
--- a/src/common/widget/Widget.class.php
+++ b/src/common/widget/Widget.class.php
@@ -333,16 +333,8 @@ require_once
$gfcommon.'widget/Widget_HomeVersion.class.php';
/* static */ function getExternalWidgets($owner_type) {
switch ($owner_type) {
case WidgetLayoutManager::OWNER_TYPE_USER:
- $widgets = array(
- );
- break;
case WidgetLayoutManager::OWNER_TYPE_GROUP:
- $widgets = array(
- );
- break;
case WidgetLayoutManager::OWNER_TYPE_HOME:
- $widgets = array();
- break;
default:
$widgets = array();
break;
diff --git a/src/www/themes/funky/Theme.class.php
b/src/www/themes/funky/Theme.class.php
index 5cd78fc..acd1542 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -311,47 +311,6 @@ class Theme_Funky extends Layout {
}
/**
- * multiTableRow() - create a multilevel row in a table
- *
- * @param array $row_attrs the row attributes
- * @param array $cell_data the array of cell data, each
element is an array,
- * the first item being the text,
- * the subsequent items are
attributes (dont include
- * the bgcolor for the title here,
that will be
- * handled by $istitle
- * @param bool $istitle is this row part of the title ?
- *
- * @return string
- */
- function multiTableRow($row_attrs, $cell_data, $istitle = false) {
- $ap = html_ap();
- (isset($row_attrs['class'])) ? $row_attrs['class'] .= ' ff' :
$row_attrs['class'] = 'ff';
- if ( $istitle ) {
- $row_attrs['class'] .= ' align-center';
- }
- $return = html_ao('tr', $row_attrs);
- for ( $c = 0; $c < count($cell_data); $c++ ) {
- $locAp = html_ap();
- $cellAttrs = array();
- foreach (array_slice($cell_data[$c],1) as $k => $v) {
- $cellAttrs[$k] = $v;
- }
- (isset($cellAttrs['class'])) ? $cellAttrs['class'] .= '
ff' : $cellAttrs['class'] = 'ff';
- $return .= html_ao('td', $cellAttrs);
- if ( $istitle ) {
- $return .= html_ao('strong');
- }
- $return .= $cell_data[$c][0];
- if ( $istitle ) {
- $return .= html_ac(html_ap() -1);
- }
- $return .= html_ac($locAp);
- }
- $return .= html_ac($ap);
- return $return;
- }
-
- /**
* headerJS() - creates the JS headers and calls the plugin javascript
hook
* @todo generalize this
*/
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e4b934c107409b7592a1f9beb221c37336d09d78
commit e4b934c107409b7592a1f9beb221c37336d09d78
Author: Franck Villaume <[email protected]>
Date: Fri Jul 8 20:03:40 2016 +0200
remove duplicate code
diff --git a/src/common/include/RBAC.php b/src/common/include/RBAC.php
index 33cd22b..4e288b8 100644
--- a/src/common/include/RBAC.php
+++ b/src/common/include/RBAC.php
@@ -482,6 +482,7 @@ abstract class BaseRole extends FFError {
case 'forge_read':
case 'approve_projects':
case 'approve_news':
+ case 'project_admin':
if ($this->hasGlobalPermission('forge_admin')) {
return 1 ;
}
@@ -495,13 +496,6 @@ abstract class BaseRole extends FFError {
return $value ;
break ;
- case 'project_admin':
- if ($this->hasGlobalPermission('forge_admin')) {
- return 1 ;
- }
- return $value ;
- break ;
-
case 'project_read':
if ($this->hasPermission('project_admin', $reference)) {
return 1;
@@ -683,6 +677,7 @@ abstract class BaseRole extends FFError {
break ;
case 'forge_stats':
+ case 'frs_admin':
switch ($action) {
case 'read':
return ($value >= 1) ;
@@ -721,16 +716,6 @@ abstract class BaseRole extends FFError {
}
break ;
- case 'frs_admin':
- switch ($action) {
- case 'read':
- return ($value >= 1);
- break;
- case 'admin':
- return ($value >= 2);
- break;
- }
- break;
case 'frs':
case 'new_frs':
switch ($action) {
@@ -802,6 +787,7 @@ abstract class BaseRole extends FFError {
break ;
}
break ;
+
default:
$hook_params = array ();
$hook_params['section'] = $section ;
diff --git a/src/common/include/sqlparser.php b/src/common/include/sqlparser.php
index 6f81507..eacf1b4 100644
--- a/src/common/include/sqlparser.php
+++ b/src/common/include/sqlparser.php
@@ -114,16 +114,7 @@ function parse_sql_file($filename) {
case $states['IN_COMMENT']:
// error_log('IN_COMMENT');
- if (($l == '') || preg_match('/^\s*$/', $l)) {
- $l = get_next_line($f);
- if ($l === false) {
- error_log("End of file reached during a
comment");
- $state = $states['ERROR'];
- continue;
- }
- $state = $states['IN_COMMENT'];
- continue;
- } elseif (preg_match(',\*/,', $l) ||
preg_match(',/\*,', $l)) {
+ if (preg_match(',\*/,', $l) || preg_match(',/\*,', $l))
{
$l = preg_replace(',.*?((/\*)|(\*/)),', '$1',
$l, 1);
$chunk = substr($l,0,2);
$rest = substr($l,2);
@@ -153,16 +144,7 @@ function parse_sql_file($filename) {
case $states['IN_SQL_COMMENT']:
// error_log('IN_SQL_COMMENT');
- if (($rest == '') || preg_match('/^\s*$/')) {
- $rest = get_next_line($f);
- if ($rest === false) {
- error_log("End of file reached during a
comment");
- $state = $states['ERROR'];
- continue;
- }
- $state = $states['IN_SQL_COMMENT'];
- continue;
- } elseif (preg_match(',\*/,', $rest) ||
preg_match(',/\*,', $rest)) {
+ if (preg_match(',\*/,', $rest) || preg_match(',/\*,',
$rest)) {
$rest = preg_replace(',.*?((/\*)|(\*/)),',
'$1', $l, 1);
$chunk = substr($rest,0,2);
$rest = substr($rest,2);
-----------------------------------------------------------------------
Summary of changes:
src/common/include/RBAC.php | 20 ++---------
src/common/include/sqlparser.php | 22 ++----------
src/common/widget/Widget.class.php | 8 -----
...meDetailActivityMostActiveProjectWeek.class.php | 11 +++---
src/www/themes/funky/Theme.class.php | 41 ----------------------
5 files changed, 9 insertions(+), 93 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
