Revert "Mandatory function arguments must be listed before optional ones."

leenooks · leenooks · commit 3bfd55de0831 · 2023-04-02T10:42:25.000+10:00
This reverts commit 3a75a32. Since calls to those functions had the arguements fully populated, just remove the default configured arg values.
diff --git a/htdocs/collapse.php b/htdocs/collapse.php
@@ -19,7 +19,7 @@
 $tree = get_cached_item($app['server']->getIndex(),'tree');
 $entry = $tree->getEntry($dn);
 $entry->close();
-set_cached_item($app['server']->getIndex(),$tree,'tree','null');
+set_cached_item($app['server']->getIndex(),'tree','null',$tree);
 
 header(sprintf('Location:index.php?server_id=%s&junk=%s#%s%s',
 	$app['server']->getIndex(),random_junk(),htmlid($app['server']->getIndex(),$dn),app_session_param()));
diff --git a/htdocs/draw_tree_node.php b/htdocs/draw_tree_node.php
@@ -50,7 +50,7 @@
 }
 
 if ($treesave)
-	set_cached_item($app['server']->getIndex(),$tree,'tree','null');
+	set_cached_item($app['server']->getIndex(),'tree','null',$tree);
 
 if ($request['dn'])
 	echo $tree->draw_children($dnentry,$request['code']);
diff --git a/htdocs/expand.php b/htdocs/expand.php
@@ -19,7 +19,7 @@
 $tree = get_cached_item($app['server']->getIndex(),'tree');
 $entry = $tree->getEntry($dn);
 $entry->open();
-set_cached_item($app['server']->getIndex(),$tree,'tree','null');
+set_cached_item($app['server']->getIndex(),'tree','null',$tree);
 
 header(sprintf('Location:index.php?server_id=%s&junk=%s#%s%s',
 	$app['server']->getIndex(),random_junk(),htmlid($app['server']->getIndex(),$dn),app_session_param()));
diff --git a/htdocs/refresh.php b/htdocs/refresh.php
@@ -34,7 +34,7 @@
 		$entry->open();
 	}
 
-	set_cached_item($app['server']->getIndex(),$tree,'tree','null');
+	set_cached_item($app['server']->getIndex(),'tree','null',$tree);
 }
 
 if (get_request('meth','REQUEST') == 'ajax') 
diff --git a/lib/PageRender.php b/lib/PageRender.php
@@ -827,7 +827,7 @@ final protected function drawOldValueJpegAttribute($attribute,$i) {
 		if (! $attribute->getOldValue($i))
 			return;
 
-		draw_jpeg_photo($this->getServer(),$this->template->getDN(),$i,$attribute->getName(),false,false);
+		draw_jpeg_photo($this->getServer(),$this->template->getDN(),$attribute->getName(),$i,false,false);
 	}
 
 	/**
@@ -844,16 +844,16 @@ final protected function drawCurrentValueJpegAttribute($attribute,$i) {
 		# If the attribute is modified, the new value needs to be stored in a session variable for the draw_jpeg_photo callback.
 		if ($attribute->hasBeenModified()) {
 			$_SESSION['tmp'][$attribute->getName()][$i] = $attribute->getValue($i);
-			draw_jpeg_photo(null,$this->template->getDN(),$i,$attribute->getName(),false,false);
+			draw_jpeg_photo(null,$this->template->getDN(),$attribute->getName(),$i,false,false);
 		} else
-			draw_jpeg_photo($this->getServer(),$this->template->getDN(),$i,$attribute->getName(),false,false);
+			draw_jpeg_photo($this->getServer(),$this->template->getDN(),$attribute->getName(),$i,false,false);
 	}
 
 	protected function drawFormReadOnlyValueJpegAttribute($attribute,$i) {
 		$this->draw('HiddenValue',$attribute,$i);
 		$_SESSION['tmp'][$attribute->getName()][$i] = $attribute->getValue($i);
 
-		draw_jpeg_photo(null,$this->template->getDN(),$i,$attribute->getName(),false,false);
+		draw_jpeg_photo(null,$this->template->getDN(),$attribute->getName(),$i,false,false);
 	}
 
 	protected function drawFormReadOnlyValueMultiLineAttribute($attribute,$i) {
diff --git a/lib/Tree.php b/lib/Tree.php
@@ -68,7 +68,7 @@ static public function getInstance($server_id) {
 				}
 			}
 
-			set_cached_item($server_id,$tree,'tree','null');
+			set_cached_item($server_id,'tree','null',$tree);
 		}
 
 		return $tree;
diff --git a/lib/ds_ldap.php b/lib/ds_ldap.php
@@ -1770,7 +1770,7 @@ public function SchemaObjectClasses($method=null,$dn='') {
 			ksort($return);
 
 			# cache the schema to prevent multiple schema fetches from LDAP server
-			set_cached_item($this->index,$return,'schema','objectclasses');
+			set_cached_item($this->index,'schema','objectclasses',$return);
 		}
 
 		if (DEBUG_ENABLED)
@@ -1955,7 +1955,7 @@ public function SchemaAttributes($method=null,$dn='') {
 			$return = $attrs;
 
 			# cache the schema to prevent multiple schema fetches from LDAP server
-			set_cached_item($this->index,$return,'schema','attributes');
+			set_cached_item($this->index,'schema','attributes',$return);
 		}
 
 		if (DEBUG_ENABLED)
@@ -2031,7 +2031,7 @@ public function MatchingRules($method=null,$dn='') {
 			$return = $rules;
 
 			# cache the schema to prevent multiple schema fetches from LDAP server
-			set_cached_item($this->index,$return,'schema','matchingrules');
+			set_cached_item($this->index,'schema','matchingrules',$return);
 		}
 
 		if (DEBUG_ENABLED)
@@ -2080,7 +2080,7 @@ public function SchemaSyntaxes($method=null,$dn='') {
 			ksort($return);
 
 			# cache the schema to prevent multiple schema fetches from LDAP server
-			set_cached_item($this->index,$return,'schema','syntaxes');
+			set_cached_item($this->index,'schema','syntaxes',$return);
 		}
 
 		if (DEBUG_ENABLED)
diff --git a/lib/ds_ldap_pla.php b/lib/ds_ldap_pla.php
@@ -371,7 +371,7 @@ public function add($dn,$entry_array,$method=null) {
 
 				$tree->addEntry($dn);
 
-				set_cached_item($this->index,$tree,'tree','null');
+				set_cached_item($this->index,'tree','null',$tree);
 
 				run_hook('post_entry_create',array('server_id'=>$this->index,'method'=>$method,'dn'=>$dn,'attrs'=>$entry_array));
 
@@ -403,7 +403,7 @@ public function delete($dn,$method=null) {
 				$tree = get_cached_item($this->index,'tree');
 				$tree->delEntry($dn);
 
-				set_cached_item($this->index,$tree,'tree','null');
+				set_cached_item($this->index,'tree','null',$tree);
 
 				run_hook('post_entry_delete',array('server_id'=>$this->index,'method'=>$method,'dn'=>$dn));
 			}
@@ -430,7 +430,7 @@ public function rename($dn,$new_rdn,$container,$deleteoldrdn,$method=null) {
 				$newdn = sprintf('%s,%s',$new_rdn,$container);
 				$tree->renameEntry($dn,$newdn);
 
-				set_cached_item($this->index,$tree,'tree','null');
+				set_cached_item($this->index,'tree','null',$tree);
 
 				run_hook('post_entry_rename',array('server_id'=>$this->index,'method'=>$method,'dn'=>$dn,'rdn'=>$new_rdn,'container'=>$container));
 			}
diff --git a/lib/functions.php b/lib/functions.php
@@ -955,7 +955,7 @@ function get_cached_item($index,$item,$subitem='null') {
  *
  * Returns true on success of false on failure.
  */
