[Fusionforge-commits] FusionForge branch master updated. b0e2ab6adfd01cf36d428580afc0b793d51019f4

Franck VILLAUME nerville at fusionforge.org
Sat Feb 22 15:17:21 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  b0e2ab6adfd01cf36d428580afc0b793d51019f4 (commit)
      from  91a46b5ac4c6c419878bdd59d80d153c3c2ea233 (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 b0e2ab6adfd01cf36d428580afc0b793d51019f4
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Feb 22 15:08:41 2014 +0100

    docman: use html_e et al. helpers

diff --git a/src/common/docman/DocumentManager.class.php b/src/common/docman/DocumentManager.class.php
index 48b7e62..7c24065 100644
--- a/src/common/docman/DocumentManager.class.php
+++ b/src/common/docman/DocumentManager.class.php
@@ -187,13 +187,13 @@ class DocumentManager extends Error {
 				}
 
 				if ($nbDocs && (!isset($nbDocsPending) || $nbDocsPending == 0) && (!isset($nbDocsHidden) || $nbDocsHidden == 0) && (!isset($nbDocsPrivate) || $nbDocsPrivate) && (!isset($nbDocsTrashed) || $nbDocsTrashed)) {
-					$nbDocsLabel = '<span class="tabtitle-nw" title="'._('Number of documents in this folder').'" >('.$nbDocs.')</span>';
+					$nbDocsLabel = html_e('span', array('class' => 'tabtitle-nw', 'title' => _('Number of documents in this folder')), '('.$nbDocs.')', false);
 				}
 				if (isset($nbDocsPending) && isset($nbDocsHidden) && isset($nbDocsPrivate)) {
-					$nbDocsLabel = '<span class="tabtitle-nw" title="'._('Number of documents in this folder per status. active/pending/hidden/private').'" >('.$nbDocs.'/'.$nbDocsPending.'/'.$nbDocsHidden.'/'.$nbDocsPrivate.')</span>';
+					$nbDocsLabel = html_e('span', array('class' => 'tabtitle-nw', 'title' => _('Number of documents in this folder per status. active/pending/hidden/private')), '('.$nbDocs.'/'.$nbDocsPending.'/'.$nbDocsHidden.'/'.$nbDocsPrivate.')', false);
 				}
 				if (isset($nbDocsTrashed)) {
-					$nbDocsLabel = '<span class="tabtitle-nw" title="'._('Number of deleted documents in this folder').'" >('.$nbDocsTrashed.')</span>';
+					$nbDocsLabel = html_e('span', array('class' => 'tabtitle-nw', 'title' => _('Number of deleted documents in this folder')), '('.$nbDocsTrashed.')', false);
 				}
 				if ($localDg->getName() != '.trash') {
 					$lititle = '';
@@ -207,16 +207,14 @@ class DocumentManager extends Error {
 						}
 						$lititle .= _('Last Modified')._(': ').relative_date($localDg->getLastModifyDate());
 					}
-					echo '<li id="leaf-'.$subGroupIdValue.'" class="'.$liclass.'">'.util_make_link($link, $localDg->getName(), array('class'=>'tabtitle-nw', 'title'=>$lititle)).$nbDocsLabel;
+					echo html_ao('li', array('id' => 'leaf-'.$subGroupIdValue, 'class' => $liclass)).util_make_link($link, $localDg->getName(), array('class'=>'tabtitle-nw', 'title'=>$lititle)).$nbDocsLabel;
 				} else {
-					echo '<li id="leaf-'.$subGroupIdValue.'" class="'.$liclass.'">'.util_make_link($link, $localDg->getName()).$nbDocsLabel;
+					echo html_ao('li', array('id' => 'leaf-'.$subGroupIdValue, 'class' => $liclass)).util_make_link($link, $localDg->getName()).$nbDocsLabel;
 				}
 				if ($dg->getSubgroup($subGroupIdValue, $stateId)) {
-					echo '<ul class="simpleTreeMenu" >';
-					$this->getTree($selecteddir, $linkmenu, $subGroupIdValue);
-					echo '</ul>';
+					echo html_e('ul', array('class' => 'simpleTreeMenu'), $this->getTree($selecteddir, $linkmenu, $subGroupIdValue), false);
 				}
-				echo '</li>';
+				echo html_ac(html_ap() -1);
 			}
 		}
 	}

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

Summary of changes:
 src/common/docman/DocumentManager.class.php |   16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list