[evolvis-commits] r12406: Removed some warning?==?UTF-8?Q?s↵

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 01:37:32 CET 2011


Author: mirabilos
Date: 2011-02-28 01:37:32 +0100 (Mon, 28 Feb 2011)
New Revision: 12406

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/common/docman/DocumentGroup.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/include/doc_utils.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/include/vtemplate.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/search.php
   trunk/gforge_base/evolvisforge-5.1/gforge/www/frs/index.php
Log:
Removed some warnings


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/docman/DocumentGroup.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/docman/DocumentGroup.class.php	2011-02-28 00:37:30 UTC (rev 12405)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/docman/DocumentGroup.class.php	2011-02-28 00:37:32 UTC (rev 12406)
@@ -251,8 +251,9 @@
 	* @param int	(optional) State of the documents
 	*/
 	function hasDocuments(&$nested_groups, &$document_factory, $stateid=0) {
+		global $doc_group_id;
 		static $result = array();	// this function will probably be called several times so we better store results in order to speed things up
-		if (!is_array($result[$stateid])) $result[$stateid] = array();
+		if (!is_array(@$result[$stateid])) $result[$stateid] = array();
 		if (array_key_exists($doc_group_id, $result[$stateid])) return $result[$stateid][$doc_group_id];
 
 		$doc_group_id = $this->getID();
@@ -296,7 +297,7 @@
 	function hasSubgroup(&$nested_groups, $doc_subgroup_id) {
 		$doc_group_id = $this->getID();
 
-		if (is_array($nested_groups["$doc_group_id"])) {
+		if (is_array(@$nested_groups["$doc_group_id"])) {
 			$count = count($nested_groups["$doc_group_id"]);
 			for ($i=0; $i < $count; $i++) {
 				// child is a match?

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/include/doc_utils.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/include/doc_utils.php	2011-02-28 00:37:30 UTC (rev 12405)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/include/doc_utils.php	2011-02-28 00:37:32 UTC (rev 12406)
@@ -172,12 +172,12 @@
 		// Display group and subgroups only if it has associated documents
 		if ($doc_group->hasDocuments($nested_groups, $document_factory, $stateid)) {
 			// Recursive call			
-			if (($doc_group->getID() == $selected_doc_group_id || $doc_group->hasSubgroup($nested_groups, $selected_doc_group_id)) && (!$stateid || $stateid == $selected_stateid)) {
+			if (($doc_group->getID() == $selected_doc_group_id || $doc_group->hasSubgroup($nested_groups, $selected_doc_group_id)) && (!$stateid || $stateid == @$selected_stateid)) {
 				$icon = 'ofolder15.png';
 			} else {
 				$icon = 'cfolder15.png';
 			}
-			echo "<li>".html_image('ic/'.$icon,"15","13",array("border"=>"0"))." <a href='index.php?group_id=".$doc_group->Group->getID()."&selected_doc_group_id=".$doc_group->getID()."&language_id=".$GLOBALS['selected_language'];
+			echo "<li>".html_image('ic/'.$icon,"15","13",array("border"=>"0"))." <a href='index.php?group_id=".$doc_group->Group->getID()."&selected_doc_group_id=".$doc_group->getID()."&language_id=".@$GLOBALS['selected_language'];
 			if ($from_admin && $stateid) {	// if we're sorting by the state, pass the state as a variable
 				echo "&selected_stateid=".$stateid;
 			}

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/include/vtemplate.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/include/vtemplate.class.php	2011-02-28 00:37:30 UTC (rev 12405)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/include/vtemplate.class.php	2011-02-28 00:37:32 UTC (rev 12406)
@@ -450,6 +450,7 @@
 }
 
 function newSession($handle="{0}",$nom_zone = "|root|"){
+global $cache,$time,$num_session;
 if ( $this->sessions[$handle][$nom_zone]->used ) $this->closeSession($handle,$nom_zone);
 $this->addSession($handle,$nom_zone,$cache,$time,$num_session);
 return 1;

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/search.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/search.php	2011-02-28 00:37:30 UTC (rev 12405)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/docman/search.php	2011-02-28 00:37:32 UTC (rev 12406)
@@ -82,12 +82,12 @@
 $vtp->NewSession($handle,"MAIN");
 
 $allchecked = ""; $onechecked = ""; 
-if ($_POST["search_type"] == "one") {$onechecked = "checked";}
+if (getStringFromPost('search_type') == "one") {$onechecked = "checked";}
 else {$allchecked = "checked";}
 $vtp->AddSession($handle,"FORMSEARCH");
 $vtp->SetVar($handle,"FORMSEARCH.TITLE",_('Search in documents'));
 $vtp->SetVar($handle,"FORMSEARCH.GROUP_ID",$_GET["group_id"]);
-$vtp->SetVar($handle,"FORMSEARCH.TEXTSEARCH",$_POST["textsearch"]);
+$vtp->SetVar($handle,"FORMSEARCH.TEXTSEARCH",getStringFromPost("textsearch"));
 $vtp->SetVar($handle,"FORMSEARCH.ALLCHECKED",$allchecked);
 $vtp->SetVar($handle,"FORMSEARCH.ONECHECKED",$onechecked);
 $vtp->SetVar($handle,"FORMSEARCH.SUBMIT_PROMPT",_('Search'));
@@ -95,14 +95,14 @@
 $vtp->SetVar($handle,"FORMSEARCH.SEARCH_ONE_WORD",_('With at least one of words'));
 $vtp->CloseSession($handle,"FORMSEARCH");
 
-if ($_POST["cmd"] == "search")
+if (getStringFromPost('cmd') == "search")
 {
 	
-	$textsearch = $_POST["textsearch"];
+	$textsearch = getStringFromPost("textsearch");
 	$textsearch = prepare_search_text ($textsearch);
 	$mots = preg_split("/[\s,]+/",$textsearch);
 	$WHERE = "WHERE TRUE ";
-	if ($_POST["search_type"] == "one")
+	if (getStringFromPost('search_type') == "one")
 	{
 		if (count($mots) > 0)
 		{
@@ -223,12 +223,12 @@
 		{
 			if ($group["parent_doc_group"] == 0) 
 			{
-				$href = "/docman/index.php?group_id=$group_id&selected_doc_group_id=$group[doc_group]&language_id=$language_id";
+				$href = util_make_url ("/docman/index.php?group_id=$group_id&selected_doc_group_id=$group[doc_group]&language_id=$language_id");
 				$rep .= "<a href=\"$href\" style=\"color:#00610A;\">$group[groupname]</a>";
 				break;
 			}
 			$s = get_path_document ($groupsarr,  $group["parent_doc_group"], $group_id, $language_id);
-			$href = "/docman/index.php?group_id=$group_id&selected_doc_group_id=$group[doc_group]&language_id=$language_id";
+			$href = util_make_url ("/docman/index.php?group_id=$group_id&selected_doc_group_id=$group[doc_group]&language_id=$language_id");
 			$rep .= "$s / <a href=\"$href\" style=\"color:#00610A;\">$group[groupname]</a>";
 			break;
 		}

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/frs/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/frs/index.php	2011-02-28 00:37:30 UTC (rev 12405)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/frs/index.php	2011-02-28 00:37:32 UTC (rev 12406)
@@ -180,7 +180,7 @@
 				$res_file = db_query($sql);
 				$num_files = db_numrows( $res_file );
 
-				$proj_stats['files'] += $num_files;
+				@$proj_stats['files'] += $num_files;
 
 				if ( !$res_file || $num_files < 1 ) {
 					print '<tr '.$bgstyle.'><td colspan="3"><dd><em>No Files</em></td><td colspan="4"> </td></tr>'."\n";
@@ -208,7 +208,7 @@
 							print $GLOBALS['HTML']->multiTableRow($bgstyle, $cell_data, FALSE);
 						}
 						$proj_stats['size'] += $file_release['file_size'];
-						$proj_stats['downloads'] += $file_release['downloads'];
+						@$proj_stats['downloads'] += $file_release['downloads'];
 					}
 				}
 			}



More information about the evolvis-commits mailing list