- allow_call_time_pass_reference=Off allowed

doc/ChangeLog

@@ -31,7 +31,8 @@ wersja 1.3.6 Osiris (??/??/2004);
   - BTS#0000189: poprawiony trigger dns2 w formularzu netadd.html (alec)
   - dodany modu� pinger (szybszy odpowiednik lms-fping) do demona (alec)
   - w demonie wszystkie komunikaty informacyjne s� w DEBUG1 (alec)
-
+  - usuni�te b��dy przy allow_call_time_pass_reference=Off w php.ini (alec)    
+
 wersja 1.3.5 Ju (30/07/2004):
 
   - usuni�ty b��d w skryptach perlowych, powoduj�cy b��dne dzia�anie

index.php

@@ -38,31 +38,40 @@
 function lms_parse_ini_file($filename, $process_sections = false) 
 {
 	$ini_array = array();
-	$sec_name = "";
+	$section = '';
 	$lines = file($filename);
 	foreach($lines as $line) 
 	{
 		$line = trim($line);
 
-		if($line == "" || $line[0] == ";" || $line[0] == "#") 
+		if($line == '' || $line[0] == ';' || $line[0] == '#') 
 			continue;
 
-		if( sscanf($line, "[%[^]]", &$sec_name)==1 ) 
-			$sec_name = trim($sec_name);
+		list($sec_name) = sscanf($line, "[%[^]]");
+
+		if( $sec_name )
+			$section = trim($sec_name);
 		else 
 		{
-			if ( sscanf($line, "%[^=] = '%[^']'", &$property, &$value) != 2 ) 
-				if ( sscanf($line, "%[^=] = \"%[^\"]\"", &$property, &$value) != 2 ) 
-					if( sscanf($line, "%[^=] = %[^;#]",    &$property, &$value) != 2 ) 
+			list($property, $value) = sscanf($line, "%[^=] = '%[^']'");
+			if ( !$property || !$value ) 
+			{
+				list($property, $value) = sscanf($line, "%[^=] = \"%[^\"]\"");
+				if ( !$property || !$value ) 
+				{
+					list($property, $value) = sscanf($line, "%[^=] = %[^;#]");
+					if( !$property || !$value ) 
 						continue;
 					else
 						$value = trim($value, "\"'");
-
+				}
+			}
+
 			$property = trim($property);
 			$value = trim($value);
 
 			if($process_sections) 
-				$ini_array[$sec_name][$property] = $value;
+				$ini_array[$section][$property] = $value;
 			else 
 				$ini_array[$property] = $value;
 		}

lib/LMS.class.php

@@ -3017,9 +3017,9 @@ function GetQueueContents($id, $order='createtime,desc', $state=NULL)
 				//$ticket['requestoremail'] = ereg_replace('^.*<(.*@.*)>$','\1',$ticket['requestor']);
 				//$ticket['requestor'] = str_replace(' <'.$ticket['requestoremail'].'>','',$ticket['requestor']);
 				if(!$ticket['userid'])
-					sscanf($ticket['requestor'], "%[^<]<%[^>]", &$ticket['requestor'], &$ticket['requestoremail']);
+					list($ticket['requestor'], $ticket['requestoremail']) = sscanf($ticket['requestor'], "%[^<]<%[^>]");
 				else
-					sscanf($ticket['requestor'], "<%[^>]", &$ticket['requestoremail']);
+					list($ticket['requestoremail']) = sscanf($ticket['requestor'], "<%[^>]");
 				$result[$idx] = $ticket;
 				$result['total']++;
 			}
@@ -3103,9 +3103,9 @@ function GetTicketContents($id)
 			LEFT JOIN admins ON (admins.id = adminid)
 			WHERE ticketid = ? ORDER BY createtime ASC', array($id));
 		if(!$ticket['userid'])
-			sscanf($ticket['requestor'], "%[^<]<%[^>]", &$ticket['requestor'], &$ticket['requestoremail']);
+			list($ticket['requestor'], $ticket['requestoremail']) = sscanf($ticket['requestor'], "%[^<]<%[^>]");
 		else
-			sscanf($ticket['requestor'], "<%[^>]", &$ticket['requestoremail']);
+			list($ticket['requetoremail']) = sscanf($ticket['requestor'], "<%[^>]");
 //		$ticket['requestoremail'] = ereg_replace('^.* <(.+@.+)>$','\1',$ticket['requestor']);
 //		$ticket['requestor'] = str_replace(' <'.$ticket['requestoremail'].'>','',$ticket['requestor']);
 		$ticket['status'] = $this->rtstates[$ticket['state']];
@@ -3199,9 +3199,9 @@ function RTSearch($search, $order='createtime,desc')
 				//$ticket['requestoremail'] = ereg_replace('^.*<(.*@.*)>$','\1',$ticket['requestor']);
 				//$ticket['requestor'] = str_replace(' <'.$ticket['requestoremail'].'>','',$ticket['requestor']);
 				if(!$ticket['userid'])
-					sscanf($ticket['requestor'], "%[^<]<%[^>]", &$ticket['requestor'], &$ticket['requestoremail']);
+					list($ticket['requestor'], $ticket['requestoremail']) = sscanf($ticket['requestor'], "%[^<]<%[^>]");
 				else
-					sscanf($ticket['requestor'], "<%[^>]", &$ticket['requestoremail']);
+					list($ticket['requestoremail']) = sscanf($ticket['requestor'], "<%[^>]");
 				$result[$idx] = $ticket;
 				$result['total']++;
 			}