rpms/glpi/devel glpi.patch,1.1,1.2 glpi.spec,1.7,1.8

[Remi Collet (remi)]

Author: remi

Update of /cvs/extras/rpms/glpi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19291

Modified Files:
	glpi.patch glpi.spec 
Log Message:
more patches

glpi.patch:

Index: glpi.patch
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/glpi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glpi.patch	29 Dec 2007 07:33:15 -0000	1.1
+++ glpi.patch	3 Jan 2008 08:25:47 -0000	1.2
@@ -4,6 +4,8 @@
 clean code			https://dev.indepnet.net:8080/glpi/changeset/6191
 Correction reports		https://dev.indepnet.net:8080/glpi/changeset/6194
 fix search end warranty		https://dev.indepnet.net:8080/glpi/changeset/6196
+mailgate			https://dev.indepnet.net:8080/glpi/changeset/6226
+mailgate			https://dev.indepnet.net:8080/glpi/changeset/6228
 
 Index: branches/0.70-bugfixes/inc/rulesengine.class.php
 ===================================================================
@@ -244,3 +246,76 @@
 +		case "glpi_infocoms.end_warranty":
  		case "glpi_contracts.end_date":
  			if ($data["ITEM_$num"]!=''&&$data["ITEM_$num"]!="0000-00-00"){
+Index: branches/0.70-bugfixes/inc/mailgate.class.php
+===================================================================
+--- trunk/inc/mailgate.class.php (revision 6096)
++++ branches/0.70-bugfixes/inc/mailgate.class.php (revision 6226)
+@@ -260,4 +260,6 @@
+ 		// Mail request type
+ 		$tkt['request_type']=2;
++		// AUto_import
++		$tkt['_auto_import']=1;
+ 		$body=$this->getBody($i);
+ 		
+Index: branches/0.70-bugfixes/inc/tracking.class.php
+===================================================================
+--- branches/0.70-bugfixes/inc/tracking.class.php (revision 6177)
++++ branches/0.70-bugfixes/inc/tracking.class.php (revision 6226)
+@@ -414,12 +414,19 @@
+ 		unset($input["type"]);
+ 
+-		if (!isset($input["author"])){
++		// No Auto set Import for external source
++		if (!isset($input['_auto_import'])&&!isset($input["author"])){
+ 			if (isset($_SESSION["glpiID"])&&$_SESSION["glpiID"]>0)
+ 				$input["author"]=$_SESSION["glpiID"];
+ 			else $input["author"]=1; // Helpdesk injector
+-		}
+-
+-		if (isset($_SESSION["glpiID"])) $input["recipient"]=$_SESSION["glpiID"];
+-		else if ($input["author"]) $input["recipient"]=$input["author"];
++		} else {
++			$input["author"]=0;
++		}
++
++		// No Auto set Import for external source
++		if (isset($_SESSION["glpiID"])&&!isset($input['_auto_import'])) {
++				$input["recipient"]=$_SESSION["glpiID"];
++		} else if ($input["author"]) {
++			$input["recipient"]=$input["author"];
++		}
+ 
+ 		if (!isset($input["request_type"])) $input["request_type"]=1;
+@@ -440,5 +447,4 @@
+ 			$input["computer"]=0;
+ 		}
+-
+ 
+ 		// Auto group define
+Index: branches/0.70-bugfixes/inc/tracking.class.php
+===================================================================
+--- branches/0.70-bugfixes/inc/tracking.class.php (revision 6226)
++++ branches/0.70-bugfixes/inc/tracking.class.php (revision 6228)
+@@ -415,15 +415,15 @@
+ 
+ 		// No Auto set Import for external source
+-		if (!isset($input['_auto_import'])&&!isset($input["author"])){
+-			if (isset($_SESSION["glpiID"])&&$_SESSION["glpiID"]>0)
+-				$input["author"]=$_SESSION["glpiID"];
+-			else $input["author"]=1; // Helpdesk injector
+-		} else {
+-			$input["author"]=0;
++		if (!isset($input['_auto_import'])){
++			if (!isset($input["author"])){
++				if (isset($_SESSION["glpiID"])&&$_SESSION["glpiID"]>0)
++					$input["author"]=$_SESSION["glpiID"];
++				else $input["author"]=1; // Helpdesk injector
++			}
+ 		}
+ 
+ 		// No Auto set Import for external source
+ 		if (isset($_SESSION["glpiID"])&&!isset($input['_auto_import'])) {
+-				$input["recipient"]=$_SESSION["glpiID"];
++			$input["recipient"]=$_SESSION["glpiID"];
+ 		} else if ($input["author"]) {
+ 			$input["recipient"]=$input["author"];


Index: glpi.spec
===================================================================
RCS file: /cvs/extras/rpms/glpi/devel/glpi.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- glpi.spec	29 Dec 2007 07:33:15 -0000	1.7
+++ glpi.spec	3 Jan 2008 08:25:47 -0000	1.8
@@ -1,4 +1,4 @@
-%if %{?fedora}%{?rhel} >= 5
+%if %{?fedora}%{?rhel} >= 6
 %define useselinux 1
 %else
 %define useselinux 0
@@ -6,7 +6,7 @@
 
 Name:           glpi
 Version:        0.70
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Free IT asset management software
 Summary(fr):    Gestion Libre de Parc Informatique
 
@@ -239,6 +239,10 @@
 %endif
 
 %changelog
+* Thu Jan 03 2008 Remi Collet <Fedora at FamilleCollet.com> - 0.70-4
+- Changeset 6226 + 6228
+- disable SELinux in EL-5
+
 * Sat Dec 29 2007 Remi Collet <Fedora at FamilleCollet.com> - 0.70-3
 - Changeset 6191 + 6194 + 6196