diff --git a/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php b/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php index c41c8a216fdf93fc07d09248531b006c235278a6..4a3977a7d606c1bc6b6774e049915f12b8f8e58a 100755 --- a/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php +++ b/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php @@ -107,7 +107,6 @@ abstract class business_app_tools_Abstract extends Database $_SESSION['config']['debug'] = (string) $config->debug; $_SESSION['config']['applicationname'] = (string) $config->applicationname; $_SESSION['config']['defaultPage'] = (string) $config->defaultPage; - $_SESSION['config']['exportdirectory'] = (string) $config->exportdirectory; $_SESSION['config']['cookietime'] = (string) $config->CookieTime; $_SESSION['config']['userdefaultpassword'] = (string) $config->userdefaultpassword; $_SESSION['config']['usePHPIDS'] = (string) $config->usePHPIDS; diff --git a/apps/maarch_entreprise/xml/config.xml.default b/apps/maarch_entreprise/xml/config.xml.default index b2275f16dc106f2a564ab334cee67ab0a213724d..4733e5a56f0498540dce6951f54de4ea8091c153 100755 --- a/apps/maarch_entreprise/xml/config.xml.default +++ b/apps/maarch_entreprise/xml/config.xml.default @@ -16,7 +16,6 @@ <debug>false</debug> <applicationname>MAARCH 18.10</applicationname> <defaultPage>welcome</defaultPage> - <exportdirectory/> <CookieTime>20</CookieTime> <!-- minutes --> <timezone>Europe/Paris</timezone> <userdefaultpassword>maarch</userdefaultpassword> <!-- default user's password --> diff --git a/sql/structure.sql b/sql/structure.sql index 3a2055b42791ebc47b53400cfcac7eff63c00128..432ba78280fe3aeb1ef83219bb6941e51abf6495 100755 --- a/sql/structure.sql +++ b/sql/structure.sql @@ -2142,3 +2142,16 @@ CREATE TABLE contacts_filling CONSTRAINT contacts_filling_pkey PRIMARY KEY (id) ) WITH (OIDS=FALSE); + +/* Sender/Recipient */ +DROP TABLE IF EXISTS resource_contacts; +CREATE TABLE resource_contacts +( + id serial NOT NULL, + res_id int NOT NULL, + item_id int NOT NULL, + type character varying(32) NOT NULL, + mode character varying(32) NOT NULL, + CONSTRAINT resource_contacts_pkey PRIMARY KEY (id) +) +WITH (OIDS=FALSE);