From 0ded7f6bdff84f5a6ce68b4ff5db6a0f61d7f8f6 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Sun, 27 Nov 2016 17:34:53 +0100 Subject: [PATCH] =?UTF-8?q?`upload.php::local=5Fdata`=20correction=20de=20?= =?UTF-8?q?l'upload=20et=20la=20v=C3=A9rification=20de=20`checkContacts`?= =?UTF-8?q?=20avec=20`existing`=20pas=20tjs=20pr=C3=A9sent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- autoloader.php | 2 +- build/api/module/upload.php | 17 ++++++++--------- public_html/src/upload/local_data/.json | 1 + public_html/src/upload/local_data/xdrm.json | 1 - public_html/view/js/input.js | 2 +- public_html/view/js/min/input.js | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 public_html/src/upload/local_data/.json delete mode 100644 public_html/src/upload/local_data/xdrm.json diff --git a/autoloader.php b/autoloader.php index 5150cf1..25b9bcc 100644 --- a/autoloader.php +++ b/autoloader.php @@ -56,7 +56,7 @@ /* [3] Gestion des droits des utilisateurs =========================================================*/ /* (1) Retourne si l'utilisateur est connecte ou non */ - function connected(){ return isset($_SESSION['permission']) && count($_SESSION['permission']); } + function connected(){ return isset($_SESSION['permission']) && is_array($_SESSION['permission']); } /* (2) Retourne si l'utilisateur a le status en question */ function permission($type){ return connected() && in_array($type, $_SESSION['permission']); } diff --git a/build/api/module/upload.php b/build/api/module/upload.php index 4d97c63..cfdc68e 100644 --- a/build/api/module/upload.php +++ b/build/api/module/upload.php @@ -48,7 +48,7 @@ /* [3] Construction du chemin =========================================================*/ /* (1) On construit le chemin */ - $path = __BUILD__.$uploadAuth['root'].'/'.$prefix.'/'; + $path = __PUBLIC__.$uploadAuth['root'].'/'.$prefix.'/'; /* (2) On crée le dossier s'il n'existe pas */ if ( !file_exists($path) ) mkdir($path, 0775, true); @@ -82,8 +82,8 @@ */ private static function simpleFile($prefix, $extension, $file, $tester){ // Si on est pas connecté, on retourne une erreur -> impossible via token - if( !connected() ) return [ 'error' => ManagerError::PermissionError ]; - if( !file_exists($file['tmp_name']) ) return [ 'error' => ManagerError::UnreachableResource ]; + if( !connected() ) return ManagerError::PermissionError; + if( !file_exists($file['tmp_name']) ) return ManagerError::UnreachableResource; /* [1] On récupère le chemin du fichier à créer et vérifie le dossier @@ -167,10 +167,11 @@ /* (4) Vérification des contacts */ foreach($json['contacts'] as $contact){ $checkContact = isset($contact['uid']) && is_numeric($contact['uid']); - $checkContact = $checkContact && isset($contact['username']) && is_string($contact['username']); - // Existing ou username.length > 0 - $checkContact = $checkContact && isset($contact['existing']); - $checkContact = $checkContact && ( strlen($contact['username']) > 0 || intval($contact['existing']) == $contact['existing'] ); + $checkContact = $checkContact && ( + ( isset($contact['username']) && is_string($contact['username']) ) + || + ( isset($contact['existing']) && is_numeric($contact['existing']) ) + ); // $checkContact = $checkContact && isset($contact['sms']) && is_numeric($contact['sms']); // $checkContact = $checkContact && isset($contact['call']) && is_numeric($contact['call']); // $checkContact = $checkContact && isset($contact['countsms']) && is_numeric($contact['countsms']); @@ -182,7 +183,6 @@ } - /* (5) Vérification des mini-fiches */ foreach($json['mini'] as $mini){ $checkMini = isset($mini['uid']) && is_numeric($mini['uid']); @@ -199,7 +199,6 @@ } - /* (6) Vérification des fiches */ foreach($json['fiches'] as $fiches){ $checkFiche = isset($fiches['uid']) && is_numeric($fiches['uid']); diff --git a/public_html/src/upload/local_data/.json b/public_html/src/upload/local_data/.json new file mode 100644 index 0000000..dfcbb04 --- /dev/null +++ b/public_html/src/upload/local_data/.json @@ -0,0 +1 @@ +{"subject":{"subject_id":"1"},"contacts":{"0":{"uid":0,"username":"contact-x","existing":".","hash":4049848760},"1":{"uid":1,"username":"contact-1","existing":".","hash":480850802},"2":{"uid":2,"username":"contact-2","existing":".","hash":3700645528},"3":{"uid":3,"username":"contact-3","existing":".","hash":2625993278},"4":{"uid":4,"username":"contact-4","existing":".","hash":2274788109},"5":{"uid":5,"username":"contact-5","existing":".","hash":3347097515},"6":{"uid":6,"username":"contact-6","existing":".","hash":129681985},"7":{"uid":7,"username":"contact-7","existing":".","hash":1202515687},"8":{"uid":8,"username":"contact-8","existing":".","hash":832387111},"9":{"uid":9,"username":"contact-9","existing":".","hash":1904942209},"10":{"uid":10,"username":"contact-10"},"11":{"uid":11,"username":"contact-11"},"12":{"uid":12,"username":"contact-12"},"13":{"uid":13,"username":"contact-13"},"14":{"uid":14,"username":"contact-14"},"15":{"uid":15,"username":"contact-15"},"16":{"uid":16,"username":"contact-16"},"17":{"uid":17,"username":"contact-17"},"18":{"uid":18,"username":"contact-18"},"19":{"uid":19,"username":"contact-19"},"20":{"uid":20,"username":"contact-x"},"21":{"uid":21,"username":"contact-21"},"22":{"uid":22,"username":"contact-22"},"23":{"uid":23,"username":"contact-23"},"24":{"uid":24,"username":"contact-24"},"25":{"uid":25,"username":"contact-25"},"26":{"uid":26,"username":"contact-26"},"27":{"uid":27,"username":"contact-27"},"28":{"uid":28,"username":"contact-28"},"29":{"uid":29,"username":"contact-29"},"30":{"uid":30,"username":"contact-30"},"31":{"uid":31,"username":"contact-31"},"32":{"uid":32,"username":"contact-32"},"33":{"uid":33,"username":"contact-33"},"34":{"uid":34,"username":"contact-34"},"35":{"uid":35,"username":"contact-35"},"36":{"uid":36,"username":"contact-36"},"37":{"uid":37,"username":"contact-37"},"38":{"uid":38,"username":"contact-38"},"39":{"uid":39,"username":"contact-39"},"40":{"uid":40,"username":"contact-x"},"41":{"uid":41,"username":"contact-41"},"42":{"uid":42,"username":"contact-42"},"43":{"uid":43,"username":"contact-43"},"44":{"uid":44,"username":"contact-44"}},"mini":{"40":{"contact":40,"sexe":"2","age":".","studies":"0","loc":"0","reltype":"4","reltypeSpecial":"","unknown":false,"uid":40,"hash":2131767284,"valid":false,"timestamp":1480262797964},"41":{"contact":41,"sexe":"2","age":".","studies":"0","loc":".","reltype":"9","reltypeSpecial":"","unknown":false,"timestamp":0,"valid":false,"uid":41,"hash":3814988093},"42":{"contact":42,"sexe":"2","age":".","studies":"0","loc":".","reltype":"9","reltypeSpecial":"","unknown":false,"timestamp":0,"valid":false,"uid":42,"hash":1502973455},"43":{"contact":43,"sexe":"2","age":".","studies":"0","loc":".","reltype":"9","reltypeSpecial":"","unknown":false,"timestamp":0,"valid":false,"uid":43,"hash":809172193},"44":{"contact":44,"sexe":"2","age":".","studies":"0","loc":".","reltype":"9","reltypeSpecial":"","unknown":false,"timestamp":0,"valid":false,"uid":44,"hash":4144473642}},"fiches":{"0":{"sexe":"2","age":".","interest":"0","relmark":"0","job":"73","famsit":"0","studies":"08","reltype":"4","reltypeSpecial":"","city":"30","quartier":"20","cp":"10020","loc":"0","duration":["20","120"],"context":"6","medsoc":"0","medrel":"2","contextSpecial":["","",""],"freq":["0","5","10","15","20"],"irlfreq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":0,"contact":0,"hash":2448739354,"valid":true,"timestamp":1480262797855},"1":{"sexe":"1","age":"1","interest":"1","relmark":"1","job":"21","famsit":"1","studies":"01","reltype":"1","reltypeSpecial":"","city":"11","quartier":"1","cp":"10001","loc":"1","duration":["1","11"],"context":"1","medsoc":"1","medrel":"1","contextSpecial":["","",""],"freq":["1","6","11","16","21"],"irlfreq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":1,"contact":1,"hash":865669108,"valid":true,"timestamp":1480262537051},"2":{"sexe":"2","age":"2","interest":"2","relmark":"2","job":"22","famsit":"2","studies":"02","reltype":"2","reltypeSpecial":"","city":"12","quartier":"2","cp":"10002","loc":"2","duration":["2","12"],"context":"2","medsoc":"2","medrel":"2","contextSpecial":["","",""],"freq":["2","7","12","17","22"],"irlfreq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":2,"contact":2,"hash":3813968270,"valid":true,"timestamp":1480262795382},"3":{"sexe":"0","age":"3","interest":"3","relmark":"3","job":"23","famsit":"3","studies":"03","reltype":"3","reltypeSpecial":"","city":"13","quartier":"3","cp":"10003","loc":"3","duration":["3","13"],"context":"3","medsoc":"3","medrel":"0","contextSpecial":["","",""],"freq":["3","8","13","18","23"],"irlfreq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":3,"contact":3,"hash":1751660689,"valid":true,"timestamp":1480262582214},"4":{"sexe":"1","age":"4","interest":"4","relmark":"4","job":"31","famsit":"0","studies":"04","reltype":"4","reltypeSpecial":"","city":"14","quartier":"4","cp":"10004","loc":"0","duration":["4","14"],"context":"4","medsoc":"0","medrel":"1","contextSpecial":["","",""],"freq":["0","5","10","15","20"],"irlfreq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":4,"contact":4,"hash":3281345458,"valid":true,"timestamp":1480262795606},"5":{"sexe":"2","age":"5","interest":"0","relmark":"0","job":"32","famsit":"1","studies":"05","reltype":"5","reltypeSpecial":"","city":"15","quartier":"5","cp":"10005","loc":"1","duration":["5","15"],"context":"5","medsoc":"1","medrel":"2","contextSpecial":["","",""],"freq":["1","6","11","16","21"],"irlfreq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":5,"contact":5,"hash":2612355850,"valid":true,"timestamp":1480262582771},"6":{"sexe":"0","age":"6","interest":"1","relmark":"1","job":"36","famsit":"2","studies":"06","reltype":"6","reltypeSpecial":"","city":"16","quartier":"6","cp":"10006","loc":"2","duration":["6","16"],"context":"6","medsoc":"2","medrel":"0","contextSpecial":["","",""],"freq":["2","7","12","17","22"],"irlfreq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":6,"contact":6,"hash":1740449459,"valid":true,"timestamp":1480262795953},"7":{"sexe":"1","age":"7","interest":"2","relmark":"2","job":"41","famsit":"3","studies":"07","reltype":"10","reltypeSpecial":"autre","city":"17","quartier":"7","cp":"10007","loc":"3","duration":["7","17"],"context":"7","medsoc":"3","medrel":"1","contextSpecial":["","",""],"freq":["3","8","13","18","23"],"irlfreq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":7,"contact":7,"hash":611991831,"valid":true,"timestamp":1480262583633},"8":{"sexe":"2","age":"8","interest":"3","relmark":"3","job":"46","famsit":"0","studies":"08","reltype":"0","reltypeSpecial":"","city":"18","quartier":"8","cp":"10008","loc":"0","duration":["8","18"],"context":"8","medsoc":"0","medrel":"2","contextSpecial":["","",""],"freq":["0","5","10","15","20"],"irlfreq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":8,"contact":8,"hash":2327523302,"valid":true,"timestamp":1480262796221},"9":{"sexe":"0","age":"9","interest":"4","relmark":"4","job":"47","famsit":"1","studies":"09","reltype":"1","reltypeSpecial":"","city":"19","quartier":"9","cp":"10009","loc":"1","duration":["9","19"],"context":"9","medsoc":"1","medrel":"0","contextSpecial":["","",""],"freq":["1","6","11","16","21"],"irlfreq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":9,"contact":9,"hash":1938923971,"valid":true,"timestamp":1480262584221},"10":{"sexe":"1","age":"10","interest":"0","relmark":"0","job":"48","famsit":"2","studies":"10","reltype":"2","reltypeSpecial":"","city":"20","quartier":"10","cp":"10010","loc":"2","duration":["10","110"],"context":"10","medsoc":"2","medrel":"1","contextSpecial":["","",""],"freq":["2","7","12","17","22"],"irlfreq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":10,"contact":10,"hash":2054772991,"valid":true,"timestamp":1480262796478},"11":{"sexe":"2","age":"11","interest":"1","relmark":"1","job":"51","famsit":"3","studies":"11","reltype":"3","reltypeSpecial":"","city":"21","quartier":"11","cp":"10011","loc":"3","duration":["11","111"],"context":"11","medsoc":"3","medrel":"2","contextSpecial":["internet","",""],"freq":["3","8","13","18","23"],"irlfreq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":11,"contact":11,"hash":146325425,"valid":true,"timestamp":1480262584720},"12":{"sexe":"0","age":"12","interest":"2","relmark":"2","job":"54","famsit":"0","studies":"","reltype":"4","reltypeSpecial":"","city":"22","quartier":"12","cp":"10012","loc":"0","duration":["12","112"],"context":"12","medsoc":"0","medrel":"0","contextSpecial":["","association",""],"freq":["0","5","10","15","20"],"irlfreq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":12,"contact":12,"hash":932127720,"valid":true,"timestamp":1480262796711},"13":{"sexe":"1","age":"13","interest":"3","relmark":"3","job":"55","famsit":"1","studies":"01","reltype":"5","reltypeSpecial":"","city":"23","quartier":"13","cp":"10013","loc":"1","duration":["13","113"],"context":"13","medsoc":"1","medrel":"1","contextSpecial":["","","autre"],"freq":["1","6","11","16","21"],"irlfreq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":13,"contact":13,"hash":3870613695,"valid":true,"timestamp":1480262585308},"14":{"sexe":"2","age":"14","interest":"4","relmark":"4","job":"56","famsit":"2","studies":"02","reltype":"6","reltypeSpecial":"","city":"24","quartier":"14","cp":"10014","loc":"2","duration":["14","114"],"context":"0","medsoc":"2","medrel":"2","contextSpecial":["","",""],"freq":["2","7","12","17","22"],"irlfreq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":14,"contact":14,"hash":2432458727,"valid":true,"timestamp":1480262796969},"15":{"sexe":"0","age":"15","interest":"0","relmark":"0","job":"61","famsit":"3","studies":"03","reltype":"10","reltypeSpecial":"autre","city":"25","quartier":"15","cp":"10015","loc":"3","duration":["15","115"],"context":"1","medsoc":"3","medrel":"0","contextSpecial":["","",""],"freq":["3","8","13","18","23"],"irlfreq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":15,"contact":15,"hash":1894161439,"valid":true,"timestamp":1480262585584},"16":{"sexe":"1","age":"16","interest":"1","relmark":"1","job":"66","famsit":"0","studies":"04","reltype":"0","reltypeSpecial":"","city":"26","quartier":"16","cp":"10016","loc":"0","duration":["16","116"],"context":"2","medsoc":"0","medrel":"1","contextSpecial":["","",""],"freq":["0","5","10","15","20"],"irlfreq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":16,"contact":16,"hash":3709255833,"valid":true,"timestamp":1480262797332},"17":{"sexe":"2","age":"17","interest":"2","relmark":"2","job":"69","famsit":"1","studies":"05","reltype":"1","reltypeSpecial":"","city":"27","quartier":"17","cp":"10017","loc":"1","duration":["17","117"],"context":"3","medsoc":"1","medrel":"2","contextSpecial":["","",""],"freq":["1","6","11","16","21"],"irlfreq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":17,"contact":17,"hash":2715016153,"valid":true,"timestamp":1480262585832},"18":{"sexe":"0","age":"18","interest":"3","relmark":"3","job":"71","famsit":"2","studies":"06","reltype":"2","reltypeSpecial":"","city":"28","quartier":"18","cp":"10018","loc":"2","duration":["18","118"],"context":"4","medsoc":"2","medrel":"0","contextSpecial":["","",""],"freq":["2","7","12","17","22"],"irlfreq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":18,"contact":18,"hash":2401144186,"valid":true,"timestamp":1480262797600},"19":{"sexe":"1","age":"0","interest":"4","relmark":"4","job":"72","famsit":"3","studies":"07","reltype":"3","reltypeSpecial":"","city":"29","quartier":"19","cp":"10019","loc":"3","duration":["19","119"],"context":"5","medsoc":"3","medrel":"1","contextSpecial":["","",""],"freq":["3","8","13","18","23"],"irlfreq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":19,"contact":19,"hash":629477506,"valid":true,"timestamp":1480262586055},"20":{"sexe":"2","age":".","interest":"0","relmark":"0","job":"73","famsit":"0","studies":"08","reltype":"4","reltypeSpecial":"","city":"30","quartier":"20","cp":"10020","loc":"0","duration":["20","120"],"context":"6","medsoc":"0","medrel":"2","contextSpecial":["","",""],"freq":["0","5","10","15","20"],"irlfreq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":20,"contact":20,"hash":3546086924,"valid":true,"timestamp":1480262797855},"21":{"sexe":"0","age":"2","interest":"1","relmark":"1","job":"74","famsit":"1","studies":"09","reltype":"5","reltypeSpecial":"","city":"31","quartier":"21","cp":"10021","loc":"1","duration":["21","121"],"context":"7","medsoc":"1","medrel":"0","contextSpecial":["","",""],"freq":["1","6","11","16","21"],"irlfreq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":21,"contact":21,"hash":596973097,"valid":true,"timestamp":1480262586267},"22":{"sexe":"1","age":"3","interest":"2","relmark":"2","job":"75","famsit":"2","studies":"10","reltype":"6","reltypeSpecial":"","city":"32","quartier":"22","cp":"10022","loc":"2","duration":["22","122"],"context":"8","medsoc":"2","medrel":"1","contextSpecial":["","",""],"freq":["2","7","12","17","22"],"irlfreq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":22,"contact":22,"hash":377519293,"valid":true,"timestamp":1480262798164},"23":{"sexe":"2","age":"4","interest":"3","relmark":"3","job":"76","famsit":"3","studies":"11","reltype":"10","reltypeSpecial":"autre","city":"33","quartier":"23","cp":"10023","loc":"3","duration":["23","123"],"context":"9","medsoc":"3","medrel":"2","contextSpecial":["","",""],"freq":["3","8","13","18","23"],"irlfreq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":23,"contact":23,"hash":2854932022,"valid":true,"timestamp":1480262586605},"24":{"sexe":"0","age":"5","interest":"4","relmark":"4","job":"81","famsit":"0","studies":"","reltype":"0","reltypeSpecial":"","city":"34","quartier":"24","cp":"10024","loc":"0","duration":["24","124"],"context":"10","medsoc":"0","medrel":"0","contextSpecial":["","",""],"freq":["0","5","10","15","20"],"irlfreq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":24,"contact":24,"hash":2193009114,"valid":true,"timestamp":1480262798387},"25":{"sexe":"1","age":"6","interest":"0","relmark":"0","job":"82","famsit":"1","studies":"01","reltype":"1","reltypeSpecial":"","city":"35","quartier":"25","cp":"10025","loc":"1","duration":["25","125"],"context":"11","medsoc":"1","medrel":"1","contextSpecial":["internet","",""],"freq":["1","6","11","16","21"],"irlfreq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":25,"contact":25,"hash":3605584947,"valid":true,"timestamp":1480262586834},"26":{"sexe":"2","age":"7","interest":"1","relmark":"1","job":"10","famsit":"2","studies":"02","reltype":"2","reltypeSpecial":"","city":"36","quartier":"26","cp":"10026","loc":"2","duration":["26","126"],"context":"12","medsoc":"2","medrel":"2","contextSpecial":["","association",""],"freq":["2","7","12","17","22"],"irlfreq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":26,"contact":26,"hash":328221768,"valid":true,"timestamp":1480262798625},"27":{"sexe":"0","age":"8","interest":"2","relmark":"2","job":"21","famsit":"3","studies":"03","reltype":"3","reltypeSpecial":"","city":"37","quartier":"27","cp":"10027","loc":"3","duration":["27","127"],"context":"13","medsoc":"3","medrel":"0","contextSpecial":["","","autre"],"freq":["3","8","13","18","23"],"irlfreq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":27,"contact":27,"hash":3072076881,"valid":true,"timestamp":1480262587089},"28":{"sexe":"1","age":"9","interest":"3","relmark":"3","job":"22","famsit":"0","studies":"04","reltype":"4","reltypeSpecial":"","city":"38","quartier":"28","cp":"10028","loc":"0","duration":["28","128"],"context":"0","medsoc":"0","medrel":"1","contextSpecial":["","",""],"freq":["0","5","10","15","20"],"irlfreq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":28,"contact":28,"hash":328170044,"valid":true,"timestamp":1480262798844},"29":{"sexe":"2","age":"10","interest":"4","relmark":"4","job":"23","famsit":"1","studies":"05","reltype":"5","reltypeSpecial":"","city":"39","quartier":"29","cp":"10029","loc":"1","duration":["29","129"],"context":"1","medsoc":"1","medrel":"2","contextSpecial":["","",""],"freq":["1","6","11","16","21"],"irlfreq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":29,"contact":29,"hash":3048629884,"valid":true,"timestamp":1480262587380},"30":{"sexe":"0","age":"11","interest":"0","relmark":"0","job":"31","famsit":"2","studies":"06","reltype":"6","reltypeSpecial":"","city":"40","quartier":"30","cp":"10030","loc":"2","duration":["30","130"],"context":"2","medsoc":"2","medrel":"0","contextSpecial":["","",""],"freq":["2","7","12","17","22"],"irlfreq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":30,"contact":30,"hash":2674644843,"valid":true,"timestamp":1480262799178},"31":{"sexe":"1","age":"12","interest":"1","relmark":"1","job":"32","famsit":"3","studies":"07","reltype":"10","reltypeSpecial":"autre","city":"41","quartier":"31","cp":"10031","loc":"3","duration":["31","131"],"context":"3","medsoc":"3","medrel":"1","contextSpecial":["","",""],"freq":["3","8","13","18","23"],"irlfreq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":31,"contact":31,"hash":4012808490,"valid":true,"timestamp":1480262587638},"32":{"sexe":"2","age":"13","interest":"2","relmark":"2","job":"36","famsit":"0","studies":"08","reltype":"0","reltypeSpecial":"","city":"42","quartier":"32","cp":"10032","loc":"0","duration":["32","132"],"context":"4","medsoc":"0","medrel":"2","contextSpecial":["","",""],"freq":["0","5","10","15","20"],"irlfreq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":32,"contact":32,"hash":2318387796,"valid":true,"timestamp":1480262799409},"33":{"sexe":"0","age":"14","interest":"3","relmark":"3","job":"41","famsit":"1","studies":"09","reltype":"1","reltypeSpecial":"","city":"43","quartier":"33","cp":"10033","loc":"1","duration":["33","133"],"context":"5","medsoc":"1","medrel":"0","contextSpecial":["","",""],"freq":["1","6","11","16","21"],"irlfreq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":33,"contact":33,"hash":558965731,"valid":true,"timestamp":1480262587960},"34":{"sexe":"1","age":"15","interest":"4","relmark":"4","job":"46","famsit":"2","studies":"10","reltype":"2","reltypeSpecial":"","city":"44","quartier":"34","cp":"10034","loc":"2","duration":["34","134"],"context":"6","medsoc":"2","medrel":"1","contextSpecial":["","",""],"freq":["2","7","12","17","22"],"irlfreq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":34,"contact":34,"hash":4142975735,"valid":true,"timestamp":1480262799734},"35":{"sexe":"2","age":"16","interest":"0","relmark":"0","job":"47","famsit":"3","studies":"11","reltype":"3","reltypeSpecial":"","city":"45","quartier":"35","cp":"10035","loc":"3","duration":["35","135"],"context":"7","medsoc":"3","medrel":"2","contextSpecial":["","",""],"freq":["3","8","13","18","23"],"irlfreq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":35,"contact":35,"hash":1619935067,"valid":true,"timestamp":1480262588193},"36":{"sexe":"0","age":"17","interest":"1","relmark":"1","job":"48","famsit":"0","studies":"","reltype":"4","reltypeSpecial":"","city":"46","quartier":"36","cp":"10036","loc":"0","duration":["36","136"],"context":"8","medsoc":"0","medrel":"0","contextSpecial":["","",""],"freq":["0","5","10","15","20"],"irlfreq":["0","5","10","15","20"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":36,"contact":36,"hash":1843330868,"valid":true,"timestamp":1480262799935},"37":{"sexe":"1","age":"18","interest":"2","relmark":"2","job":"51","famsit":"1","studies":"01","reltype":"5","reltypeSpecial":"","city":"47","quartier":"37","cp":"10037","loc":"1","duration":["37","137"],"context":"9","medsoc":"1","medrel":"1","contextSpecial":["","",""],"freq":["1","6","11","16","21"],"irlfreq":["1","6","11","16","21"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":37,"contact":37,"hash":2066689081,"valid":true,"timestamp":1480262588469},"38":{"sexe":"2","age":"0","interest":"3","relmark":"3","job":"54","famsit":"2","studies":"02","reltype":"6","reltypeSpecial":"","city":"48","quartier":"38","cp":"10038","loc":"2","duration":["38","138"],"context":"10","medsoc":"2","medrel":"2","contextSpecial":["","",""],"freq":["2","7","12","17","22"],"irlfreq":["2","7","12","17","22"],"connect":["0","2","4","6","8","10"],"connectSpecial":["",""],"uid":38,"contact":38,"hash":4098584431,"valid":true,"timestamp":1480262800225},"39":{"sexe":"0","age":"1","interest":"4","relmark":"4","job":"55","famsit":"3","studies":"03","reltype":"10","reltypeSpecial":"autre","city":"49","quartier":"39","cp":"10039","loc":"3","duration":["39","139"],"context":"11","medsoc":"3","medrel":"0","contextSpecial":["internet","",""],"freq":["3","8","13","18","23"],"irlfreq":["3","8","13","18","23"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"uid":39,"contact":39,"hash":3737786050,"valid":true,"timestamp":1480262603547}},"matrice":{}} \ No newline at end of file diff --git a/public_html/src/upload/local_data/xdrm.json b/public_html/src/upload/local_data/xdrm.json deleted file mode 100644 index 34d0533..0000000 --- a/public_html/src/upload/local_data/xdrm.json +++ /dev/null @@ -1 +0,0 @@ -{"subject":{"tmp_id":"","subject_id":"1"},"contacts":{"0":{"uid":0,"number":"","username":"","call":-1,"sms":-1,"countcall":0,"countsms":0,"existing":18,"hash":898112018}},"mini":{},"fiches":{"0":{"contact":0,"uid":0,"sexe":"0","age":"9","job":"56","famsit":"0","studies":"06","reltype":"3","reltypeSpecial":"","city":"76","quartier":"66","cp":"10066","loc":"2","duration":["66","166"],"context":"10","contextSpecial":["","",""],"freq":["4","9","14","19","24"],"connect":["1","3","5","7","9","11"],"connectSpecial":["",""],"hash":4117636975,"valid":true,"timestamp":1474798137256}},"matrice":{}} \ No newline at end of file diff --git a/public_html/view/js/input.js b/public_html/view/js/input.js index 36142ec..5b710c6 100644 --- a/public_html/view/js/input.js +++ b/public_html/view/js/input.js @@ -210,7 +210,7 @@ var phoneRoutine = function(){ /* (2) On lance le téléchargement */ var downloadTarget = $('[data-sublink="phone"] #p_download-target'); // On récupère le lien () caché qui fera le téléchargement - downloadTarget.download = 'local-facebook-data.json'; // Nom du fichier qui sera téléchargé + downloadTarget.download = 'local-phone-data.json'; // Nom du fichier qui sera téléchargé downloadTarget.href = 'data:application/octet-stream,' + encodeURIComponent(JSON.stringify(data)); // Contenu downloadTarget.click(); // On lance le téléchargement diff --git a/public_html/view/js/min/input.js b/public_html/view/js/min/input.js index e9817cc..0b560c5 100644 --- a/public_html/view/js/min/input.js +++ b/public_html/view/js/min/input.js @@ -5,7 +5,7 @@ a.join("")})};sSubmit.addEventListener("click",tmpSubjectSearchListener,!1);sFie var pAlready=0,pLoaded=[0,0,0,0,0],phoneRoutine=function(){!Math.min.apply(Math,pLoaded)|pAlready||(pAlready=1,console.groupEnd(),console.group("[phone] Initialization"),pSubjectManager=new inputPhoneSubject($('[data-sublink="phone"] article.subject-panel [data-name="subject_id"]'),$('[data-sublink="phone"] article.subject-panel [data-name="submit"]')),pSubjectManager.attach(pDynamicUpdate),pContactManager=new inputPhoneContact($('[data-sublink="phone"] article.contact-panel'),$('[data-sublink="phone"] #p_nav-contact')), pContactManager.attach(pDynamicUpdate),pMiniManager=new inputPhoneMini($('[data-sublink="phone"] article.mini-relation-panel'),$('[data-sublink="phone"] #p_nav-mini')),pMiniManager.attach(pDynamicUpdate),pFicheManager=new inputPhoneFiche($('[data-sublink="phone"] article.relation-panel'),$('[data-sublink="phone"] #p_nav-fiche')),pFicheManager.top_size=20,pFicheManager.attach(pDynamicUpdate),pMatriceManager=new inputPhoneMatrice($('[data-sublink="phone"] article.matrice-panel')),pMatriceManager.attach(pDynamicUpdate), $('[data-sublink="phone"] #p_clear-all').addEventListener("click",function(a){lsi.clear("p_subject");lsi.clear("p_contacts");lsi.clear("p_mini-fiches");lsi.clear("p_fiches");lsi.clear("p_matrice");lsi.clear("p_friends");pSubjectManager.storageToFields();pContactManager.storageToFields();pMiniManager.storageToFields();pFicheManager.storageToFields();pMatriceManager.storageToFields();Notification.success("OK","Les donn\u00e9es ont \u00e9t\u00e9 supprim\u00e9es")},!1),$('[data-sublink="phone"] #p_export-all').addEventListener("click", -function(a){Notification.info("INFORMATION","Lancement du t\u00e9l\u00e9chargement de la sauvegarde");a={subject:lsi["export"]("p_subject")[0],contacts:lsi["export"]("p_contacts"),mini:lsi["export"]("p_mini-fiches"),fiches:lsi["export"]("p_fiches"),matrice:lsi["export"]("p_matrice")[0]};var b=$('[data-sublink="phone"] #p_download-target');b.download="local-facebook-data.json";b.href="data:application/octet-stream,"+encodeURIComponent(JSON.stringify(a));b.click()},!1),$('[data-sublink="phone"] #p_import-all').addEventListener("click", +function(a){Notification.info("INFORMATION","Lancement du t\u00e9l\u00e9chargement de la sauvegarde");a={subject:lsi["export"]("p_subject")[0],contacts:lsi["export"]("p_contacts"),mini:lsi["export"]("p_mini-fiches"),fiches:lsi["export"]("p_fiches"),matrice:lsi["export"]("p_matrice")[0]};var b=$('[data-sublink="phone"] #p_download-target');b.download="local-phone-data.json";b.href="data:application/octet-stream,"+encodeURIComponent(JSON.stringify(a));b.click()},!1),$('[data-sublink="phone"] #p_import-all').addEventListener("click", function(a){$('[data-sublink="phone"] #p_local-upload').click()},!1),$('[data-sublink="phone"] #p_local-upload').addEventListener("click",function(a){a.target.value=null},!1),$('[data-sublink="phone"] #p_local-upload').addEventListener("change",function(a){a={path:"upload/local_data",file:$('[data-sublink="phone"] #p_local-upload').files[0]};api.send(a,function(a){console.log(a);if(0!=a.ModuleError)return Notification.error("Erreur",a.ModuleError),!1;lsi.set("p_subject",0,a.local_data.subject);lsi["import"]("p_contacts", a.local_data.contacts);lsi["import"]("p_mini-fiches",a.local_data.mini);lsi["import"]("p_fiches",a.local_data.fiches);lsi.set("p_matrice",0,a.local_data.matrice);pSubjectManager.storageToFields();pContactManager.storageToFields();pMatriceManager.storageToFields();pDynamicUpdate(!0)})},!1),$('[data-sublink="phone"] #p_submit-all').addEventListener("click",function(a){console.log("> GATHERING ALL DATA");pContactManager.fieldsToStorage();pMiniManager.fieldsToStorage();pFicheManager.fieldsToStorage(); if(!pSubjectManager.check())return Notification.warning("Attention","Vous devez saisir les informations du sujet"),!1;a=lsi["export"]("p_mini-fiches");var b=0,f;for(f in a)if(!isNaN(f)&&(b++,!a[f].valid))return Notification.warning("Attention","La fiche rapide "+b+" est incompl\u00e8te et/ou incorrecte"),!1;a=lsi["export"]("p_fiches");for(f in a)if(!a[f].valid)return Notification.warning("Attention","La fiche compl\u00e8te "+(parseInt(f)+1)+" est incompl\u00e8te et/ou incorrecte"),