[Fusionforge-commits] FusionForge branch master updated. 0d8dfb51a4da005aa69c14c09f88dc36ce274af3

Franck VILLAUME nerville at fusionforge.org
Fri Nov 8 12:03:30 CET 2013


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  0d8dfb51a4da005aa69c14c09f88dc36ce274af3 (commit)
      from  d31cff0224c131b7d3c8ff12e2b20e8251f25bdd (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 0d8dfb51a4da005aa69c14c09f88dc36ce274af3
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Fri Nov 8 11:43:49 2013 +0100

    docman: fix indent .... again

diff --git a/src/common/docman/Document.class.php b/src/common/docman/Document.class.php
index 8dbf98c..a66b48c 100644
--- a/src/common/docman/Document.class.php
+++ b/src/common/docman/Document.class.php
@@ -99,13 +99,13 @@ class Document extends Error {
 	/**
 	 * create - use this function to create a new entry in the database.
 	 *
-	 * @param	string	$filename		The filename of this document. Can be a URL.
-	 * @param	string	$filetype		The filetype of this document. If filename is URL, this should be 'URL';
-	 * @param	string	$data			The absolute path file itself.
-	 * @param	int		$doc_group		The doc_group id of the doc_groups table.
-	 * @param	string	$title			The title of this document.
+	 * @param	string	$filename	The filename of this document. Can be a URL.
+	 * @param	string	$filetype	The filetype of this document. If filename is URL, this should be 'URL';
+	 * @param	string	$data		The absolute path file itself.
+	 * @param	int	$doc_group	The doc_group id of the doc_groups table.
+	 * @param	string	$title		The title of this document.
 	 * @param	string	$description	The description of this document.
-	 * @param	int		$stateid		The state id of the document. At creation, cannot be deleted status.
+	 * @param	int	$stateid	The state id of the document. At creation, cannot be deleted status.
 	 * @return	bool	success.
 	 */
 	function create($filename, $filetype, $data, $doc_group, $title, $description, $stateid = 0) {
@@ -548,9 +548,9 @@ class Document extends Error {
 	/**
 	 * isMonitoredBy - get the monitored status of this document for a specific user id.
 	 *
-	 * @param	string $userid
-	 * @internal	param \User $int ID
-	 * @return	boolean    true if monitored by this user
+	 * @param	string	$userid
+	 * @internal	param	\User $int ID
+	 * @return	boolean	true if monitored by this user
 	 */
 	function isMonitoredBy($userid = 'ALL') {
 		if ( $userid == 'ALL' ) {
@@ -679,7 +679,7 @@ class Document extends Error {
 	 * setReservedBy - set the reserved status of the document and the owner
 	 *
 	 * @param	int	$statusReserved	The status of the reserved
-	 * @param	int	$idReserver		The ID of the owner : by default : noone
+	 * @param	int	$idReserver	The ID of the owner : by default : noone
 	 * @return	boolean	success
 	 */
 	function setReservedBy($statusReserved, $idReserver = NULL) {
@@ -801,13 +801,13 @@ class Document extends Error {
 	/**
 	 * update - use this function to update an existing entry in the database.
 	 *
-	 * @param	string	$filename		The filename of this document. Can be a URL.
-	 * @param	string	$filetype		The filetype of this document. If filename is URL, this should be 'URL';
-	 * @param	string	$data			The contents of this document.
-	 * @param	int		$doc_group		The doc_group id of the doc_groups table.
-	 * @param	string	$title			The title of this document.
+	 * @param	string	$filename	The filename of this document. Can be a URL.
+	 * @param	string	$filetype	The filetype of this document. If filename is URL, this should be 'URL';
+	 * @param	string	$data		The contents of this document.
+	 * @param	int	$doc_group	The doc_group id of the doc_groups table.
+	 * @param	string	$title		The title of this document.
 	 * @param	string	$description	The description of this document.
-	 * @param	int		$stateid		The state id of the doc_states table.
+	 * @param	int	$stateid	The state id of the doc_states table.
 	 * @return	boolean	success.
 	 */
 	function update($filename, $filetype, $data, $doc_group, $title, $description, $stateid) {
@@ -955,9 +955,9 @@ class Document extends Error {
 	}
 
 	/**
-	 *	SendApprovalNotice - send email to project admin for pending documents.
+	 * SendApprovalNotice - send email to project admin for pending documents.
 	 *
-	 *	@return boolean success.
+	 * @return	boolean success.
 	 */
 	function SendApprovalNotice() {
 		if ($this->getStateID() != 3)
@@ -1064,7 +1064,7 @@ class Document extends Error {
 	 * setValueinDB - private function to update columns in db
 	 *
 	 * @param	string	$column	the column to update
-	 * @param	int		$value	the value to store
+	 * @param	int	$value	the value to store
 	 * @return	boolean	success or not
 	 * @access	private
 	 */
diff --git a/src/common/docman/DocumentGroup.class.php b/src/common/docman/DocumentGroup.class.php
index 14e42ee..4618d05 100644
--- a/src/common/docman/DocumentGroup.class.php
+++ b/src/common/docman/DocumentGroup.class.php
@@ -541,7 +541,7 @@ class DocumentGroup extends Error {
 	 * @internal	param		int $State of the documents
 	 * @return	boolean		success
 	 * @access	public
-	*/
+	 */
 	function hasDocuments(&$nested_groups, &$document_factory, $stateid = 0) {
 		$doc_group_id = $this->getID();
 		static $result = array();	// this function will probably be called several times so we better store results in order to speed things up
@@ -681,7 +681,7 @@ class DocumentGroup extends Error {
 	/**
 	 * setStateID - set the state id of this document group.
 	 *
-	 * @param	int		$stateid	State ID.
+	 * @param	int	$stateid	State ID.
 	 * @return	boolean	success or not.
 	 * @access	public
 	 */
@@ -845,7 +845,7 @@ class DocumentGroup extends Error {
 	 * setValueinDB - private function to update columns in db
 	 *
 	 * @param	string	$column	the column to update
-	 * @param	int		$value	the value to store
+	 * @param	int	$value	the value to store
 	 * @return	boolean	success or not
 	 * @access	private
 	 */
diff --git a/src/common/docman/Parsedata.class.php b/src/common/docman/Parsedata.class.php
index 14a0f5b..728181b 100644
--- a/src/common/docman/Parsedata.class.php
+++ b/src/common/docman/Parsedata.class.php
@@ -43,12 +43,12 @@ class Parsedata {
 	/**
 	 * get_parse_data - analyse content and metadata
 	 *
-	 * @param	string	$data			the path of the file to be analysed
-	 * @param	string	$title			the file title
+	 * @param	string	$data		the path of the file to be analysed
+	 * @param	string	$title		the file title
 	 * @param	string	$description	the file description
-	 * @param	string	$filetype		the file type
-	 * @param	string	$filename		the filename
-	 * @return	string					the analysed content
+	 * @param	string	$filetype	the file type
+	 * @param	string	$filename	the filename
+	 * @return	string	the analysed content
 	 */
 	function get_parse_data($data, $title, $description, $filetype, $filename) {
 		$parser = "";
diff --git a/src/common/docman/include/DocumentGroupHTML.class.php b/src/common/docman/include/DocumentGroupHTML.class.php
index e042ad9..5647ef4 100644
--- a/src/common/docman/include/DocumentGroupHTML.class.php
+++ b/src/common/docman/include/DocumentGroupHTML.class.php
@@ -56,10 +56,10 @@ class DocumentGroupHTML extends Error {
 	/**
 	 * showSelectNestedGroups - Display the tree of document groups inside a <select> tag
 	 *
-	 * @param	array	$group_arr		Array of groups.
+	 * @param	array	$group_arr	Array of groups.
 	 * @param	string	$select_name	The name that will be assigned to the input
-	 * @param	bool	$allow_none		Allow selection of "None"
-	 * @param	int		$selected_id	The ID of the group that should be selected by default (if any)
+	 * @param	bool	$allow_none	Allow selection of "None"
+	 * @param	int	$selected_id	The ID of the group that should be selected by default (if any)
 	 * @param	array	$dont_display	Array of IDs of groups that should not be displayed
 	 * @return	string	html select box code
 	 */
@@ -83,12 +83,12 @@ class DocumentGroupHTML extends Error {
 	/**
 	 * buildArrays - Build the arrays to call html_build_select_box_from_arrays()
 	 *
-	 * @param	array	$group_arr		Array of groups.
-	 * @param	array	$id_array		Reference to the array of ids that will be build
-	 * @param	array	$text_array		Reference to the array of group names
+	 * @param	array	$group_arr	Array of groups.
+	 * @param	array	$id_array	Reference to the array of ids that will be build
+	 * @param	array	$text_array	Reference to the array of group names
 	 * @param	array	$dont_display	Array of IDs of groups that should not be displayed
-	 * @param	int		$parent			The ID of the parent whose childs are being showed (0 for root groups)
-	 * @param	int		$level			The current level
+	 * @param	int	$parent		The ID of the parent whose childs are being showed (0 for root groups)
+	 * @param	int	$level		The current level
 	 */
 	function buildArrays($group_arr, &$id_array, &$text_array, &$dont_display, $parent = 0, $level = 0) {
 		if (!is_array($group_arr) || !array_key_exists("$parent", $group_arr)) return;

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

Summary of changes:
 src/common/docman/Document.class.php               |   38 ++++++++++----------
 src/common/docman/DocumentGroup.class.php          |    6 ++--
 src/common/docman/Parsedata.class.php              |   10 +++---
 .../docman/include/DocumentGroupHTML.class.php     |   16 ++++-----
 4 files changed, 35 insertions(+), 35 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list