diff --git a/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses.php b/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses.php old mode 100644 new mode 100755 index 16c8ecf6ad5d64abf189fbe182af1bf0920d2787..ff6071705500bfbae24625d2f815ffcc21c8b926 --- a/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses.php +++ b/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses.php @@ -45,8 +45,8 @@ require_once "apps" . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id'] $func = new functions(); if (isset($_REQUEST['fromMyContactsList']) || isset($_REQUEST['fromSearchContactsList'])) { - $_REQUEST['what'] = ""; - $_REQUEST['order'] = ""; + $_REQUEST['what'] = ""; + $_REQUEST['order'] = ""; $_REQUEST['order_field'] = ""; } @@ -84,73 +84,73 @@ for ($i = 0; $i < count($tab); $i ++) { for ($j = 0; $j < count($tab[$i]); $j ++) { foreach (array_keys($tab[$i][$j]) as $value) { if ($tab[$i][$j][$value] == "id") { - $tab[$i][$j]["id"] = $tab[$i][$j]['value']; - $tab[$i][$j]["label"] = _ID; - $tab[$i][$j]["size"] = "30"; + $tab[$i][$j]["id"] = $tab[$i][$j]['value']; + $tab[$i][$j]["label"] = _ID; + $tab[$i][$j]["size"] = "30"; $tab[$i][$j]["label_align"] = "left"; - $tab[$i][$j]["align"] = "left"; - $tab[$i][$j]["valign"] = "bottom"; - $tab[$i][$j]["show"] = false; - $tab[$i][$j]["order"] = 'id'; + $tab[$i][$j]["align"] = "left"; + $tab[$i][$j]["valign"] = "bottom"; + $tab[$i][$j]["show"] = false; + $tab[$i][$j]["order"] = 'id'; } if ($tab[$i][$j][$value] == "contact_id") { - $tab[$i][$j]["contact_id"] = $tab[$i][$j]['value']; - $tab[$i][$j]["label"] = _CONTACT_ID; - $tab[$i][$j]["size"] = "30"; + $tab[$i][$j]["contact_id"] = $tab[$i][$j]['value']; + $tab[$i][$j]["label"] = _CONTACT_ID; + $tab[$i][$j]["size"] = "30"; $tab[$i][$j]["label_align"] = "left"; - $tab[$i][$j]["align"] = "left"; - $tab[$i][$j]["valign"] = "bottom"; - $tab[$i][$j]["show"] = false; - $tab[$i][$j]["order"] = 'contact_id'; + $tab[$i][$j]["align"] = "left"; + $tab[$i][$j]["valign"] = "bottom"; + $tab[$i][$j]["show"] = false; + $tab[$i][$j]["order"] = 'contact_id'; } if ($tab[$i][$j][$value] == "contact_purpose_id") { - $tab[$i][$j]["value"]= $contact->get_label_contact($tab[$i][$j]['value'], $_SESSION['tablename']['contact_purposes']); + $tab[$i][$j]["value"] = $contact->get_label_contact($tab[$i][$j]['value'], $_SESSION['tablename']['contact_purposes']); $tab[$i][$j]["contact_purpose_id"] = $tab[$i][$j]['value']; - $tab[$i][$j]["label"] = _CONTACT_PURPOSE; - $tab[$i][$j]["size"] = "20"; - $tab[$i][$j]["label_align"] = "left"; - $tab[$i][$j]["align"] = "left"; - $tab[$i][$j]["valign"] = "bottom"; - $tab[$i][$j]["show"] = true; - $tab[$i][$j]["order"] = 'contact_purpose_id'; + $tab[$i][$j]["label"] = _CONTACT_PURPOSE; + $tab[$i][$j]["size"] = "20"; + $tab[$i][$j]["label_align"] = "left"; + $tab[$i][$j]["align"] = "left"; + $tab[$i][$j]["valign"] = "bottom"; + $tab[$i][$j]["show"] = true; + $tab[$i][$j]["order"] = 'contact_purpose_id'; } if ($tab[$i][$j][$value] == "departement") { $tab[$i][$j]['value'] = $request->show_string( $tab[$i][$j]['value'] ); $tab[$i][$j]["departement"] = $tab[$i][$j]['value']; - $tab[$i][$j]["label"] = _SERVICE; - $tab[$i][$j]["size"] = "20"; + $tab[$i][$j]["label"] = _SERVICE; + $tab[$i][$j]["size"] = "20"; $tab[$i][$j]["label_align"] = "left"; - $tab[$i][$j]["align"] = "left"; - $tab[$i][$j]["valign"] = "bottom"; - $tab[$i][$j]["show"] = true; - $tab[$i][$j]["order"] = 'departement'; + $tab[$i][$j]["align"] = "left"; + $tab[$i][$j]["valign"] = "bottom"; + $tab[$i][$j]["show"] = true; + $tab[$i][$j]["order"] = 'departement'; } if($tab[$i][$j][$value]=="lastname") { - $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']); - $tab[$i][$j]["lastname"]=$tab[$i][$j]['value']; - $tab[$i][$j]["label"]=_LASTNAME; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="left"; - $tab[$i][$j]["align"]="left"; - $tab[$i][$j]["valign"]="bottom"; + $tab[$i][$j]['value'] =$request->show_string($tab[$i][$j]['value']); + $tab[$i][$j]["lastname"] =$tab[$i][$j]['value']; + $tab[$i][$j]["label"] =_LASTNAME; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="left"; + $tab[$i][$j]["align"] ="left"; + $tab[$i][$j]["valign"] ="bottom"; if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") { $tab[$i][$j]["show"]=true; } else { $tab[$i][$j]["show"]=false; } - $tab[$i][$j]["order"]= "lastname"; + $tab[$i][$j]["order"] = "lastname"; } if($tab[$i][$j][$value]=="firstname") { - $tab[$i][$j]["firstname"]= $request->show_string($tab[$i][$j]['value']); - $tab[$i][$j]["label"]=_FIRSTNAME; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="left"; - $tab[$i][$j]["align"]="left"; - $tab[$i][$j]["valign"]="bottom"; + $tab[$i][$j]["firstname"] = $request->show_string($tab[$i][$j]['value']); + $tab[$i][$j]["label"] =_FIRSTNAME; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="left"; + $tab[$i][$j]["align"] ="left"; + $tab[$i][$j]["valign"] ="bottom"; if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") { $tab[$i][$j]["show"]=true; } else { @@ -160,13 +160,13 @@ for ($i = 0; $i < count($tab); $i ++) { } if($tab[$i][$j][$value]=="function") { - $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']); - $tab[$i][$j]["function"]=$tab[$i][$j]['value']; - $tab[$i][$j]["label"]=_FUNCTION; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="left"; - $tab[$i][$j]["align"]="left"; - $tab[$i][$j]["valign"]="bottom"; + $tab[$i][$j]['value'] =$request->show_string($tab[$i][$j]['value']); + $tab[$i][$j]["function"] =$tab[$i][$j]['value']; + $tab[$i][$j]["label"] =_FUNCTION; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="left"; + $tab[$i][$j]["align"] ="left"; + $tab[$i][$j]["valign"] ="bottom"; if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") { $tab[$i][$j]["show"]=true; } else { @@ -192,12 +192,12 @@ for ($i = 0; $i < count($tab); $i ++) { $tab[$i][$j]['value'] = $address_num . " " . $request->show_string($tab[$i][$j]['value']); } - $tab[$i][$j]["address_street"]= $tab[$i][$j]['value']; - $tab[$i][$j]["label"]= _ADDRESS; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="left"; - $tab[$i][$j]["align"]="left"; - $tab[$i][$j]["valign"]="bottom"; + $tab[$i][$j]["address_street"] = $tab[$i][$j]['value']; + $tab[$i][$j]["label"] = _ADDRESS; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="left"; + $tab[$i][$j]["align"] ="left"; + $tab[$i][$j]["valign"] ="bottom"; if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") { $tab[$i][$j]["show"]=false; } else { @@ -212,12 +212,12 @@ for ($i = 0; $i < count($tab); $i ++) { } else { $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']); } - $tab[$i][$j]["address_postal_code"]=$tab[$i][$j]['value']; - $tab[$i][$j]["label"]=_POSTAL_CODE; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="left"; - $tab[$i][$j]["align"]="left"; - $tab[$i][$j]["valign"]="bottom"; + $tab[$i][$j]["address_postal_code"] =$tab[$i][$j]['value']; + $tab[$i][$j]["label"] =_POSTAL_CODE; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="left"; + $tab[$i][$j]["align"] ="left"; + $tab[$i][$j]["valign"] ="bottom"; if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") { $tab[$i][$j]["show"]=false; } else { @@ -230,14 +230,14 @@ for ($i = 0; $i < count($tab); $i ++) { if ($is_private == "Y") { $tab[$i][$j]['value'] = "Confidentielle"; } - $tab[$i][$j]["address_town"]= $request->show_string($tab[$i][$j]['value']); - $tab[$i][$j]["label"]=_TOWN; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="left"; - $tab[$i][$j]["align"]="left"; - $tab[$i][$j]["valign"]="bottom"; - $tab[$i][$j]["show"]=true; - $tab[$i][$j]["order"]= "address_town"; + $tab[$i][$j]["address_town"] = $request->show_string($tab[$i][$j]['value']); + $tab[$i][$j]["label"] =_TOWN; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="left"; + $tab[$i][$j]["align"] ="left"; + $tab[$i][$j]["valign"] ="bottom"; + $tab[$i][$j]["show"] =true; + $tab[$i][$j]["order"] = "address_town"; } if($tab[$i][$j][$value]=="phone") { @@ -246,28 +246,28 @@ for ($i = 0; $i < count($tab); $i ++) { } else { $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']); } - $tab[$i][$j]["phone"]=$tab[$i][$j]['value']; - $tab[$i][$j]["label"]=_PHONE; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="left"; - $tab[$i][$j]["align"]="left"; - $tab[$i][$j]["valign"]="bottom"; - $tab[$i][$j]["show"]=true; - $tab[$i][$j]["order"]= "phone"; + $tab[$i][$j]["phone"] =$tab[$i][$j]['value']; + $tab[$i][$j]["label"] =_PHONE; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="left"; + $tab[$i][$j]["align"] ="left"; + $tab[$i][$j]["valign"] ="bottom"; + $tab[$i][$j]["show"] =true; + $tab[$i][$j]["order"] = "phone"; } if($tab[$i][$j][$value]=="email") { if ($is_private == "Y") { $tab[$i][$j]['value'] = "Confidentiel"; } - $tab[$i][$j]["email"]= $request->show_string($tab[$i][$j]['value']); - $tab[$i][$j]["label"]=_MAIL; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="center"; - $tab[$i][$j]["align"]="center"; - $tab[$i][$j]["valign"]="bottom"; - $tab[$i][$j]["show"]=true; - $tab[$i][$j]["order"]= "email"; + $tab[$i][$j]["email"] = $request->show_string($tab[$i][$j]['value']); + $tab[$i][$j]["label"] =_MAIL; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="center"; + $tab[$i][$j]["align"] ="center"; + $tab[$i][$j]["valign"] ="bottom"; + $tab[$i][$j]["show"] =true; + $tab[$i][$j]["order"] = "email"; } } } @@ -284,9 +284,9 @@ for ($i = 0; $i < count($tab); $i ++) { $paramsTab['urlParameters'] = '&dir=my_contacts&letters&display=true'; //parametre d'url supplementaire } - $paramsTab['bool_sortColumn'] = true; //Affichage Tri + $paramsTab['bool_sortColumn'] = true; //Affichage Tri $paramsTab['bool_showSearchTools'] = true; //Afficle le filtre alphabetique et le champ de recherche - $paramsTab['bool_showSearchBox'] = false; + $paramsTab['bool_showSearchBox'] = false; $paramsTab['searchBoxAutoCompletionUrl'] = $_SESSION['config']['businessappurl'] ."index.php?display=true&page=contact_addresses_list_by_name&idContact=".$_SESSION['contact']['current_contact_id']; //Script pour l'autocompletion @@ -366,4 +366,5 @@ for ($i = 0; $i < count($tab); $i ++) { } //Afficher la liste echo '<br/>'; - $list2->showList($tab, $paramsTab, 'id'); \ No newline at end of file + $list2->showList($tab, $paramsTab, 'id'); + \ No newline at end of file diff --git a/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses_add.php b/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses_add.php old mode 100644 new mode 100755 index 9afa82a9e716943246c44132e06effc0a38e8c99..e932140723882edff8576f33abb7b130b43f6f0d --- a/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses_add.php +++ b/apps/maarch_entreprise/admin/contacts/contact_addresses/contact_addresses_add.php @@ -77,6 +77,10 @@ if(isset($_GET['mycontact']) && $_GET['mycontact'] <> ''){ } else { $admin = true; } - -$contact->formaddress("add", "", $admin); ?> +<br> +<div class="block"> +<?php + $contact->formaddress("add", "", $admin); +?> +</div> diff --git a/apps/maarch_entreprise/admin/contacts/contacts_v2/contacts_v2_up.php b/apps/maarch_entreprise/admin/contacts/contacts_v2/contacts_v2_up.php old mode 100644 new mode 100755 index fd46f89c65260be8f457043080ed17e216e42dc3..b307d732bec7ab54906b4b29c0ce8f1522739afa --- a/apps/maarch_entreprise/admin/contacts/contacts_v2/contacts_v2_up.php +++ b/apps/maarch_entreprise/admin/contacts/contacts_v2/contacts_v2_up.php @@ -48,17 +48,15 @@ require_once("apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_ $func = new functions(); -if(isset($_GET['id'])) -{ +if(isset($_GET['id'])) { $id = addslashes($func->wash($_GET['id'], "alphanum", _CONTACT)); $_SESSION['contact']['current_contact_id'] = $id; }else if ($_SESSION['contact']['current_contact_id'] <> ''){ $id = $_SESSION['contact']['current_contact_id']; -} -else -{ +} else { $id = ""; } + /****************Management of the location bar ************/ $init = false; if(isset($_REQUEST['reinit']) && $_REQUEST['reinit'] == "true") @@ -70,11 +68,12 @@ if(isset($_REQUEST['level']) && ($_REQUEST['level'] == 2 || $_REQUEST['level'] = { $level = $_REQUEST['level']; } -$page_path = $_SESSION['config']['businessappurl'].'index.php?page=contacts_v2_up'; +$page_path = $_SESSION['config']['businessappurl'].'index.php?page=contacts_v2_up'; $page_label = _MODIFICATION; -$page_id = "contacts_v2_up"; +$page_id = "contacts_v2_up"; $core_tools->manage_location_bar($page_path, $page_label, $page_id, $init, $level); /***********************************************************/ + if (isset($_REQUEST['fromContactTree'])) { $_SESSION['fromContactTree'] = 'yes'; } @@ -82,13 +81,10 @@ $contact = new contacts_v2(); $contact->formcontact("up",$id); // GESTION DES ADDRESSES -echo '<div class="block">'; +echo '<div>'; echo '<h2><i class="fa fa-home fa-2x"></i> ' . _MANAGE_CONTACT_ADDRESSES_IMG . '</h2>'; -require_once "core" . DIRECTORY_SEPARATOR . "class" . DIRECTORY_SEPARATOR - . "class_request.php"; -require_once "apps" . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id'] - . DIRECTORY_SEPARATOR . "class" . DIRECTORY_SEPARATOR - . "class_list_show.php"; +require_once "core" . DIRECTORY_SEPARATOR . "class" . DIRECTORY_SEPARATOR . "class_request.php"; +require_once "apps" . DIRECTORY_SEPARATOR . $_SESSION['config']['app_id'] . DIRECTORY_SEPARATOR . "class" . DIRECTORY_SEPARATOR . "class_list_show.php"; $func = new functions(); $select['view_contacts'] = array(); @@ -122,12 +118,8 @@ if (isset($_REQUEST['selectedObject']) && ! empty($_REQUEST['selectedObject'])) $where .= " or " . implode(' OR ', $sql_purpose) . " "; $where .= " or " . implode(' OR ', $sql_society) . ") "; } - } -// var_dump($arrayPDO); -// var_dump($where); - $list = new list_show(); $order = 'asc'; if (isset($_REQUEST['order']) && !empty($_REQUEST['order'])) { @@ -148,59 +140,59 @@ for ($i = 0; $i < count($tab); $i ++) { for ($j = 0; $j < count($tab[$i]); $j ++) { foreach (array_keys($tab[$i][$j]) as $value) { if ($tab[$i][$j][$value] == "id") { - $tab[$i][$j]["id"] = $tab[$i][$j]['value']; - $tab[$i][$j]["label"] = _ID; - $tab[$i][$j]["size"] = "30"; + $tab[$i][$j]["id"] = $tab[$i][$j]['value']; + $tab[$i][$j]["label"] = _ID; + $tab[$i][$j]["size"] = "30"; $tab[$i][$j]["label_align"] = "left"; - $tab[$i][$j]["align"] = "left"; - $tab[$i][$j]["valign"] = "bottom"; - $tab[$i][$j]["show"] = false; - $tab[$i][$j]["order"] = 'id'; + $tab[$i][$j]["align"] = "left"; + $tab[$i][$j]["valign"] = "bottom"; + $tab[$i][$j]["show"] = false; + $tab[$i][$j]["order"] = 'id'; } if ($tab[$i][$j][$value] == "contact_id") { - $tab[$i][$j]["contact_id"] = $tab[$i][$j]['value']; - $tab[$i][$j]["label"] = _CONTACT_ID; - $tab[$i][$j]["size"] = "30"; + $tab[$i][$j]["contact_id"] = $tab[$i][$j]['value']; + $tab[$i][$j]["label"] = _CONTACT_ID; + $tab[$i][$j]["size"] = "30"; $tab[$i][$j]["label_align"] = "left"; - $tab[$i][$j]["align"] = "left"; - $tab[$i][$j]["valign"] = "bottom"; - $tab[$i][$j]["show"] = false; - $tab[$i][$j]["order"] = 'contact_id'; + $tab[$i][$j]["align"] = "left"; + $tab[$i][$j]["valign"] = "bottom"; + $tab[$i][$j]["show"] = false; + $tab[$i][$j]["order"] = 'contact_id'; } if ($tab[$i][$j][$value] == "contact_purpose_id") { - $tab[$i][$j]["value"]= $contact->get_label_contact($tab[$i][$j]['value'], $_SESSION['tablename']['contact_purposes']); + $tab[$i][$j]["value"] = $contact->get_label_contact($tab[$i][$j]['value'], $_SESSION['tablename']['contact_purposes']); $tab[$i][$j]["contact_purpose_id"] = $tab[$i][$j]['value']; - $tab[$i][$j]["label"] = _CONTACT_PURPOSE; - $tab[$i][$j]["size"] = "20"; - $tab[$i][$j]["label_align"] = "left"; - $tab[$i][$j]["align"] = "left"; - $tab[$i][$j]["valign"] = "bottom"; - $tab[$i][$j]["show"] = true; - $tab[$i][$j]["order"] = 'contact_purpose_id'; + $tab[$i][$j]["label"] = _CONTACT_PURPOSE; + $tab[$i][$j]["size"] = "20"; + $tab[$i][$j]["label_align"] = "left"; + $tab[$i][$j]["align"] = "left"; + $tab[$i][$j]["valign"] = "bottom"; + $tab[$i][$j]["show"] = true; + $tab[$i][$j]["order"] = 'contact_purpose_id'; } if ($tab[$i][$j][$value] == "departement") { $tab[$i][$j]['value'] = $request->show_string( $tab[$i][$j]['value'] ); $tab[$i][$j]["departement"] = $tab[$i][$j]['value']; - $tab[$i][$j]["label"] = _SERVICE; - $tab[$i][$j]["size"] = "20"; + $tab[$i][$j]["label"] = _SERVICE; + $tab[$i][$j]["size"] = "20"; $tab[$i][$j]["label_align"] = "left"; - $tab[$i][$j]["align"] = "left"; - $tab[$i][$j]["valign"] = "bottom"; - $tab[$i][$j]["show"] = true; - $tab[$i][$j]["order"] = 'departement'; + $tab[$i][$j]["align"] = "left"; + $tab[$i][$j]["valign"] = "bottom"; + $tab[$i][$j]["show"] = true; + $tab[$i][$j]["order"] = 'departement'; } if($tab[$i][$j][$value]=="lastname") { - $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']); - $tab[$i][$j]["lastname"]=$tab[$i][$j]['value']; - $tab[$i][$j]["label"]=_LASTNAME; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="left"; - $tab[$i][$j]["align"]="left"; - $tab[$i][$j]["valign"]="bottom"; + $tab[$i][$j]['value'] =$request->show_string($tab[$i][$j]['value']); + $tab[$i][$j]["lastname"] =$tab[$i][$j]['value']; + $tab[$i][$j]["label"] =_LASTNAME; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="left"; + $tab[$i][$j]["align"] ="left"; + $tab[$i][$j]["valign"] ="bottom"; if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") { $tab[$i][$j]["show"]=true; } else { @@ -210,12 +202,12 @@ for ($i = 0; $i < count($tab); $i ++) { } if($tab[$i][$j][$value]=="firstname") { - $tab[$i][$j]["firstname"]= $request->show_string($tab[$i][$j]['value']); - $tab[$i][$j]["label"]=_FIRSTNAME; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="center"; - $tab[$i][$j]["align"]="center"; - $tab[$i][$j]["valign"]="bottom"; + $tab[$i][$j]["firstname"] = $request->show_string($tab[$i][$j]['value']); + $tab[$i][$j]["label"] =_FIRSTNAME; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="center"; + $tab[$i][$j]["align"] ="center"; + $tab[$i][$j]["valign"] ="bottom"; if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") { $tab[$i][$j]["show"]=true; } else { @@ -225,13 +217,13 @@ for ($i = 0; $i < count($tab); $i ++) { } if($tab[$i][$j][$value]=="function") { - $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']); - $tab[$i][$j]["function"]=$tab[$i][$j]['value']; - $tab[$i][$j]["label"]=_FUNCTION; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="left"; - $tab[$i][$j]["align"]="left"; - $tab[$i][$j]["valign"]="bottom"; + $tab[$i][$j]['value'] =$request->show_string($tab[$i][$j]['value']); + $tab[$i][$j]["function"] =$tab[$i][$j]['value']; + $tab[$i][$j]["label"] =_FUNCTION; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="left"; + $tab[$i][$j]["align"] ="left"; + $tab[$i][$j]["valign"] ="bottom"; if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") { $tab[$i][$j]["show"]=true; } else { @@ -246,13 +238,13 @@ for ($i = 0; $i < count($tab); $i ++) { } if($tab[$i][$j][$value]=="address_street") { - $tab[$i][$j]['value'] = $address_num . " " . $request->show_string($tab[$i][$j]['value']); - $tab[$i][$j]["address_street"]= $tab[$i][$j]['value']; - $tab[$i][$j]["label"]= _ADDRESS; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="left"; - $tab[$i][$j]["align"]="left"; - $tab[$i][$j]["valign"]="bottom"; + $tab[$i][$j]['value'] = $address_num . " " . $request->show_string($tab[$i][$j]['value']); + $tab[$i][$j]["address_street"] = $tab[$i][$j]['value']; + $tab[$i][$j]["label"] = _ADDRESS; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="left"; + $tab[$i][$j]["align"] ="left"; + $tab[$i][$j]["valign"] ="bottom"; if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") { $tab[$i][$j]["show"]=false; } else { @@ -262,13 +254,13 @@ for ($i = 0; $i < count($tab); $i ++) { } if($tab[$i][$j][$value]=="address_postal_code") { - $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']); - $tab[$i][$j]["address_postal_code"]=$tab[$i][$j]['value']; - $tab[$i][$j]["label"]=_POSTAL_CODE; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="left"; - $tab[$i][$j]["align"]="left"; - $tab[$i][$j]["valign"]="bottom"; + $tab[$i][$j]['value'] =$request->show_string($tab[$i][$j]['value']); + $tab[$i][$j]["address_postal_code"] =$tab[$i][$j]['value']; + $tab[$i][$j]["label"] =_POSTAL_CODE; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="left"; + $tab[$i][$j]["align"] ="left"; + $tab[$i][$j]["valign"] ="bottom"; if ($_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] == "Y") { $tab[$i][$j]["show"]=false; } else { @@ -279,54 +271,55 @@ for ($i = 0; $i < count($tab); $i ++) { if($tab[$i][$j][$value]=="address_town") { - $tab[$i][$j]["address_town"]= $request->show_string($tab[$i][$j]['value']); - $tab[$i][$j]["label"]=_TOWN; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="center"; - $tab[$i][$j]["align"]="center"; - $tab[$i][$j]["valign"]="bottom"; - $tab[$i][$j]["show"]=true; - $tab[$i][$j]["order"]= "address_town"; + $tab[$i][$j]["address_town"] = $request->show_string($tab[$i][$j]['value']); + $tab[$i][$j]["label"] =_TOWN; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="center"; + $tab[$i][$j]["align"] ="center"; + $tab[$i][$j]["valign"] ="bottom"; + $tab[$i][$j]["show"] =true; + $tab[$i][$j]["order"] = "address_town"; } if($tab[$i][$j][$value]=="phone") { - $tab[$i][$j]['value']=$request->show_string($tab[$i][$j]['value']); - $tab[$i][$j]["phone"]=$tab[$i][$j]['value']; - $tab[$i][$j]["label"]=_PHONE; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="left"; - $tab[$i][$j]["align"]="left"; - $tab[$i][$j]["valign"]="bottom"; - $tab[$i][$j]["show"]=true; - $tab[$i][$j]["order"]= "phone"; + $tab[$i][$j]['value'] =$request->show_string($tab[$i][$j]['value']); + $tab[$i][$j]["phone"] =$tab[$i][$j]['value']; + $tab[$i][$j]["label"] =_PHONE; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="left"; + $tab[$i][$j]["align"] ="left"; + $tab[$i][$j]["valign"] ="bottom"; + $tab[$i][$j]["show"] =true; + $tab[$i][$j]["order"] = "phone"; } if($tab[$i][$j][$value]=="email") { - $tab[$i][$j]["email"]= $request->show_string($tab[$i][$j]['value']); - $tab[$i][$j]["label"]=_MAIL; - $tab[$i][$j]["size"]="15"; - $tab[$i][$j]["label_align"]="center"; - $tab[$i][$j]["align"]="center"; - $tab[$i][$j]["valign"]="bottom"; - $tab[$i][$j]["show"]=true; - $tab[$i][$j]["order"]= "email"; + $tab[$i][$j]["email"] = $request->show_string($tab[$i][$j]['value']); + $tab[$i][$j]["label"] =_MAIL; + $tab[$i][$j]["size"] ="15"; + $tab[$i][$j]["label_align"] ="center"; + $tab[$i][$j]["align"] ="center"; + $tab[$i][$j]["valign"] ="bottom"; + $tab[$i][$j]["show"] =true; + $tab[$i][$j]["order"] = "email"; } if($tab[$i][$j][$value]=="enabled") { - $tab[$i][$j]["enabled"]= $tab[$i][$j]['value']; - $tab[$i][$j]["label"]=_STATUS; - $tab[$i][$j]["size"]="5"; - $tab[$i][$j]["label_align"]="center"; - $tab[$i][$j]["align"]="center"; - $tab[$i][$j]["valign"]="bottom"; - $tab[$i][$j]["show"]=true; - $tab[$i][$j]["order"]= "enabled"; + $tab[$i][$j]["enabled"] = $tab[$i][$j]['value']; + $tab[$i][$j]["label"] =_STATUS; + $tab[$i][$j]["size"] ="5"; + $tab[$i][$j]["label_align"] ="center"; + $tab[$i][$j]["align"] ="center"; + $tab[$i][$j]["valign"] ="bottom"; + $tab[$i][$j]["show"] =true; + $tab[$i][$j]["order"] = "enabled"; } } } } -$pageName = "contact_addresses"; -$pageNameUp = "contact_addresses_up"; + +$pageName = "contact_addresses"; +$pageNameUp = "contact_addresses_up"; $pageNameAdd = "contact_addresses_add"; $pageNameVal = ""; $pageNameBan = ""; @@ -361,4 +354,3 @@ $list->admin_list( $_SESSION['m_admin']['address'] = array(); echo '</div>'; -?> diff --git a/apps/maarch_entreprise/display_tab.php b/apps/maarch_entreprise/display_tab.php index a9419a94ade9b87b4a9280130424a4be522a2c8d..d06c7be643c637c5a673889814b8030b22da6cc8 100755 --- a/apps/maarch_entreprise/display_tab.php +++ b/apps/maarch_entreprise/display_tab.php @@ -2,10 +2,10 @@ if(isset($_REQUEST["titleTab"])){ $titleTab = $_REQUEST["titleTab"]; - $res_id = $_REQUEST["resId"]; - $coll_id = $_REQUEST["collId"]; - $script = $_REQUEST["pathScriptTab"]; -}else{ + $res_id = $_REQUEST["resId"]; + $coll_id = $_REQUEST["collId"]; + $script = $_REQUEST["pathScriptTab"]; +} else { echo 'NO TAB FOUND!'; exit(); } diff --git a/apps/maarch_entreprise/indexing_searching/contact_address_view.php b/apps/maarch_entreprise/indexing_searching/contact_address_view.php index 6ef5998f59e8129b45460183afb1c6a0f5ce88e8..d7bd0529acf5b7fc4703f9250748c6a80969337c 100644 --- a/apps/maarch_entreprise/indexing_searching/contact_address_view.php +++ b/apps/maarch_entreprise/indexing_searching/contact_address_view.php @@ -109,7 +109,8 @@ $_SESSION['m_admin']['address']['SALUTATION_FOOTER'] = $request->show_string($l ?> <h1><i class="fa fa-home fa-2x"></i> <?php echo _VIEW_ADDRESS;?></h1> - <div id="inner_content" class="clearfix" align="center"> + <br> + <div class="clearfix block" align="center"> <?php $contact->get_contact_form(); $contact->get_address_form(); diff --git a/apps/maarch_entreprise/indexing_searching/contacts_view.php b/apps/maarch_entreprise/indexing_searching/contacts_view.php old mode 100644 new mode 100755 index ed2581f97dc9e48d984097b6c8a2b979b901c333..ae43dd9160a749e0f323b13956647dbc1d3a34ca --- a/apps/maarch_entreprise/indexing_searching/contacts_view.php +++ b/apps/maarch_entreprise/indexing_searching/contacts_view.php @@ -16,9 +16,9 @@ require("apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPAR require_once "apps".DIRECTORY_SEPARATOR.$_SESSION['config']['app_id'].DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_lists.php"; require_once 'core' . DIRECTORY_SEPARATOR . 'class' . DIRECTORY_SEPARATOR . 'class_request.php'; -$func = new functions(); +$func = new functions(); $list2 = new lists(); -$db = new Database(); +$db = new Database(); if(isset($_GET['id'])) { @@ -60,21 +60,22 @@ $query = "SELECT * FROM ".$_SESSION['tablename']['contacts_v2']." WHERE contact_ $stmt = $db->query($query, array($_SESSION['contact']['current_contact_id'])); $line = $stmt->fetchObject(); -$_SESSION['m_admin']['contact'] = array(); -$_SESSION['m_admin']['contact']['ID'] = $line->contact_id; -$_SESSION['m_admin']['contact']['TITLE'] = $request->show_string($line->title); -$_SESSION['m_admin']['contact']['LASTNAME'] = $request->show_string($line->lastname); -$_SESSION['m_admin']['contact']['FIRSTNAME'] = $request->show_string($line->firstname); -$_SESSION['m_admin']['contact']['SOCIETY'] = $request->show_string($line->society); -$_SESSION['m_admin']['contact']['SOCIETY_SHORT'] = $request->show_string($line->society_short); -$_SESSION['m_admin']['contact']['FUNCTION'] = $request->show_string($line->function); -$_SESSION['m_admin']['contact']['OTHER_DATA'] = $request->show_string($line->other_data); +$_SESSION['m_admin']['contact'] = array(); +$_SESSION['m_admin']['contact']['ID'] = $line->contact_id; +$_SESSION['m_admin']['contact']['TITLE'] = $request->show_string($line->title); +$_SESSION['m_admin']['contact']['LASTNAME'] = $request->show_string($line->lastname); +$_SESSION['m_admin']['contact']['FIRSTNAME'] = $request->show_string($line->firstname); +$_SESSION['m_admin']['contact']['SOCIETY'] = $request->show_string($line->society); +$_SESSION['m_admin']['contact']['SOCIETY_SHORT'] = $request->show_string($line->society_short); +$_SESSION['m_admin']['contact']['FUNCTION'] = $request->show_string($line->function); +$_SESSION['m_admin']['contact']['OTHER_DATA'] = $request->show_string($line->other_data); $_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] = $request->show_string($line->is_corporate_person); -$_SESSION['m_admin']['contact']['CONTACT_TYPE'] = $line->contact_type; -$_SESSION['m_admin']['contact']['OWNER'] = $line->user_id; +$_SESSION['m_admin']['contact']['CONTACT_TYPE'] = $line->contact_type; +$_SESSION['m_admin']['contact']['OWNER'] = $line->user_id; ?> <h1><i class="fa fa-users fa-2x"></i> <?php echo _VIEW_CONTACT;?></h1> - <div id="test" class="clearfix" align="center"> + <br> + <div id="test" class="clearfix block" align="center"> <?php $contact->get_contact_form(); ?> @@ -85,4 +86,5 @@ $_SESSION['m_admin']['contact']['OWNER'] = $line->user_id; $mode = 'view'; include_once 'apps/' . $_SESSION['config']['app_id'] . '/admin/contacts/contact_addresses/contact_addresses.php'; -?> </div> \ No newline at end of file +?> +</div> diff --git a/apps/maarch_entreprise/my_contacts/create_contact_iframe.php b/apps/maarch_entreprise/my_contacts/create_contact_iframe.php index c5371879a88458df2518c400e277097711f1119d..e77176f0d70cd61ec636a26184c3859fed7668dc 100644 --- a/apps/maarch_entreprise/my_contacts/create_contact_iframe.php +++ b/apps/maarch_entreprise/my_contacts/create_contact_iframe.php @@ -81,7 +81,7 @@ if (isset($_GET['created']) && $_GET['created'] <> '') { } ?> <br/> - <hr> + <br/> <br/> <?php $contact->formcontact("add", "", false, true); diff --git a/apps/maarch_entreprise/my_contacts/info_contact_iframe.php b/apps/maarch_entreprise/my_contacts/info_contact_iframe.php old mode 100644 new mode 100755 index 8ffab70101d8d00b6b4c89836174abd71b875ea7..2792e8883d2b5b24b207eb6c7d7ebb6691a834ae --- a/apps/maarch_entreprise/my_contacts/info_contact_iframe.php +++ b/apps/maarch_entreprise/my_contacts/info_contact_iframe.php @@ -86,17 +86,17 @@ $stmt = $db->query($query, array($_GET['contactid'])); $line = $stmt->fetchObject(); $_SESSION['m_admin']['contact'] = array(); -$_SESSION['m_admin']['contact']['ID'] = $line->contact_id; -$_SESSION['m_admin']['contact']['TITLE'] = $request->show_string($line->title); -$_SESSION['m_admin']['contact']['LASTNAME'] = $request->show_string($line->lastname); -$_SESSION['m_admin']['contact']['FIRSTNAME'] = $request->show_string($line->firstname); -$_SESSION['m_admin']['contact']['SOCIETY'] = $request->show_string($line->society); -$_SESSION['m_admin']['contact']['SOCIETY_SHORT'] = $request->show_string($line->society_short); -$_SESSION['m_admin']['contact']['FUNCTION'] = $request->show_string($line->function); -$_SESSION['m_admin']['contact']['OTHER_DATA'] = $request->show_string($line->other_data); +$_SESSION['m_admin']['contact']['ID'] = $line->contact_id; +$_SESSION['m_admin']['contact']['TITLE'] = $request->show_string($line->title); +$_SESSION['m_admin']['contact']['LASTNAME'] = $request->show_string($line->lastname); +$_SESSION['m_admin']['contact']['FIRSTNAME'] = $request->show_string($line->firstname); +$_SESSION['m_admin']['contact']['SOCIETY'] = $request->show_string($line->society); +$_SESSION['m_admin']['contact']['SOCIETY_SHORT'] = $request->show_string($line->society_short); +$_SESSION['m_admin']['contact']['FUNCTION'] = $request->show_string($line->function); +$_SESSION['m_admin']['contact']['OTHER_DATA'] = $request->show_string($line->other_data); $_SESSION['m_admin']['contact']['IS_CORPORATE_PERSON'] = $request->show_string($line->is_corporate_person); -$_SESSION['m_admin']['contact']['CONTACT_TYPE'] = $line->contact_type; -$_SESSION['m_admin']['contact']['OWNER'] = $line->user_id; +$_SESSION['m_admin']['contact']['CONTACT_TYPE'] = $line->contact_type; +$_SESSION['m_admin']['contact']['OWNER'] = $line->user_id; if (isset($_GET['mode']) && $_GET['mode'] <> '') { $mode = $_GET['mode']; @@ -130,35 +130,34 @@ if ($core_tools2->test_admin('update_contacts', 'apps', false) && $mode <> "view $line = $stmt->fetchObject(); $_SESSION['m_admin']['address'] = array(); - $_SESSION['m_admin']['address']['ID'] = $line->id; - $_SESSION['m_admin']['address']['CONTACT_ID'] = $line->contact_id; - $_SESSION['m_admin']['address']['TITLE'] = $request->show_string($line->title); - $_SESSION['m_admin']['address']['LASTNAME'] = $request->show_string($line->lastname); - $_SESSION['m_admin']['address']['FIRSTNAME'] = $request->show_string($line->firstname); - $_SESSION['m_admin']['address']['FUNCTION'] = $request->show_string($line->function); - $_SESSION['m_admin']['address']['OTHER_DATA'] = $request->show_string($line->other_data); - $_SESSION['m_admin']['address']['OWNER'] = $line->user_id; - $_SESSION['m_admin']['address']['DEPARTEMENT'] = $request->show_string($line->departement); + $_SESSION['m_admin']['address']['ID'] = $line->id; + $_SESSION['m_admin']['address']['CONTACT_ID'] = $line->contact_id; + $_SESSION['m_admin']['address']['TITLE'] = $request->show_string($line->title); + $_SESSION['m_admin']['address']['LASTNAME'] = $request->show_string($line->lastname); + $_SESSION['m_admin']['address']['FIRSTNAME'] = $request->show_string($line->firstname); + $_SESSION['m_admin']['address']['FUNCTION'] = $request->show_string($line->function); + $_SESSION['m_admin']['address']['OTHER_DATA'] = $request->show_string($line->other_data); + $_SESSION['m_admin']['address']['OWNER'] = $line->user_id; + $_SESSION['m_admin']['address']['DEPARTEMENT'] = $request->show_string($line->departement); $_SESSION['m_admin']['address']['CONTACT_PURPOSE_ID'] = $line->contact_purpose_id; - $_SESSION['m_admin']['address']['OCCUPANCY'] = $request->show_string($line->occupancy); - $_SESSION['m_admin']['address']['ADD_NUM'] = $request->show_string($line->address_num); - $_SESSION['m_admin']['address']['ADD_STREET'] = $request->show_string($line->address_street); - $_SESSION['m_admin']['address']['ADD_COMP'] = $request->show_string($line->address_complement); - $_SESSION['m_admin']['address']['ADD_TOWN'] = $request->show_string($line->address_town); - $_SESSION['m_admin']['address']['ADD_CP'] = $request->show_string($line->address_postal_code); - $_SESSION['m_admin']['address']['ADD_COUNTRY'] = $request->show_string($line->address_country); - $_SESSION['m_admin']['address']['PHONE'] = $request->show_string($line->phone); - $_SESSION['m_admin']['address']['MAIL'] = $request->show_string($line->email); - $_SESSION['m_admin']['address']['WEBSITE'] = $request->show_string($line->website); - $_SESSION['m_admin']['address']['IS_PRIVATE'] = $request->show_string($line->is_private); - $_SESSION['m_admin']['address']['SALUTATION_HEADER'] = $request->show_string($line->salutation_header); - $_SESSION['m_admin']['address']['SALUTATION_FOOTER'] = $request->show_string($line->salutation_footer); + $_SESSION['m_admin']['address']['OCCUPANCY'] = $request->show_string($line->occupancy); + $_SESSION['m_admin']['address']['ADD_NUM'] = $request->show_string($line->address_num); + $_SESSION['m_admin']['address']['ADD_STREET'] = $request->show_string($line->address_street); + $_SESSION['m_admin']['address']['ADD_COMP'] = $request->show_string($line->address_complement); + $_SESSION['m_admin']['address']['ADD_TOWN'] = $request->show_string($line->address_town); + $_SESSION['m_admin']['address']['ADD_CP'] = $request->show_string($line->address_postal_code); + $_SESSION['m_admin']['address']['ADD_COUNTRY'] = $request->show_string($line->address_country); + $_SESSION['m_admin']['address']['PHONE'] = $request->show_string($line->phone); + $_SESSION['m_admin']['address']['MAIL'] = $request->show_string($line->email); + $_SESSION['m_admin']['address']['WEBSITE'] = $request->show_string($line->website); + $_SESSION['m_admin']['address']['IS_PRIVATE'] = $request->show_string($line->is_private); + $_SESSION['m_admin']['address']['SALUTATION_HEADER'] = $request->show_string($line->salutation_header); + $_SESSION['m_admin']['address']['SALUTATION_FOOTER'] = $request->show_string($line->salutation_footer); $core_tools2->load_js(); ?> <div id="inner_content" class="clearfix" align="center" style="padding:0px;width:100% !important;"> <div class="block"> - <!--<h2><?php echo _CONTACT_CARD;?></h2>--> <?php $contact->get_contact_form(); $contact->get_address_form(); diff --git a/apps/maarch_entreprise/my_contacts/my_contact_up.php b/apps/maarch_entreprise/my_contacts/my_contact_up.php old mode 100644 new mode 100755 index e0c86178992c7a80c430b46a2fe256c90c574ace..a7c9a17ed90c2deabad9eff602342490f56530b0 --- a/apps/maarch_entreprise/my_contacts/my_contact_up.php +++ b/apps/maarch_entreprise/my_contacts/my_contact_up.php @@ -53,7 +53,7 @@ if (!isset($_REQUEST['letters'])) { /***********************************************************/ } -?><div id="divList" class="block" name="divList"><?php +?><div id="divList" name="divList"><?php $contact = new contacts_v2(); if ($from_iframe) { @@ -71,4 +71,4 @@ if ($_SESSION['origin']=='contacts_list') { include_once 'apps/' . $_SESSION['config']['app_id'] . '/admin/contacts/contact_addresses/contact_addresses.php'; -?> </div> \ No newline at end of file +?> </div> diff --git a/apps/maarch_entreprise/xml/IVS/validation_rules.xml b/apps/maarch_entreprise/xml/IVS/validation_rules.xml index 77a3f656b6be6a453bc5af478920ceb6984959e7..8360c89b2418713959baa74204193d68299c58c0 100755 --- a/apps/maarch_entreprise/xml/IVS/validation_rules.xml +++ b/apps/maarch_entreprise/xml/IVS/validation_rules.xml @@ -61,6 +61,7 @@ <validationRule name="admin_ajax_search" extends="standardForm" mode="error"> <parameter name="what" type="string" /> + <parameter name="idContact" type="integer" /> </validationRule> <validationRule name="contact_id" extends="standardForm" mode="error">