[Fusionforge-commits] FusionForge branch master updated. 6.0.4-815-g124f735

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Aug 28 19:17:05 CEST 2016


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  124f735a10953e2ead5cf4120c2af3374d993862 (commit)
      from  b5588d694a1813b187d2d03a0b78447e583c2e13 (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=124f735a10953e2ead5cf4120c2af3374d993862

commit 124f735a10953e2ead5cf4120c2af3374d993862
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Aug 28 19:16:45 2016 +0200

    use HTML helpers

diff --git a/src/plugins/blocks/www/index.php b/src/plugins/blocks/www/index.php
index 8ee11bd..3edcda2 100644
--- a/src/plugins/blocks/www/index.php
+++ b/src/plugins/blocks/www/index.php
@@ -199,16 +199,20 @@ if ($type == 'admin') {
 	foreach ($blocks as $b => $help) {
 		$match = '';
 		if (preg_match('/(.*) index$/', $b, $match)) {
-			print '<tr><td colspan="4"><b>'.$blocks_text[$match[1]].'</b></td></tr>';
+			$cells = array();
+			$cells[] = array(html_e('b', array(), $blocks_text[$match[1]]), 'colspan' => 4);
+			echo $HTML->multiTableRow(array(), $cells);
 		}
-
-		$checked = (isset($status[$b]) && $status[$b] == 1) ? ' checked="checked"' : '';
-
-		print "<tr ".$HTML->boxGetAltRowStyle($b)."><td>$b</td>\n" .
-		"<td class=\"align-center\">" .
-		"<input type=\"checkbox\" name=\"activate[$b]\" value=\"1\"$checked /></td>\n" .
-		"<td>$help</td>\n" .
-		"<td>".util_make_link('/plugins/blocks/?id='.$id.'&type=configure&pluginname=blocks&name='.urlencode($b), _('Configure'))."</td>\n</tr>\n";
+		$cells = array();
+		$cells[][] = $b;
+		$inputAttr = array('type' => 'checkbox', 'name' => 'activate['.$b.']', 'value' => 1);
+		if (isset($status[$b]) && $status[$b] == 1) {
+			$inputAttr['checked'] = 'checked';
+		}
+		$cells[] = array(html_e('input', $inputAttr), 'class' => 'align-center');
+		$cells[][] = $help;
+		$cells[][] = util_make_link('/plugins/blocks/?id='.$id.'&type=configure&pluginname=blocks&name='.urlencode($b), _('Configure'));
+		echo $HTML->multiTableRow(array('class' => $HTML->boxGetAltRowStyle($b, true)), $cells);
 	}
 	echo $HTML->listTableBottom();
 	print '<p class="align-center"><input type="submit" value="' .
@@ -339,7 +343,7 @@ if ($type == 'admin') {
 				WHERE group_id=$2 AND name=$3',
 				array($body, $id, htmlspecialchars($name)));
 	}
-	$feedback = $name .' : '. _('Block configuration saved');
+	$feedback = $name ._(' : '). _('Block configuration saved');
 	session_redirect('/plugins/blocks/?id='.$id.'&type=admin&pluginname=blocks');
 }
 

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/blocks/www/index.php | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list