-function set_cached_item($index,$data,$item,$subitem='null') {
+function set_cached_item($index,$item,$subitem='null',$data) {
 	if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
 		debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
 
@@ -2065,8 +2065,8 @@ function ldap_error_msg($msg,$errnum) {
  *
  * Usage Examples:
  *  <code>
- *   draw_jpeg_photo(0,'cn=Bob,ou=People,dc=example,dc=com',0,"jpegPhoto",true,array('img_opts'=>"border: 1px; width: 150px"));
- *   draw_jpeg_photo(1,'cn=Fred,ou=People,dc=example,dc=com',1,null);
+ *   draw_jpeg_photo(0,'cn=Bob,ou=People,dc=example,dc=com',"jpegPhoto",0,true,array('img_opts'=>"border: 1px; width: 150px"));
+ *   draw_jpeg_photo(1,'cn=Fred,ou=People,dc=example,dc=com',null,1);
  *  </code>
  *
  * @param object The Server to get the image from.
@@ -2079,7 +2079,7 @@ function ldap_error_msg($msg,$errnum) {
  * @param array Specifies optional image and CSS style attributes for the table tag. Supported keys are
  *                fixed_width, fixed_height, img_opts.
  */
-function draw_jpeg_photo($server,$dn,$index,$attr_name='jpegphoto',$draw_delete_buttons=false,$options=array()) {
+function draw_jpeg_photo($server,$dn,$attr_name='jpegphoto',$index,$draw_delete_buttons=false,$options=array()) {
 	if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
 		debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs);
 
diff --git a/lib/xmlTemplates.php b/lib/xmlTemplates.php
@@ -140,7 +140,7 @@ function __construct($server_id) {
 
 		if ($changed) {
 			masort($this->templates,'title');
-			set_cached_item($server_id,$this->templates,$class['item'],'null');
+			set_cached_item($server_id,$class['item'],'null',$this->templates);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`if ($treesave)`
`53`		`- set_cached_item($app['server']->getIndex(),$tree,'tree','null');`
	`53`	`+ set_cached_item($app['server']->getIndex(),'tree','null',$tree);`
`54`	`54`
`55`	`55`	`if ($request['dn'])`
`56`	`56`	`echo $tree->draw_children($dnentry,$request['code']);`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`$entry->open();`
`35`	`35`	`}`
`36`	`36`
`37`		`- set_cached_item($app['server']->getIndex(),$tree,'tree','null');`
	`37`	`+ set_cached_item($app['server']->getIndex(),'tree','null',$tree);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`if (get_request('meth','REQUEST') == 'ajax')`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ static public function getInstance($server_id) {`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`71`		`- set_cached_item($server_id,$tree,'tree','null');`
	`71`	`+ set_cached_item($server_id,'tree','null',$tree);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`return $tree;`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ function __construct($server_id) {`
`140`	`140`
`141`	`141`	`if ($changed) {`
`142`	`142`	`masort($this->templates,'title');`
`143`		`- set_cached_item($server_id,$this->templates,$class['item'],'null');`
	`143`	`+ set_cached_item($server_id,$class['item'],'null',$this->templates);`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`