diff --git a/FAC/FAC_SET.SRC b/FAC/FAC_SET.SRC index 99fa66ca..29e9c93e 100644 --- a/FAC/FAC_SET.SRC +++ b/FAC/FAC_SET.SRC @@ -478,7 +478,6 @@ DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'inline_actions_hamburger' DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'inline_actions_mld' , 'number' , '1' , 'Show inline actions in MLD-list {0=No | 1=Yes | 2=Yes, but suppress in embedded lists}') DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'kosten_klant_default' , 'number' , '1' , 'initial status of kosten klant checkbox { 0 - unchecked | 1 - checked }') DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'login_remember_days' , 'number' , '30' , 'Days to remember login. { 0 disable }') -DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'login_use_email' , 'number' , '0' , 'use email to check user authentication { 0 - use oslogin | 1 - use email }') DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'logoff_return_url' , 'string' , '../../' , 'Return url to go to after log off') DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'max_horizontal_blocks' , 'number' , '3' , 'Max. horizontal blocks in detail-frames') DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'max_tracking_length' , 'number' , '30' , 'Max. displayed length of single value in a tracking line, longer values are summarized') diff --git a/FAC/FAC_TAB.SRC b/FAC/FAC_TAB.SRC index d56fd5f3..6255eb0d 100644 --- a/FAC/FAC_TAB.SRC +++ b/FAC/FAC_TAB.SRC @@ -1191,7 +1191,7 @@ CREATE_TABLE(fac_imp_perslid, 0) ,prs_perslid_email VARCHAR2 (200) ,prs_srtperslid_omschrijving VARCHAR2 (100) ,prs_perslid_nr VARCHAR2 (16) - ,prs_perslid_oslogin VARCHAR2 (30) + ,prs_perslid_oslogin VARCHAR2 (256) ,prs_perslid_wachtwoord VARCHAR2 (30) ,prs_perslid_partner_naam VARCHAR2(60) ,prs_perslid_partner_tussenv VARCHAR2(15) diff --git a/PRS/PRS_PAC.SRC b/PRS/PRS_PAC.SRC index db2cf245..084caf70 100644 --- a/PRS/PRS_PAC.SRC +++ b/PRS/PRS_PAC.SRC @@ -1773,9 +1773,9 @@ AS v_errorhint := 'Ongeldige loginnaam'; v_prs_perslid_oslogin := TRIM (v_prs_perslid_oslogin); - IF LENGTH (v_prs_perslid_oslogin) > 30 + IF LENGTH (v_prs_perslid_oslogin) > 256 THEN - v_prs_perslid_oslogin := SUBSTR (v_prs_perslid_oslogin, 1, 30); + v_prs_perslid_oslogin := SUBSTR (v_prs_perslid_oslogin, 1, 256); fac.imp_writelog ( p_import_key, 'W', diff --git a/PRS/PRS_TAB.SRC b/PRS/PRS_TAB.SRC index 206bc4d3..f262dbef 100644 --- a/PRS/PRS_TAB.SRC +++ b/PRS/PRS_TAB.SRC @@ -646,7 +646,7 @@ CREATE_TABLE(prs_perslid,0) prs_perslid_nr VARCHAR2(16), prs_perslid_oslogin - VARCHAR2(30) + VARCHAR2(256) CONSTRAINT prs_c_prs_perslid_oslogin UNIQUE, prs_perslid_oslogin2 VARCHAR2(30) diff --git a/PRS/PRS_TRI.SRC b/PRS/PRS_TRI.SRC index 618a4e72..e6981ead 100644 --- a/PRS/PRS_TRI.SRC +++ b/PRS/PRS_TRI.SRC @@ -300,19 +300,12 @@ BEGIN END IF; END IF; - IF (NVL(:new.prs_perslid_wachtwoord_hash, 'X') <> NVL(:old.prs_perslid_wachtwoord_hash, 'X')) - OR ( fac.getsetting ('login_use_email') = 0 - AND ( :new.prs_perslid_oslogin IS NULL AND :old.prs_perslid_oslogin IS NOT NULL - OR :new.prs_perslid_oslogin2 IS NULL AND :old.prs_perslid_oslogin2 IS NOT NULL - ) - ) - OR ( fac.getsetting ('login_use_email') = 1 - AND :new.prs_perslid_email IS NULL - AND :old.prs_perslid_email IS NOT NULL - ) - OR ( :new.prs_perslid_inactief IS NOT NULL - AND :old.prs_perslid_inactief IS NULL - ) + IF ( (NVL(:new.prs_perslid_wachtwoord_hash, 'X') <> NVL(:old.prs_perslid_wachtwoord_hash, 'X')) + OR (:new.prs_perslid_oslogin IS NULL AND :old.prs_perslid_oslogin IS NOT NULL) + OR (:new.prs_perslid_oslogin2 IS NULL AND :old.prs_perslid_oslogin2 IS NOT NULL) + OR (:new.prs_perslid_email IS NULL AND :old.prs_perslid_email IS NOT NULL) + OR (:new.prs_perslid_inactief IS NOT NULL AND :old.prs_perslid_inactief IS NULL) + ) THEN -- Merk op: anno 5.3.2 wordt een persoon die *nu* is ingelogd hier niet -- automatisch door uitgelogd :new.prs_perslid_credentials_datum := SYSDATE; diff --git a/_UP/DB49to50.src b/_UP/DB49to50.src index 8fc13425..989455d3 100644 --- a/_UP/DB49to50.src +++ b/_UP/DB49to50.src @@ -206,6 +206,12 @@ ALTER TABLE fac_imp_cnt , contact_naam VARCHAR2(200) ); +/////////////////////////////////////////////////////////////////////////////////////////// DHLD#86034 +ALTER TABLE prs_perslid + MODIFY prs_perslid_oslogin VARCHAR2(256); +ALTER TABLE fac_imp_perslid + MODIFY prs_perslid_oslogin VARCHAR2(256); + /////////////////////////////////////////////////////////////////////////////////////////// FCLT#00000 REGISTERONCE('$Id$')