Documentation corrections, and disable just the display of the ACL ID…

… in cases of $return_all.
openemr · Feb 8, 2013 · c0f4842 · c0f4842
1 parent 3a5dbd0
commit c0f4842
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/gacl/gacl.class.php b/gacl/gacl.class.php
@@ -318,8 +318,8 @@ function acl_check_array($aco_section_value, $aco_value, $aro_array) {
         *
 	* @param string The ACO section value
 	* @param string The ACO value
-	* @param string The ARO section value (optional)
+	* @param string The ARO section value
-	* @param string The ARO value (optional)
+	* @param string The ARO value
 	* @param string The AXO section value (optional)
 	* @param string The AXO value (optional)
 	* @param string The value of the ARO group (optional)
@@ -548,8 +548,13 @@ function acl_query($aco_section_value, $aco_value, $aro_section_value, $aro_valu
 			$this->put_cache($retarr, $cache_id);
 		}
 
-		if (!$return_all) {
+		if ($return_all)
-		$this->debug_text("<b>acl_query():</b> ACO Section: $aco_section_value ACO Value: $aco_value ARO Section: $aro_section_value ARO Value $aro_value ACL ID: ". $retarr['acl_id'] .' Result: '. $retarr['allow']);
+		{
+			$this->debug_text("<b>acl_query():</b> ACO Section: $aco_section_value ACO Value: $aco_value ARO Section: $aro_section_value ARO Value $aro_value ACL ID: OMITTED due to return_all");
+		}
+		else
+		{
+			$this->debug_text("<b>acl_query():</b> ACO Section: $aco_section_value ACO Value: $aco_value ARO Section: $aro_section_value ARO Value $aro_value ACL ID: ". $retarr['acl_id'] .' Result: '. $retarr['allow']);
 		}
 
 		return $retarr;