@@ -401,24 +401,31 @@ discard block |
||
401 | 401 | $sql.= " FROM ".MAIN_DB_PREFIX.$element; |
402 | 402 | $sql.= " WHERE entity IN (".getEntity($element).")" ; |
403 | 403 | |
404 | - if ($id > 0) $sql.= " AND rowid = ".$db->escape($id); |
|
405 | - else if ($ref) $sql.= " AND ref = '".$db->escape($ref)."'"; |
|
406 | - else if ($ref_ext) $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'"; |
|
407 | - else { |
|
404 | + if ($id > 0) { |
|
405 | + $sql.= " AND rowid = ".$db->escape($id); |
|
406 | + } else if ($ref) { |
|
407 | + $sql.= " AND ref = '".$db->escape($ref)."'"; |
|
408 | + } else if ($ref_ext) { |
|
409 | + $sql.= " AND ref_ext = '".$db->escape($ref_ext)."'"; |
|
410 | + } else { |
|
408 | 411 | $error='ErrorWrongParameters'; |
409 | 412 | dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR); |
410 | 413 | return -1; |
411 | 414 | } |
412 | - if ($ref || $ref_ext) |
|
413 | - $sql .= " AND entity = " . Globals::$conf->entity; |
|
415 | + if ($ref || $ref_ext) { |
|
416 | + $sql .= " AND entity = " . Globals::$conf->entity; |
|
417 | + } |
|
414 | 418 | |
415 | 419 | dol_syslog(get_class()."::isExistingObject", LOG_DEBUG); |
416 | 420 | $resql = $db->query($sql); |
417 | 421 | if ($resql) |
418 | 422 | { |
419 | 423 | $num=$db->num_rows($resql); |
420 | - if ($num > 0) return 1; |
|
421 | - else return 0; |
|
424 | + if ($num > 0) { |
|
425 | + return 1; |
|
426 | + } else { |
|
427 | + return 0; |
|
428 | + } |
|
422 | 429 | } |
423 | 430 | return -1; |
424 | 431 | } |
@@ -447,13 +454,18 @@ discard block |
||
447 | 454 | //print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n"; |
448 | 455 | $lastname=$this->lastname; |
449 | 456 | $firstname=$this->firstname; |
450 | - if (empty($lastname)) $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:''))))); |
|
457 | + if (empty($lastname)) { |
|
458 | + $lastname=(isset($this->lastname)?$this->lastname:(isset($this->name)?$this->name:(isset($this->nom)?$this->nom:(isset($this->societe)?$this->societe:(isset($this->company)?$this->company:''))))); |
|
459 | + } |
|
451 | 460 | |
452 | 461 | $ret=''; |
453 | 462 | if ($option && $this->civility_id) |
454 | 463 | { |
455 | - if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' '; |
|
456 | - else $ret.=$this->civility_id.' '; |
|
464 | + if ($langs->transnoentitiesnoconv("Civility".$this->civility_id)!="Civility".$this->civility_id) { |
|
465 | + $ret.=$langs->transnoentitiesnoconv("Civility".$this->civility_id).' '; |
|
466 | + } else { |
|
467 | + $ret.=$this->civility_id.' '; |
|
468 | + } |
|
457 | 469 | } |
458 | 470 | |
459 | 471 | $ret .= DolUtils::dolGetFirstLastname($firstname, $lastname, $nameorder); |
@@ -544,14 +556,15 @@ discard block |
||
544 | 556 | && empty(Globals::$conf->global->SOCIETE_DISABLE_STATE) && $this->state) { |
545 | 557 | if (!empty(Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && Globals::$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) { |
546 | 558 | $out.=($outdone?' - ':'').$this->region.' - '.$this->state; |
547 | - } |
|
548 | - else { |
|
559 | + } else { |
|
549 | 560 | $out.=($outdone?' - ':'').$this->state; |
550 | 561 | } |
551 | 562 | $outdone++; |
552 | 563 | } |
553 | 564 | |
554 | - if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) $out.=($outdone?'<br>':''); |
|
565 | + if (! empty($this->phone) || ! empty($this->phone_pro) || ! empty($this->phone_mobile) || ! empty($this->phone_perso) || ! empty($this->fax) || ! empty($this->office_phone) || ! empty($this->user_mobile) || ! empty($this->office_fax)) { |
|
566 | + $out.=($outdone?'<br>':''); |
|
567 | + } |
|
555 | 568 | if (! empty($this->phone) && empty($this->phone_pro)) { // For objects that store pro phone into ->phone |
556 | 569 | $out.=dol_print_phone($this->phone,$this->country_code,$contactid,$thirdpartyid,'AC_TEL',' ','phone',$langs->trans("PhonePro")); $outdone++; |
557 | 570 | } |
@@ -591,13 +604,21 @@ discard block |
||
591 | 604 | } |
592 | 605 | $out.='<div style="clear: both;">'; |
593 | 606 | if (!empty(Globals::$conf->socialnetworks->enabled)) { |
594 | - if ($this->skype) $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype'); |
|
607 | + if ($this->skype) { |
|
608 | + $out.=dol_print_socialnetworks($this->skype,$this->id,$object->id,'skype'); |
|
609 | + } |
|
595 | 610 | $outdone++; |
596 | - if ($this->jabberid) $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber'); |
|
611 | + if ($this->jabberid) { |
|
612 | + $out.=dol_print_socialnetworks($this->jabberid,$this->id,$object->id,'jabber'); |
|
613 | + } |
|
597 | 614 | $outdone++; |
598 | - if ($this->twitter) $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter'); |
|
615 | + if ($this->twitter) { |
|
616 | + $out.=dol_print_socialnetworks($this->twitter,$this->id,$object->id,'twitter'); |
|
617 | + } |
|
599 | 618 | $outdone++; |
600 | - if ($this->facebook) $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook'); |
|
619 | + if ($this->facebook) { |
|
620 | + $out.=dol_print_socialnetworks($this->facebook,$this->id,$object->id,'facebook'); |
|
621 | + } |
|
601 | 622 | $outdone++; |
602 | 623 | } |
603 | 624 | $out.='</div>'; |
@@ -657,10 +678,10 @@ discard block |
||
657 | 678 | $this->errors = $ecmfile->errors; |
658 | 679 | } |
659 | 680 | */ |
660 | - } |
|
661 | - else return ''; |
|
662 | - } |
|
663 | - elseif (empty($ecmfile->share)) |
|
681 | + } else { |
|
682 | + return ''; |
|
683 | + } |
|
684 | + } elseif (empty($ecmfile->share)) |
|
664 | 685 | { |
665 | 686 | // Add entry into index |
666 | 687 | if ($initsharekey) |
@@ -668,8 +689,9 @@ discard block |
||
668 | 689 | require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; |
669 | 690 | $ecmfile->share = getRandomPassword(true); |
670 | 691 | $ecmfile->update($user); |
671 | - } |
|
672 | - else return ''; |
|
692 | + } else { |
|
693 | + return ''; |
|
694 | + } |
|
673 | 695 | } |
674 | 696 | |
675 | 697 | // Define $urlwithroot |
@@ -683,14 +705,18 @@ discard block |
||
683 | 705 | //if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart; // For sharing with hash (so public files), modulepart is not required. |
684 | 706 | //if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; // For sharing with hash (so public files), entity is not required. |
685 | 707 | //$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath); // No need of name of file for public link, we will use the hash |
686 | - if (! empty($ecmfile->share)) $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share; // Hash for public share |
|
687 | - if ($forcedownload) $paramlink.=($paramlink?'&':'').'attachment=1'; |
|
708 | + if (! empty($ecmfile->share)) { |
|
709 | + $paramlink.=($paramlink?'&':'').'hashp='.$ecmfile->share; |
|
710 | + } |
|
711 | + // Hash for public share |
|
712 | + if ($forcedownload) { |
|
713 | + $paramlink.=($paramlink?'&':'').'attachment=1'; |
|
714 | + } |
|
688 | 715 | |
689 | 716 | if ($relativelink) |
690 | 717 | { |
691 | 718 | $linktoreturn='document.php'.($paramlink?'?'.$paramlink:''); |
692 | - } |
|
693 | - else |
|
719 | + } else |
|
694 | 720 | { |
695 | 721 | $linktoreturn=$urlwithroot.'/document.php'.($paramlink?'?'.$paramlink:''); |
696 | 722 | } |
@@ -738,8 +764,7 @@ discard block |
||
738 | 764 | if (is_numeric($type_contact)) |
739 | 765 | { |
740 | 766 | $id_type_contact=$type_contact; |
741 | - } |
|
742 | - else |
|
767 | + } else |
|
743 | 768 | { |
744 | 769 | // We look for id type_contact |
745 | 770 | $sql = "SELECT tc.rowid"; |
@@ -752,7 +777,9 @@ discard block |
||
752 | 777 | if ($resql) |
753 | 778 | { |
754 | 779 | $obj = $this->db->fetch_object($resql); |
755 | - if ($obj) $id_type_contact=$obj->rowid; |
|
780 | + if ($obj) { |
|
781 | + $id_type_contact=$obj->rowid; |
|
782 | + } |
|
756 | 783 | } |
757 | 784 | } |
758 | 785 | |
@@ -804,8 +831,7 @@ discard block |
||
804 | 831 | |
805 | 832 | $this->db->commit(); |
806 | 833 | return 1; |
807 | - } |
|
808 | - else |
|
834 | + } else |
|
809 | 835 | { |
810 | 836 | if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') |
811 | 837 | { |
@@ -813,15 +839,16 @@ discard block |
||
813 | 839 | $this->db->rollback(); |
814 | 840 | echo 'err rollback'; |
815 | 841 | return -2; |
816 | - } |
|
817 | - else |
|
842 | + } else |
|
818 | 843 | { |
819 | 844 | $this->error=$this->db->error(); |
820 | 845 | $this->db->rollback(); |
821 | 846 | return -1; |
822 | 847 | } |
823 | 848 | } |
824 | - } else return 0; |
|
849 | + } else { |
|
850 | + return 0; |
|
851 | + } |
|
825 | 852 | } |
826 | 853 | |
827 | 854 | // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps |
@@ -863,15 +890,18 @@ discard block |
||
863 | 890 | // Insert into database |
864 | 891 | $sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set"; |
865 | 892 | $sql.= " statut = ".$statut; |
866 | - if ($type_contact_id) $sql.= ", fk_c_type_contact = '".$type_contact_id ."'"; |
|
867 | - if ($fk_socpeople) $sql.= ", fk_socpeople = '".$fk_socpeople ."'"; |
|
893 | + if ($type_contact_id) { |
|
894 | + $sql.= ", fk_c_type_contact = '".$type_contact_id ."'"; |
|
895 | + } |
|
896 | + if ($fk_socpeople) { |
|
897 | + $sql.= ", fk_socpeople = '".$fk_socpeople ."'"; |
|
898 | + } |
|
868 | 899 | $sql.= " where rowid = ".$rowid; |
869 | 900 | $resql=$this->db->query($sql); |
870 | 901 | if ($resql) |
871 | 902 | { |
872 | 903 | return 0; |
873 | - } |
|
874 | - else |
|
904 | + } else |
|
875 | 905 | { |
876 | 906 | $this->error=$this->db->lasterror(); |
877 | 907 | return -1; |
@@ -908,8 +938,7 @@ discard block |
||
908 | 938 | |
909 | 939 | $this->db->commit(); |
910 | 940 | return 1; |
911 | - } |
|
912 | - else |
|
941 | + } else |
|
913 | 942 | { |
914 | 943 | $this->error=$this->db->lasterror(); |
915 | 944 | $this->db->rollback(); |
@@ -939,15 +968,15 @@ discard block |
||
939 | 968 | |
940 | 969 | $sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact"; |
941 | 970 | $sql.= " WHERE element_id = ".$this->id; |
942 | - if ($listId) |
|
943 | - $sql.= " AND fk_c_type_contact IN (".$listId.")"; |
|
971 | + if ($listId) { |
|
972 | + $sql.= " AND fk_c_type_contact IN (".$listId.")"; |
|
973 | + } |
|
944 | 974 | |
945 | 975 | dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG); |
946 | 976 | if ($this->db->query($sql)) |
947 | 977 | { |
948 | 978 | return 1; |
949 | - } |
|
950 | - else |
|
979 | + } else |
|
951 | 980 | { |
952 | 981 | $this->error=$this->db->lasterror(); |
953 | 982 | return -1; |
@@ -972,22 +1001,38 @@ discard block |
||
972 | 1001 | $tab=array(); |
973 | 1002 | |
974 | 1003 | $sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact"; // This field contains id of llx_socpeople or id of llx_user |
975 | - if ($source == 'internal') $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo"; |
|
976 | - if ($source == 'external' || $source == 'thirdparty') $sql.=", t.fk_soc as socid, t.statut as statuscontact"; |
|
1004 | + if ($source == 'internal') { |
|
1005 | + $sql.=", '-1' as socid, t.statut as statuscontact, t.login, t.photo"; |
|
1006 | + } |
|
1007 | + if ($source == 'external' || $source == 'thirdparty') { |
|
1008 | + $sql.=", t.fk_soc as socid, t.statut as statuscontact"; |
|
1009 | + } |
|
977 | 1010 | $sql.= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email"; |
978 | 1011 | $sql.= ", tc.source, tc.element, tc.code, tc.libelle"; |
979 | 1012 | $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact tc"; |
980 | 1013 | $sql.= ", ".MAIN_DB_PREFIX."element_contact ec"; |
981 | - if ($source == 'internal') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid"; |
|
982 | - if ($source == 'external'|| $source == 'thirdparty') $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid"; |
|
1014 | + if ($source == 'internal') { |
|
1015 | + $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid"; |
|
1016 | + } |
|
1017 | + if ($source == 'external'|| $source == 'thirdparty') { |
|
1018 | + $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid"; |
|
1019 | + } |
|
983 | 1020 | $sql.= " WHERE ec.element_id =".$this->id; |
984 | 1021 | $sql.= " AND ec.fk_c_type_contact=tc.rowid"; |
985 | 1022 | $sql.= " AND tc.element='".$this->db->escape($this->element)."'"; |
986 | - if ($code) $sql.= " AND tc.code = '".$this->db->escape($code)."'"; |
|
987 | - if ($source == 'internal') $sql.= " AND tc.source = 'internal'"; |
|
988 | - if ($source == 'external' || $source == 'thirdparty') $sql.= " AND tc.source = 'external'"; |
|
1023 | + if ($code) { |
|
1024 | + $sql.= " AND tc.code = '".$this->db->escape($code)."'"; |
|
1025 | + } |
|
1026 | + if ($source == 'internal') { |
|
1027 | + $sql.= " AND tc.source = 'internal'"; |
|
1028 | + } |
|
1029 | + if ($source == 'external' || $source == 'thirdparty') { |
|
1030 | + $sql.= " AND tc.source = 'external'"; |
|
1031 | + } |
|
989 | 1032 | $sql.= " AND tc.active=1"; |
990 | - if ($statut >= 0) $sql.= " AND ec.statut = '".$statut."'"; |
|
1033 | + if ($statut >= 0) { |
|
1034 | + $sql.= " AND ec.statut = '".$statut."'"; |
|
1035 | + } |
|
991 | 1036 | $sql.=" ORDER BY t.lastname ASC"; |
992 | 1037 | |
993 | 1038 | dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG); |
@@ -1008,8 +1053,7 @@ discard block |
||
1008 | 1053 | 'nom'=>$obj->lastname, // For backward compatibility |
1009 | 1054 | 'civility'=>$obj->civility, 'lastname'=>$obj->lastname, 'firstname'=>$obj->firstname, 'email'=>$obj->email, 'login'=>$obj->login, 'photo'=>$obj->photo, 'statuscontact'=>$obj->statuscontact, |
1010 | 1055 | 'rowid'=>$obj->rowid, 'code'=>$obj->code, 'libelle'=>$libelle_type, 'status'=>$obj->statuslink, 'fk_c_type_contact'=>$obj->fk_c_type_contact); |
1011 | - } |
|
1012 | - else |
|
1056 | + } else |
|
1013 | 1057 | { |
1014 | 1058 | $tab[$i]=$obj->id; |
1015 | 1059 | } |
@@ -1018,8 +1062,7 @@ discard block |
||
1018 | 1062 | } |
1019 | 1063 | |
1020 | 1064 | return $tab; |
1021 | - } |
|
1022 | - else |
|
1065 | + } else |
|
1023 | 1066 | { |
1024 | 1067 | $this->error=$this->db->lasterror(); |
1025 | 1068 | dol_print_error($this->db); |
@@ -1054,8 +1097,7 @@ discard block |
||
1054 | 1097 | $result = $this->update_contact($rowid, $newstatut); |
1055 | 1098 | $this->db->free($resql); |
1056 | 1099 | return $result; |
1057 | - } |
|
1058 | - else |
|
1100 | + } else |
|
1059 | 1101 | { |
1060 | 1102 | $this->error=$this->db->error(); |
1061 | 1103 | dol_print_error($this->db); |
@@ -1079,16 +1121,27 @@ discard block |
||
1079 | 1121 | // phpcs:enable |
1080 | 1122 | global $langs; |
1081 | 1123 | |
1082 | - if (empty($order)) $order='position'; |
|
1083 | - if ($order == 'position') $order.=',code'; |
|
1124 | + if (empty($order)) { |
|
1125 | + $order='position'; |
|
1126 | + } |
|
1127 | + if ($order == 'position') { |
|
1128 | + $order.=',code'; |
|
1129 | + } |
|
1084 | 1130 | |
1085 | 1131 | $tab = array(); |
1086 | 1132 | $sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position"; |
1087 | 1133 | $sql.= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc"; |
1088 | 1134 | $sql.= " WHERE tc.element='".$this->db->escape($this->element)."'"; |
1089 | - if ($activeonly == 1) $sql.= " AND tc.active=1"; // only the active types |
|
1090 | - if (! empty($source) && $source != 'all') $sql.= " AND tc.source='".$this->db->escape($source)."'"; |
|
1091 | - if (! empty($code)) $sql.= " AND tc.code='".$this->db->escape($code)."'"; |
|
1135 | + if ($activeonly == 1) { |
|
1136 | + $sql.= " AND tc.active=1"; |
|
1137 | + } |
|
1138 | + // only the active types |
|
1139 | + if (! empty($source) && $source != 'all') { |
|
1140 | + $sql.= " AND tc.source='".$this->db->escape($source)."'"; |
|
1141 | + } |
|
1142 | + if (! empty($code)) { |
|
1143 | + $sql.= " AND tc.code='".$this->db->escape($code)."'"; |
|
1144 | + } |
|
1092 | 1145 | $sql.= $this->db->order($order,'ASC'); |
1093 | 1146 | |
1094 | 1147 | //print "sql=".$sql; |
@@ -1103,13 +1156,15 @@ discard block |
||
1103 | 1156 | |
1104 | 1157 | $transkey="TypeContact_".$this->element."_".$source."_".$obj->code; |
1105 | 1158 | $libelle_type=($langs->trans($transkey)!=$transkey ? $langs->trans($transkey) : $obj->libelle); |
1106 | - if (empty($option)) $tab[$obj->rowid]=$libelle_type; |
|
1107 | - else $tab[$obj->code]=$libelle_type; |
|
1159 | + if (empty($option)) { |
|
1160 | + $tab[$obj->rowid]=$libelle_type; |
|
1161 | + } else { |
|
1162 | + $tab[$obj->code]=$libelle_type; |
|
1163 | + } |
|
1108 | 1164 | $i++; |
1109 | 1165 | } |
1110 | 1166 | return $tab; |
1111 | - } |
|
1112 | - else |
|
1167 | + } else |
|
1113 | 1168 | { |
1114 | 1169 | $this->error=$this->db->lasterror(); |
1115 | 1170 | //dol_print_error($this->db); |
@@ -1148,19 +1203,29 @@ discard block |
||
1148 | 1203 | |
1149 | 1204 | $sql = "SELECT ec.fk_socpeople"; |
1150 | 1205 | $sql.= " FROM ".MAIN_DB_PREFIX."element_contact as ec,"; |
1151 | - if ($source == 'internal') $sql.= " ".MAIN_DB_PREFIX."user as c,"; |
|
1152 | - if ($source == 'external') $sql.= " ".MAIN_DB_PREFIX."socpeople as c,"; |
|
1206 | + if ($source == 'internal') { |
|
1207 | + $sql.= " ".MAIN_DB_PREFIX."user as c,"; |
|
1208 | + } |
|
1209 | + if ($source == 'external') { |
|
1210 | + $sql.= " ".MAIN_DB_PREFIX."socpeople as c,"; |
|
1211 | + } |
|
1153 | 1212 | $sql.= " ".MAIN_DB_PREFIX."c_type_contact as tc"; |
1154 | 1213 | $sql.= " WHERE ec.element_id = ".$id; |
1155 | 1214 | $sql.= " AND ec.fk_socpeople = c.rowid"; |
1156 | - if ($source == 'internal') $sql.= " AND c.entity IN (".getEntity('user').")"; |
|
1157 | - if ($source == 'external') $sql.= " AND c.entity IN (".getEntity('societe').")"; |
|
1215 | + if ($source == 'internal') { |
|
1216 | + $sql.= " AND c.entity IN (".getEntity('user').")"; |
|
1217 | + } |
|
1218 | + if ($source == 'external') { |
|
1219 | + $sql.= " AND c.entity IN (".getEntity('societe').")"; |
|
1220 | + } |
|
1158 | 1221 | $sql.= " AND ec.fk_c_type_contact = tc.rowid"; |
1159 | 1222 | $sql.= " AND tc.element = '".$element."'"; |
1160 | 1223 | $sql.= " AND tc.source = '".$source."'"; |
1161 | 1224 | $sql.= " AND tc.code = '".$code."'"; |
1162 | 1225 | $sql.= " AND tc.active = 1"; |
1163 | - if ($status) $sql.= " AND ec.statut = ".$status; |
|
1226 | + if ($status) { |
|
1227 | + $sql.= " AND ec.statut = ".$status; |
|
1228 | + } |
|
1164 | 1229 | |
1165 | 1230 | dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG); |
1166 | 1231 | $resql=$this->db->query($sql); |
@@ -1171,8 +1236,7 @@ discard block |
||
1171 | 1236 | $result[$i]=$obj->fk_socpeople; |
1172 | 1237 | $i++; |
1173 | 1238 | } |
1174 | - } |
|
1175 | - else |
|
1239 | + } else |
|
1176 | 1240 | { |
1177 | 1241 | $this->error=$this->db->error(); |
1178 | 1242 | return null; |
@@ -1191,9 +1255,13 @@ discard block |
||
1191 | 1255 | function fetch_contact($contactid=null) |
1192 | 1256 | { |
1193 | 1257 | // phpcs:enable |
1194 | - if (empty($contactid)) $contactid=$this->contactid; |
|
1258 | + if (empty($contactid)) { |
|
1259 | + $contactid=$this->contactid; |
|
1260 | + } |
|
1195 | 1261 | |
1196 | - if (empty($contactid)) return 0; |
|
1262 | + if (empty($contactid)) { |
|
1263 | + return 0; |
|
1264 | + } |
|
1197 | 1265 | |
1198 | 1266 | require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; |
1199 | 1267 | $contact = new Contact($this->db); |
@@ -1214,14 +1282,16 @@ discard block |
||
1214 | 1282 | // phpcs:enable |
1215 | 1283 | global $conf; |
1216 | 1284 | |
1217 | - if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id)) |
|
1218 | - return 0; |
|
1285 | + if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id)) { |
|
1286 | + return 0; |
|
1287 | + } |
|
1219 | 1288 | |
1220 | 1289 | require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php'; |
1221 | 1290 | |
1222 | 1291 | $idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty); |
1223 | - if ($force_thirdparty_id) |
|
1224 | - $idtofetch = $force_thirdparty_id; |
|
1292 | + if ($force_thirdparty_id) { |
|
1293 | + $idtofetch = $force_thirdparty_id; |
|
1294 | + } |
|
1225 | 1295 | |
1226 | 1296 | if ($idtofetch) { |
1227 | 1297 | $thirdparty = new Societe($this->db); |
@@ -1234,8 +1304,9 @@ discard block |
||
1234 | 1304 | } |
1235 | 1305 | |
1236 | 1306 | return $result; |
1237 | - } else |
|
1238 | - return -1; |
|
1307 | + } else { |
|
1308 | + return -1; |
|
1309 | + } |
|
1239 | 1310 | } |
1240 | 1311 | |
1241 | 1312 | |
@@ -1281,20 +1352,25 @@ discard block |
||
1281 | 1352 | dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type); |
1282 | 1353 | |
1283 | 1354 | $idtype=$this->barcode_type; |
1284 | - if (empty($idtype) && $idtype != '0') // If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined |
|
1355 | + if (empty($idtype) && $idtype != '0') { |
|
1356 | + // If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined |
|
1285 | 1357 | { |
1286 | 1358 | if ($this->element == 'product') |
1287 | - $idtype = Globals::$conf->global->PRODUIT_DEFAULT_BARCODE_TYPE; |
|
1288 | - else if ($this->element == 'societe') |
|
1289 | - $idtype = Globals::$conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY; |
|
1290 | - else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING); |
|
1359 | + $idtype = Globals::$conf->global->PRODUIT_DEFAULT_BARCODE_TYPE; |
|
1360 | + } else if ($this->element == 'societe') { |
|
1361 | + $idtype = Globals::$conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY; |
|
1362 | + } else { |
|
1363 | + dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING); |
|
1364 | + } |
|
1291 | 1365 | } |
1292 | 1366 | |
1293 | 1367 | if ($idtype > 0) |
1294 | 1368 | { |
1295 | - if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder)) // If data not already loaded |
|
1369 | + if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder)) { |
|
1370 | + // If data not already loaded |
|
1296 | 1371 | { |
1297 | - $sql = "SELECT rowid, code, libelle as label, coder"; |
|
1372 | + $sql = "SELECT rowid, code, libelle as label, coder"; |
|
1373 | + } |
|
1298 | 1374 | $sql.= " FROM ".MAIN_DB_PREFIX."c_barcode_type"; |
1299 | 1375 | $sql.= " WHERE rowid = ".$idtype; |
1300 | 1376 | dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG); |
@@ -1307,8 +1383,7 @@ discard block |
||
1307 | 1383 | $this->barcode_type_label = $obj->label; |
1308 | 1384 | $this->barcode_type_coder = $obj->coder; |
1309 | 1385 | return 1; |
1310 | - } |
|
1311 | - else |
|
1386 | + } else |
|
1312 | 1387 | { |
1313 | 1388 | dol_print_error($this->db); |
1314 | 1389 | return -1; |
@@ -1329,8 +1404,13 @@ discard block |
||
1329 | 1404 | // phpcs:enable |
1330 | 1405 | include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; |
1331 | 1406 | |
1332 | - if (empty($this->fk_project) && ! empty($this->fk_projet)) $this->fk_project = $this->fk_projet; // For backward compatibility |
|
1333 | - if (empty($this->fk_project)) return 0; |
|
1407 | + if (empty($this->fk_project) && ! empty($this->fk_projet)) { |
|
1408 | + $this->fk_project = $this->fk_projet; |
|
1409 | + } |
|
1410 | + // For backward compatibility |
|
1411 | + if (empty($this->fk_project)) { |
|
1412 | + return 0; |
|
1413 | + } |
|
1334 | 1414 | |
1335 | 1415 | $project = new Project($this->db); |
1336 | 1416 | $result = $project->fetch($this->fk_project); |
@@ -1351,7 +1431,9 @@ discard block |
||
1351 | 1431 | // phpcs:enable |
1352 | 1432 | include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; |
1353 | 1433 | |
1354 | - if (empty($this->fk_product)) return 0; |
|
1434 | + if (empty($this->fk_product)) { |
|
1435 | + return 0; |
|
1436 | + } |
|
1355 | 1437 | |
1356 | 1438 | $product = new Product($this->db); |
1357 | 1439 | $result = $product->fetch($this->fk_product); |
@@ -1385,9 +1467,15 @@ discard block |
||
1385 | 1467 | function fetch_origin() |
1386 | 1468 | { |
1387 | 1469 | // phpcs:enable |
1388 | - if ($this->origin == 'shipping') $this->origin = 'expedition'; |
|
1389 | - if ($this->origin == 'delivery') $this->origin = 'livraison'; |
|
1390 | - if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur'; |
|
1470 | + if ($this->origin == 'shipping') { |
|
1471 | + $this->origin = 'expedition'; |
|
1472 | + } |
|
1473 | + if ($this->origin == 'delivery') { |
|
1474 | + $this->origin = 'livraison'; |
|
1475 | + } |
|
1476 | + if ($this->origin == 'order_supplier') { |
|
1477 | + $this->origin = 'commandeFournisseur'; |
|
1478 | + } |
|
1391 | 1479 | |
1392 | 1480 | $origin = $this->origin; |
1393 | 1481 | |
@@ -1479,29 +1567,48 @@ discard block |
||
1479 | 1567 | { |
1480 | 1568 | global $user,$langs,$conf; |
1481 | 1569 | |
1482 | - if (empty($table)) $table=$this->table_element; |
|
1483 | - if (empty($id)) $id=$this->id; |
|
1484 | - if (empty($format)) $format='text'; |
|
1485 | - if (empty($id_field)) $id_field='rowid'; |
|
1570 | + if (empty($table)) { |
|
1571 | + $table=$this->table_element; |
|
1572 | + } |
|
1573 | + if (empty($id)) { |
|
1574 | + $id=$this->id; |
|
1575 | + } |
|
1576 | + if (empty($format)) { |
|
1577 | + $format='text'; |
|
1578 | + } |
|
1579 | + if (empty($id_field)) { |
|
1580 | + $id_field='rowid'; |
|
1581 | + } |
|
1486 | 1582 | |
1487 | 1583 | $error=0; |
1488 | 1584 | |
1489 | 1585 | $this->db->begin(); |
1490 | 1586 | |
1491 | 1587 | // Special case |
1492 | - if ($table == 'product' && $field == 'note_private') $field='note'; |
|
1493 | - if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod'; |
|
1588 | + if ($table == 'product' && $field == 'note_private') { |
|
1589 | + $field='note'; |
|
1590 | + } |
|
1591 | + if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) { |
|
1592 | + $fk_user_field = 'fk_user_mod'; |
|
1593 | + } |
|
1494 | 1594 | |
1495 | 1595 | $sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET "; |
1496 | 1596 | |
1497 | - if ($format == 'text') $sql.= $field." = '".$this->db->escape($value)."'"; |
|
1498 | - else if ($format == 'int') $sql.= $field." = ".$this->db->escape($value); |
|
1499 | - else if ($format == 'date') $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null"); |
|
1597 | + if ($format == 'text') { |
|
1598 | + $sql.= $field." = '".$this->db->escape($value)."'"; |
|
1599 | + } else if ($format == 'int') { |
|
1600 | + $sql.= $field." = ".$this->db->escape($value); |
|
1601 | + } else if ($format == 'date') { |
|
1602 | + $sql.= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null"); |
|
1603 | + } |
|
1500 | 1604 | |
1501 | 1605 | if ($fk_user_field) |
1502 | 1606 | { |
1503 | - if (! empty($fuser) && is_object($fuser)) $sql.=", ".$fk_user_field." = ".$fuser->id; |
|
1504 | - elseif (empty($fuser) || $fuser != 'none') $sql.=", ".$fk_user_field." = ".$user->id; |
|
1607 | + if (! empty($fuser) && is_object($fuser)) { |
|
1608 | + $sql.=", ".$fk_user_field." = ".$fuser->id; |
|
1609 | + } elseif (empty($fuser) || $fuser != 'none') { |
|
1610 | + $sql.=", ".$fk_user_field." = ".$user->id; |
|
1611 | + } |
|
1505 | 1612 | } |
1506 | 1613 | |
1507 | 1614 | $sql.= " WHERE ".$id_field." = ".$id; |
@@ -1516,28 +1623,32 @@ discard block |
||
1516 | 1623 | if (empty($this->fields) && method_exists($this, 'fetch')) |
1517 | 1624 | { |
1518 | 1625 | $result = $this->fetch($id); |
1519 | - } |
|
1520 | - else |
|
1626 | + } else |
|
1521 | 1627 | { |
1522 | 1628 | $result = $this->fetchCommon($id); |
1523 | 1629 | } |
1524 | - if ($result >= 0) $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors |
|
1525 | - if ($result < 0) $error++; |
|
1630 | + if ($result >= 0) { |
|
1631 | + $result=$this->call_trigger($trigkey, (! empty($fuser) && is_object($fuser)) ? $fuser : $user); |
|
1632 | + } |
|
1633 | + // This may set this->errors |
|
1634 | + if ($result < 0) { |
|
1635 | + $error++; |
|
1636 | + } |
|
1526 | 1637 | } |
1527 | 1638 | |
1528 | 1639 | if (! $error) |
1529 | 1640 | { |
1530 | - if (property_exists($this, $field)) $this->$field = $value; |
|
1641 | + if (property_exists($this, $field)) { |
|
1642 | + $this->$field = $value; |
|
1643 | + } |
|
1531 | 1644 | $this->db->commit(); |
1532 | 1645 | return 1; |
1533 | - } |
|
1534 | - else |
|
1646 | + } else |
|
1535 | 1647 | { |
1536 | 1648 | $this->db->rollback(); |
1537 | 1649 | return -2; |
1538 | 1650 | } |
1539 | - } |
|
1540 | - else |
|
1651 | + } else |
|
1541 | 1652 | { |
1542 | 1653 | $this->error=$this->db->lasterror(); |
1543 | 1654 | $this->db->rollback(); |
@@ -1564,36 +1675,66 @@ discard block |
||
1564 | 1675 | dol_print_error('',get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined"); |
1565 | 1676 | return -1; |
1566 | 1677 | } |
1567 | - if ($fieldid == 'none') return 1; |
|
1678 | + if ($fieldid == 'none') { |
|
1679 | + return 1; |
|
1680 | + } |
|
1568 | 1681 | |
1569 | 1682 | // Security on socid |
1570 | 1683 | $socid = 0; |
1571 | - if ($user->societe_id > 0) $socid = $user->societe_id; |
|
1684 | + if ($user->societe_id > 0) { |
|
1685 | + $socid = $user->societe_id; |
|
1686 | + } |
|
1572 | 1687 | |
1573 | 1688 | // this->ismultientitymanaged contains |
1574 | 1689 | // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe |
1575 | 1690 | $alias = 's'; |
1576 | - if ($this->element == 'societe') $alias = 'te'; |
|
1691 | + if ($this->element == 'societe') { |
|
1692 | + $alias = 'te'; |
|
1693 | + } |
|
1577 | 1694 | |
1578 | 1695 | $sql = "SELECT MAX(te.".$fieldid.")"; |
1579 | 1696 | $sql.= " FROM ".(empty($nodbprefix)?MAIN_DB_PREFIX:'').$this->table_element." as te"; |
1580 | 1697 | if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) { |
1581 | 1698 | $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug"; |
1582 | 1699 | } |
1583 | - if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity |
|
1584 | - else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid |
|
1585 | - else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid |
|
1586 | - if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc"; |
|
1700 | + if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) { |
|
1701 | + $sql.= ", ".MAIN_DB_PREFIX."societe as s"; |
|
1702 | + } |
|
1703 | + // If we need to link to societe to limit select to entity |
|
1704 | + else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) { |
|
1705 | + $sql.= ", ".MAIN_DB_PREFIX."societe as s"; |
|
1706 | + } |
|
1707 | + // If we need to link to societe to limit select to socid |
|
1708 | + else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) { |
|
1709 | + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; |
|
1710 | + } |
|
1711 | + // If we need to link to societe to limit select to socid |
|
1712 | + if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) { |
|
1713 | + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc"; |
|
1714 | + } |
|
1587 | 1715 | $sql.= " WHERE te.".$fieldid." < '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists) |
1588 | - if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id; |
|
1589 | - if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)'; |
|
1716 | + if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) { |
|
1717 | + $sql.= " AND sc.fk_user = " .$user->id; |
|
1718 | + } |
|
1719 | + if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) { |
|
1720 | + $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)'; |
|
1721 | + } |
|
1590 | 1722 | if (! empty($filter)) |
1591 | 1723 | { |
1592 | - if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND "; // For backward compatibility |
|
1724 | + if (! preg_match('/^\s*AND/i', $filter)) { |
|
1725 | + $sql.=" AND "; |
|
1726 | + } |
|
1727 | + // For backward compatibility |
|
1593 | 1728 | $sql.=$filter; |
1594 | 1729 | } |
1595 | - if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity |
|
1596 | - else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid |
|
1730 | + if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) { |
|
1731 | + $sql.= ' AND te.fk_soc = s.rowid'; |
|
1732 | + } |
|
1733 | + // If we need to link to societe to limit select to entity |
|
1734 | + else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) { |
|
1735 | + $sql.= ' AND te.fk_soc = s.rowid'; |
|
1736 | + } |
|
1737 | + // If we need to link to societe to limit select to socid |
|
1597 | 1738 | if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) { |
1598 | 1739 | if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) { |
1599 | 1740 | if (!empty($user->admin) && empty($user->entity) && Globals::$conf->entity == 1) { |
@@ -1606,9 +1747,15 @@ discard block |
||
1606 | 1747 | $sql.= ' AND te.entity IN ('.getEntity($this->element).')'; |
1607 | 1748 | } |
1608 | 1749 | } |
1609 | - if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid; |
|
1610 | - if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)'; |
|
1611 | - if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid; |
|
1750 | + if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') { |
|
1751 | + $sql.= ' AND te.fk_soc = ' . $socid; |
|
1752 | + } |
|
1753 | + if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') { |
|
1754 | + $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)'; |
|
1755 | + } |
|
1756 | + if ($this->restrictiononfksoc && $socid && $this->element == 'societe') { |
|
1757 | + $sql.= ' AND te.rowid = ' . $socid; |
|
1758 | + } |
|
1612 | 1759 | //print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>"; |
1613 | 1760 | |
1614 | 1761 | $result = $this->db->query($sql); |
@@ -1626,20 +1773,44 @@ discard block |
||
1626 | 1773 | if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) { |
1627 | 1774 | $sql.= ",".MAIN_DB_PREFIX."usergroup_user as ug"; |
1628 | 1775 | } |
1629 | - if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to entity |
|
1630 | - else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid |
|
1631 | - else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid |
|
1632 | - if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc"; |
|
1776 | + if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) { |
|
1777 | + $sql.= ", ".MAIN_DB_PREFIX."societe as s"; |
|
1778 | + } |
|
1779 | + // If we need to link to societe to limit select to entity |
|
1780 | + else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) { |
|
1781 | + $sql.= ", ".MAIN_DB_PREFIX."societe as s"; |
|
1782 | + } |
|
1783 | + // If we need to link to societe to limit select to socid |
|
1784 | + else if ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) { |
|
1785 | + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; |
|
1786 | + } |
|
1787 | + // If we need to link to societe to limit select to socid |
|
1788 | + if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) { |
|
1789 | + $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$alias.".rowid = sc.fk_soc"; |
|
1790 | + } |
|
1633 | 1791 | $sql.= " WHERE te.".$fieldid." > '".$this->db->escape($this->ref)."'"; // ->ref must always be defined (set to id if field does not exists) |
1634 | - if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND sc.fk_user = " .$user->id; |
|
1635 | - if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)'; |
|
1792 | + if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) { |
|
1793 | + $sql.= " AND sc.fk_user = " .$user->id; |
|
1794 | + } |
|
1795 | + if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) { |
|
1796 | + $sql.= " AND (sc.fk_user = " .$user->id.' OR te.fk_soc IS NULL)'; |
|
1797 | + } |
|
1636 | 1798 | if (! empty($filter)) |
1637 | 1799 | { |
1638 | - if (! preg_match('/^\s*AND/i', $filter)) $sql.=" AND "; // For backward compatibility |
|
1800 | + if (! preg_match('/^\s*AND/i', $filter)) { |
|
1801 | + $sql.=" AND "; |
|
1802 | + } |
|
1803 | + // For backward compatibility |
|
1639 | 1804 | $sql.=$filter; |
1640 | 1805 | } |
1641 | - if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) $sql.= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to entity |
|
1642 | - else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql.= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid |
|
1806 | + if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 2) { |
|
1807 | + $sql.= ' AND te.fk_soc = s.rowid'; |
|
1808 | + } |
|
1809 | + // If we need to link to societe to limit select to entity |
|
1810 | + else if ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) { |
|
1811 | + $sql.= ' AND te.fk_soc = s.rowid'; |
|
1812 | + } |
|
1813 | + // If we need to link to societe to limit select to socid |
|
1643 | 1814 | if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) { |
1644 | 1815 | if ($this->element == 'user' && !empty(Globals::$conf->global->MULTICOMPANY_TRANSVERSE_MODE)) { |
1645 | 1816 | if (!empty($user->admin) && empty($user->entity) && Globals::$conf->entity == 1) { |
@@ -1652,9 +1823,15 @@ discard block |
||
1652 | 1823 | $sql.= ' AND te.entity IN ('.getEntity($this->element).')'; |
1653 | 1824 | } |
1654 | 1825 | } |
1655 | - if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql.= ' AND te.fk_soc = ' . $socid; |
|
1656 | - if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)'; |
|
1657 | - if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql.= ' AND te.rowid = ' . $socid; |
|
1826 | + if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') { |
|
1827 | + $sql.= ' AND te.fk_soc = ' . $socid; |
|
1828 | + } |
|
1829 | + if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') { |
|
1830 | + $sql.= ' AND (te.fk_soc = ' . $socid.' OR te.fk_soc IS NULL)'; |
|
1831 | + } |
|
1832 | + if ($this->restrictiononfksoc && $socid && $this->element == 'societe') { |
|
1833 | + $sql.= ' AND te.rowid = ' . $socid; |
|
1834 | + } |
|
1658 | 1835 | //print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>"; |
1659 | 1836 | // Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null |
1660 | 1837 | |
@@ -1686,8 +1863,11 @@ discard block |
||
1686 | 1863 | $i = 0; |
1687 | 1864 | while ($i < $num) |
1688 | 1865 | { |
1689 | - if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid']; |
|
1690 | - else $contactAlreadySelected[$i] = $tab[$i]['id']; |
|
1866 | + if ($source == 'thirdparty') { |
|
1867 | + $contactAlreadySelected[$i] = $tab[$i]['socid']; |
|
1868 | + } else { |
|
1869 | + $contactAlreadySelected[$i] = $tab[$i]['id']; |
|
1870 | + } |
|
1691 | 1871 | $i++; |
1692 | 1872 | } |
1693 | 1873 | return $contactAlreadySelected; |
@@ -1711,14 +1891,19 @@ discard block |
||
1711 | 1891 | $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element; |
1712 | 1892 | if ($this->table_element == 'actioncomm') |
1713 | 1893 | { |
1714 | - if ($projectid) $sql.= ' SET fk_project = '.$projectid; |
|
1715 | - else $sql.= ' SET fk_project = NULL'; |
|
1894 | + if ($projectid) { |
|
1895 | + $sql.= ' SET fk_project = '.$projectid; |
|
1896 | + } else { |
|
1897 | + $sql.= ' SET fk_project = NULL'; |
|
1898 | + } |
|
1716 | 1899 | $sql.= ' WHERE id = '.$this->id; |
1717 | - } |
|
1718 | - else |
|
1900 | + } else |
|
1719 | 1901 | { |
1720 | - if ($projectid) $sql.= ' SET fk_projet = '.$projectid; |
|
1721 | - else $sql.= ' SET fk_projet = NULL'; |
|
1902 | + if ($projectid) { |
|
1903 | + $sql.= ' SET fk_projet = '.$projectid; |
|
1904 | + } else { |
|
1905 | + $sql.= ' SET fk_projet = NULL'; |
|
1906 | + } |
|
1722 | 1907 | $sql.= ' WHERE rowid = '.$this->id; |
1723 | 1908 | } |
1724 | 1909 | |
@@ -1727,8 +1912,7 @@ discard block |
||
1727 | 1912 | { |
1728 | 1913 | $this->fk_project = $projectid; |
1729 | 1914 | return 1; |
1730 | - } |
|
1731 | - else |
|
1915 | + } else |
|
1732 | 1916 | { |
1733 | 1917 | dol_print_error($this->db); |
1734 | 1918 | return -1; |
@@ -1748,8 +1932,12 @@ discard block |
||
1748 | 1932 | { |
1749 | 1933 | // TODO uniformize field name |
1750 | 1934 | $fieldname = 'fk_mode_reglement'; |
1751 | - if ($this->element == 'societe') $fieldname = 'mode_reglement'; |
|
1752 | - if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier'; |
|
1935 | + if ($this->element == 'societe') { |
|
1936 | + $fieldname = 'mode_reglement'; |
|
1937 | + } |
|
1938 | + if (get_class($this) == 'Fournisseur') { |
|
1939 | + $fieldname = 'mode_reglement_supplier'; |
|
1940 | + } |
|
1753 | 1941 | |
1754 | 1942 | $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element; |
1755 | 1943 | $sql .= ' SET '.$fieldname.' = '.$id; |
@@ -1759,17 +1947,17 @@ discard block |
||
1759 | 1947 | { |
1760 | 1948 | $this->mode_reglement_id = $id; |
1761 | 1949 | // for supplier |
1762 | - if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id; |
|
1950 | + if (get_class($this) == 'Fournisseur') { |
|
1951 | + $this->mode_reglement_supplier_id = $id; |
|
1952 | + } |
|
1763 | 1953 | return 1; |
1764 | - } |
|
1765 | - else |
|
1954 | + } else |
|
1766 | 1955 | { |
1767 | 1956 | dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error()); |
1768 | 1957 | $this->error=$this->db->error(); |
1769 | 1958 | return -1; |
1770 | 1959 | } |
1771 | - } |
|
1772 | - else |
|
1960 | + } else |
|
1773 | 1961 | { |
1774 | 1962 | dol_syslog(get_class($this).'::setPaymentMethods, status of the object is incompatible'); |
1775 | 1963 | $this->error='Status of the object is incompatible '.$this->statut; |
@@ -1799,18 +1987,18 @@ discard block |
||
1799 | 1987 | $this->multicurrency_code = $code; |
1800 | 1988 | |
1801 | 1989 | list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code); |
1802 | - if ($rate) $this->setMulticurrencyRate($rate,2); |
|
1990 | + if ($rate) { |
|
1991 | + $this->setMulticurrencyRate($rate,2); |
|
1992 | + } |
|
1803 | 1993 | |
1804 | 1994 | return 1; |
1805 | - } |
|
1806 | - else |
|
1995 | + } else |
|
1807 | 1996 | { |
1808 | 1997 | dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error()); |
1809 | 1998 | $this->error=$this->db->error(); |
1810 | 1999 | return -1; |
1811 | 2000 | } |
1812 | - } |
|
1813 | - else |
|
2001 | + } else |
|
1814 | 2002 | { |
1815 | 2003 | dol_syslog(get_class($this).'::setMulticurrencyCode, status of the object is incompatible'); |
1816 | 2004 | $this->error='Status of the object is incompatible '.$this->statut; |
@@ -1904,15 +2092,13 @@ discard block |
||
1904 | 2092 | } |
1905 | 2093 | |
1906 | 2094 | return 1; |
1907 | - } |
|
1908 | - else |
|
2095 | + } else |
|
1909 | 2096 | { |
1910 | 2097 | dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error()); |
1911 | 2098 | $this->error=$this->db->error(); |
1912 | 2099 | return -1; |
1913 | 2100 | } |
1914 | - } |
|
1915 | - else |
|
2101 | + } else |
|
1916 | 2102 | { |
1917 | 2103 | dol_syslog(get_class($this).'::setMulticurrencyRate, status of the object is incompatible'); |
1918 | 2104 | $this->error='Status of the object is incompatible '.$this->statut; |
@@ -1933,8 +2119,12 @@ discard block |
||
1933 | 2119 | { |
1934 | 2120 | // TODO uniformize field name |
1935 | 2121 | $fieldname = 'fk_cond_reglement'; |
1936 | - if ($this->element == 'societe') $fieldname = 'cond_reglement'; |
|
1937 | - if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier'; |
|
2122 | + if ($this->element == 'societe') { |
|
2123 | + $fieldname = 'cond_reglement'; |
|
2124 | + } |
|
2125 | + if (get_class($this) == 'Fournisseur') { |
|
2126 | + $fieldname = 'cond_reglement_supplier'; |
|
2127 | + } |
|
1938 | 2128 | |
1939 | 2129 | $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element; |
1940 | 2130 | $sql .= ' SET '.$fieldname.' = '.$id; |
@@ -1944,18 +2134,18 @@ discard block |
||
1944 | 2134 | { |
1945 | 2135 | $this->cond_reglement_id = $id; |
1946 | 2136 | // for supplier |
1947 | - if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id; |
|
2137 | + if (get_class($this) == 'Fournisseur') { |
|
2138 | + $this->cond_reglement_supplier_id = $id; |
|
2139 | + } |
|
1948 | 2140 | $this->cond_reglement = $id; // for compatibility |
1949 | 2141 | return 1; |
1950 | - } |
|
1951 | - else |
|
2142 | + } else |
|
1952 | 2143 | { |
1953 | 2144 | dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error()); |
1954 | 2145 | $this->error=$this->db->error(); |
1955 | 2146 | return -1; |
1956 | 2147 | } |
1957 | - } |
|
1958 | - else |
|
2148 | + } else |
|
1959 | 2149 | { |
1960 | 2150 | dol_syslog(get_class($this).'::setPaymentTerms, status of the object is incompatible'); |
1961 | 2151 | $this->error='Status of the object is incompatible '.$this->statut; |
@@ -1973,7 +2163,9 @@ discard block |
||
1973 | 2163 | function setDeliveryAddress($id) |
1974 | 2164 | { |
1975 | 2165 | $fieldname = 'fk_delivery_address'; |
1976 | - if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address'; |
|
2166 | + if ($this->element == 'delivery' || $this->element == 'shipping') { |
|
2167 | + $fieldname = 'fk_address'; |
|
2168 | + } |
|
1977 | 2169 | |
1978 | 2170 | $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id; |
1979 | 2171 | $sql.= " WHERE rowid = ".$this->id." AND fk_statut = 0"; |
@@ -1982,8 +2174,7 @@ discard block |
||
1982 | 2174 | { |
1983 | 2175 | $this->fk_delivery_address = $id; |
1984 | 2176 | return 1; |
1985 | - } |
|
1986 | - else |
|
2177 | + } else |
|
1987 | 2178 | { |
1988 | 2179 | $this->error=$this->db->error(); |
1989 | 2180 | dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error); |
@@ -2005,7 +2196,9 @@ discard block |
||
2005 | 2196 | { |
2006 | 2197 | global $user; |
2007 | 2198 | |
2008 | - if (empty($userused)) $userused=$user; |
|
2199 | + if (empty($userused)) { |
|
2200 | + $userused=$user; |
|
2201 | + } |
|
2009 | 2202 | |
2010 | 2203 | $error = 0; |
2011 | 2204 | |
@@ -2016,7 +2209,9 @@ discard block |
||
2016 | 2209 | |
2017 | 2210 | $this->db->begin(); |
2018 | 2211 | |
2019 | - if ($shipping_method_id<0) $shipping_method_id='NULL'; |
|
2212 | + if ($shipping_method_id<0) { |
|
2213 | + $shipping_method_id='NULL'; |
|
2214 | + } |
|
2020 | 2215 | dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')'); |
2021 | 2216 | |
2022 | 2217 | $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element; |
@@ -2033,7 +2228,9 @@ discard block |
||
2033 | 2228 | // Call trigger |
2034 | 2229 | $this->context=array('shippingmethodupdate'=>1); |
2035 | 2230 | $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused); |
2036 | - if ($result < 0) $error++; |
|
2231 | + if ($result < 0) { |
|
2232 | + $error++; |
|
2233 | + } |
|
2037 | 2234 | // End call trigger |
2038 | 2235 | } |
2039 | 2236 | } |
@@ -2061,7 +2258,9 @@ discard block |
||
2061 | 2258 | dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined",LOG_ERR); |
2062 | 2259 | return -1; |
2063 | 2260 | } |
2064 | - if ($warehouse_id<0) $warehouse_id='NULL'; |
|
2261 | + if ($warehouse_id<0) { |
|
2262 | + $warehouse_id='NULL'; |
|
2263 | + } |
|
2065 | 2264 | dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')'); |
2066 | 2265 | |
2067 | 2266 | $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element; |
@@ -2108,8 +2307,7 @@ discard block |
||
2108 | 2307 | { |
2109 | 2308 | $this->modelpdf=$modelpdf; |
2110 | 2309 | return 1; |
2111 | - } |
|
2112 | - else |
|
2310 | + } else |
|
2113 | 2311 | { |
2114 | 2312 | dol_print_error($this->db); |
2115 | 2313 | return 0; |
@@ -2129,7 +2327,9 @@ discard block |
||
2129 | 2327 | { |
2130 | 2328 | global $user; |
2131 | 2329 | |
2132 | - if (empty($userused)) $userused=$user; |
|
2330 | + if (empty($userused)) { |
|
2331 | + $userused=$user; |
|
2332 | + } |
|
2133 | 2333 | |
2134 | 2334 | $error = 0; |
2135 | 2335 | |
@@ -2139,7 +2339,9 @@ discard block |
||
2139 | 2339 | } |
2140 | 2340 | $this->db->begin(); |
2141 | 2341 | |
2142 | - if ($fk_account<0) $fk_account='NULL'; |
|
2342 | + if ($fk_account<0) { |
|
2343 | + $fk_account='NULL'; |
|
2344 | + } |
|
2143 | 2345 | dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')'); |
2144 | 2346 | |
2145 | 2347 | $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element; |
@@ -2152,15 +2354,16 @@ discard block |
||
2152 | 2354 | dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error()); |
2153 | 2355 | $this->error = $this->db->lasterror(); |
2154 | 2356 | $error++; |
2155 | - } |
|
2156 | - else |
|
2357 | + } else |
|
2157 | 2358 | { |
2158 | 2359 | if (!$notrigger) |
2159 | 2360 | { |
2160 | 2361 | // Call trigger |
2161 | 2362 | $this->context=array('bankaccountupdate'=>1); |
2162 | 2363 | $result = $this->call_trigger(strtoupper(get_class($this)) . '_MODIFY', $userused); |
2163 | - if ($result < 0) $error++; |
|
2364 | + if ($result < 0) { |
|
2365 | + $error++; |
|
2366 | + } |
|
2164 | 2367 | // End call trigger |
2165 | 2368 | } |
2166 | 2369 | } |
@@ -2168,8 +2371,7 @@ discard block |
||
2168 | 2371 | { |
2169 | 2372 | $this->db->rollback(); |
2170 | 2373 | return -1; |
2171 | - } |
|
2172 | - else |
|
2374 | + } else |
|
2173 | 2375 | { |
2174 | 2376 | $this->fk_account = ($fk_account=='NULL')?null:$fk_account; |
2175 | 2377 | $this->db->commit(); |
@@ -2208,8 +2410,12 @@ discard block |
||
2208 | 2410 | $nl=0; |
2209 | 2411 | $sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line; |
2210 | 2412 | $sql.= ' WHERE '.$this->fk_element.'='.$this->id; |
2211 | - if (! $renum) $sql.= ' AND rang = 0'; |
|
2212 | - if ($renum) $sql.= ' AND rang <> 0'; |
|
2413 | + if (! $renum) { |
|
2414 | + $sql.= ' AND rang = 0'; |
|
2415 | + } |
|
2416 | + if ($renum) { |
|
2417 | + $sql.= ' AND rang <> 0'; |
|
2418 | + } |
|
2213 | 2419 | |
2214 | 2420 | dol_syslog(get_class($this)."::line_order", LOG_DEBUG); |
2215 | 2421 | $resql = $this->db->query($sql); |
@@ -2217,8 +2423,9 @@ discard block |
||
2217 | 2423 | { |
2218 | 2424 | $row = $this->db->fetch_row($resql); |
2219 | 2425 | $nl = $row[0]; |
2220 | - } |
|
2221 | - else dol_print_error($this->db); |
|
2426 | + } else { |
|
2427 | + dol_print_error($this->db); |
|
2428 | + } |
|
2222 | 2429 | if ($nl > 0) |
2223 | 2430 | { |
2224 | 2431 | // The goal of this part is to reorder all lines, with all children lines sharing the same |
@@ -2228,7 +2435,9 @@ discard block |
||
2228 | 2435 | // We first search all lines that are parent lines (for multilevel details lines) |
2229 | 2436 | $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line; |
2230 | 2437 | $sql.= ' WHERE '.$this->fk_element.' = '.$this->id; |
2231 | - if ($fk_parent_line) $sql.= ' AND fk_parent_line IS NULL'; |
|
2438 | + if ($fk_parent_line) { |
|
2439 | + $sql.= ' AND fk_parent_line IS NULL'; |
|
2440 | + } |
|
2232 | 2441 | $sql.= ' ORDER BY rang ASC, rowid '.$rowidorder; |
2233 | 2442 | |
2234 | 2443 | dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG); |
@@ -2260,8 +2469,7 @@ discard block |
||
2260 | 2469 | $this->updateRangOfLine($row, ($key+1)); |
2261 | 2470 | } |
2262 | 2471 | } |
2263 | - } |
|
2264 | - else |
|
2472 | + } else |
|
2265 | 2473 | { |
2266 | 2474 | dol_print_error($this->db); |
2267 | 2475 | } |
@@ -2354,7 +2562,9 @@ discard block |
||
2354 | 2562 | function updateRangOfLine($rowid,$rang) |
2355 | 2563 | { |
2356 | 2564 | $fieldposition = 'rang'; |
2357 | - if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position'; |
|
2565 | + if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) { |
|
2566 | + $fieldposition = 'position'; |
|
2567 | + } |
|
2358 | 2568 | |
2359 | 2569 | $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang; |
2360 | 2570 | $sql.= ' WHERE rowid = '.$rowid; |
@@ -2395,7 +2605,9 @@ discard block |
||
2395 | 2605 | if ($rang > 1) |
2396 | 2606 | { |
2397 | 2607 | $fieldposition = 'rang'; |
2398 | - if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position'; |
|
2608 | + if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) { |
|
2609 | + $fieldposition = 'position'; |
|
2610 | + } |
|
2399 | 2611 | |
2400 | 2612 | $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang ; |
2401 | 2613 | $sql.= ' WHERE '.$this->fk_element.' = '.$this->id; |
@@ -2408,8 +2620,7 @@ discard block |
||
2408 | 2620 | { |
2409 | 2621 | dol_print_error($this->db); |
2410 | 2622 | } |
2411 | - } |
|
2412 | - else |
|
2623 | + } else |
|
2413 | 2624 | { |
2414 | 2625 | dol_print_error($this->db); |
2415 | 2626 | } |
@@ -2429,7 +2640,9 @@ discard block |
||
2429 | 2640 | if ($rang < $max) |
2430 | 2641 | { |
2431 | 2642 | $fieldposition = 'rang'; |
2432 | - if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position'; |
|
2643 | + if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) { |
|
2644 | + $fieldposition = 'position'; |
|
2645 | + } |
|
2433 | 2646 | |
2434 | 2647 | $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang; |
2435 | 2648 | $sql.= ' WHERE '.$this->fk_element.' = '.$this->id; |
@@ -2442,8 +2655,7 @@ discard block |
||
2442 | 2655 | { |
2443 | 2656 | dol_print_error($this->db); |
2444 | 2657 | } |
2445 | - } |
|
2446 | - else |
|
2658 | + } else |
|
2447 | 2659 | { |
2448 | 2660 | dol_print_error($this->db); |
2449 | 2661 | } |
@@ -2514,8 +2726,7 @@ discard block |
||
2514 | 2726 | if (! empty($row[0])) |
2515 | 2727 | { |
2516 | 2728 | return $row[0]; |
2517 | - } |
|
2518 | - else |
|
2729 | + } else |
|
2519 | 2730 | { |
2520 | 2731 | return $this->getRangOfLine($fk_parent_line); |
2521 | 2732 | } |
@@ -2562,8 +2773,7 @@ discard block |
||
2562 | 2773 | { |
2563 | 2774 | $this->ref_ext = $ref_ext; |
2564 | 2775 | return 1; |
2565 | - } |
|
2566 | - else |
|
2776 | + } else |
|
2567 | 2777 | { |
2568 | 2778 | $this->error=$this->db->error(); |
2569 | 2779 | return -1; |
@@ -2597,7 +2807,9 @@ discard block |
||
2597 | 2807 | } |
2598 | 2808 | // Special cas |
2599 | 2809 | //var_dump($this->table_element);exit; |
2600 | - if ($this->table_element == 'product') $suffix=''; |
|
2810 | + if ($this->table_element == 'product') { |
|
2811 | + $suffix=''; |
|
2812 | + } |
|
2601 | 2813 | |
2602 | 2814 | $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element; |
2603 | 2815 | $sql.= " SET note".$suffix." = ".(!empty($note)?("'".$this->db->escape($note)."'"):"NULL"); |
@@ -2607,16 +2819,17 @@ discard block |
||
2607 | 2819 | dol_syslog(get_class($this)."::update_note", LOG_DEBUG); |
2608 | 2820 | if ($this->db->query($sql)) |
2609 | 2821 | { |
2610 | - if ($suffix == '_public') $this->note_public = $note; |
|
2611 | - else if ($suffix == '_private') $this->note_private = $note; |
|
2612 | - else |
|
2822 | + if ($suffix == '_public') { |
|
2823 | + $this->note_public = $note; |
|
2824 | + } else if ($suffix == '_private') { |
|
2825 | + $this->note_private = $note; |
|
2826 | + } else |
|
2613 | 2827 | { |
2614 | 2828 | $this->note = $note; // deprecated |
2615 | 2829 | $this->note_private = $note; |
2616 | 2830 | } |
2617 | 2831 | return 1; |
2618 | - } |
|
2619 | - else |
|
2832 | + } else |
|
2620 | 2833 | { |
2621 | 2834 | $this->error=$this->db->lasterror(); |
2622 | 2835 | return -1; |
@@ -2656,37 +2869,45 @@ discard block |
||
2656 | 2869 | |
2657 | 2870 | // Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield) |
2658 | 2871 | $MODULE = ""; |
2659 | - if ($this->element == 'propal') |
|
2660 | - $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL"; |
|
2661 | - elseif ($this->element == 'order') |
|
2662 | - $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER"; |
|
2663 | - elseif ($this->element == 'facture') |
|
2664 | - $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE"; |
|
2665 | - elseif ($this->element == 'facture_fourn') |
|
2666 | - $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE"; |
|
2667 | - elseif ($this->element == 'order_supplier') |
|
2668 | - $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER"; |
|
2669 | - elseif ($this->element == 'supplier_proposal') |
|
2670 | - $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL"; |
|
2872 | + if ($this->element == 'propal') { |
|
2873 | + $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL"; |
|
2874 | + } elseif ($this->element == 'order') { |
|
2875 | + $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER"; |
|
2876 | + } elseif ($this->element == 'facture') { |
|
2877 | + $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE"; |
|
2878 | + } elseif ($this->element == 'facture_fourn') { |
|
2879 | + $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE"; |
|
2880 | + } elseif ($this->element == 'order_supplier') { |
|
2881 | + $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER"; |
|
2882 | + } elseif ($this->element == 'supplier_proposal') { |
|
2883 | + $MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL"; |
|
2884 | + } |
|
2671 | 2885 | |
2672 | 2886 | if (! empty($MODULE)) { |
2673 | 2887 | if (!empty(Globals::$conf->global->$MODULE)) { |
2674 | 2888 | $modsactivated = explode(',', Globals::$conf->global->$MODULE); |
2675 | 2889 | foreach ($modsactivated as $mod) { |
2676 | - if (Globals::$conf->$mod->enabled) |
|
2677 | - return 1; // update was disabled by specific setup |
|
2890 | + if (Globals::$conf->$mod->enabled) { |
|
2891 | + return 1; |
|
2892 | + } |
|
2893 | + // update was disabled by specific setup |
|
2678 | 2894 | } |
2679 | 2895 | } |
2680 | 2896 | } |
2681 | 2897 | |
2682 | 2898 | include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php'; |
2683 | 2899 | |
2684 | - if ($roundingadjust == '-1') $roundingadjust='auto'; // For backward compatibility |
|
2900 | + if ($roundingadjust == '-1') { |
|
2901 | + $roundingadjust='auto'; |
|
2902 | + } |
|
2903 | + // For backward compatibility |
|
2685 | 2904 | |
2686 | 2905 | $forcedroundingmode=$roundingadjust; |
2687 | - if ($forcedroundingmode == 'auto' && isset(Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) |
|
2688 | - $forcedroundingmode = Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND; |
|
2689 | - elseif ($forcedroundingmode == 'auto') $forcedroundingmode='0'; |
|
2906 | + if ($forcedroundingmode == 'auto' && isset(Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) { |
|
2907 | + $forcedroundingmode = Globals::$conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND; |
|
2908 | + } elseif ($forcedroundingmode == 'auto') { |
|
2909 | + $forcedroundingmode='0'; |
|
2910 | + } |
|
2690 | 2911 | |
2691 | 2912 | $error=0; |
2692 | 2913 | |
@@ -2709,15 +2930,22 @@ discard block |
||
2709 | 2930 | |
2710 | 2931 | $sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,'; |
2711 | 2932 | $sql.= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type'; |
2712 | - if ($this->table_element_line == 'facturedet') $sql.= ', situation_percent'; |
|
2933 | + if ($this->table_element_line == 'facturedet') { |
|
2934 | + $sql.= ', situation_percent'; |
|
2935 | + } |
|
2713 | 2936 | $sql.= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc'; |
2714 | 2937 | $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line; |
2715 | 2938 | $sql.= ' WHERE '.$this->fk_element.' = '.$this->id; |
2716 | 2939 | if ($exclspec) |
2717 | 2940 | { |
2718 | 2941 | $product_field='product_type'; |
2719 | - if ($this->table_element_line == 'contratdet') $product_field=''; // contratdet table has no product_type field |
|
2720 | - if ($product_field) $sql.= ' AND '.$product_field.' <> 9'; |
|
2942 | + if ($this->table_element_line == 'contratdet') { |
|
2943 | + $product_field=''; |
|
2944 | + } |
|
2945 | + // contratdet table has no product_type field |
|
2946 | + if ($product_field) { |
|
2947 | + $sql.= ' AND '.$product_field.' <> 9'; |
|
2948 | + } |
|
2721 | 2949 | } |
2722 | 2950 | $sql.= ' ORDER by rowid'; // We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used |
2723 | 2951 | |
@@ -2747,9 +2975,11 @@ discard block |
||
2747 | 2975 | $parameters=array('fk_element' => $obj->rowid); |
2748 | 2976 | $reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
2749 | 2977 | |
2750 | - if (empty($reshook) && $forcedroundingmode == '0') // Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto' |
|
2978 | + if (empty($reshook) && $forcedroundingmode == '0') { |
|
2979 | + // Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto' |
|
2751 | 2980 | { |
2752 | - $localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx); |
|
2981 | + $localtax_array=array($obj->localtax1_type,$obj->localtax1_tx,$obj->localtax2_type,$obj->localtax2_tx); |
|
2982 | + } |
|
2753 | 2983 | $tmpcal=calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx); |
2754 | 2984 | $diff=price2num($tmpcal[1] - $obj->total_tva, 'MT', 1); |
2755 | 2985 | if ($diff) |
@@ -2757,7 +2987,9 @@ discard block |
||
2757 | 2987 | $sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid; |
2758 | 2988 | dol_syslog('We found unconsistent data into detailed line (difference of '.$diff.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix); |
2759 | 2989 | $resqlfix=$this->db->query($sqlfix); |
2760 | - if (! $resqlfix) dol_print_error($this->db,'Failed to update line'); |
|
2990 | + if (! $resqlfix) { |
|
2991 | + dol_print_error($this->db,'Failed to update line'); |
|
2992 | + } |
|
2761 | 2993 | $obj->total_tva = $tmpcal[1]; |
2762 | 2994 | $obj->total_ttc = $tmpcal[2]; |
2763 | 2995 | // |
@@ -2773,16 +3005,24 @@ discard block |
||
2773 | 3005 | $this->multicurrency_total_tva += $obj->multicurrency_total_tva; |
2774 | 3006 | $this->multicurrency_total_ttc += $obj->multicurrency_total_ttc; |
2775 | 3007 | |
2776 | - if (! isset($total_ht_by_vats[$obj->vatrate])) $total_ht_by_vats[$obj->vatrate]=0; |
|
2777 | - if (! isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate]=0; |
|
2778 | - if (! isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate]=0; |
|
3008 | + if (! isset($total_ht_by_vats[$obj->vatrate])) { |
|
3009 | + $total_ht_by_vats[$obj->vatrate]=0; |
|
3010 | + } |
|
3011 | + if (! isset($total_tva_by_vats[$obj->vatrate])) { |
|
3012 | + $total_tva_by_vats[$obj->vatrate]=0; |
|
3013 | + } |
|
3014 | + if (! isset($total_ttc_by_vats[$obj->vatrate])) { |
|
3015 | + $total_ttc_by_vats[$obj->vatrate]=0; |
|
3016 | + } |
|
2779 | 3017 | $total_ht_by_vats[$obj->vatrate] += $obj->total_ht; |
2780 | 3018 | $total_tva_by_vats[$obj->vatrate] += $obj->total_tva; |
2781 | 3019 | $total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc; |
2782 | 3020 | |
2783 | - if ($forcedroundingmode == '1') // Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency |
|
3021 | + if ($forcedroundingmode == '1') { |
|
3022 | + // Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency |
|
2784 | 3023 | { |
2785 | - $tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1); |
|
3024 | + $tmpvat=price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1); |
|
3025 | + } |
|
2786 | 3026 | $diff=price2num($total_tva_by_vats[$obj->vatrate]-$tmpvat, 'MT', 1); |
2787 | 3027 | //print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n"; |
2788 | 3028 | if ($diff) |
@@ -2791,7 +3031,9 @@ discard block |
||
2791 | 3031 | $sqlfix="UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid; |
2792 | 3032 | dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix); |
2793 | 3033 | $resqlfix=$this->db->query($sqlfix); |
2794 | - if (! $resqlfix) dol_print_error($this->db,'Failed to update line'); |
|
3034 | + if (! $resqlfix) { |
|
3035 | + dol_print_error($this->db,'Failed to update line'); |
|
3036 | + } |
|
2795 | 3037 | $this->total_tva -= $diff; |
2796 | 3038 | $this->total_ttc -= $diff; |
2797 | 3039 | $total_tva_by_vats[$obj->vatrate] -= $diff; |
@@ -2832,11 +3074,21 @@ discard block |
||
2832 | 3074 | $fieldlocaltax2='localtax2'; |
2833 | 3075 | $fieldttc='total_ttc'; |
2834 | 3076 | // Specific code for backward compatibility with old field names |
2835 | - if ($this->element == 'facture' || $this->element == 'facturerec') $fieldht='total'; |
|
2836 | - if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva='total_tva'; |
|
2837 | - if ($this->element == 'propal') $fieldttc='total'; |
|
2838 | - if ($this->element == 'expensereport') $fieldtva='total_tva'; |
|
2839 | - if ($this->element == 'supplier_proposal') $fieldttc='total'; |
|
3077 | + if ($this->element == 'facture' || $this->element == 'facturerec') { |
|
3078 | + $fieldht='total'; |
|
3079 | + } |
|
3080 | + if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') { |
|
3081 | + $fieldtva='total_tva'; |
|
3082 | + } |
|
3083 | + if ($this->element == 'propal') { |
|
3084 | + $fieldttc='total'; |
|
3085 | + } |
|
3086 | + if ($this->element == 'expensereport') { |
|
3087 | + $fieldtva='total_tva'; |
|
3088 | + } |
|
3089 | + if ($this->element == 'supplier_proposal') { |
|
3090 | + $fieldttc='total'; |
|
3091 | + } |
|
2840 | 3092 | |
2841 | 3093 | if (empty($nodatabaseupdate)) |
2842 | 3094 | { |
@@ -2865,13 +3117,11 @@ discard block |
||
2865 | 3117 | if (! $error) |
2866 | 3118 | { |
2867 | 3119 | return 1; |
2868 | - } |
|
2869 | - else |
|
3120 | + } else |
|
2870 | 3121 | { |
2871 | 3122 | return -1; |
2872 | 3123 | } |
2873 | - } |
|
2874 | - else |
|
3124 | + } else |
|
2875 | 3125 | { |
2876 | 3126 | dol_print_error($this->db,'Bad request in update_price'); |
2877 | 3127 | return -1; |
@@ -2894,10 +3144,18 @@ discard block |
||
2894 | 3144 | $origin_id = (! empty($origin_id) ? $origin_id : $this->origin_id); |
2895 | 3145 | |
2896 | 3146 | // Special case |
2897 | - if ($origin == 'order') $origin='commande'; |
|
2898 | - if ($origin == 'invoice') $origin='facture'; |
|
2899 | - if ($origin == 'invoice_template') $origin='facturerec'; |
|
2900 | - if ($origin == 'supplierorder') $origin='order_supplier'; |
|
3147 | + if ($origin == 'order') { |
|
3148 | + $origin='commande'; |
|
3149 | + } |
|
3150 | + if ($origin == 'invoice') { |
|
3151 | + $origin='facture'; |
|
3152 | + } |
|
3153 | + if ($origin == 'invoice_template') { |
|
3154 | + $origin='facturerec'; |
|
3155 | + } |
|
3156 | + if ($origin == 'supplierorder') { |
|
3157 | + $origin='order_supplier'; |
|
3158 | + } |
|
2901 | 3159 | $this->db->begin(); |
2902 | 3160 | |
2903 | 3161 | $sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element ("; |
@@ -2917,8 +3175,7 @@ discard block |
||
2917 | 3175 | { |
2918 | 3176 | $this->db->commit(); |
2919 | 3177 | return 1; |
2920 | - } |
|
2921 | - else |
|
3178 | + } else |
|
2922 | 3179 | { |
2923 | 3180 | $this->error=$this->db->lasterror(); |
2924 | 3181 | $this->db->rollback(); |
@@ -2963,12 +3220,16 @@ discard block |
||
2963 | 3220 | if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid)) |
2964 | 3221 | { |
2965 | 3222 | $justsource=true; // the source (id and type) is a search criteria |
2966 | - if (! empty($targettype)) $withtargettype=true; |
|
3223 | + if (! empty($targettype)) { |
|
3224 | + $withtargettype=true; |
|
3225 | + } |
|
2967 | 3226 | } |
2968 | 3227 | if (! empty($targetid) && ! empty($targettype) && empty($sourceid)) |
2969 | 3228 | { |
2970 | 3229 | $justtarget=true; // the target (id and type) is a search criteria |
2971 | - if (! empty($sourcetype)) $withsourcetype=true; |
|
3230 | + if (! empty($sourcetype)) { |
|
3231 | + $withsourcetype=true; |
|
3232 | + } |
|
2972 | 3233 | } |
2973 | 3234 | |
2974 | 3235 | $sourceid = (! empty($sourceid) ? $sourceid : $this->id); |
@@ -2991,15 +3252,17 @@ discard block |
||
2991 | 3252 | if ($justsource) |
2992 | 3253 | { |
2993 | 3254 | $sql.= "fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."'"; |
2994 | - if ($withtargettype) $sql.= " AND targettype = '".$targettype."'"; |
|
2995 | - } |
|
2996 | - else if ($justtarget) |
|
3255 | + if ($withtargettype) { |
|
3256 | + $sql.= " AND targettype = '".$targettype."'"; |
|
3257 | + } |
|
3258 | + } else if ($justtarget) |
|
2997 | 3259 | { |
2998 | 3260 | $sql.= "fk_target = ".$targetid." AND targettype = '".$targettype."'"; |
2999 | - if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'"; |
|
3261 | + if ($withsourcetype) { |
|
3262 | + $sql.= " AND sourcetype = '".$sourcetype."'"; |
|
3263 | + } |
|
3000 | 3264 | } |
3001 | - } |
|
3002 | - else |
|
3265 | + } else |
|
3003 | 3266 | { |
3004 | 3267 | $sql.= "(fk_source = ".$sourceid." AND sourcetype = '".$sourcetype."')"; |
3005 | 3268 | $sql.= " ".$clause." (fk_target = ".$targetid." AND targettype = '".$targettype."')"; |
@@ -3020,13 +3283,11 @@ discard block |
||
3020 | 3283 | if ($justsource) |
3021 | 3284 | { |
3022 | 3285 | $this->linkedObjectsIds[$obj->targettype][$obj->rowid]=$obj->fk_target; |
3023 | - } |
|
3024 | - else if ($justtarget) |
|
3286 | + } else if ($justtarget) |
|
3025 | 3287 | { |
3026 | 3288 | $this->linkedObjectsIds[$obj->sourcetype][$obj->rowid]=$obj->fk_source; |
3027 | 3289 | } |
3028 | - } |
|
3029 | - else |
|
3290 | + } else |
|
3030 | 3291 | { |
3031 | 3292 | if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype) |
3032 | 3293 | { |
@@ -3043,10 +3304,12 @@ discard block |
||
3043 | 3304 | if (! empty($this->linkedObjectsIds)) |
3044 | 3305 | { |
3045 | 3306 | $tmparray = $this->linkedObjectsIds; |
3046 | - foreach($tmparray as $objecttype => $objectids) // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...) |
|
3307 | + foreach($tmparray as $objecttype => $objectids) { |
|
3308 | + // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...) |
|
3047 | 3309 | { |
3048 | 3310 | // Parse element/subelement (ex: project_task, cabinetmed_consultation, ...) |
3049 | - $module = $element = $subelement = $objecttype; |
|
3311 | + $module = $element = $subelement = $objecttype; |
|
3312 | + } |
|
3050 | 3313 | if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier' |
3051 | 3314 | && preg_match('/^([^_]+)_([^_]+)/i',$objecttype,$regs)) |
3052 | 3315 | { |
@@ -3058,29 +3321,21 @@ discard block |
||
3058 | 3321 | // To work with non standard classpath or module name |
3059 | 3322 | if ($objecttype == 'facture') { |
3060 | 3323 | $classpath = 'compta/facture/class'; |
3061 | - } |
|
3062 | - else if ($objecttype == 'facturerec') { |
|
3324 | + } else if ($objecttype == 'facturerec') { |
|
3063 | 3325 | $classpath = 'compta/facture/class'; $module = 'facture'; |
3064 | - } |
|
3065 | - else if ($objecttype == 'propal') { |
|
3326 | + } else if ($objecttype == 'propal') { |
|
3066 | 3327 | $classpath = 'comm/propal/class'; |
3067 | - } |
|
3068 | - else if ($objecttype == 'supplier_proposal') { |
|
3328 | + } else if ($objecttype == 'supplier_proposal') { |
|
3069 | 3329 | $classpath = 'supplier_proposal/class'; |
3070 | - } |
|
3071 | - else if ($objecttype == 'shipping') { |
|
3330 | + } else if ($objecttype == 'shipping') { |
|
3072 | 3331 | $classpath = 'expedition/class'; $subelement = 'expedition'; $module = 'expedition_bon'; |
3073 | - } |
|
3074 | - else if ($objecttype == 'delivery') { |
|
3332 | + } else if ($objecttype == 'delivery') { |
|
3075 | 3333 | $classpath = 'livraison/class'; $subelement = 'livraison'; $module = 'livraison_bon'; |
3076 | - } |
|
3077 | - else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') { |
|
3334 | + } else if ($objecttype == 'invoice_supplier' || $objecttype == 'order_supplier') { |
|
3078 | 3335 | $classpath = 'fourn/class'; $module = 'fournisseur'; |
3079 | - } |
|
3080 | - else if ($objecttype == 'fichinter') { |
|
3336 | + } else if ($objecttype == 'fichinter') { |
|
3081 | 3337 | $classpath = 'fichinter/class'; $subelement = 'fichinter'; $module = 'ficheinter'; |
3082 | - } |
|
3083 | - else if ($objecttype == 'subscription') { |
|
3338 | + } else if ($objecttype == 'subscription') { |
|
3084 | 3339 | $classpath = 'adherents/class'; $module = 'adherent'; |
3085 | 3340 | } |
3086 | 3341 | |
@@ -3089,20 +3344,15 @@ discard block |
||
3089 | 3344 | |
3090 | 3345 | if ($objecttype == 'order') { |
3091 | 3346 | $classfile = 'commande'; $classname = 'Commande'; |
3092 | - } |
|
3093 | - else if ($objecttype == 'invoice_supplier') { |
|
3347 | + } else if ($objecttype == 'invoice_supplier') { |
|
3094 | 3348 | $classfile = 'fournisseur.facture'; $classname = 'FactureFournisseur'; |
3095 | - } |
|
3096 | - else if ($objecttype == 'order_supplier') { |
|
3349 | + } else if ($objecttype == 'order_supplier') { |
|
3097 | 3350 | $classfile = 'fournisseur.commande'; $classname = 'CommandeFournisseur'; |
3098 | - } |
|
3099 | - else if ($objecttype == 'supplier_proposal') { |
|
3351 | + } else if ($objecttype == 'supplier_proposal') { |
|
3100 | 3352 | $classfile = 'supplier_proposal'; $classname = 'SupplierProposal'; |
3101 | - } |
|
3102 | - else if ($objecttype == 'facturerec') { |
|
3353 | + } else if ($objecttype == 'facturerec') { |
|
3103 | 3354 | $classfile = 'facture-rec'; $classname = 'FactureRec'; |
3104 | - } |
|
3105 | - else if ($objecttype == 'subscription') { |
|
3355 | + } else if ($objecttype == 'subscription') { |
|
3106 | 3356 | $classfile = 'subscription'; $classname = 'Subscription'; |
3107 | 3357 | } |
3108 | 3358 | |
@@ -3114,9 +3364,11 @@ discard block |
||
3114 | 3364 | //print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname); |
3115 | 3365 | if (class_exists($classname)) |
3116 | 3366 | { |
3117 | - foreach($objectids as $i => $objectid) // $i is rowid into llx_element_element |
|
3367 | + foreach($objectids as $i => $objectid) { |
|
3368 | + // $i is rowid into llx_element_element |
|
3118 | 3369 | { |
3119 | - $object = new $classname($this->db); |
|
3370 | + $object = new $classname($this->db); |
|
3371 | + } |
|
3120 | 3372 | $ret = $object->fetch($objectid); |
3121 | 3373 | if ($ret >= 0) |
3122 | 3374 | { |
@@ -3125,16 +3377,14 @@ discard block |
||
3125 | 3377 | } |
3126 | 3378 | } |
3127 | 3379 | } |
3128 | - } |
|
3129 | - else |
|
3380 | + } else |
|
3130 | 3381 | { |
3131 | 3382 | unset($this->linkedObjectsIds[$objecttype]); |
3132 | 3383 | } |
3133 | 3384 | } |
3134 | 3385 | } |
3135 | 3386 | return 1; |
3136 | - } |
|
3137 | - else |
|
3387 | + } else |
|
3138 | 3388 | { |
3139 | 3389 | dol_print_error($this->db); |
3140 | 3390 | return -1; |
@@ -3156,8 +3406,11 @@ discard block |
||
3156 | 3406 | $updatesource=false; |
3157 | 3407 | $updatetarget=false; |
3158 | 3408 | |
3159 | - if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource=true; |
|
3160 | - else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $updatetarget=true; |
|
3409 | + if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) { |
|
3410 | + $updatesource=true; |
|
3411 | + } else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) { |
|
3412 | + $updatetarget=true; |
|
3413 | + } |
|
3161 | 3414 | |
3162 | 3415 | $sql = "UPDATE ".MAIN_DB_PREFIX."element_element SET "; |
3163 | 3416 | if ($updatesource) |
@@ -3166,8 +3419,7 @@ discard block |
||
3166 | 3419 | $sql.= ", sourcetype = '".$this->db->escape($sourcetype)."'"; |
3167 | 3420 | $sql.= " WHERE fk_target = ".$this->id; |
3168 | 3421 | $sql.= " AND targettype = '".$this->db->escape($this->element)."'"; |
3169 | - } |
|
3170 | - else if ($updatetarget) |
|
3422 | + } else if ($updatetarget) |
|
3171 | 3423 | { |
3172 | 3424 | $sql.= "fk_target = ".$targetid; |
3173 | 3425 | $sql.= ", targettype = '".$this->db->escape($targettype)."'"; |
@@ -3179,8 +3431,7 @@ discard block |
||
3179 | 3431 | if ($this->db->query($sql)) |
3180 | 3432 | { |
3181 | 3433 | return 1; |
3182 | - } |
|
3183 | - else |
|
3434 | + } else |
|
3184 | 3435 | { |
3185 | 3436 | $this->error=$this->db->lasterror(); |
3186 | 3437 | return -1; |
@@ -3203,8 +3454,11 @@ discard block |
||
3203 | 3454 | $deletesource=false; |
3204 | 3455 | $deletetarget=false; |
3205 | 3456 | |
3206 | - if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource=true; |
|
3207 | - else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) $deletetarget=true; |
|
3457 | + if (! empty($sourceid) && ! empty($sourcetype) && empty($targetid) && empty($targettype)) { |
|
3458 | + $deletesource=true; |
|
3459 | + } else if (empty($sourceid) && empty($sourcetype) && ! empty($targetid) && ! empty($targettype)) { |
|
3460 | + $deletetarget=true; |
|
3461 | + } |
|
3208 | 3462 | |
3209 | 3463 | $sourceid = (! empty($sourceid) ? $sourceid : $this->id); |
3210 | 3464 | $sourcetype = (! empty($sourcetype) ? $sourcetype : $this->element); |
@@ -3216,20 +3470,17 @@ discard block |
||
3216 | 3470 | if ($rowid > 0) |
3217 | 3471 | { |
3218 | 3472 | $sql.=" rowid = ".$rowid; |
3219 | - } |
|
3220 | - else |
|
3473 | + } else |
|
3221 | 3474 | { |
3222 | 3475 | if ($deletesource) |
3223 | 3476 | { |
3224 | 3477 | $sql.= " fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'"; |
3225 | 3478 | $sql.= " AND fk_target = ".$this->id." AND targettype = '".$this->db->escape($this->element)."'"; |
3226 | - } |
|
3227 | - else if ($deletetarget) |
|
3479 | + } else if ($deletetarget) |
|
3228 | 3480 | { |
3229 | 3481 | $sql.= " fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'"; |
3230 | 3482 | $sql.= " AND fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."'"; |
3231 | - } |
|
3232 | - else |
|
3483 | + } else |
|
3233 | 3484 | { |
3234 | 3485 | $sql.= " (fk_source = ".$this->id." AND sourcetype = '".$this->db->escape($this->element)."')"; |
3235 | 3486 | $sql.= " OR"; |
@@ -3241,8 +3492,7 @@ discard block |
||
3241 | 3492 | if ($this->db->query($sql)) |
3242 | 3493 | { |
3243 | 3494 | return 1; |
3244 | - } |
|
3245 | - else |
|
3495 | + } else |
|
3246 | 3496 | { |
3247 | 3497 | $this->error=$this->db->lasterror(); |
3248 | 3498 | $this->errors[]=$this->error; |
@@ -3271,17 +3521,31 @@ discard block |
||
3271 | 3521 | $this->db->begin(); |
3272 | 3522 | |
3273 | 3523 | $fieldstatus="fk_statut"; |
3274 | - if ($elementTable == 'facture_rec') $fieldstatus="suspended"; |
|
3275 | - if ($elementTable == 'mailing') $fieldstatus="statut"; |
|
3276 | - if ($elementTable == 'cronjob') $fieldstatus="status"; |
|
3277 | - if ($elementTable == 'user') $fieldstatus="statut"; |
|
3278 | - if ($elementTable == 'expensereport') $fieldstatus="fk_statut"; |
|
3279 | - if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus="status"; |
|
3524 | + if ($elementTable == 'facture_rec') { |
|
3525 | + $fieldstatus="suspended"; |
|
3526 | + } |
|
3527 | + if ($elementTable == 'mailing') { |
|
3528 | + $fieldstatus="statut"; |
|
3529 | + } |
|
3530 | + if ($elementTable == 'cronjob') { |
|
3531 | + $fieldstatus="status"; |
|
3532 | + } |
|
3533 | + if ($elementTable == 'user') { |
|
3534 | + $fieldstatus="statut"; |
|
3535 | + } |
|
3536 | + if ($elementTable == 'expensereport') { |
|
3537 | + $fieldstatus="fk_statut"; |
|
3538 | + } |
|
3539 | + if ($elementTable == 'commande_fournisseur_dispatch') { |
|
3540 | + $fieldstatus="status"; |
|
3541 | + } |
|
3280 | 3542 | |
3281 | 3543 | $sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable; |
3282 | 3544 | $sql.= " SET ".$fieldstatus." = ".$status; |
3283 | 3545 | // If status = 1 = validated, update also fk_user_valid |
3284 | - if ($status == 1 && $elementTable == 'expensereport') $sql.=", fk_user_valid = ".$user->id; |
|
3546 | + if ($status == 1 && $elementTable == 'expensereport') { |
|
3547 | + $sql.=", fk_user_valid = ".$user->id; |
|
3548 | + } |
|
3285 | 3549 | $sql.= " WHERE rowid=".$elementId; |
3286 | 3550 | |
3287 | 3551 | dol_syslog(get_class($this)."::setStatut", LOG_DEBUG); |
@@ -3292,12 +3556,27 @@ discard block |
||
3292 | 3556 | // Try autoset of trigkey |
3293 | 3557 | if (empty($trigkey)) |
3294 | 3558 | { |
3295 | - if ($this->element == 'supplier_proposal' && $status == 2) $trigkey='SUPPLIER_PROPOSAL_SIGN'; // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class |
|
3296 | - if ($this->element == 'supplier_proposal' && $status == 3) $trigkey='SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class |
|
3297 | - if ($this->element == 'supplier_proposal' && $status == 4) $trigkey='SUPPLIER_PROPOSAL_CLOSE'; // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class |
|
3298 | - if ($this->element == 'fichinter' && $status == 3) $trigkey='FICHINTER_CLASSIFY_DONE'; |
|
3299 | - if ($this->element == 'fichinter' && $status == 2) $trigkey='FICHINTER_CLASSIFY_BILLED'; |
|
3300 | - if ($this->element == 'fichinter' && $status == 1) $trigkey='FICHINTER_CLASSIFY_UNBILLED'; |
|
3559 | + if ($this->element == 'supplier_proposal' && $status == 2) { |
|
3560 | + $trigkey='SUPPLIER_PROPOSAL_SIGN'; |
|
3561 | + } |
|
3562 | + // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class |
|
3563 | + if ($this->element == 'supplier_proposal' && $status == 3) { |
|
3564 | + $trigkey='SUPPLIER_PROPOSAL_REFUSE'; |
|
3565 | + } |
|
3566 | + // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class |
|
3567 | + if ($this->element == 'supplier_proposal' && $status == 4) { |
|
3568 | + $trigkey='SUPPLIER_PROPOSAL_CLOSE'; |
|
3569 | + } |
|
3570 | + // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class |
|
3571 | + if ($this->element == 'fichinter' && $status == 3) { |
|
3572 | + $trigkey='FICHINTER_CLASSIFY_DONE'; |
|
3573 | + } |
|
3574 | + if ($this->element == 'fichinter' && $status == 2) { |
|
3575 | + $trigkey='FICHINTER_CLASSIFY_BILLED'; |
|
3576 | + } |
|
3577 | + if ($this->element == 'fichinter' && $status == 1) { |
|
3578 | + $trigkey='FICHINTER_CLASSIFY_UNBILLED'; |
|
3579 | + } |
|
3301 | 3580 | } |
3302 | 3581 | |
3303 | 3582 | if ($trigkey) |
@@ -3316,22 +3595,22 @@ discard block |
||
3316 | 3595 | { |
3317 | 3596 | $this->db->commit(); |
3318 | 3597 | |
3319 | - if (empty($savElementId)) // If the element we update was $this (so $elementId is null) |
|
3598 | + if (empty($savElementId)) { |
|
3599 | + // If the element we update was $this (so $elementId is null) |
|
3320 | 3600 | { |
3321 | - $this->statut = $status; |
|
3601 | + $this->statut = $status; |
|
3602 | + } |
|
3322 | 3603 | $this->status = $status; |
3323 | 3604 | } |
3324 | 3605 | |
3325 | 3606 | return 1; |
3326 | - } |
|
3327 | - else |
|
3607 | + } else |
|
3328 | 3608 | { |
3329 | 3609 | $this->db->rollback(); |
3330 | 3610 | dol_syslog(get_class($this)."::setStatus ".$this->error,LOG_ERR); |
3331 | 3611 | return -1; |
3332 | 3612 | } |
3333 | - } |
|
3334 | - else |
|
3613 | + } else |
|
3335 | 3614 | { |
3336 | 3615 | $this->error=$this->db->lasterror(); |
3337 | 3616 | $this->db->rollback(); |
@@ -3351,9 +3630,13 @@ discard block |
||
3351 | 3630 | { |
3352 | 3631 | global $conf; |
3353 | 3632 | |
3354 | - if (empty($id) && empty($ref)) return 0; |
|
3355 | - if (!empty(Globals::$conf->global->MAIN_DISABLE_CANVAS)) |
|
3356 | - return 0; // To increase speed. Not enabled by default. |
|
3633 | + if (empty($id) && empty($ref)) { |
|
3634 | + return 0; |
|
3635 | + } |
|
3636 | + if (!empty(Globals::$conf->global->MAIN_DISABLE_CANVAS)) { |
|
3637 | + return 0; |
|
3638 | + } |
|
3639 | + // To increase speed. Not enabled by default. |
|
3357 | 3640 | |
3358 | 3641 | // Clean parameters |
3359 | 3642 | $ref = trim($ref); |
@@ -3361,8 +3644,12 @@ discard block |
||
3361 | 3644 | $sql = "SELECT rowid, canvas"; |
3362 | 3645 | $sql.= " FROM ".MAIN_DB_PREFIX.$this->table_element; |
3363 | 3646 | $sql.= " WHERE entity IN (".getEntity($this->element).")"; |
3364 | - if (! empty($id)) $sql.= " AND rowid = ".$id; |
|
3365 | - if (! empty($ref)) $sql.= " AND ref = '".$this->db->escape($ref)."'"; |
|
3647 | + if (! empty($id)) { |
|
3648 | + $sql.= " AND rowid = ".$id; |
|
3649 | + } |
|
3650 | + if (! empty($ref)) { |
|
3651 | + $sql.= " AND ref = '".$this->db->escape($ref)."'"; |
|
3652 | + } |
|
3366 | 3653 | |
3367 | 3654 | $resql = $this->db->query($sql); |
3368 | 3655 | if ($resql) |
@@ -3372,10 +3659,10 @@ discard block |
||
3372 | 3659 | { |
3373 | 3660 | $this->canvas = $obj->canvas; |
3374 | 3661 | return 1; |
3375 | - } |
|
3376 | - else return 0; |
|
3377 | - } |
|
3378 | - else |
|
3662 | + } else { |
|
3663 | + return 0; |
|
3664 | + } |
|
3665 | + } else |
|
3379 | 3666 | { |
3380 | 3667 | dol_print_error($this->db); |
3381 | 3668 | return -1; |
@@ -3412,7 +3699,9 @@ discard block |
||
3412 | 3699 | { |
3413 | 3700 | global $langs; |
3414 | 3701 | |
3415 | - if (empty($id)) $id=$this->id; |
|
3702 | + if (empty($id)) { |
|
3703 | + $id=$this->id; |
|
3704 | + } |
|
3416 | 3705 | |
3417 | 3706 | // Check parameters |
3418 | 3707 | if (! isset($this->childtables) || ! is_array($this->childtables) || count($this->childtables) == 0) |
@@ -3446,18 +3735,18 @@ discard block |
||
3446 | 3735 | $langs->load("errors"); |
3447 | 3736 | //print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild; |
3448 | 3737 | $haschild += $obj->nb; |
3449 | - if (is_numeric($elementname)) // old usage |
|
3738 | + if (is_numeric($elementname)) { |
|
3739 | + // old usage |
|
3450 | 3740 | { |
3451 | - $this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table); |
|
3452 | - } |
|
3453 | - else // new usage: $elementname=Translation key |
|
3741 | + $this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table); |
|
3742 | + } |
|
3743 | + } else // new usage: $elementname=Translation key |
|
3454 | 3744 | { |
3455 | 3745 | $this->errors[]=$langs->trans("ErrorRecordHasAtLeastOneChildOfType", $langs->transnoentitiesnoconv($elementname)); |
3456 | 3746 | } |
3457 | 3747 | break; // We found at least one, we stop here |
3458 | 3748 | } |
3459 | - } |
|
3460 | - else |
|
3749 | + } else |
|
3461 | 3750 | { |
3462 | 3751 | $this->errors[]=$this->db->lasterror(); |
3463 | 3752 | return -1; |
@@ -3467,8 +3756,9 @@ discard block |
||
3467 | 3756 | { |
3468 | 3757 | $this->errors[]="ErrorRecordHasChildren"; |
3469 | 3758 | return $haschild; |
3470 | - } |
|
3471 | - else return 0; |
|
3759 | + } else { |
|
3760 | + return 0; |
|
3761 | + } |
|
3472 | 3762 | } |
3473 | 3763 | |
3474 | 3764 | /** |
@@ -3484,12 +3774,24 @@ discard block |
||
3484 | 3774 | foreach($this->lines as $key => $val) |
3485 | 3775 | { |
3486 | 3776 | $qualified=0; |
3487 | - if ($predefined == -1) $qualified=1; |
|
3488 | - if ($predefined == 1 && $val->fk_product > 0) $qualified=1; |
|
3489 | - if ($predefined == 0 && $val->fk_product <= 0) $qualified=1; |
|
3490 | - if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) $qualified=1; |
|
3491 | - if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) $qualified=1; |
|
3492 | - if ($qualified) $nb++; |
|
3777 | + if ($predefined == -1) { |
|
3778 | + $qualified=1; |
|
3779 | + } |
|
3780 | + if ($predefined == 1 && $val->fk_product > 0) { |
|
3781 | + $qualified=1; |
|
3782 | + } |
|
3783 | + if ($predefined == 0 && $val->fk_product <= 0) { |
|
3784 | + $qualified=1; |
|
3785 | + } |
|
3786 | + if ($predefined == 2 && $val->fk_product > 0 && $val->product_type==0) { |
|
3787 | + $qualified=1; |
|
3788 | + } |
|
3789 | + if ($predefined == 3 && $val->fk_product > 0 && $val->product_type==1) { |
|
3790 | + $qualified=1; |
|
3791 | + } |
|
3792 | + if ($qualified) { |
|
3793 | + $nb++; |
|
3794 | + } |
|
3493 | 3795 | } |
3494 | 3796 | dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies'); |
3495 | 3797 | return $nb; |
@@ -3553,16 +3855,24 @@ discard block |
||
3553 | 3855 | { |
3554 | 3856 | if (isset($line->qty_asked)) |
3555 | 3857 | { |
3556 | - if (empty($totalOrdered)) $totalOrdered=0; // Avoid warning because $totalOrdered is '' |
|
3858 | + if (empty($totalOrdered)) { |
|
3859 | + $totalOrdered=0; |
|
3860 | + } |
|
3861 | + // Avoid warning because $totalOrdered is '' |
|
3557 | 3862 | $totalOrdered+=$line->qty_asked; // defined for shipment only |
3558 | 3863 | } |
3559 | 3864 | if (isset($line->qty_shipped)) |
3560 | 3865 | { |
3561 | - if (empty($totalToShip)) $totalToShip=0; // Avoid warning because $totalToShip is '' |
|
3866 | + if (empty($totalToShip)) { |
|
3867 | + $totalToShip=0; |
|
3868 | + } |
|
3869 | + // Avoid warning because $totalToShip is '' |
|
3562 | 3870 | $totalToShip+=$line->qty_shipped; // defined for shipment only |
3563 | - }else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty)) |
|
3871 | + } else if ($line->element == 'commandefournisseurdispatch' && isset($line->qty)) |
|
3564 | 3872 | { |
3565 | - if (empty($totalToShip)) $totalToShip=0; |
|
3873 | + if (empty($totalToShip)) { |
|
3874 | + $totalToShip=0; |
|
3875 | + } |
|
3566 | 3876 | $totalToShip+=$line->qty; // defined for reception only |
3567 | 3877 | } |
3568 | 3878 | |
@@ -3570,8 +3880,7 @@ discard block |
||
3570 | 3880 | if ($this->element == 'shipping') { |
3571 | 3881 | // for shipments |
3572 | 3882 | $qty = $line->qty_shipped ? $line->qty_shipped : 0; |
3573 | - } |
|
3574 | - else { |
|
3883 | + } else { |
|
3575 | 3884 | $qty = $line->qty ? $line->qty : 0; |
3576 | 3885 | } |
3577 | 3886 | |
@@ -3587,19 +3896,30 @@ discard block |
||
3587 | 3896 | |
3588 | 3897 | $weightUnit=0; |
3589 | 3898 | $volumeUnit=0; |
3590 | - if (! empty($weight_units)) $weightUnit = $weight_units; |
|
3591 | - if (! empty($volume_units)) $volumeUnit = $volume_units; |
|
3592 | - |
|
3593 | - if (empty($totalWeight)) $totalWeight=0; // Avoid warning because $totalWeight is '' |
|
3594 | - if (empty($totalVolume)) $totalVolume=0; // Avoid warning because $totalVolume is '' |
|
3899 | + if (! empty($weight_units)) { |
|
3900 | + $weightUnit = $weight_units; |
|
3901 | + } |
|
3902 | + if (! empty($volume_units)) { |
|
3903 | + $volumeUnit = $volume_units; |
|
3904 | + } |
|
3905 | + |
|
3906 | + if (empty($totalWeight)) { |
|
3907 | + $totalWeight=0; |
|
3908 | + } |
|
3909 | + // Avoid warning because $totalWeight is '' |
|
3910 | + if (empty($totalVolume)) { |
|
3911 | + $totalVolume=0; |
|
3912 | + } |
|
3913 | + // Avoid warning because $totalVolume is '' |
|
3595 | 3914 | |
3596 | 3915 | //var_dump($line->volume_units); |
3597 | - if ($weight_units < 50) // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch) |
|
3916 | + if ($weight_units < 50) { |
|
3917 | + // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch) |
|
3598 | 3918 | { |
3599 | - $trueWeightUnit=pow(10, $weightUnit); |
|
3919 | + $trueWeightUnit=pow(10, $weightUnit); |
|
3920 | + } |
|
3600 | 3921 | $totalWeight += $weight * $qty * $trueWeightUnit; |
3601 | - } |
|
3602 | - else { |
|
3922 | + } else { |
|
3603 | 3923 | if ($weight_units == 99) { |
3604 | 3924 | // conversion 1 Pound = 0.45359237 KG |
3605 | 3925 | $trueWeightUnit = 0.45359237; |
@@ -3608,18 +3928,20 @@ discard block |
||
3608 | 3928 | // conversion 1 Ounce = 0.0283495 KG |
3609 | 3929 | $trueWeightUnit = 0.0283495; |
3610 | 3930 | $totalWeight += $weight * $qty * $trueWeightUnit; |
3611 | - } |
|
3612 | - else |
|
3613 | - $totalWeight += $weight * $qty; // This may be wrong if we mix different units |
|
3931 | + } else { |
|
3932 | + $totalWeight += $weight * $qty; |
|
3933 | + } |
|
3934 | + // This may be wrong if we mix different units |
|
3614 | 3935 | } |
3615 | - if ($volume_units < 50) // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch) |
|
3936 | + if ($volume_units < 50) { |
|
3937 | + // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch) |
|
3616 | 3938 | { |
3617 | 3939 | //print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit; |
3618 | - $trueVolumeUnit=pow(10, $volumeUnit); |
|
3940 | + $trueVolumeUnit=pow(10, $volumeUnit); |
|
3941 | + } |
|
3619 | 3942 | //print $line->volume; |
3620 | 3943 | $totalVolume += $volume * $qty * $trueVolumeUnit; |
3621 | - } |
|
3622 | - else |
|
3944 | + } else |
|
3623 | 3945 | { |
3624 | 3946 | $totalVolume += $volume * $qty; // This may be wrong if we mix different units |
3625 | 3947 | } |
@@ -3651,8 +3973,7 @@ discard block |
||
3651 | 3973 | $this->error=$this->db->lasterror(); |
3652 | 3974 | $this->db->rollback(); |
3653 | 3975 | return -1; |
3654 | - } |
|
3655 | - else |
|
3976 | + } else |
|
3656 | 3977 | { |
3657 | 3978 | $this->db->commit(); |
3658 | 3979 | return 1; |
@@ -3704,13 +4025,11 @@ discard block |
||
3704 | 4025 | { |
3705 | 4026 | $res = $this->db->fetch_object($resql); |
3706 | 4027 | return 'Incoterm : '.$res->code.' - '.$this->location_incoterms; |
3707 | - } |
|
3708 | - else |
|
4028 | + } else |
|
3709 | 4029 | { |
3710 | 4030 | return ''; |
3711 | 4031 | } |
3712 | - } |
|
3713 | - else |
|
4032 | + } else |
|
3714 | 4033 | { |
3715 | 4034 | $this->errors[] = $this->db->lasterror(); |
3716 | 4035 | return false; |
@@ -3747,14 +4066,14 @@ discard block |
||
3747 | 4066 | $this->libelle_incoterms = $obj->libelle; |
3748 | 4067 | } |
3749 | 4068 | return 1; |
3750 | - } |
|
3751 | - else |
|
4069 | + } else |
|
3752 | 4070 | { |
3753 | 4071 | $this->errors[] = $this->db->lasterror(); |
3754 | 4072 | return -1; |
3755 | 4073 | } |
3756 | - } |
|
3757 | - else return -1; |
|
4074 | + } else { |
|
4075 | + return -1; |
|
4076 | + } |
|
3758 | 4077 | } |
3759 | 4078 | |
3760 | 4079 | |
@@ -3793,7 +4112,9 @@ discard block |
||
3793 | 4112 | } else { |
3794 | 4113 | $res=include $tpl; // for debug |
3795 | 4114 | } |
3796 | - if ($res) break; |
|
4115 | + if ($res) { |
|
4116 | + break; |
|
4117 | + } |
|
3797 | 4118 | } |
3798 | 4119 | } |
3799 | 4120 | |
@@ -3823,8 +4144,9 @@ discard block |
||
3823 | 4144 | |
3824 | 4145 | // Define usemargins |
3825 | 4146 | $usemargins=0; |
3826 | - if (!empty(Globals::$conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'propal', 'commande'))) |
|
3827 | - $usemargins = 1; |
|
4147 | + if (!empty(Globals::$conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'propal', 'commande'))) { |
|
4148 | + $usemargins = 1; |
|
4149 | + } |
|
3828 | 4150 | |
3829 | 4151 | $num = count($this->lines); |
3830 | 4152 | |
@@ -3843,8 +4165,9 @@ discard block |
||
3843 | 4165 | print '<tr class="liste_titre nodrag nodrop">'; |
3844 | 4166 | |
3845 | 4167 | // Adds a line numbering column |
3846 | - if (!empty(Globals::$conf->global->MAIN_VIEW_LINE_NUMBER)) |
|
3847 | - print '<td class="linecolnum" align="center" width="5"> </td>'; |
|
4168 | + if (!empty(Globals::$conf->global->MAIN_VIEW_LINE_NUMBER)) { |
|
4169 | + print '<td class="linecolnum" align="center" width="5"> </td>'; |
|
4170 | + } |
|
3848 | 4171 | |
3849 | 4172 | // Description |
3850 | 4173 | print '<td class="linecoldescription">'.$langs->trans('Description').'</td>'; |
@@ -3861,10 +4184,13 @@ discard block |
||
3861 | 4184 | print '<td class="linecoluht" align="right" width="80">'.$langs->trans('PriceUHT').'</td>'; |
3862 | 4185 | |
3863 | 4186 | // Multicurrency |
3864 | - if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency) |
|
3865 | - print '<td class="linecoluht_currency" align="right" width="80">' . $langs->trans('PriceUHTCurrency', $this->multicurrency_code) . '</td>'; |
|
4187 | + if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency) { |
|
4188 | + print '<td class="linecoluht_currency" align="right" width="80">' . $langs->trans('PriceUHTCurrency', $this->multicurrency_code) . '</td>'; |
|
4189 | + } |
|
3866 | 4190 | |
3867 | - if ($inputalsopricewithtax) print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>'; |
|
4191 | + if ($inputalsopricewithtax) { |
|
4192 | + print '<td align="right" width="80">'.$langs->trans('PriceUTTC').'</td>'; |
|
4193 | + } |
|
3868 | 4194 | |
3869 | 4195 | // Qty |
3870 | 4196 | print '<td class="linecolqty" align="right">'.$langs->trans('Qty').'</td>'; |
@@ -3883,26 +4209,32 @@ discard block |
||
3883 | 4209 | if ($usemargins && !empty(Globals::$conf->margin->enabled) && empty($user->societe_id)) { |
3884 | 4210 | if (!empty($user->rights->margins->creer)) |
3885 | 4211 | { |
3886 | - if (Globals::$conf->global->MARGIN_TYPE == "1") |
|
3887 | - print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>'; |
|
3888 | - else |
|
3889 | - print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>'; |
|
4212 | + if (Globals::$conf->global->MARGIN_TYPE == "1") { |
|
4213 | + print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('BuyingPrice').'</td>'; |
|
4214 | + } else { |
|
4215 | + print '<td class="linecolmargin1 margininfos" align="right" width="80">'.$langs->trans('CostPrice').'</td>'; |
|
4216 | + } |
|
3890 | 4217 | } |
3891 | 4218 | |
3892 | - if (!empty(Globals::$conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) |
|
3893 | - print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>'; |
|
3894 | - if (!empty(Globals::$conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) |
|
3895 | - print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>'; |
|
4219 | + if (!empty(Globals::$conf->global->DISPLAY_MARGIN_RATES) && $user->rights->margins->liretous) { |
|
4220 | + print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarginRate').'</td>'; |
|
4221 | + } |
|
4222 | + if (!empty(Globals::$conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) { |
|
4223 | + print '<td class="linecolmargin2 margininfos" align="right" width="50">'.$langs->trans('MarkRate').'</td>'; |
|
4224 | + } |
|
3896 | 4225 | } |
3897 | 4226 | |
3898 | 4227 | // Total HT |
3899 | 4228 | print '<td class="linecolht" align="right">'.$langs->trans('TotalHTShort').'</td>'; |
3900 | 4229 | |
3901 | 4230 | // Multicurrency |
3902 | - if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency) |
|
3903 | - print '<td class="linecoltotalht_currency" align="right">' . $langs->trans('TotalHTShortCurrency', $this->multicurrency_code) . '</td>'; |
|
4231 | + if (!empty(Globals::$conf->multicurrency->enabled) && $this->multicurrency_code != Globals::$conf->currency) { |
|
4232 | + print '<td class="linecoltotalht_currency" align="right">' . $langs->trans('TotalHTShortCurrency', $this->multicurrency_code) . '</td>'; |
|
4233 | + } |
|
3904 | 4234 | |
3905 | - if ($outputalsopricetotalwithtax) print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>'; |
|
4235 | + if ($outputalsopricetotalwithtax) { |
|
4236 | + print '<td align="right" width="80">'.$langs->trans('TotalTTCShort').'</td>'; |
|
4237 | + } |
|
3906 | 4238 | |
3907 | 4239 | print '<td class="linecoledit"></td>'; // No width to allow autodim |
3908 | 4240 | |
@@ -3932,14 +4264,15 @@ discard block |
||
3932 | 4264 | $line->fetch_optionals(); |
3933 | 4265 | |
3934 | 4266 | //if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line))) |
3935 | - if (is_object($hookmanager)) // Old code is commented on preceding line. |
|
4267 | + if (is_object($hookmanager)) { |
|
4268 | + // Old code is commented on preceding line. |
|
3936 | 4269 | { |
3937 | 4270 | if (empty($line->fk_parent_line)) |
3938 | 4271 | { |
3939 | - $parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline); |
|
4272 | + $parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline); |
|
4273 | + } |
|
3940 | 4274 | $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
3941 | - } |
|
3942 | - else |
|
4275 | + } else |
|
3943 | 4276 | { |
3944 | 4277 | $parameters = array('line'=>$line,'var'=>$var,'num'=>$num,'i'=>$i,'dateSelector'=>$dateSelector,'seller'=>$seller,'buyer'=>$buyer,'selected'=>$selected, 'extrafieldsline'=>$extrafieldsline, 'fk_parent_line'=>$line->fk_parent_line); |
3945 | 4278 | $reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks |
@@ -3986,8 +4319,14 @@ discard block |
||
3986 | 4319 | // Show product and description |
3987 | 4320 | $type=(! empty($line->product_type)?$line->product_type:$line->fk_product_type); |
3988 | 4321 | // Try to enhance type detection using date_start and date_end for free lines where type was not saved. |
3989 | - if (! empty($line->date_start)) $type=1; // deprecated |
|
3990 | - if (! empty($line->date_end)) $type=1; // deprecated |
|
4322 | + if (! empty($line->date_start)) { |
|
4323 | + $type=1; |
|
4324 | + } |
|
4325 | + // deprecated |
|
4326 | + if (! empty($line->date_end)) { |
|
4327 | + $type=1; |
|
4328 | + } |
|
4329 | + // deprecated |
|
3991 | 4330 | |
3992 | 4331 | // Ligne en mode visu |
3993 | 4332 | if ($action != 'editline' || $selected != $line->id) |
@@ -4015,9 +4354,13 @@ discard block |
||
4015 | 4354 | |
4016 | 4355 | $outputlangs = $langs; |
4017 | 4356 | $newlang=''; |
4018 | - if (empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09'); |
|
4019 | - if (!empty(Globals::$conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) |
|
4020 | - $newlang = $this->thirdparty->default_lang; // For language to language of customer |
|
4357 | + if (empty($newlang) && GETPOST('lang_id','aZ09')) { |
|
4358 | + $newlang=GETPOST('lang_id','aZ09'); |
|
4359 | + } |
|
4360 | + if (!empty(Globals::$conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang)) { |
|
4361 | + $newlang = $this->thirdparty->default_lang; |
|
4362 | + } |
|
4363 | + // For language to language of customer |
|
4021 | 4364 | if (! empty($newlang)) |
4022 | 4365 | { |
4023 | 4366 | $outputlangs = new Translate("",$conf); |
@@ -4025,8 +4368,7 @@ discard block |
||
4025 | 4368 | } |
4026 | 4369 | |
4027 | 4370 | $label = (! empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $line->product_label; |
4028 | - } |
|
4029 | - else |
|
4371 | + } else |
|
4030 | 4372 | { |
4031 | 4373 | $label = $line->product_label; |
4032 | 4374 | } |
@@ -4048,7 +4390,9 @@ discard block |
||
4048 | 4390 | } else { |
4049 | 4391 | $res=include $tpl; // for debug |
4050 | 4392 | } |
4051 | - if ($res) break; |
|
4393 | + if ($res) { |
|
4394 | + break; |
|
4395 | + } |
|
4052 | 4396 | } |
4053 | 4397 | } |
4054 | 4398 | |
@@ -4071,7 +4415,9 @@ discard block |
||
4071 | 4415 | } else { |
4072 | 4416 | $res=include $tpl; // for debug |
4073 | 4417 | } |
4074 | - if ($res) break; |
|
4418 | + if ($res) { |
|
4419 | + break; |
|
4420 | + } |
|
4075 | 4421 | } |
4076 | 4422 | } |
4077 | 4423 | } |
@@ -4098,8 +4444,9 @@ discard block |
||
4098 | 4444 | print '<td>'.$langs->trans('Description').'</td>'; |
4099 | 4445 | print '<td align="right">'.$langs->trans('VATRate').'</td>'; |
4100 | 4446 | print '<td align="right">'.$langs->trans('PriceUHT').'</td>'; |
4101 | - if (!empty(Globals::$conf->multicurrency->enabled)) |
|
4102 | - print '<td align="right">' . $langs->trans('PriceUHTCurrency') . '</td>'; |
|
4447 | + if (!empty(Globals::$conf->multicurrency->enabled)) { |
|
4448 | + print '<td align="right">' . $langs->trans('PriceUHTCurrency') . '</td>'; |
|
4449 | + } |
|
4103 | 4450 | print '<td align="right">'.$langs->trans('Qty').'</td>'; |
4104 | 4451 | if (Globals::$conf->global->PRODUCT_USE_UNITS) { |
4105 | 4452 | print '<td align="left">'.$langs->trans('Unit').'</td>'; |
@@ -4121,8 +4468,7 @@ discard block |
||
4121 | 4468 | $action=''; |
4122 | 4469 | $hookmanager->executeHooks('printOriginObjectLine',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks |
4123 | 4470 | } |
4124 | - } |
|
4125 | - else |
|
4471 | + } else |
|
4126 | 4472 | { |
4127 | 4473 | $this->printOriginLine($line, $var, $restrictlist); |
4128 | 4474 | } |
@@ -4151,32 +4497,37 @@ discard block |
||
4151 | 4497 | if (!empty($line->date_start)) |
4152 | 4498 | { |
4153 | 4499 | $date_start=$line->date_start; |
4154 | - } |
|
4155 | - else |
|
4500 | + } else |
|
4156 | 4501 | { |
4157 | 4502 | $date_start=$line->date_debut_prevue; |
4158 | - if ($line->date_debut_reel) $date_start=$line->date_debut_reel; |
|
4503 | + if ($line->date_debut_reel) { |
|
4504 | + $date_start=$line->date_debut_reel; |
|
4505 | + } |
|
4159 | 4506 | } |
4160 | 4507 | if (!empty($line->date_end)) |
4161 | 4508 | { |
4162 | 4509 | $date_end=$line->date_end; |
4163 | - } |
|
4164 | - else |
|
4510 | + } else |
|
4165 | 4511 | { |
4166 | 4512 | $date_end=$line->date_fin_prevue; |
4167 | - if ($line->date_fin_reel) $date_end=$line->date_fin_reel; |
|
4513 | + if ($line->date_fin_reel) { |
|
4514 | + $date_end=$line->date_fin_reel; |
|
4515 | + } |
|
4168 | 4516 | } |
4169 | 4517 | |
4170 | 4518 | $this->tpl['label'] = ''; |
4171 | - if (! empty($line->fk_parent_line)) $this->tpl['label'].= img_picto('', 'rightarrow'); |
|
4519 | + if (! empty($line->fk_parent_line)) { |
|
4520 | + $this->tpl['label'].= img_picto('', 'rightarrow'); |
|
4521 | + } |
|
4172 | 4522 | |
4173 | - if (($line->info_bits & 2) == 2) // TODO Not sure this is used for source object |
|
4523 | + if (($line->info_bits & 2) == 2) { |
|
4524 | + // TODO Not sure this is used for source object |
|
4174 | 4525 | { |
4175 | - $discount=new DiscountAbsolute($this->db); |
|
4526 | + $discount=new DiscountAbsolute($this->db); |
|
4527 | + } |
|
4176 | 4528 | $discount->fk_soc = $this->socid; |
4177 | 4529 | $this->tpl['label'].= $discount->getNomUrl(0,'discount'); |
4178 | - } |
|
4179 | - else if (! empty($line->fk_product)) |
|
4530 | + } else if (! empty($line->fk_product)) |
|
4180 | 4531 | { |
4181 | 4532 | $productstatic = new Product($this->db); |
4182 | 4533 | $productstatic->id = $line->fk_product; |
@@ -4194,13 +4545,12 @@ discard block |
||
4194 | 4545 | { |
4195 | 4546 | $this->tpl['label'].= get_date_range($date_start,$date_end); |
4196 | 4547 | } |
4197 | - } |
|
4198 | - else |
|
4548 | + } else |
|
4199 | 4549 | { |
4200 | 4550 | $this->tpl['label'].= ($line->product_type == -1 ? ' ' : ($line->product_type == 1 ? img_object($langs->trans(''),'service') : img_object($langs->trans(''),'product'))); |
4201 | 4551 | if (!empty($line->desc)) { |
4202 | 4552 | $this->tpl['label'].=$line->desc; |
4203 | - }else { |
|
4553 | + } else { |
|
4204 | 4554 | $this->tpl['label'].= ($line->label ? ' '.$line->label : ''); |
4205 | 4555 | } |
4206 | 4556 | |
@@ -4213,36 +4563,35 @@ discard block |
||
4213 | 4563 | |
4214 | 4564 | if (! empty($line->desc)) |
4215 | 4565 | { |
4216 | - if ($line->desc == '(CREDIT_NOTE)') // TODO Not sure this is used for source object |
|
4566 | + if ($line->desc == '(CREDIT_NOTE)') { |
|
4567 | + // TODO Not sure this is used for source object |
|
4217 | 4568 | { |
4218 | - $discount=new DiscountAbsolute($this->db); |
|
4569 | + $discount=new DiscountAbsolute($this->db); |
|
4570 | + } |
|
4219 | 4571 | $discount->fetch($line->fk_remise_except); |
4220 | 4572 | $this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote",$discount->getNomUrl(0)); |
4221 | - } |
|
4222 | - elseif ($line->desc == '(DEPOSIT)') // TODO Not sure this is used for source object |
|
4573 | + } elseif ($line->desc == '(DEPOSIT)') { |
|
4574 | + // TODO Not sure this is used for source object |
|
4223 | 4575 | { |
4224 | - $discount=new DiscountAbsolute($this->db); |
|
4576 | + $discount=new DiscountAbsolute($this->db); |
|
4577 | + } |
|
4225 | 4578 | $discount->fetch($line->fk_remise_except); |
4226 | 4579 | $this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit",$discount->getNomUrl(0)); |
4227 | - } |
|
4228 | - elseif ($line->desc == '(EXCESS RECEIVED)') |
|
4580 | + } elseif ($line->desc == '(EXCESS RECEIVED)') |
|
4229 | 4581 | { |
4230 | 4582 | $discount=new DiscountAbsolute($this->db); |
4231 | 4583 | $discount->fetch($line->fk_remise_except); |
4232 | 4584 | $this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived",$discount->getNomUrl(0)); |
4233 | - } |
|
4234 | - elseif ($line->desc == '(EXCESS PAID)') |
|
4585 | + } elseif ($line->desc == '(EXCESS PAID)') |
|
4235 | 4586 | { |
4236 | 4587 | $discount=new DiscountAbsolute($this->db); |
4237 | 4588 | $discount->fetch($line->fk_remise_except); |
4238 | 4589 | $this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid",$discount->getNomUrl(0)); |
4239 | - } |
|
4240 | - else |
|
4590 | + } else |
|
4241 | 4591 | { |
4242 | 4592 | $this->tpl['description'] = dol_trunc($line->desc,60); |
4243 | 4593 | } |
4244 | - } |
|
4245 | - else |
|
4594 | + } else |
|
4246 | 4595 | { |
4247 | 4596 | $this->tpl['description'] = ' '; |
4248 | 4597 | } |
@@ -4250,18 +4599,23 @@ discard block |
||
4250 | 4599 | // VAT Rate |
4251 | 4600 | $this->tpl['vat_rate'] = vatrate($line->tva_tx, true); |
4252 | 4601 | $this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : ''; |
4253 | - if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')'; |
|
4602 | + if (! empty($line->vat_src_code) && ! preg_match('/\(/', $this->tpl['vat_rate'])) { |
|
4603 | + $this->tpl['vat_rate'].=' ('.$line->vat_src_code.')'; |
|
4604 | + } |
|
4254 | 4605 | |
4255 | 4606 | $this->tpl['price'] = price($line->subprice); |
4256 | 4607 | $this->tpl['multicurrency_price'] = price($line->multicurrency_subprice); |
4257 | 4608 | $this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : ' '; |
4258 | - if (Globals::$conf->global->PRODUCT_USE_UNITS) |
|
4259 | - $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long')); |
|
4609 | + if (Globals::$conf->global->PRODUCT_USE_UNITS) { |
|
4610 | + $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long')); |
|
4611 | + } |
|
4260 | 4612 | $this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : ' '; |
4261 | 4613 | |
4262 | 4614 | // Is the line strike or not |
4263 | 4615 | $this->tpl['strike']=0; |
4264 | - if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike']=1; |
|
4616 | + if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) { |
|
4617 | + $this->tpl['strike']=1; |
|
4618 | + } |
|
4265 | 4619 | |
4266 | 4620 | // Output template part (modules that overwrite templates must declare this into descriptor) |
4267 | 4621 | // Use global variables + $dateSelector + $seller and $buyer |
@@ -4274,7 +4628,9 @@ discard block |
||
4274 | 4628 | } else { |
4275 | 4629 | $res=include $tpl; // for debug |
4276 | 4630 | } |
4277 | - if ($res) break; |
|
4631 | + if ($res) { |
|
4632 | + break; |
|
4633 | + } |
|
4278 | 4634 | } |
4279 | 4635 | } |
4280 | 4636 | |
@@ -4316,8 +4672,7 @@ discard block |
||
4316 | 4672 | { |
4317 | 4673 | $this->db->commit(); |
4318 | 4674 | return 1; |
4319 | - } |
|
4320 | - else |
|
4675 | + } else |
|
4321 | 4676 | { |
4322 | 4677 | $this->error=$this->db->lasterror(); |
4323 | 4678 | $this->db->rollback(); |
@@ -4352,8 +4707,7 @@ discard block |
||
4352 | 4707 | $this->error=$this->db->lasterror(); |
4353 | 4708 | $this->db->rollback(); |
4354 | 4709 | return -1; |
4355 | - } |
|
4356 | - else |
|
4710 | + } else |
|
4357 | 4711 | { |
4358 | 4712 | if (! $notrigger) |
4359 | 4713 | { |
@@ -4420,14 +4774,20 @@ discard block |
||
4420 | 4774 | // Search template files |
4421 | 4775 | $file=''; $classname=''; $filefound=0; |
4422 | 4776 | $dirmodels=array('/'); |
4423 | - if (is_array(Globals::$conf->modules_parts['models'])) |
|
4424 | - $dirmodels = array_merge($dirmodels, Globals::$conf->modules_parts['models']); |
|
4777 | + if (is_array(Globals::$conf->modules_parts['models'])) { |
|
4778 | + $dirmodels = array_merge($dirmodels, Globals::$conf->modules_parts['models']); |
|
4779 | + } |
|
4425 | 4780 | foreach($dirmodels as $reldir) |
4426 | 4781 | { |
4427 | 4782 | foreach(array('doc','pdf') as $prefix) |
4428 | 4783 | { |
4429 | - if (in_array(get_class($this), array('Adherent'))) $file = $prefix."_".$modele.".class.php"; // Member module use prefix_module.class.php |
|
4430 | - else $file = $prefix."_".$modele.".modules.php"; |
|
4784 | + if (in_array(get_class($this), array('Adherent'))) { |
|
4785 | + $file = $prefix."_".$modele.".class.php"; |
|
4786 | + } |
|
4787 | + // Member module use prefix_module.class.php |
|
4788 | + else { |
|
4789 | + $file = $prefix."_".$modele.".modules.php"; |
|
4790 | + } |
|
4431 | 4791 | |
4432 | 4792 | // On verifie l'emplacement du modele |
4433 | 4793 | $file=dol_buildpath($reldir.$modelspath.$file,0); |
@@ -4438,7 +4798,9 @@ discard block |
||
4438 | 4798 | break; |
4439 | 4799 | } |
4440 | 4800 | } |
4441 | - if ($filefound) break; |
|
4801 | + if ($filefound) { |
|
4802 | + break; |
|
4803 | + } |
|
4442 | 4804 | } |
4443 | 4805 | |
4444 | 4806 | // If generator was found |
@@ -4469,7 +4831,9 @@ discard block |
||
4469 | 4831 | if (is_dir($tmpdir)) |
4470 | 4832 | { |
4471 | 4833 | $tmpfiles=dol_dir_list($tmpdir,'files',0,'\.od(s|t)$','','name',SORT_ASC,0); |
4472 | - if (count($tmpfiles)) $listoffiles=array_merge($listoffiles,$tmpfiles); |
|
4834 | + if (count($tmpfiles)) { |
|
4835 | + $listoffiles=array_merge($listoffiles,$tmpfiles); |
|
4836 | + } |
|
4473 | 4837 | } |
4474 | 4838 | } |
4475 | 4839 | |
@@ -4507,8 +4871,7 @@ discard block |
||
4507 | 4871 | { |
4508 | 4872 | $arrayofrecords = array(); // The write_file of templates of adherent class need this var |
4509 | 4873 | $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams); |
4510 | - } |
|
4511 | - else |
|
4874 | + } else |
|
4512 | 4875 | { |
4513 | 4876 | $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams); |
4514 | 4877 | } |
@@ -4530,9 +4893,11 @@ discard block |
||
4530 | 4893 | $destfile = basename($destfull); |
4531 | 4894 | $rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT,'/').'/', '', $upload_dir); |
4532 | 4895 | |
4533 | - if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) // If not a tmp dir |
|
4896 | + if (! preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) { |
|
4897 | + // If not a tmp dir |
|
4534 | 4898 | { |
4535 | - $filename = basename($destfile); |
|
4899 | + $filename = basename($destfile); |
|
4900 | + } |
|
4536 | 4901 | $rel_dir = preg_replace('/[\\/]$/', '', $rel_dir); |
4537 | 4902 | $rel_dir = preg_replace('/^[\\/]/', '', $rel_dir); |
4538 | 4903 | |
@@ -4545,22 +4910,30 @@ discard block |
||
4545 | 4910 | if ($this->element == 'propal') |
4546 | 4911 | { |
4547 | 4912 | $useonlinesignature = Globals::$conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok |
4548 | - if ($useonlinesignature) $setsharekey=true; |
|
4549 | - if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) |
|
4550 | - $setsharekey = true; |
|
4913 | + if ($useonlinesignature) { |
|
4914 | + $setsharekey=true; |
|
4915 | + } |
|
4916 | + if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) { |
|
4917 | + $setsharekey = true; |
|
4918 | + } |
|
4551 | 4919 | } |
4552 | - if ($this->element == 'commande' && !empty(Globals::$conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) |
|
4553 | - $setsharekey = true; |
|
4554 | - if ($this->element == 'facture' && !empty(Globals::$conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) |
|
4555 | - $setsharekey = true; |
|
4556 | - if ($this->element == 'bank_account' && !empty(Globals::$conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) |
|
4557 | - $setsharekey = true; |
|
4920 | + if ($this->element == 'commande' && !empty(Globals::$conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) { |
|
4921 | + $setsharekey = true; |
|
4922 | + } |
|
4923 | + if ($this->element == 'facture' && !empty(Globals::$conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) { |
|
4924 | + $setsharekey = true; |
|
4925 | + } |
|
4926 | + if ($this->element == 'bank_account' && !empty(Globals::$conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) { |
|
4927 | + $setsharekey = true; |
|
4928 | + } |
|
4558 | 4929 | |
4559 | 4930 | if ($setsharekey) |
4560 | 4931 | { |
4561 | - if (empty($ecmfile->share)) // Because object not found or share not set yet |
|
4932 | + if (empty($ecmfile->share)) { |
|
4933 | + // Because object not found or share not set yet |
|
4562 | 4934 | { |
4563 | - require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; |
|
4935 | + require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php'; |
|
4936 | + } |
|
4564 | 4937 | $ecmfile->share = getRandomPassword(true); |
4565 | 4938 | } |
4566 | 4939 | } |
@@ -4577,8 +4950,7 @@ discard block |
||
4577 | 4950 | { |
4578 | 4951 | setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings'); |
4579 | 4952 | } |
4580 | - } |
|
4581 | - else |
|
4953 | + } else |
|
4582 | 4954 | { |
4583 | 4955 | $ecmfile->entity = Globals::$conf->entity; |
4584 | 4956 | $ecmfile->filepath = $rel_dir; |
@@ -4605,17 +4977,20 @@ discard block |
||
4605 | 4977 | |
4606 | 4978 | // Update the last_main_doc field into main object (if documenent generator has property ->update_main_doc_field set) |
4607 | 4979 | $update_main_doc_field=0; |
4608 | - if (! empty($obj->update_main_doc_field)) $update_main_doc_field=1; |
|
4980 | + if (! empty($obj->update_main_doc_field)) { |
|
4981 | + $update_main_doc_field=1; |
|
4982 | + } |
|
4609 | 4983 | if ($update_main_doc_field && ! empty($this->table_element)) |
4610 | 4984 | { |
4611 | 4985 | $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".($ecmfile->filepath.'/'.$ecmfile->filename)."'"; |
4612 | 4986 | $sql.= ' WHERE rowid = '.$this->id; |
4613 | 4987 | $resql = $this->db->query($sql); |
4614 | - if (! $resql) dol_print_error($this->db); |
|
4988 | + if (! $resql) { |
|
4989 | + dol_print_error($this->db); |
|
4990 | + } |
|
4615 | 4991 | } |
4616 | 4992 | } |
4617 | - } |
|
4618 | - else |
|
4993 | + } else |
|
4619 | 4994 | { |
4620 | 4995 | dol_syslog('Method ->write_file was called on object '.get_class($obj).' and return a success but the return array ->result["fullpath"] was not set.', LOG_WARNING); |
4621 | 4996 | } |
@@ -4624,15 +4999,13 @@ discard block |
||
4624 | 4999 | dol_meta_create($this); |
4625 | 5000 | |
4626 | 5001 | return 1; |
4627 | - } |
|
4628 | - else |
|
5002 | + } else |
|
4629 | 5003 | { |
4630 | 5004 | $outputlangs->charset_output=$sav_charset_output; |
4631 | 5005 | dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors); |
4632 | 5006 | return -1; |
4633 | 5007 | } |
4634 | - } |
|
4635 | - else |
|
5008 | + } else |
|
4636 | 5009 | { |
4637 | 5010 | $this->error=$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$file); |
4638 | 5011 | dol_print_error('',$this->error); |
@@ -4688,13 +5061,21 @@ discard block |
||
4688 | 5061 | global $conf, $_POST; |
4689 | 5062 | |
4690 | 5063 | // If param here has been posted, we use this value first. |
4691 | - if (isset($_POST[$fieldname])) return GETPOST($fieldname, 2); |
|
5064 | + if (isset($_POST[$fieldname])) { |
|
5065 | + return GETPOST($fieldname, 2); |
|
5066 | + } |
|
4692 | 5067 | |
4693 | - if (isset($alternatevalue)) return $alternatevalue; |
|
5068 | + if (isset($alternatevalue)) { |
|
5069 | + return $alternatevalue; |
|
5070 | + } |
|
4694 | 5071 | |
4695 | 5072 | $newelement=$this->element; |
4696 | - if ($newelement == 'facture') $newelement='invoice'; |
|
4697 | - if ($newelement == 'commande') $newelement='order'; |
|
5073 | + if ($newelement == 'facture') { |
|
5074 | + $newelement='invoice'; |
|
5075 | + } |
|
5076 | + if ($newelement == 'commande') { |
|
5077 | + $newelement='order'; |
|
5078 | + } |
|
4698 | 5079 | if (empty($newelement)) |
4699 | 5080 | { |
4700 | 5081 | dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING); |
@@ -4703,8 +5084,9 @@ discard block |
||
4703 | 5084 | |
4704 | 5085 | $keyforfieldname=strtoupper($newelement.'_DEFAULT_'.$fieldname); |
4705 | 5086 | //var_dump($keyforfieldname); |
4706 | - if (isset(Globals::$conf->global->$keyforfieldname)) |
|
4707 | - return Globals::$conf->global->$keyforfieldname; |
|
5087 | + if (isset(Globals::$conf->global->$keyforfieldname)) { |
|
5088 | + return Globals::$conf->global->$keyforfieldname; |
|
5089 | + } |
|
4708 | 5090 | |
4709 | 5091 | // TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname |
4710 | 5092 | } |
@@ -4738,8 +5120,7 @@ discard block |
||
4738 | 5120 | if (!empty($this->errors)) |
4739 | 5121 | { |
4740 | 5122 | $this->errors=array_unique(array_merge($this->errors,$interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice. |
4741 | - } |
|
4742 | - else |
|
5123 | + } else |
|
4743 | 5124 | { |
4744 | 5125 | $this->errors=$interface->errors; |
4745 | 5126 | } |
@@ -4791,15 +5172,17 @@ discard block |
||
4791 | 5172 | $extrafields->fetch_name_optionals_label($this->table_element); |
4792 | 5173 | } |
4793 | 5174 | $optionsArray = (! empty($extrafields->attributes[$this->table_element]['label'])?$extrafields->attributes[$this->table_element]['label']:null); |
4794 | - } |
|
4795 | - else |
|
5175 | + } else |
|
4796 | 5176 | { |
4797 | 5177 | // global $extrafields; |
4798 | 5178 | dol_syslog("Warning: fetch_optionals was called with param optionsArray defined when you should pass null now", LOG_WARNING); |
4799 | 5179 | } |
4800 | 5180 | |
4801 | 5181 | $table_element = $this->table_element; |
4802 | - if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility |
|
5182 | + if ($table_element == 'categorie') { |
|
5183 | + $table_element = 'categories'; |
|
5184 | + } |
|
5185 | + // For compatibility |
|
4803 | 5186 | |
4804 | 5187 | // Request to get complementary values |
4805 | 5188 | if (is_array($optionsArray) && count($optionsArray) > 0) |
@@ -4835,8 +5218,7 @@ discard block |
||
4835 | 5218 | { |
4836 | 5219 | //var_dump($extrafields->attributes[$this->table_element]['type'][$key]); |
4837 | 5220 | $this->array_options["options_".$key]=$this->db->jdate($value); |
4838 | - } |
|
4839 | - else |
|
5221 | + } else |
|
4840 | 5222 | { |
4841 | 5223 | $this->array_options["options_".$key]=$value; |
4842 | 5224 | } |
@@ -4848,10 +5230,12 @@ discard block |
||
4848 | 5230 | |
4849 | 5231 | $this->db->free($resql); |
4850 | 5232 | |
4851 | - if ($numrows) return $numrows; |
|
4852 | - else return 0; |
|
4853 | - } |
|
4854 | - else |
|
5233 | + if ($numrows) { |
|
5234 | + return $numrows; |
|
5235 | + } else { |
|
5236 | + return 0; |
|
5237 | + } |
|
5238 | + } else |
|
4855 | 5239 | { |
4856 | 5240 | dol_print_error($this->db); |
4857 | 5241 | return -1; |
@@ -4870,7 +5254,10 @@ discard block |
||
4870 | 5254 | $this->db->begin(); |
4871 | 5255 | |
4872 | 5256 | $table_element = $this->table_element; |
4873 | - if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility |
|
5257 | + if ($table_element == 'categorie') { |
|
5258 | + $table_element = 'categories'; |
|
5259 | + } |
|
5260 | + // For compatibility |
|
4874 | 5261 | |
4875 | 5262 | $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id; |
4876 | 5263 | dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG); |
@@ -4880,8 +5267,7 @@ discard block |
||
4880 | 5267 | $this->error=$this->db->lasterror(); |
4881 | 5268 | $this->db->rollback(); |
4882 | 5269 | return -1; |
4883 | - } |
|
4884 | - else |
|
5270 | + } else |
|
4885 | 5271 | { |
4886 | 5272 | $this->db->commit(); |
4887 | 5273 | return 1; |
@@ -4902,12 +5288,16 @@ discard block |
||
4902 | 5288 | { |
4903 | 5289 | global $conf,$langs,$user; |
4904 | 5290 | |
4905 | - if (empty($userused)) $userused=$user; |
|
5291 | + if (empty($userused)) { |
|
5292 | + $userused=$user; |
|
5293 | + } |
|
4906 | 5294 | |
4907 | 5295 | $error=0; |
4908 | 5296 | |
4909 | - if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED)) |
|
4910 | - return 0; // For avoid conflicts if trigger used |
|
5297 | + if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED)) { |
|
5298 | + return 0; |
|
5299 | + } |
|
5300 | + // For avoid conflicts if trigger used |
|
4911 | 5301 | |
4912 | 5302 | if (! empty($this->array_options)) |
4913 | 5303 | { |
@@ -4920,10 +5310,13 @@ discard block |
||
4920 | 5310 | //Eliminate copied source object extra_fields that do not exist in target object |
4921 | 5311 | $new_array_options=array(); |
4922 | 5312 | foreach ($this->array_options as $key => $value) { |
4923 | - if (in_array(substr($key,8), array_keys($target_extrafields))) // We remove the 'options_' from $key for test |
|
4924 | - $new_array_options[$key] = $value; |
|
4925 | - elseif (in_array($key, array_keys($target_extrafields))) // We test on $key that does not contains the 'options_' prefix |
|
4926 | - $new_array_options['options_'.$key] = $value; |
|
5313 | + if (in_array(substr($key,8), array_keys($target_extrafields))) { |
|
5314 | + // We remove the 'options_' from $key for test |
|
5315 | + $new_array_options[$key] = $value; |
|
5316 | + } elseif (in_array($key, array_keys($target_extrafields))) { |
|
5317 | + // We test on $key that does not contains the 'options_' prefix |
|
5318 | + $new_array_options['options_'.$key] = $value; |
|
5319 | + } |
|
4927 | 5320 | } |
4928 | 5321 | |
4929 | 5322 | foreach($new_array_options as $key => $value) |
@@ -4937,8 +5330,12 @@ discard block |
||
4937 | 5330 | if ($attributeRequired) |
4938 | 5331 | { |
4939 | 5332 | $mandatorypb=false; |
4940 | - if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb=true; |
|
4941 | - if ($this->array_options[$key] === '') $mandatorypb=true; |
|
5333 | + if ($attributeType == 'link' && $this->array_options[$key] == '-1') { |
|
5334 | + $mandatorypb=true; |
|
5335 | + } |
|
5336 | + if ($this->array_options[$key] === '') { |
|
5337 | + $mandatorypb=true; |
|
5338 | + } |
|
4942 | 5339 | if ($mandatorypb) |
4943 | 5340 | { |
4944 | 5341 | dol_syslog($this->error); |
@@ -4957,8 +5354,7 @@ discard block |
||
4957 | 5354 | { |
4958 | 5355 | $this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel); |
4959 | 5356 | return -1; |
4960 | - } |
|
4961 | - elseif ($value=='') |
|
5357 | + } elseif ($value=='') |
|
4962 | 5358 | { |
4963 | 5359 | $new_array_options[$key] = null; |
4964 | 5360 | } |
@@ -4970,8 +5366,7 @@ discard block |
||
4970 | 5366 | dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG); |
4971 | 5367 | $this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel); |
4972 | 5368 | return -1; |
4973 | - } |
|
4974 | - elseif ($value=='') |
|
5369 | + } elseif ($value=='') |
|
4975 | 5370 | { |
4976 | 5371 | $new_array_options[$key] = null; |
4977 | 5372 | } |
@@ -4996,27 +5391,27 @@ discard block |
||
4996 | 5391 | //global $action; // $action may be 'create', 'update', 'update_extras'... |
4997 | 5392 | //var_dump($action); |
4998 | 5393 | //var_dump($this->oldcopy);exit; |
4999 | - if (is_object($this->oldcopy)) // If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value |
|
5394 | + if (is_object($this->oldcopy)) { |
|
5395 | + // If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value |
|
5000 | 5396 | { |
5001 | 5397 | //var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]); |
5002 | 5398 | if ($this->array_options[$key] == $this->oldcopy->array_options[$key]) // If old value crypted in database is same than submited new value, it means we don't change it, so we don't update. |
5003 | 5399 | { |
5004 | - $new_array_options[$key] = $this->array_options[$key]; // Value is kept |
|
5005 | - } |
|
5006 | - else |
|
5400 | + $new_array_options[$key] = $this->array_options[$key]; |
|
5401 | + } |
|
5402 | + // Value is kept |
|
5403 | + } else |
|
5007 | 5404 | { |
5008 | 5405 | // var_dump($algo); |
5009 | 5406 | $newvalue = dol_hash($this->array_options[$key], $algo); |
5010 | 5407 | $new_array_options[$key] = $newvalue; |
5011 | 5408 | } |
5012 | - } |
|
5013 | - else |
|
5409 | + } else |
|
5014 | 5410 | { |
5015 | 5411 | $new_array_options[$key] = $this->array_options[$key]; // Value is kept |
5016 | 5412 | } |
5017 | 5413 | } |
5018 | - } |
|
5019 | - else // Common usage |
|
5414 | + } else // Common usage |
|
5020 | 5415 | { |
5021 | 5416 | $new_array_options[$key] = $this->array_options[$key]; |
5022 | 5417 | } |
@@ -5042,26 +5437,30 @@ discard block |
||
5042 | 5437 | dol_include_once($InfoFieldList[1]); |
5043 | 5438 | if ($InfoFieldList[0] && class_exists($InfoFieldList[0])) |
5044 | 5439 | { |
5045 | - if ($value == '-1') // -1 is key for no defined in combo list of objects |
|
5440 | + if ($value == '-1') { |
|
5441 | + // -1 is key for no defined in combo list of objects |
|
5046 | 5442 | { |
5047 | - $new_array_options[$key]=''; |
|
5048 | - } |
|
5049 | - elseif ($value) |
|
5443 | + $new_array_options[$key]=''; |
|
5444 | + } |
|
5445 | + } elseif ($value) |
|
5050 | 5446 | { |
5051 | 5447 | $object = new $InfoFieldList[0]($this->db); |
5052 | - if (is_numeric($value)) $res=$object->fetch($value); |
|
5053 | - else $res=$object->fetch('',$value); |
|
5054 | - |
|
5055 | - if ($res > 0) $new_array_options[$key]=$object->id; |
|
5056 | - else |
|
5448 | + if (is_numeric($value)) { |
|
5449 | + $res=$object->fetch($value); |
|
5450 | + } else { |
|
5451 | + $res=$object->fetch('',$value); |
|
5452 | + } |
|
5453 | + |
|
5454 | + if ($res > 0) { |
|
5455 | + $new_array_options[$key]=$object->id; |
|
5456 | + } else |
|
5057 | 5457 | { |
5058 | 5458 | $this->error="Id/Ref '".$value."' for object '".$object->element."' not found"; |
5059 | 5459 | $this->db->rollback(); |
5060 | 5460 | return -1; |
5061 | 5461 | } |
5062 | 5462 | } |
5063 | - } |
|
5064 | - else |
|
5463 | + } else |
|
5065 | 5464 | { |
5066 | 5465 | dol_syslog('Error bad setup of extrafield', LOG_WARNING); |
5067 | 5466 | } |
@@ -5072,7 +5471,10 @@ discard block |
||
5072 | 5471 | $this->db->begin(); |
5073 | 5472 | |
5074 | 5473 | $table_element = $this->table_element; |
5075 | - if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility |
|
5474 | + if ($table_element == 'categorie') { |
|
5475 | + $table_element = 'categories'; |
|
5476 | + } |
|
5477 | + // For compatibility |
|
5076 | 5478 | |
5077 | 5479 | $sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id; |
5078 | 5480 | dol_syslog(get_class($this)."::insertExtraFields delete", LOG_DEBUG); |
@@ -5083,8 +5485,10 @@ discard block |
||
5083 | 5485 | { |
5084 | 5486 | $attributeKey = substr($key,8); // Remove 'options_' prefix |
5085 | 5487 | // Add field of attribut |
5086 | - if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator |
|
5087 | - $sql.=",".$attributeKey; |
|
5488 | + if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') { |
|
5489 | + // Only for other type than separator |
|
5490 | + $sql.=",".$attributeKey; |
|
5491 | + } |
|
5088 | 5492 | } |
5089 | 5493 | $sql .= ") VALUES (".$this->id; |
5090 | 5494 | |
@@ -5092,13 +5496,14 @@ discard block |
||
5092 | 5496 | { |
5093 | 5497 | $attributeKey = substr($key,8); // Remove 'options_' prefix |
5094 | 5498 | // Add field of attribute |
5095 | - if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator) |
|
5499 | + if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') { |
|
5500 | + // Only for other type than separator) |
|
5096 | 5501 | { |
5097 | 5502 | if ($new_array_options[$key] != '') |
5098 | 5503 | { |
5099 | - $sql.=",'".$this->db->escape($new_array_options[$key])."'"; |
|
5100 | - } |
|
5101 | - else |
|
5504 | + $sql.=",'".$this->db->escape($new_array_options[$key])."'"; |
|
5505 | + } |
|
5506 | + } else |
|
5102 | 5507 | { |
5103 | 5508 | $sql.=",null"; |
5104 | 5509 | } |
@@ -5119,7 +5524,9 @@ discard block |
||
5119 | 5524 | // Call trigger |
5120 | 5525 | $this->context=array('extrafieldaddupdate'=>1); |
5121 | 5526 | $result=$this->call_trigger($trigger, $userused); |
5122 | - if ($result < 0) $error++; |
|
5527 | + if ($result < 0) { |
|
5528 | + $error++; |
|
5529 | + } |
|
5123 | 5530 | // End call trigger |
5124 | 5531 | } |
5125 | 5532 | |
@@ -5127,14 +5534,14 @@ discard block |
||
5127 | 5534 | { |
5128 | 5535 | $this->db->rollback(); |
5129 | 5536 | return -1; |
5130 | - } |
|
5131 | - else |
|
5537 | + } else |
|
5132 | 5538 | { |
5133 | 5539 | $this->db->commit(); |
5134 | 5540 | return 1; |
5135 | 5541 | } |
5136 | - } |
|
5137 | - else return 0; |
|
5542 | + } else { |
|
5543 | + return 0; |
|
5544 | + } |
|
5138 | 5545 | } |
5139 | 5546 | |
5140 | 5547 | /** |
@@ -5151,12 +5558,16 @@ discard block |
||
5151 | 5558 | { |
5152 | 5559 | global $conf,$langs,$user; |
5153 | 5560 | |
5154 | - if (empty($userused)) $userused=$user; |
|
5561 | + if (empty($userused)) { |
|
5562 | + $userused=$user; |
|
5563 | + } |
|
5155 | 5564 | |
5156 | 5565 | $error=0; |
5157 | 5566 | |
5158 | - if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED)) |
|
5159 | - return 0; // For avoid conflicts if trigger used |
|
5567 | + if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_DISABLED)) { |
|
5568 | + return 0; |
|
5569 | + } |
|
5570 | + // For avoid conflicts if trigger used |
|
5160 | 5571 | |
5161 | 5572 | if (! empty($this->array_options) && isset($this->array_options["options_".$key])) |
5162 | 5573 | { |
@@ -5183,8 +5594,7 @@ discard block |
||
5183 | 5594 | { |
5184 | 5595 | $this->errors[]=$langs->trans("ExtraFieldHasWrongValue",$attributeLabel); |
5185 | 5596 | return -1; |
5186 | - } |
|
5187 | - elseif ($value=='') |
|
5597 | + } elseif ($value=='') |
|
5188 | 5598 | { |
5189 | 5599 | $this->array_options["options_".$key] = null; |
5190 | 5600 | } |
@@ -5196,8 +5606,7 @@ discard block |
||
5196 | 5606 | dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG); |
5197 | 5607 | $this->errors[]=$langs->trans("ExtraFieldHasWrongValue", $attributeLabel); |
5198 | 5608 | return -1; |
5199 | - } |
|
5200 | - elseif ($value=='') |
|
5609 | + } elseif ($value=='') |
|
5201 | 5610 | { |
5202 | 5611 | $this->array_options["options_".$key] = null; |
5203 | 5612 | } |
@@ -5249,7 +5658,9 @@ discard block |
||
5249 | 5658 | // Call trigger |
5250 | 5659 | $this->context=array('extrafieldupdate'=>1); |
5251 | 5660 | $result=$this->call_trigger($trigger, $userused); |
5252 | - if ($result < 0) $error++; |
|
5661 | + if ($result < 0) { |
|
5662 | + $error++; |
|
5663 | + } |
|
5253 | 5664 | // End call trigger |
5254 | 5665 | } |
5255 | 5666 | |
@@ -5258,14 +5669,14 @@ discard block |
||
5258 | 5669 | dol_syslog(get_class($this) . "::".__METHOD__ . $this->error, LOG_ERR); |
5259 | 5670 | $this->db->rollback(); |
5260 | 5671 | return -1; |
5261 | - } |
|
5262 | - else |
|
5672 | + } else |
|
5263 | 5673 | { |
5264 | 5674 | $this->db->commit(); |
5265 | 5675 | return 1; |
5266 | 5676 | } |
5267 | - } |
|
5268 | - else return 0; |
|
5677 | + } else { |
|
5678 | + return 0; |
|
5679 | + } |
|
5269 | 5680 | } |
5270 | 5681 | |
5271 | 5682 | |
@@ -5340,8 +5751,11 @@ discard block |
||
5340 | 5751 | |
5341 | 5752 | if ($computed) |
5342 | 5753 | { |
5343 | - if (! preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>'; |
|
5344 | - else return ''; |
|
5754 | + if (! preg_match('/^search_/', $keyprefix)) { |
|
5755 | + return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>'; |
|
5756 | + } else { |
|
5757 | + return ''; |
|
5758 | + } |
|
5345 | 5759 | } |
5346 | 5760 | |
5347 | 5761 | |
@@ -5355,33 +5769,27 @@ discard block |
||
5355 | 5769 | if ($type == 'date') |
5356 | 5770 | { |
5357 | 5771 | $morecss = 'minwidth100imp'; |
5358 | - } |
|
5359 | - elseif ($type == 'datetime') |
|
5772 | + } elseif ($type == 'datetime') |
|
5360 | 5773 | { |
5361 | 5774 | $morecss = 'minwidth200imp'; |
5362 | - } |
|
5363 | - elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type)) |
|
5775 | + } elseif (in_array($type,array('int','integer','price')) || preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type)) |
|
5364 | 5776 | { |
5365 | 5777 | $morecss = 'maxwidth75'; |
5366 | - }elseif ($type == 'url') |
|
5778 | + } elseif ($type == 'url') |
|
5367 | 5779 | { |
5368 | 5780 | $morecss='minwidth400'; |
5369 | - } |
|
5370 | - elseif ($type == 'boolean') |
|
5781 | + } elseif ($type == 'boolean') |
|
5371 | 5782 | { |
5372 | 5783 | $morecss=''; |
5373 | - } |
|
5374 | - else |
|
5784 | + } else |
|
5375 | 5785 | { |
5376 | 5786 | if (round($size) < 12) |
5377 | 5787 | { |
5378 | 5788 | $morecss = 'minwidth100'; |
5379 | - } |
|
5380 | - else if (round($size) <= 48) |
|
5789 | + } else if (round($size) <= 48) |
|
5381 | 5790 | { |
5382 | 5791 | $morecss = 'minwidth200'; |
5383 | - } |
|
5384 | - else |
|
5792 | + } else |
|
5385 | 5793 | { |
5386 | 5794 | $morecss = 'minwidth400'; |
5387 | 5795 | } |
@@ -5396,52 +5804,50 @@ discard block |
||
5396 | 5804 | $showtime = in_array($type,array('datetime')) ? 1 : 0; |
5397 | 5805 | |
5398 | 5806 | // Do not show current date when field not required (see selectDate() method) |
5399 | - if (!$required && $value == '') $value = '-1'; |
|
5807 | + if (!$required && $value == '') { |
|
5808 | + $value = '-1'; |
|
5809 | + } |
|
5400 | 5810 | |
5401 | 5811 | // TODO Must also support $moreparam |
5402 | 5812 | $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1); |
5403 | - } |
|
5404 | - elseif (in_array($type,array('int','integer'))) |
|
5813 | + } elseif (in_array($type,array('int','integer'))) |
|
5405 | 5814 | { |
5406 | 5815 | $tmp=explode(',',$size); |
5407 | 5816 | $newsize=$tmp[0]; |
5408 | 5817 | $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>'; |
5409 | - } |
|
5410 | - elseif (preg_match('/varchar/', $type)) |
|
5818 | + } elseif (preg_match('/varchar/', $type)) |
|
5411 | 5819 | { |
5412 | 5820 | $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam?$moreparam:'').'>'; |
5413 | - } |
|
5414 | - elseif (in_array($type, array('mail', 'phone', 'url'))) |
|
5821 | + } elseif (in_array($type, array('mail', 'phone', 'url'))) |
|
5415 | 5822 | { |
5416 | 5823 | $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>'; |
5417 | - } |
|
5418 | - elseif ($type == 'text') |
|
5824 | + } elseif ($type == 'text') |
|
5419 | 5825 | { |
5420 | - if (! preg_match('/search_/', $keyprefix)) // If keyprefix is search_ or search_options_, we must just use a simple text field |
|
5826 | + if (! preg_match('/search_/', $keyprefix)) { |
|
5827 | + // If keyprefix is search_ or search_options_, we must just use a simple text field |
|
5421 | 5828 | { |
5422 | - require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; |
|
5829 | + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; |
|
5830 | + } |
|
5423 | 5831 | $doleditor=new DolEditor($keyprefix.$key.$keysuffix,$value,'',200,'dolibarr_notes','In',false,false,false,ROWS_5,'90%'); |
5424 | 5832 | $out=$doleditor->Create(1); |
5425 | - } |
|
5426 | - else |
|
5833 | + } else |
|
5427 | 5834 | { |
5428 | 5835 | $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>'; |
5429 | 5836 | } |
5430 | - } |
|
5431 | - elseif ($type == 'html') |
|
5837 | + } elseif ($type == 'html') |
|
5432 | 5838 | { |
5433 | - if (! preg_match('/search_/', $keyprefix)) // If keyprefix is search_ or search_options_, we must just use a simple text field |
|
5839 | + if (! preg_match('/search_/', $keyprefix)) { |
|
5840 | + // If keyprefix is search_ or search_options_, we must just use a simple text field |
|
5434 | 5841 | { |
5435 | - require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; |
|
5842 | + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; |
|
5843 | + } |
|
5436 | 5844 | $doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%'); |
5437 | 5845 | $out=$doleditor->Create(1); |
5438 | - } |
|
5439 | - else |
|
5846 | + } else |
|
5440 | 5847 | { |
5441 | 5848 | $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam?$moreparam:'').'>'; |
5442 | 5849 | } |
5443 | - } |
|
5444 | - elseif ($type == 'boolean') |
|
5850 | + } elseif ($type == 'boolean') |
|
5445 | 5851 | { |
5446 | 5852 | $checked=''; |
5447 | 5853 | if (!empty($value)) { |
@@ -5450,22 +5856,19 @@ discard block |
||
5450 | 5856 | $checked=' value="1" '; |
5451 | 5857 | } |
5452 | 5858 | $out='<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam?$moreparam:'').'>'; |
5453 | - } |
|
5454 | - elseif ($type == 'price') |
|
5859 | + } elseif ($type == 'price') |
|
5455 | 5860 | { |
5456 | 5861 | if (!empty($value)) { // $value in memory is a php numeric, we format it into user number format. |
5457 | 5862 | $value=price($value); |
5458 | 5863 | } |
5459 | 5864 | $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> ' . $langs->getCurrencySymbol(Globals::$conf->currency); |
5460 | - } |
|
5461 | - elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type)) |
|
5865 | + } elseif (preg_match('/^double(\([0-9],[0-9]\)){0,1}/',$type)) |
|
5462 | 5866 | { |
5463 | 5867 | if (!empty($value)) { // $value in memory is a php numeric, we format it into user number format. |
5464 | 5868 | $value=price($value); |
5465 | 5869 | } |
5466 | 5870 | $out='<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'> '; |
5467 | - } |
|
5468 | - elseif ($type == 'select') |
|
5871 | + } elseif ($type == 'select') |
|
5469 | 5872 | { |
5470 | 5873 | $out = ''; |
5471 | 5874 | if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) { |
@@ -5474,10 +5877,14 @@ discard block |
||
5474 | 5877 | } |
5475 | 5878 | |
5476 | 5879 | $out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>'; |
5477 | - if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1))$out.='<option value="0"> </option>'; |
|
5880 | + if((! isset($this->fields[$key]['default'])) ||($this->fields[$key]['notnull']!=1)) { |
|
5881 | + $out.='<option value="0"> </option>'; |
|
5882 | + } |
|
5478 | 5883 | foreach ($param['options'] as $key => $val) |
5479 | 5884 | { |
5480 | - if ((string) $key == '') continue; |
|
5885 | + if ((string) $key == '') { |
|
5886 | + continue; |
|
5887 | + } |
|
5481 | 5888 | list($val, $parent) = explode('|', $val); |
5482 | 5889 | $out.='<option value="'.$key.'"'; |
5483 | 5890 | $out.= (((string) $value == (string) $key)?' selected':''); |
@@ -5485,8 +5892,7 @@ discard block |
||
5485 | 5892 | $out.='>'.$val.'</option>'; |
5486 | 5893 | } |
5487 | 5894 | $out.='</select>'; |
5488 | - } |
|
5489 | - elseif ($type == 'sellist') |
|
5895 | + } elseif ($type == 'sellist') |
|
5490 | 5896 | { |
5491 | 5897 | $out = ''; |
5492 | 5898 | if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) { |
@@ -5552,13 +5958,11 @@ discard block |
||
5552 | 5958 | { |
5553 | 5959 | $sql.= ' as main, '.MAIN_DB_PREFIX .$InfoFieldList[0].'_extrafields as extra'; |
5554 | 5960 | $sqlwhere.= ' WHERE extra.fk_object=main.'.$InfoFieldList[2]. ' AND '.$InfoFieldList[4]; |
5555 | - } |
|
5556 | - else |
|
5961 | + } else |
|
5557 | 5962 | { |
5558 | 5963 | $sqlwhere.= ' WHERE '.$InfoFieldList[4]; |
5559 | 5964 | } |
5560 | - } |
|
5561 | - else |
|
5965 | + } else |
|
5562 | 5966 | { |
5563 | 5967 | $sqlwhere.= ' WHERE 1=1'; |
5564 | 5968 | } |
@@ -5594,8 +5998,7 @@ discard block |
||
5594 | 5998 | { |
5595 | 5999 | $labeltoshow.= $obj->$field_toshow.' '; |
5596 | 6000 | } |
5597 | - } |
|
5598 | - else |
|
6001 | + } else |
|
5599 | 6002 | { |
5600 | 6003 | $labeltoshow=$obj->{$InfoFieldList[1]}; |
5601 | 6004 | } |
@@ -5608,25 +6011,25 @@ discard block |
||
5608 | 6011 | $translabel=$langs->trans($obj->$field_toshow); |
5609 | 6012 | if ($translabel!=$obj->$field_toshow) { |
5610 | 6013 | $labeltoshow=dol_trunc($translabel,18).' '; |
5611 | - }else { |
|
6014 | + } else { |
|
5612 | 6015 | $labeltoshow=dol_trunc($obj->$field_toshow,18).' '; |
5613 | 6016 | } |
5614 | 6017 | } |
5615 | 6018 | $out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>'; |
5616 | - } |
|
5617 | - else |
|
6019 | + } else |
|
5618 | 6020 | { |
5619 | 6021 | if (! $notrans) |
5620 | 6022 | { |
5621 | 6023 | $translabel=$langs->trans($obj->{$InfoFieldList[1]}); |
5622 | 6024 | if ($translabel!=$obj->{$InfoFieldList[1]}) { |
5623 | 6025 | $labeltoshow=dol_trunc($translabel,18); |
5624 | - } |
|
5625 | - else { |
|
6026 | + } else { |
|
5626 | 6027 | $labeltoshow=dol_trunc($obj->{$InfoFieldList[1]},18); |
5627 | 6028 | } |
5628 | 6029 | } |
5629 | - if (empty($labeltoshow)) $labeltoshow='(not defined)'; |
|
6030 | + if (empty($labeltoshow)) { |
|
6031 | + $labeltoshow='(not defined)'; |
|
6032 | + } |
|
5630 | 6033 | if ($value==$obj->rowid) |
5631 | 6034 | { |
5632 | 6035 | $out.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>'; |
@@ -5646,19 +6049,16 @@ discard block |
||
5646 | 6049 | $i++; |
5647 | 6050 | } |
5648 | 6051 | $this->db->free($resql); |
5649 | - } |
|
5650 | - else { |
|
6052 | + } else { |
|
5651 | 6053 | print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>'; |
5652 | 6054 | } |
5653 | 6055 | } |
5654 | 6056 | $out.='</select>'; |
5655 | - } |
|
5656 | - elseif ($type == 'checkbox') |
|
6057 | + } elseif ($type == 'checkbox') |
|
5657 | 6058 | { |
5658 | 6059 | $value_arr=explode(',',$value); |
5659 | 6060 | $out=$form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options'])?null:$param['options']), $value_arr, '', 0, '', 0, '100%'); |
5660 | - } |
|
5661 | - elseif ($type == 'radio') |
|
6061 | + } elseif ($type == 'radio') |
|
5662 | 6062 | { |
5663 | 6063 | $out=''; |
5664 | 6064 | foreach ($param['options'] as $keyopt => $val) |
@@ -5669,13 +6069,11 @@ discard block |
||
5669 | 6069 | $out.= ($value==$keyopt?'checked':''); |
5670 | 6070 | $out.='/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>'; |
5671 | 6071 | } |
5672 | - } |
|
5673 | - elseif ($type == 'chkbxlst') |
|
6072 | + } elseif ($type == 'chkbxlst') |
|
5674 | 6073 | { |
5675 | 6074 | if (is_array($value)) { |
5676 | 6075 | $value_arr = $value; |
5677 | - } |
|
5678 | - else { |
|
6076 | + } else { |
|
5679 | 6077 | $value_arr = explode(',', $value); |
5680 | 6078 | } |
5681 | 6079 | |
@@ -5790,8 +6188,9 @@ discard block |
||
5790 | 6188 | $labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18); |
5791 | 6189 | } |
5792 | 6190 | } |
5793 | - if (empty($labeltoshow)) |
|
5794 | - $labeltoshow = '(not defined)'; |
|
6191 | + if (empty($labeltoshow)) { |
|
6192 | + $labeltoshow = '(not defined)'; |
|
6193 | + } |
|
5795 | 6194 | |
5796 | 6195 | if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) { |
5797 | 6196 | $data[$obj->rowid]=$labeltoshow; |
@@ -5813,26 +6212,26 @@ discard block |
||
5813 | 6212 | print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>'; |
5814 | 6213 | } |
5815 | 6214 | } |
5816 | - } |
|
5817 | - elseif ($type == 'link') |
|
6215 | + } elseif ($type == 'link') |
|
5818 | 6216 | { |
5819 | 6217 | $param_list=array_keys($param['options']); // $param_list='ObjectName:classPath' |
5820 | 6218 | $showempty=(($required && $default != '')?0:1); |
5821 | 6219 | $out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty); |
5822 | 6220 | if (Globals::$conf->global->MAIN_FEATURES_LEVEL >= 2) { |
5823 | 6221 | list($class,$classfile)=explode(':',$param_list[0]); |
5824 | - if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1); |
|
5825 | - else $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1); |
|
6222 | + if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) { |
|
6223 | + $url_path=dol_buildpath(dirname(dirname($classfile)).'/card.php',1); |
|
6224 | + } else { |
|
6225 | + $url_path=dol_buildpath(dirname(dirname($classfile)).'/'.$class.'_card.php',1); |
|
6226 | + } |
|
5826 | 6227 | $out.='<a class="butActionNew" href="'.$url_path.'?action=create&backtopage='.$_SERVER['PHP_SELF'].'"><span class="fa fa-plus-circle valignmiddle"></span></a>'; |
5827 | 6228 | // TODO Add Javascript code to add input fields contents to new elements urls |
5828 | 6229 | } |
5829 | - } |
|
5830 | - elseif ($type == 'password') |
|
6230 | + } elseif ($type == 'password') |
|
5831 | 6231 | { |
5832 | 6232 | // If prefix is 'search_', field is used as a filter, we use a common text field. |
5833 | 6233 | $out='<input type="'.($keyprefix=='search_'?'text':'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam?$moreparam:'').'>'; |
5834 | - } |
|
5835 | - elseif ($type == 'array') |
|
6234 | + } elseif ($type == 'array') |
|
5836 | 6235 | { |
5837 | 6236 | $newval = $val; |
5838 | 6237 | $newval['type'] = 'varchar(256)'; |
@@ -5910,17 +6309,25 @@ discard block |
||
5910 | 6309 | { |
5911 | 6310 | $type = 'varchar'; // convert varchar(xx) int varchar |
5912 | 6311 | $size = $reg[1]; |
5913 | - } |
|
5914 | - elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar |
|
5915 | - if (is_array($val['arrayofkeyval'])) $type='select'; |
|
5916 | - if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type='link'; |
|
6312 | + } elseif (preg_match('/varchar/', $type)) { |
|
6313 | + $type = 'varchar'; |
|
6314 | + } |
|
6315 | + // convert varchar(xx) int varchar |
|
6316 | + if (is_array($val['arrayofkeyval'])) { |
|
6317 | + $type='select'; |
|
6318 | + } |
|
6319 | + if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) { |
|
6320 | + $type='link'; |
|
6321 | + } |
|
5917 | 6322 | |
5918 | 6323 | $default=$val['default']; |
5919 | 6324 | $computed=$val['computed']; |
5920 | 6325 | $unique=$val['unique']; |
5921 | 6326 | $required=$val['required']; |
5922 | 6327 | $param=$val['param']; |
5923 | - if (is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval']; |
|
6328 | + if (is_array($val['arrayofkeyval'])) { |
|
6329 | + $param['options'] = $val['arrayofkeyval']; |
|
6330 | + } |
|
5924 | 6331 | if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) |
5925 | 6332 | { |
5926 | 6333 | $type='link'; |
@@ -5931,7 +6338,9 @@ discard block |
||
5931 | 6338 | $help=$val['help']; |
5932 | 6339 | $hidden=(($val['visible'] == 0) ? 1 : 0); // If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller) |
5933 | 6340 | |
5934 | - if ($hidden) return ''; |
|
6341 | + if ($hidden) { |
|
6342 | + return ''; |
|
6343 | + } |
|
5935 | 6344 | |
5936 | 6345 | // If field is a computed field, value must become result of compute |
5937 | 6346 | if ($computed) |
@@ -5947,36 +6356,29 @@ discard block |
||
5947 | 6356 | { |
5948 | 6357 | //$showsize=10; |
5949 | 6358 | $showsize = 'minwidth100imp'; |
5950 | - } |
|
5951 | - elseif ($type == 'datetime') |
|
6359 | + } elseif ($type == 'datetime') |
|
5952 | 6360 | { |
5953 | 6361 | //$showsize=19; |
5954 | 6362 | $showsize = 'minwidth200imp'; |
5955 | - } |
|
5956 | - elseif (in_array($type,array('int','double','price'))) |
|
6363 | + } elseif (in_array($type,array('int','double','price'))) |
|
5957 | 6364 | { |
5958 | 6365 | //$showsize=10; |
5959 | 6366 | $showsize = 'maxwidth75'; |
5960 | - } |
|
5961 | - elseif ($type == 'url') |
|
6367 | + } elseif ($type == 'url') |
|
5962 | 6368 | { |
5963 | 6369 | $showsize='minwidth400'; |
5964 | - } |
|
5965 | - elseif ($type == 'boolean') |
|
6370 | + } elseif ($type == 'boolean') |
|
5966 | 6371 | { |
5967 | 6372 | $showsize=''; |
5968 | - } |
|
5969 | - else |
|
6373 | + } else |
|
5970 | 6374 | { |
5971 | 6375 | if (round($size) < 12) |
5972 | 6376 | { |
5973 | 6377 | $showsize = 'minwidth100'; |
5974 | - } |
|
5975 | - else if (round($size) <= 48) |
|
6378 | + } else if (round($size) <= 48) |
|
5976 | 6379 | { |
5977 | 6380 | $showsize = 'minwidth200'; |
5978 | - } |
|
5979 | - else |
|
6381 | + } else |
|
5980 | 6382 | { |
5981 | 6383 | //$showsize=48; |
5982 | 6384 | $showsize = 'minwidth400'; |
@@ -5985,59 +6387,52 @@ discard block |
||
5985 | 6387 | } |
5986 | 6388 | |
5987 | 6389 | // Format output value differently according to properties of field |
5988 | - if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value=$this->getNomUrl(1, '', 0, '', 1); |
|
5989 | - elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value=$this->getLibStatut(3); |
|
5990 | - elseif ($type == 'date') |
|
6390 | + if ($key == 'ref' && method_exists($this, 'getNomUrl')) { |
|
6391 | + $value=$this->getNomUrl(1, '', 0, '', 1); |
|
6392 | + } elseif ($key == 'status' && method_exists($this, 'getLibStatut')) { |
|
6393 | + $value=$this->getLibStatut(3); |
|
6394 | + } elseif ($type == 'date') |
|
5991 | 6395 | { |
5992 | 6396 | if(! empty($value)) { |
5993 | 6397 | $value=dol_print_date($value,'day'); |
5994 | 6398 | } else { |
5995 | 6399 | $value=''; |
5996 | 6400 | } |
5997 | - } |
|
5998 | - elseif ($type == 'datetime') |
|
6401 | + } elseif ($type == 'datetime') |
|
5999 | 6402 | { |
6000 | 6403 | if(! empty($value)) { |
6001 | 6404 | $value=dol_print_date($value,'dayhour'); |
6002 | 6405 | } else { |
6003 | 6406 | $value=''; |
6004 | 6407 | } |
6005 | - } |
|
6006 | - elseif ($type == 'double') |
|
6408 | + } elseif ($type == 'double') |
|
6007 | 6409 | { |
6008 | 6410 | if (!empty($value)) { |
6009 | 6411 | $value=price($value); |
6010 | 6412 | } |
6011 | - } |
|
6012 | - elseif ($type == 'boolean') |
|
6413 | + } elseif ($type == 'boolean') |
|
6013 | 6414 | { |
6014 | 6415 | $checked=''; |
6015 | 6416 | if (!empty($value)) { |
6016 | 6417 | $checked=' checked '; |
6017 | 6418 | } |
6018 | 6419 | $value='<input type="checkbox" '.$checked.' '.($moreparam?$moreparam:'').' readonly disabled>'; |
6019 | - } |
|
6020 | - elseif ($type == 'mail') |
|
6420 | + } elseif ($type == 'mail') |
|
6021 | 6421 | { |
6022 | 6422 | $value=dol_print_email($value,0,0,0,64,1,1); |
6023 | - } |
|
6024 | - elseif ($type == 'url') |
|
6423 | + } elseif ($type == 'url') |
|
6025 | 6424 | { |
6026 | 6425 | $value=dol_print_url($value,'_blank',32,1); |
6027 | - } |
|
6028 | - elseif ($type == 'phone') |
|
6426 | + } elseif ($type == 'phone') |
|
6029 | 6427 | { |
6030 | 6428 | $value=dol_print_phone($value, '', 0, 0, '', ' ', 1); |
6031 | - } |
|
6032 | - elseif ($type == 'price') |
|
6429 | + } elseif ($type == 'price') |
|
6033 | 6430 | { |
6034 | 6431 | $value = price($value, 0, $langs, 0, 0, -1, Globals::$conf->currency); |
6035 | - } |
|
6036 | - elseif ($type == 'select') |
|
6432 | + } elseif ($type == 'select') |
|
6037 | 6433 | { |
6038 | 6434 | $value=$param['options'][$value]; |
6039 | - } |
|
6040 | - elseif ($type == 'sellist') |
|
6435 | + } elseif ($type == 'sellist') |
|
6041 | 6436 | { |
6042 | 6437 | $param_list=array_keys($param['options']); |
6043 | 6438 | $InfoFieldList = explode(":", $param_list[0]); |
@@ -6067,7 +6462,7 @@ discard block |
||
6067 | 6462 | $sql.= " WHERE ".$selectkey."=0"; |
6068 | 6463 | } elseif ($selectkey=='rowid') { |
6069 | 6464 | $sql.= " WHERE ".$selectkey."=".$this->db->escape($value); |
6070 | - }else { |
|
6465 | + } else { |
|
6071 | 6466 | $sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'"; |
6072 | 6467 | } |
6073 | 6468 | |
@@ -6094,12 +6489,11 @@ discard block |
||
6094 | 6489 | } |
6095 | 6490 | if ($translabel!=$field_toshow) { |
6096 | 6491 | $value.=dol_trunc($translabel,18).' '; |
6097 | - }else { |
|
6492 | + } else { |
|
6098 | 6493 | $value.=$obj->$field_toshow.' '; |
6099 | 6494 | } |
6100 | 6495 | } |
6101 | - } |
|
6102 | - else |
|
6496 | + } else |
|
6103 | 6497 | { |
6104 | 6498 | $translabel=''; |
6105 | 6499 | if (!empty($obj->{$InfoFieldList[1]})) { |
@@ -6107,18 +6501,17 @@ discard block |
||
6107 | 6501 | } |
6108 | 6502 | if ($translabel!=$obj->{$InfoFieldList[1]}) { |
6109 | 6503 | $value=dol_trunc($translabel,18); |
6110 | - }else { |
|
6504 | + } else { |
|
6111 | 6505 | $value=$obj->{$InfoFieldList[1]}; |
6112 | 6506 | } |
6113 | 6507 | } |
6114 | - } |
|
6115 | - else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING); |
|
6116 | - } |
|
6117 | - elseif ($type == 'radio') |
|
6508 | + } else { |
|
6509 | + dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING); |
|
6510 | + } |
|
6511 | + } elseif ($type == 'radio') |
|
6118 | 6512 | { |
6119 | 6513 | $value=$param['options'][$value]; |
6120 | - } |
|
6121 | - elseif ($type == 'checkbox') |
|
6514 | + } elseif ($type == 'checkbox') |
|
6122 | 6515 | { |
6123 | 6516 | $value_arr=explode(',',$value); |
6124 | 6517 | $value=''; |
@@ -6129,8 +6522,7 @@ discard block |
||
6129 | 6522 | } |
6130 | 6523 | $value='<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>'; |
6131 | 6524 | } |
6132 | - } |
|
6133 | - elseif ($type == 'chkbxlst') |
|
6525 | + } elseif ($type == 'chkbxlst') |
|
6134 | 6526 | { |
6135 | 6527 | $value_arr = explode(',', $value); |
6136 | 6528 | |
@@ -6198,8 +6590,7 @@ discard block |
||
6198 | 6590 | } else { |
6199 | 6591 | dol_syslog(get_class($this) . '::showOutputField error ' . $this->db->lasterror(), LOG_WARNING); |
6200 | 6592 | } |
6201 | - } |
|
6202 | - elseif ($type == 'link') |
|
6593 | + } elseif ($type == 'link') |
|
6203 | 6594 | { |
6204 | 6595 | $out=''; |
6205 | 6596 | |
@@ -6221,24 +6612,21 @@ discard block |
||
6221 | 6612 | $object->fetch($value); |
6222 | 6613 | $value=$object->getNomUrl($getnomurlparam); |
6223 | 6614 | } |
6224 | - } |
|
6225 | - else |
|
6615 | + } else |
|
6226 | 6616 | { |
6227 | 6617 | dol_syslog('Error bad setup of extrafield', LOG_WARNING); |
6228 | 6618 | return 'Error bad setup of extrafield'; |
6229 | 6619 | } |
6230 | - } |
|
6231 | - else $value=''; |
|
6232 | - } |
|
6233 | - elseif ($type == 'text' || $type == 'html') |
|
6620 | + } else { |
|
6621 | + $value=''; |
|
6622 | + } |
|
6623 | + } elseif ($type == 'text' || $type == 'html') |
|
6234 | 6624 | { |
6235 | 6625 | $value=dol_htmlentitiesbr($value); |
6236 | - } |
|
6237 | - elseif ($type == 'password') |
|
6626 | + } elseif ($type == 'password') |
|
6238 | 6627 | { |
6239 | 6628 | $value=preg_replace('/./i','*',$value); |
6240 | - } |
|
6241 | - elseif ($type == 'array') |
|
6629 | + } elseif ($type == 'array') |
|
6242 | 6630 | { |
6243 | 6631 | $value = implode('<br>', $value); |
6244 | 6632 | } |
@@ -6265,7 +6653,9 @@ discard block |
||
6265 | 6653 | { |
6266 | 6654 | global $db, $conf, $langs, $action, $form; |
6267 | 6655 | |
6268 | - if (! is_object($form)) $form=new Form($db); |
|
6656 | + if (! is_object($form)) { |
|
6657 | + $form=new Form($db); |
|
6658 | + } |
|
6269 | 6659 | |
6270 | 6660 | $out = ''; |
6271 | 6661 | |
@@ -6279,7 +6669,9 @@ discard block |
||
6279 | 6669 | foreach($extrafields->attributes[$this->table_element]['label'] as $key=>$label) |
6280 | 6670 | { |
6281 | 6671 | // Show only the key field in params |
6282 | - if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) continue; |
|
6672 | + if (is_array($params) && array_key_exists('onlykey',$params) && $key != $params['onlykey']) { |
|
6673 | + continue; |
|
6674 | + } |
|
6283 | 6675 | |
6284 | 6676 | $enabled = 1; |
6285 | 6677 | if ($enabled && isset($extrafields->attributes[$this->table_element]['list'][$key])) |
@@ -6293,11 +6685,18 @@ discard block |
||
6293 | 6685 | $perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1); |
6294 | 6686 | } |
6295 | 6687 | |
6296 | - if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list |
|
6297 | - if (empty($perms)) continue; |
|
6688 | + if (($mode == 'create' || $mode == 'edit') && abs($enabled) != 1 && abs($enabled) != 3) { |
|
6689 | + continue; |
|
6690 | + } |
|
6691 | + // <> -1 and <> 1 and <> 3 = not visible on forms, only on list |
|
6692 | + if (empty($perms)) { |
|
6693 | + continue; |
|
6694 | + } |
|
6298 | 6695 | |
6299 | 6696 | // Load language if required |
6300 | - if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]); |
|
6697 | + if (! empty($extrafields->attributes[$this->table_element]['langfile'][$key])) { |
|
6698 | + $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]); |
|
6699 | + } |
|
6301 | 6700 | |
6302 | 6701 | $colspan='3'; |
6303 | 6702 | if (is_array($params) && count($params)>0) { |
@@ -6331,8 +6730,7 @@ discard block |
||
6331 | 6730 | if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate') |
6332 | 6731 | { |
6333 | 6732 | $out .= $extrafields->showSeparator($key, $this); |
6334 | - } |
|
6335 | - else |
|
6733 | + } else |
|
6336 | 6734 | { |
6337 | 6735 | $csstyle=''; |
6338 | 6736 | $class=(!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : ''); |
@@ -6363,9 +6761,11 @@ discard block |
||
6363 | 6761 | if (in_array($extrafields->attributes[$this->table_element]['type'][$key],array('date','datetime'))) |
6364 | 6762 | { |
6365 | 6763 | $datenotinstring = $this->array_options['options_' . $key]; |
6366 | - if (! is_numeric($this->array_options['options_' . $key])) // For backward compatibility |
|
6764 | + if (! is_numeric($this->array_options['options_' . $key])) { |
|
6765 | + // For backward compatibility |
|
6367 | 6766 | { |
6368 | - $datenotinstring = $this->db->jdate($datenotinstring); |
|
6767 | + $datenotinstring = $this->db->jdate($datenotinstring); |
|
6768 | + } |
|
6369 | 6769 | } |
6370 | 6770 | $value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)?dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min",'int',3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day",'int',3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year",'int',3)):$datenotinstring; |
6371 | 6771 | } |
@@ -6378,11 +6778,18 @@ discard block |
||
6378 | 6778 | $labeltoshow = $langs->trans($label); |
6379 | 6779 | |
6380 | 6780 | $out .= '<td class="titlefield'; |
6381 | - if (GETPOST('action','none') == 'create') $out.='create'; |
|
6382 | - if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired'; |
|
6781 | + if (GETPOST('action','none') == 'create') { |
|
6782 | + $out.='create'; |
|
6783 | + } |
|
6784 | + if ($mode != 'view' && ! empty($extrafields->attributes[$this->table_element]['required'][$key])) { |
|
6785 | + $out .= ' fieldrequired'; |
|
6786 | + } |
|
6383 | 6787 | $out .= '">'; |
6384 | - if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]); |
|
6385 | - else $out .= $labeltoshow; |
|
6788 | + if (! empty($extrafields->attributes[$object->table_element]['help'][$key])) { |
|
6789 | + $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$object->table_element]['help'][$key]); |
|
6790 | + } else { |
|
6791 | + $out .= $labeltoshow; |
|
6792 | + } |
|
6386 | 6793 | $out .= '</td>'; |
6387 | 6794 | |
6388 | 6795 | $html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : ''; |
@@ -6399,9 +6806,11 @@ discard block |
||
6399 | 6806 | |
6400 | 6807 | $out .= '</td>'; |
6401 | 6808 | |
6402 | - if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) |
|
6403 | - $out .= '</tr>'; |
|
6404 | - else $out .= '</tr>'; |
|
6809 | + if (!empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && (($e % 2) == 1)) { |
|
6810 | + $out .= '</tr>'; |
|
6811 | + } else { |
|
6812 | + $out .= '</tr>'; |
|
6813 | + } |
|
6405 | 6814 | $e++; |
6406 | 6815 | } |
6407 | 6816 | } |
@@ -6453,7 +6862,9 @@ discard block |
||
6453 | 6862 | global $user; |
6454 | 6863 | |
6455 | 6864 | $element = $this->element; |
6456 | - if ($element == 'facturerec') $element='facture'; |
|
6865 | + if ($element == 'facturerec') { |
|
6866 | + $element='facture'; |
|
6867 | + } |
|
6457 | 6868 | |
6458 | 6869 | return $user->rights->{$element}; |
6459 | 6870 | } |
@@ -6478,7 +6889,10 @@ discard block |
||
6478 | 6889 | |
6479 | 6890 | if (! $db->query($sql)) |
6480 | 6891 | { |
6481 | - if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B. |
|
6892 | + if ($ignoreerrors) { |
|
6893 | + return true; |
|
6894 | + } |
|
6895 | + // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B. |
|
6482 | 6896 | //$this->errors = $db->lasterror(); |
6483 | 6897 | return false; |
6484 | 6898 | } |
@@ -6507,8 +6921,7 @@ discard block |
||
6507 | 6921 | |
6508 | 6922 | if (($unitPrice > 0) && (isset(Globals::$conf->global->ForceBuyingPriceIfNull) && Globals::$conf->global->ForceBuyingPriceIfNull == 1)) { // In most cases, test here is false{ |
6509 | 6923 | $buyPrice = $unitPrice * (1 - $discountPercent / 100); |
6510 | - } |
|
6511 | - else |
|
6924 | + } else |
|
6512 | 6925 | { |
6513 | 6926 | // Get cost price for margin calculation |
6514 | 6927 | if (! empty($fk_product)) |
@@ -6525,13 +6938,11 @@ discard block |
||
6525 | 6938 | if ($product->cost_price > 0) |
6526 | 6939 | { |
6527 | 6940 | $buyPrice = $product->cost_price; |
6528 | - } |
|
6529 | - else if ($product->pmp > 0) |
|
6941 | + } else if ($product->pmp > 0) |
|
6530 | 6942 | { |
6531 | 6943 | $buyPrice = $product->pmp; |
6532 | 6944 | } |
6533 | - } |
|
6534 | - else if (isset(Globals::$conf->global->MARGIN_TYPE) && Globals::$conf->global->MARGIN_TYPE == 'pmp') { |
|
6945 | + } else if (isset(Globals::$conf->global->MARGIN_TYPE) && Globals::$conf->global->MARGIN_TYPE == 'pmp') { |
|
6535 | 6946 | require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php'; |
6536 | 6947 | $product = new Product($this->db); |
6537 | 6948 | $result = $product->fetch($fk_product); |
@@ -6552,8 +6963,7 @@ discard block |
||
6552 | 6963 | if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0) |
6553 | 6964 | { |
6554 | 6965 | $buyPrice = $productFournisseur->fourn_unitprice; |
6555 | - } |
|
6556 | - else if ($result < 0) |
|
6966 | + } else if ($result < 0) |
|
6557 | 6967 | { |
6558 | 6968 | $this->errors[] = $productFournisseur->error; |
6559 | 6969 | return -2; |
@@ -6599,8 +7009,7 @@ discard block |
||
6599 | 7009 | { |
6600 | 7010 | $dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/'; |
6601 | 7011 | $pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->track_id.'/'; |
6602 | - } |
|
6603 | - else |
|
7012 | + } else |
|
6604 | 7013 | { |
6605 | 7014 | $dir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/'; |
6606 | 7015 | $pdir .= get_exdir(0, 0, 0, 0, $this, $modulepart).$this->ref.'/'; |
@@ -6662,19 +7071,26 @@ discard block |
||
6662 | 7071 | |
6663 | 7072 | // Find name of thumb file |
6664 | 7073 | $photo_vignette=basename(getImageFileNameForSize($dir.$file, '_small')); |
6665 | - if (! dol_is_file($dirthumb.$photo_vignette)) $photo_vignette=''; |
|
7074 | + if (! dol_is_file($dirthumb.$photo_vignette)) { |
|
7075 | + $photo_vignette=''; |
|
7076 | + } |
|
6666 | 7077 | |
6667 | 7078 | // Get filesize of original file |
6668 | 7079 | $imgarray=dol_getImageSize($dir.$photo); |
6669 | 7080 | |
6670 | 7081 | if ($nbbyrow > 0) |
6671 | 7082 | { |
6672 | - if ($nbphoto == 1) $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">'; |
|
7083 | + if ($nbphoto == 1) { |
|
7084 | + $return.= '<table width="100%" valign="top" align="center" border="0" cellpadding="2" cellspacing="2">'; |
|
7085 | + } |
|
6673 | 7086 | |
6674 | - if ($nbphoto % $nbbyrow == 1) $return.= '<tr align=center valign=middle border=1>'; |
|
7087 | + if ($nbphoto % $nbbyrow == 1) { |
|
7088 | + $return.= '<tr align=center valign=middle border=1>'; |
|
7089 | + } |
|
6675 | 7090 | $return.= '<td width="'.ceil(100/$nbbyrow).'%" class="photo">'; |
6676 | - } |
|
6677 | - else if ($nbbyrow < 0) $return .= '<div class="inline-block">'; |
|
7091 | + } else if ($nbbyrow < 0) { |
|
7092 | + $return .= '<div class="inline-block">'; |
|
7093 | + } |
|
6678 | 7094 | |
6679 | 7095 | $return.= "\n"; |
6680 | 7096 | |
@@ -6682,15 +7098,20 @@ discard block |
||
6682 | 7098 | if (empty($nolink)) |
6683 | 7099 | { |
6684 | 7100 | $urladvanced=getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity); |
6685 | - if ($urladvanced) $return.='<a href="'.$urladvanced.'">'; |
|
6686 | - else $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">'; |
|
7101 | + if ($urladvanced) { |
|
7102 | + $return.='<a href="'.$urladvanced.'">'; |
|
7103 | + } else { |
|
7104 | + $return.= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">'; |
|
7105 | + } |
|
6687 | 7106 | } |
6688 | 7107 | |
6689 | 7108 | // Show image (width height=$maxHeight) |
6690 | 7109 | // Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine |
6691 | 7110 | $alt=$langs->transnoentitiesnoconv('File').': '.$relativefile; |
6692 | 7111 | $alt.=' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height']; |
6693 | - if ($notitle) $alt=''; |
|
7112 | + if ($notitle) { |
|
7113 | + $alt=''; |
|
7114 | + } |
|
6694 | 7115 | |
6695 | 7116 | if ($usesharelink) |
6696 | 7117 | { |
@@ -6700,35 +7121,35 @@ discard block |
||
6700 | 7121 | { |
6701 | 7122 | $return.= '<!-- Show original file (thumb not yet available with shared links) -->'; |
6702 | 7123 | $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">'; |
6703 | - } |
|
6704 | - else { |
|
7124 | + } else { |
|
6705 | 7125 | $return.= '<!-- Show original file -->'; |
6706 | 7126 | $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?hashp='.urlencode($val['share']).'" title="'.dol_escape_htmltag($alt).'">'; |
6707 | 7127 | } |
6708 | - } |
|
6709 | - else |
|
7128 | + } else |
|
6710 | 7129 | { |
6711 | 7130 | $return.= '<!-- Show nophoto file (because file is not shared) -->'; |
6712 | 7131 | $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png" title="'.dol_escape_htmltag($alt).'">'; |
6713 | 7132 | } |
6714 | - } |
|
6715 | - else |
|
7133 | + } else |
|
6716 | 7134 | { |
6717 | 7135 | if (empty($maxHeight) || $photo_vignette && $imgarray['height'] > $maxHeight) |
6718 | 7136 | { |
6719 | 7137 | $return.= '<!-- Show thumb -->'; |
6720 | 7138 | $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdirthumb.$photo_vignette).'" title="'.dol_escape_htmltag($alt).'">'; |
6721 | - } |
|
6722 | - else { |
|
7139 | + } else { |
|
6723 | 7140 | $return.= '<!-- Show original file -->'; |
6724 | 7141 | $return.= '<img class="photo photowithmargin" border="0" height="'.$maxHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" title="'.dol_escape_htmltag($alt).'">'; |
6725 | 7142 | } |
6726 | 7143 | } |
6727 | 7144 | |
6728 | - if (empty($nolink)) $return.= '</a>'; |
|
7145 | + if (empty($nolink)) { |
|
7146 | + $return.= '</a>'; |
|
7147 | + } |
|
6729 | 7148 | $return.="\n"; |
6730 | 7149 | |
6731 | - if ($showfilename) $return.= '<br>'.$viewfilename; |
|
7150 | + if ($showfilename) { |
|
7151 | + $return.= '<br>'.$viewfilename; |
|
7152 | + } |
|
6732 | 7153 | if ($showaction) |
6733 | 7154 | { |
6734 | 7155 | $return.= '<br>'; |
@@ -6753,15 +7174,20 @@ discard block |
||
6753 | 7174 | if ($nbbyrow > 0) |
6754 | 7175 | { |
6755 | 7176 | $return.= '</td>'; |
6756 | - if (($nbphoto % $nbbyrow) == 0) $return.= '</tr>'; |
|
6757 | - } |
|
6758 | - else if ($nbbyrow < 0) $return.='</div>'; |
|
7177 | + if (($nbphoto % $nbbyrow) == 0) { |
|
7178 | + $return.= '</tr>'; |
|
7179 | + } |
|
7180 | + } else if ($nbbyrow < 0) { |
|
7181 | + $return.='</div>'; |
|
7182 | + } |
|
6759 | 7183 | } |
6760 | 7184 | |
6761 | 7185 | if (empty($size)) { // Format origine |
6762 | 7186 | $return.= '<img class="photo photowithmargin" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">'; |
6763 | 7187 | |
6764 | - if ($showfilename) $return.= '<br>'.$viewfilename; |
|
7188 | + if ($showfilename) { |
|
7189 | + $return.= '<br>'.$viewfilename; |
|
7190 | + } |
|
6765 | 7191 | if ($showaction) |
6766 | 7192 | { |
6767 | 7193 | // Special case for product |
@@ -6778,7 +7204,9 @@ discard block |
||
6778 | 7204 | } |
6779 | 7205 | |
6780 | 7206 | // On continue ou on arrete de boucler ? |
6781 | - if ($nbmax && $nbphoto >= $nbmax) break; |
|
7207 | + if ($nbmax && $nbphoto >= $nbmax) { |
|
7208 | + break; |
|
7209 | + } |
|
6782 | 7210 | } |
6783 | 7211 | } |
6784 | 7212 | |
@@ -6793,7 +7221,9 @@ discard block |
||
6793 | 7221 | $nbphoto++; |
6794 | 7222 | } |
6795 | 7223 | |
6796 | - if ($nbphoto) $return.= '</table>'; |
|
7224 | + if ($nbphoto) { |
|
7225 | + $return.= '</table>'; |
|
7226 | + } |
|
6797 | 7227 | } |
6798 | 7228 | } |
6799 | 7229 | } |
@@ -6814,10 +7244,14 @@ discard block |
||
6814 | 7244 | { |
6815 | 7245 | if(is_array($info)) |
6816 | 7246 | { |
6817 | - if(isset($info['type']) && $info['type']=='array') return true; |
|
6818 | - else return false; |
|
6819 | - } |
|
6820 | - else return false; |
|
7247 | + if(isset($info['type']) && $info['type']=='array') { |
|
7248 | + return true; |
|
7249 | + } else { |
|
7250 | + return false; |
|
7251 | + } |
|
7252 | + } else { |
|
7253 | + return false; |
|
7254 | + } |
|
6821 | 7255 | } |
6822 | 7256 | |
6823 | 7257 | /** |
@@ -6830,10 +7264,14 @@ discard block |
||
6830 | 7264 | { |
6831 | 7265 | if(is_array($info)) |
6832 | 7266 | { |
6833 | - if(isset($info['type']) && $info['type']=='null') return true; |
|
6834 | - else return false; |
|
6835 | - } |
|
6836 | - else return false; |
|
7267 | + if(isset($info['type']) && $info['type']=='null') { |
|
7268 | + return true; |
|
7269 | + } else { |
|
7270 | + return false; |
|
7271 | + } |
|
7272 | + } else { |
|
7273 | + return false; |
|
7274 | + } |
|
6837 | 7275 | } |
6838 | 7276 | |
6839 | 7277 | /** |
@@ -6844,8 +7282,11 @@ discard block |
||
6844 | 7282 | */ |
6845 | 7283 | public function isDate($info) |
6846 | 7284 | { |
6847 | - if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) return true; |
|
6848 | - else return false; |
|
7285 | + if(isset($info['type']) && ($info['type']=='date' || $info['type']=='datetime' || $info['type']=='timestamp')) { |
|
7286 | + return true; |
|
7287 | + } else { |
|
7288 | + return false; |
|
7289 | + } |
|
6849 | 7290 | } |
6850 | 7291 | |
6851 | 7292 | /** |
@@ -6858,10 +7299,14 @@ discard block |
||
6858 | 7299 | { |
6859 | 7300 | if(is_array($info)) |
6860 | 7301 | { |
6861 | - if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) return true; |
|
6862 | - else return false; |
|
6863 | - } |
|
6864 | - else return false; |
|
7302 | + if(isset($info['type']) && ($info['type']=='int' || preg_match('/^integer/i',$info['type']) ) ) { |
|
7303 | + return true; |
|
7304 | + } else { |
|
7305 | + return false; |
|
7306 | + } |
|
7307 | + } else { |
|
7308 | + return false; |
|
7309 | + } |
|
6865 | 7310 | } |
6866 | 7311 | |
6867 | 7312 | /** |
@@ -6874,10 +7319,14 @@ discard block |
||
6874 | 7319 | { |
6875 | 7320 | if(is_array($info)) |
6876 | 7321 | { |
6877 | - if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) return true; |
|
6878 | - else return false; |
|
6879 | - } |
|
6880 | - else return false; |
|
7322 | + if (isset($info['type']) && (preg_match('/^(double|real)/i', $info['type']))) { |
|
7323 | + return true; |
|
7324 | + } else { |
|
7325 | + return false; |
|
7326 | + } |
|
7327 | + } else { |
|
7328 | + return false; |
|
7329 | + } |
|
6881 | 7330 | } |
6882 | 7331 | |
6883 | 7332 | /** |
@@ -6890,10 +7339,14 @@ discard block |
||
6890 | 7339 | { |
6891 | 7340 | if(is_array($info)) |
6892 | 7341 | { |
6893 | - if(isset($info['type']) && $info['type']=='text') return true; |
|
6894 | - else return false; |
|
6895 | - } |
|
6896 | - else return false; |
|
7342 | + if(isset($info['type']) && $info['type']=='text') { |
|
7343 | + return true; |
|
7344 | + } else { |
|
7345 | + return false; |
|
7346 | + } |
|
7347 | + } else { |
|
7348 | + return false; |
|
7349 | + } |
|
6897 | 7350 | } |
6898 | 7351 | |
6899 | 7352 | /** |
@@ -6906,10 +7359,14 @@ discard block |
||
6906 | 7359 | { |
6907 | 7360 | if(is_array($info)) |
6908 | 7361 | { |
6909 | - if(isset($info['index']) && $info['index']==true) return true; |
|
6910 | - else return false; |
|
6911 | - } |
|
6912 | - else return false; |
|
7362 | + if(isset($info['index']) && $info['index']==true) { |
|
7363 | + return true; |
|
7364 | + } else { |
|
7365 | + return false; |
|
7366 | + } |
|
7367 | + } else { |
|
7368 | + return false; |
|
7369 | + } |
|
6913 | 7370 | } |
6914 | 7371 | |
6915 | 7372 | /** |
@@ -6923,21 +7380,21 @@ discard block |
||
6923 | 7380 | global $conf; |
6924 | 7381 | |
6925 | 7382 | $queryarray=array(); |
6926 | - foreach ($this->fields as $field=>$info) // Loop on definition of fields |
|
7383 | + foreach ($this->fields as $field=>$info) { |
|
7384 | + // Loop on definition of fields |
|
6927 | 7385 | { |
6928 | 7386 | // Depending on field type ('datetime', ...) |
6929 | 7387 | if($this->isDate($info)) |
6930 | 7388 | { |
6931 | 7389 | if(empty($this->{$field})) |
6932 | 7390 | { |
6933 | - $queryarray[$field] = null; |
|
6934 | - } |
|
6935 | - else |
|
7391 | + $queryarray[$field] = null; |
|
7392 | + } |
|
7393 | + } else |
|
6936 | 7394 | { |
6937 | 7395 | $queryarray[$field] = $this->db->idate($this->{$field}); |
6938 | 7396 | } |
6939 | - } |
|
6940 | - else if($this->isArray($info)) |
|
7397 | + } else if($this->isArray($info)) |
|
6941 | 7398 | { |
6942 | 7399 | if(! empty($this->{$field})) { |
6943 | 7400 | if(! is_array($this->{$field})) { |
@@ -6947,29 +7404,35 @@ discard block |
||
6947 | 7404 | } else { |
6948 | 7405 | $queryarray[$field] = null; |
6949 | 7406 | } |
6950 | - } |
|
6951 | - else if($this->isInt($info)) |
|
7407 | + } else if($this->isInt($info)) |
|
6952 | 7408 | { |
6953 | - if ($field == 'entity' && is_null($this->{$field})) |
|
6954 | - $queryarray[$field] = Globals::$conf->entity; |
|
6955 | - else |
|
7409 | + if ($field == 'entity' && is_null($this->{$field})) { |
|
7410 | + $queryarray[$field] = Globals::$conf->entity; |
|
7411 | + } else |
|
6956 | 7412 | { |
6957 | 7413 | $queryarray[$field] = (int) price2num($this->{$field}); |
6958 | - if (empty($queryarray[$field])) $queryarray[$field]=0; // May be reset to null later if property 'notnull' is -1 for this field. |
|
7414 | + if (empty($queryarray[$field])) { |
|
7415 | + $queryarray[$field]=0; |
|
7416 | + } |
|
7417 | + // May be reset to null later if property 'notnull' is -1 for this field. |
|
6959 | 7418 | } |
6960 | - } |
|
6961 | - else if($this->isFloat($info)) |
|
7419 | + } else if($this->isFloat($info)) |
|
6962 | 7420 | { |
6963 | 7421 | $queryarray[$field] = (double) price2num($this->{$field}); |
6964 | - if (empty($queryarray[$field])) $queryarray[$field]=0; |
|
6965 | - } |
|
6966 | - else |
|
7422 | + if (empty($queryarray[$field])) { |
|
7423 | + $queryarray[$field]=0; |
|
7424 | + } |
|
7425 | + } else |
|
6967 | 7426 | { |
6968 | 7427 | $queryarray[$field] = $this->{$field}; |
6969 | 7428 | } |
6970 | 7429 | |
6971 | - if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]); |
|
6972 | - if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null; |
|
7430 | + if ($info['type'] == 'timestamp' && empty($queryarray[$field])) { |
|
7431 | + unset($queryarray[$field]); |
|
7432 | + } |
|
7433 | + if (! empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) { |
|
7434 | + $queryarray[$field] = null; |
|
7435 | + } |
|
6973 | 7436 | } |
6974 | 7437 | |
6975 | 7438 | return $queryarray; |
@@ -6987,42 +7450,47 @@ discard block |
||
6987 | 7450 | { |
6988 | 7451 | if($this->isDate($info)) |
6989 | 7452 | { |
6990 | - if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0; |
|
6991 | - else $this->{$field} = strtotime($obj->{$field}); |
|
6992 | - } |
|
6993 | - elseif($this->isArray($info)) |
|
7453 | + if(empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') { |
|
7454 | + $this->{$field} = 0; |
|
7455 | + } else { |
|
7456 | + $this->{$field} = strtotime($obj->{$field}); |
|
7457 | + } |
|
7458 | + } elseif($this->isArray($info)) |
|
6994 | 7459 | { |
6995 | 7460 | if(! empty($obj->{$field})) { |
6996 | 7461 | $this->{$field} = @unserialize($obj->{$field}); |
6997 | 7462 | // Hack for data not in UTF8 |
6998 | - if($this->{$field } === false) @unserialize(utf8_decode($obj->{$field})); |
|
7463 | + if($this->{$field } === false) { |
|
7464 | + @unserialize(utf8_decode($obj->{$field})); |
|
7465 | + } |
|
6999 | 7466 | } else { |
7000 | 7467 | $this->{$field} = array(); |
7001 | 7468 | } |
7002 | - } |
|
7003 | - elseif($this->isInt($info)) |
|
7469 | + } elseif($this->isInt($info)) |
|
7004 | 7470 | { |
7005 | - if ($field == 'rowid') $this->id = (int) $obj->{$field}; |
|
7006 | - else $this->{$field} = (int) $obj->{$field}; |
|
7007 | - } |
|
7008 | - elseif($this->isFloat($info)) |
|
7471 | + if ($field == 'rowid') { |
|
7472 | + $this->id = (int) $obj->{$field}; |
|
7473 | + } else { |
|
7474 | + $this->{$field} = (int) $obj->{$field}; |
|
7475 | + } |
|
7476 | + } elseif($this->isFloat($info)) |
|
7009 | 7477 | { |
7010 | 7478 | $this->{$field} = (double) $obj->{$field}; |
7011 | - } |
|
7012 | - elseif($this->isNull($info)) |
|
7479 | + } elseif($this->isNull($info)) |
|
7013 | 7480 | { |
7014 | 7481 | $val = $obj->{$field}; |
7015 | 7482 | // zero is not null |
7016 | 7483 | $this->{$field} = (is_null($val) || (empty($val) && $val!==0 && $val!=='0') ? null : $val); |
7017 | - } |
|
7018 | - else |
|
7484 | + } else |
|
7019 | 7485 | { |
7020 | 7486 | $this->{$field} = $obj->{$field}; |
7021 | 7487 | } |
7022 | 7488 | } |
7023 | 7489 | |
7024 | 7490 | // If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions. |
7025 | - if (! isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id; |
|
7491 | + if (! isset($this->fields['ref']) && isset($this->id)) { |
|
7492 | + $this->ref = $this->id; |
|
7493 | + } |
|
7026 | 7494 | } |
7027 | 7495 | |
7028 | 7496 | /** |
@@ -7045,9 +7513,13 @@ discard block |
||
7045 | 7513 | */ |
7046 | 7514 | protected function quote($value, $fieldsentry) |
7047 | 7515 | { |
7048 | - if (is_null($value)) return 'NULL'; |
|
7049 | - else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) return $this->db->escape("$value"); |
|
7050 | - else return "'".$this->db->escape($value)."'"; |
|
7516 | + if (is_null($value)) { |
|
7517 | + return 'NULL'; |
|
7518 | + } else if (preg_match('/^(int|double|real)/i', $fieldsentry['type'])) { |
|
7519 | + return $this->db->escape("$value"); |
|
7520 | + } else { |
|
7521 | + return "'".$this->db->escape($value)."'"; |
|
7522 | + } |
|
7051 | 7523 | } |
7052 | 7524 | |
7053 | 7525 | |
@@ -7067,8 +7539,12 @@ discard block |
||
7067 | 7539 | $now=dol_now(); |
7068 | 7540 | |
7069 | 7541 | $fieldvalues = $this->setSaveQuery(); |
7070 | - if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation']=$this->db->idate($now); |
|
7071 | - if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat']=$user->id; |
|
7542 | + if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) { |
|
7543 | + $fieldvalues['date_creation']=$this->db->idate($now); |
|
7544 | + } |
|
7545 | + if (array_key_exists('fk_user_creat', $fieldvalues) && ! ($fieldvalues['fk_user_creat'] > 0)) { |
|
7546 | + $fieldvalues['fk_user_creat']=$user->id; |
|
7547 | + } |
|
7072 | 7548 | unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert. |
7073 | 7549 | |
7074 | 7550 | $keys=array(); |
@@ -7083,8 +7559,12 @@ discard block |
||
7083 | 7559 | foreach($keys as $key) |
7084 | 7560 | { |
7085 | 7561 | // If field is an implicit foreign key field |
7086 | - if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]=''; |
|
7087 | - if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]=''; |
|
7562 | + if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') { |
|
7563 | + $values[$key]=''; |
|
7564 | + } |
|
7565 | + if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') { |
|
7566 | + $values[$key]=''; |
|
7567 | + } |
|
7088 | 7568 | |
7089 | 7569 | //var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1)); |
7090 | 7570 | if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && ! isset($values[$key]) && is_null($val['default'])) |
@@ -7094,11 +7574,17 @@ discard block |
||
7094 | 7574 | } |
7095 | 7575 | |
7096 | 7576 | // If field is an implicit foreign key field |
7097 | - if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) $values[$key]='null'; |
|
7098 | - if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key]='null'; |
|
7577 | + if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) { |
|
7578 | + $values[$key]='null'; |
|
7579 | + } |
|
7580 | + if (! empty($this->fields[$key]['foreignkey']) && empty($values[$key])) { |
|
7581 | + $values[$key]='null'; |
|
7582 | + } |
|
7099 | 7583 | } |
7100 | 7584 | |
7101 | - if ($error) return -1; |
|
7585 | + if ($error) { |
|
7586 | + return -1; |
|
7587 | + } |
|
7102 | 7588 | |
7103 | 7589 | $this->db->begin(); |
7104 | 7590 | |
@@ -7124,7 +7610,9 @@ discard block |
||
7124 | 7610 | if (! $error) |
7125 | 7611 | { |
7126 | 7612 | $result=$this->insertExtraFields(); |
7127 | - if ($result < 0) $error++; |
|
7613 | + if ($result < 0) { |
|
7614 | + $error++; |
|
7615 | + } |
|
7128 | 7616 | } |
7129 | 7617 | |
7130 | 7618 | // Triggers |
@@ -7157,15 +7645,24 @@ discard block |
||
7157 | 7645 | */ |
7158 | 7646 | public function fetchCommon($id, $ref = null, $morewhere = '') |
7159 | 7647 | { |
7160 | - if (empty($id) && empty($ref) && empty($morewhere)) return -1; |
|
7648 | + if (empty($id) && empty($ref) && empty($morewhere)) { |
|
7649 | + return -1; |
|
7650 | + } |
|
7161 | 7651 | |
7162 | 7652 | $sql = 'SELECT '.$this->getFieldList(); |
7163 | 7653 | $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element; |
7164 | 7654 | |
7165 | - if (!empty($id)) $sql.= ' WHERE rowid = '.$id; |
|
7166 | - elseif (!empty($ref)) $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']); |
|
7167 | - else $sql.=' WHERE 1 = 1'; // usage with empty id and empty ref is very rare |
|
7168 | - if ($morewhere) $sql.= $morewhere; |
|
7655 | + if (!empty($id)) { |
|
7656 | + $sql.= ' WHERE rowid = '.$id; |
|
7657 | + } elseif (!empty($ref)) { |
|
7658 | + $sql.= " WHERE ref = ".$this->quote($ref, $this->fields['ref']); |
|
7659 | + } else { |
|
7660 | + $sql.=' WHERE 1 = 1'; |
|
7661 | + } |
|
7662 | + // usage with empty id and empty ref is very rare |
|
7663 | + if ($morewhere) { |
|
7664 | + $sql.= $morewhere; |
|
7665 | + } |
|
7169 | 7666 | $sql.=' LIMIT 1'; // This is a fetch, to be sure to get only one record |
7170 | 7667 | |
7171 | 7668 | $res = $this->db->query($sql); |
@@ -7176,13 +7673,11 @@ discard block |
||
7176 | 7673 | { |
7177 | 7674 | $this->setVarsFromFetchObj($obj); |
7178 | 7675 | return $this->id; |
7179 | - } |
|
7180 | - else |
|
7676 | + } else |
|
7181 | 7677 | { |
7182 | 7678 | return 0; |
7183 | 7679 | } |
7184 | - } |
|
7185 | - else |
|
7680 | + } else |
|
7186 | 7681 | { |
7187 | 7682 | $this->error = $this->db->lasterror(); |
7188 | 7683 | $this->errors[] = $this->error; |
@@ -7206,8 +7701,12 @@ discard block |
||
7206 | 7701 | $now=dol_now(); |
7207 | 7702 | |
7208 | 7703 | $fieldvalues = $this->setSaveQuery(); |
7209 | - if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification']=$this->db->idate($now); |
|
7210 | - if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif']=$user->id; |
|
7704 | + if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) { |
|
7705 | + $fieldvalues['date_modification']=$this->db->idate($now); |
|
7706 | + } |
|
7707 | + if (array_key_exists('fk_user_modif', $fieldvalues) && ! ($fieldvalues['fk_user_modif'] > 0)) { |
|
7708 | + $fieldvalues['fk_user_modif']=$user->id; |
|
7709 | + } |
|
7211 | 7710 | unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update. |
7212 | 7711 | |
7213 | 7712 | $keys=array(); |
@@ -7222,8 +7721,14 @@ discard block |
||
7222 | 7721 | // Clean and check mandatory |
7223 | 7722 | foreach($keys as $key) |
7224 | 7723 | { |
7225 | - if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key]=''; // This is an implicit foreign key field |
|
7226 | - if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key]=''; // This is an explicit foreign key field |
|
7724 | + if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') { |
|
7725 | + $values[$key]=''; |
|
7726 | + } |
|
7727 | + // This is an implicit foreign key field |
|
7728 | + if (! empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') { |
|
7729 | + $values[$key]=''; |
|
7730 | + } |
|
7731 | + // This is an explicit foreign key field |
|
7227 | 7732 | |
7228 | 7733 | //var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1)); |
7229 | 7734 | /* |
@@ -7303,10 +7808,11 @@ discard block |
||
7303 | 7808 | return -1; |
7304 | 7809 | } |
7305 | 7810 | } |
7306 | - } |
|
7307 | - elseif (! empty($this->fk_element) && ! empty($this->childtables)) // If object has childs linked with a foreign key field, we check all child tables. |
|
7811 | + } elseif (! empty($this->fk_element) && ! empty($this->childtables)) { |
|
7812 | + // If object has childs linked with a foreign key field, we check all child tables. |
|
7308 | 7813 | { |
7309 | - $objectisused = $this->isObjectUsed($this->id); |
|
7814 | + $objectisused = $this->isObjectUsed($this->id); |
|
7815 | + } |
|
7310 | 7816 | if (! empty($objectisused)) |
7311 | 7817 | { |
7312 | 7818 | dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING); |
@@ -7413,7 +7919,9 @@ discard block |
||
7413 | 7919 | */ |
7414 | 7920 | public function trimParameters($parameters) |
7415 | 7921 | { |
7416 | - if (!is_array($parameters)) return; |
|
7922 | + if (!is_array($parameters)) { |
|
7923 | + return; |
|
7924 | + } |
|
7417 | 7925 | foreach ($parameters as $parameter) { |
7418 | 7926 | if (isset($this->$parameter)) { |
7419 | 7927 | $this->$parameter = trim($this->$parameter); |
@@ -509,8 +509,9 @@ discard block |
||
509 | 509 | if (!$error && !$notrigger) { |
510 | 510 | // Call trigger |
511 | 511 | $result = $this->call_trigger('CATEGORY_DELETE', $user); |
512 | - if ($result < 0) |
|
513 | - $error++; |
|
512 | + if ($result < 0) { |
|
513 | + $error++; |
|
514 | + } |
|
514 | 515 | // End call triggers |
515 | 516 | } |
516 | 517 | |
@@ -580,8 +581,9 @@ discard block |
||
580 | 581 | |
581 | 582 | $error = 0; |
582 | 583 | |
583 | - if ($this->id == -1) |
|
584 | - return -2; |
|
584 | + if ($this->id == -1) { |
|
585 | + return -2; |
|
586 | + } |
|
585 | 587 | |
586 | 588 | Config::$dbEngine->begin(); |
587 | 589 | |
@@ -1089,15 +1091,18 @@ discard block |
||
1089 | 1091 | function get_all_categories($type = null, $parent = false) |
1090 | 1092 | { |
1091 | 1093 | // phpcs:enable |
1092 | - if (!is_numeric($type)) |
|
1093 | - $type = $this->MAP_ID[$type]; |
|
1094 | + if (!is_numeric($type)) { |
|
1095 | + $type = $this->MAP_ID[$type]; |
|
1096 | + } |
|
1094 | 1097 | |
1095 | 1098 | $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "categorie"; |
1096 | 1099 | $sql .= " WHERE entity IN (" . getEntity('category') . ")"; |
1097 | - if (!is_null($type)) |
|
1098 | - $sql .= " AND type = " . $type; |
|
1099 | - if ($parent) |
|
1100 | - $sql .= " AND fk_parent = 0"; |
|
1100 | + if (!is_null($type)) { |
|
1101 | + $sql .= " AND type = " . $type; |
|
1102 | + } |
|
1103 | + if ($parent) { |
|
1104 | + $sql .= " AND fk_parent = 0"; |
|
1105 | + } |
|
1101 | 1106 | |
1102 | 1107 | $res = Config::$dbEngine->select($sql); |
1103 | 1108 | if ($res) { |
@@ -1125,8 +1130,9 @@ discard block |
||
1125 | 1130 | // phpcs:enable |
1126 | 1131 | $type = $this->type; |
1127 | 1132 | |
1128 | - if (!is_numeric($type)) |
|
1129 | - $type = $this->MAP_ID[$type]; |
|
1133 | + if (!is_numeric($type)) { |
|
1134 | + $type = $this->MAP_ID[$type]; |
|
1135 | + } |
|
1130 | 1136 | |
1131 | 1137 | /* We have to select any rowid from llx_categorie which category's mother and label |
1132 | 1138 | * are equals to those of the calling category |
@@ -1203,8 +1209,9 @@ discard block |
||
1203 | 1209 | // Check contrast with background and correct text color |
1204 | 1210 | $forced_color = 'categtextwhite'; |
1205 | 1211 | if ($cat->color) { |
1206 | - if (colorIsLight($cat->color)) |
|
1207 | - $forced_color = 'categtextblack'; |
|
1212 | + if (colorIsLight($cat->color)) { |
|
1213 | + $forced_color = 'categtextblack'; |
|
1214 | + } |
|
1208 | 1215 | } |
1209 | 1216 | } |
1210 | 1217 | } |
@@ -1280,8 +1287,9 @@ discard block |
||
1280 | 1287 | } |
1281 | 1288 | } |
1282 | 1289 | |
1283 | - if (count($ways) == 0) |
|
1284 | - $ways[0][0] = $this; |
|
1290 | + if (count($ways) == 0) { |
|
1291 | + $ways[0][0] = $this; |
|
1292 | + } |
|
1285 | 1293 | |
1286 | 1294 | return $ways; |
1287 | 1295 | } |
@@ -1300,8 +1308,9 @@ discard block |
||
1300 | 1308 | { |
1301 | 1309 | $cats = array(); |
1302 | 1310 | |
1303 | - if (is_numeric($type)) |
|
1304 | - $type = Categorie::$MAP_ID_TO_CODE[$type]; |
|
1311 | + if (is_numeric($type)) { |
|
1312 | + $type = Categorie::$MAP_ID_TO_CODE[$type]; |
|
1313 | + } |
|
1305 | 1314 | |
1306 | 1315 | if ($type === Categorie::TYPE_BANK_LINE) { // TODO Remove this with standard category code |
1307 | 1316 | // Load bank groups |
@@ -1389,12 +1398,14 @@ discard block |
||
1389 | 1398 | $sql .= " WHERE type = " . $this->MAP_ID[$type]; |
1390 | 1399 | $sql .= " AND entity IN (" . getEntity('category') . ")"; |
1391 | 1400 | if ($nom) { |
1392 | - if (!$exact) |
|
1393 | - $nom = '%' . str_replace('*', '%', $nom) . '%'; |
|
1394 | - if (!$case) |
|
1395 | - $sql .= " AND label LIKE '" . Config::$dbEngine->escape($nom) . "'"; |
|
1396 | - else |
|
1397 | - $sql .= " AND label LIKE BINARY '" . Config::$dbEngine->escape($nom) . "'"; |
|
1401 | + if (!$exact) { |
|
1402 | + $nom = '%' . str_replace('*', '%', $nom) . '%'; |
|
1403 | + } |
|
1404 | + if (!$case) { |
|
1405 | + $sql .= " AND label LIKE '" . Config::$dbEngine->escape($nom) . "'"; |
|
1406 | + } else { |
|
1407 | + $sql .= " AND label LIKE BINARY '" . Config::$dbEngine->escape($nom) . "'"; |
|
1408 | + } |
|
1398 | 1409 | } |
1399 | 1410 | if ($id) { |
1400 | 1411 | $sql .= " AND rowid = '" . $id . "'"; |
@@ -1434,8 +1445,9 @@ discard block |
||
1434 | 1445 | // Check contrast with background and correct text color |
1435 | 1446 | $forced_color = 'categtextwhite'; |
1436 | 1447 | if ($this->color) { |
1437 | - if (colorIsLight($this->color)) |
|
1438 | - $forced_color = 'categtextblack'; |
|
1448 | + if (colorIsLight($this->color)) { |
|
1449 | + $forced_color = 'categtextblack'; |
|
1450 | + } |
|
1439 | 1451 | } |
1440 | 1452 | |
1441 | 1453 | $link = '<a href="' . DOL_URL_ROOT . '/categories/viewcat.php?id=' . $this->id . '&type=' . $this->type . '&backtopage=' . urlencode($_SERVER['PHP_SELF']) . '" title="' . dol_escape_htmltag($label, 1) . '" class="classfortooltip ' . $forced_color . '">'; |
@@ -1444,12 +1456,15 @@ discard block |
||
1444 | 1456 | $picto = 'category'; |
1445 | 1457 | |
1446 | 1458 | |
1447 | - if ($withpicto) |
|
1448 | - $result .= ($link . img_object($label, $picto, 'class="classfortooltip"') . $linkend); |
|
1449 | - if ($withpicto && $withpicto != 2) |
|
1450 | - $result .= ' '; |
|
1451 | - if ($withpicto != 2) |
|
1452 | - $result .= $link . dol_trunc(($this->ref ? $this->ref : $this->label), $maxlength) . $linkend; |
|
1459 | + if ($withpicto) { |
|
1460 | + $result .= ($link . img_object($label, $picto, 'class="classfortooltip"') . $linkend); |
|
1461 | + } |
|
1462 | + if ($withpicto && $withpicto != 2) { |
|
1463 | + $result .= ' '; |
|
1464 | + } |
|
1465 | + if ($withpicto != 2) { |
|
1466 | + $result .= $link . dol_trunc(($this->ref ? $this->ref : $this->label), $maxlength) . $linkend; |
|
1467 | + } |
|
1453 | 1468 | return $result; |
1454 | 1469 | } |
1455 | 1470 | |
@@ -1537,16 +1552,18 @@ discard block |
||
1537 | 1552 | // Objet |
1538 | 1553 | $obj = array(); |
1539 | 1554 | $obj['photo'] = $photo; |
1540 | - if ($photo_vignette && is_file($dirthumb . $photo_vignette)) |
|
1541 | - $obj['photo_vignette'] = 'thumbs/' . $photo_vignette; |
|
1542 | - else |
|
1543 | - $obj['photo_vignette'] = ""; |
|
1555 | + if ($photo_vignette && is_file($dirthumb . $photo_vignette)) { |
|
1556 | + $obj['photo_vignette'] = 'thumbs/' . $photo_vignette; |
|
1557 | + } else { |
|
1558 | + $obj['photo_vignette'] = ""; |
|
1559 | + } |
|
1544 | 1560 | |
1545 | 1561 | $tabobj[$nbphoto - 1] = $obj; |
1546 | 1562 | |
1547 | 1563 | // On continue ou on arrete de boucler |
1548 | - if ($nbmax && $nbphoto >= $nbmax) |
|
1549 | - break; |
|
1564 | + if ($nbmax && $nbphoto >= $nbmax) { |
|
1565 | + break; |
|
1566 | + } |
|
1550 | 1567 | } |
1551 | 1568 | } |
1552 | 1569 | |
@@ -1650,8 +1667,9 @@ discard block |
||
1650 | 1667 | } |
1651 | 1668 | |
1652 | 1669 | // on ne sauvegarde pas des champs vides |
1653 | - if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"]) |
|
1654 | - dol_syslog(get_class($this) . '::setMultiLangs', LOG_DEBUG); |
|
1670 | + if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"]) { |
|
1671 | + dol_syslog(get_class($this) . '::setMultiLangs', LOG_DEBUG); |
|
1672 | + } |
|
1655 | 1673 | if (!Config::$dbEngine->query($sql2)) { |
1656 | 1674 | $this->error = Config::$dbEngine->lasterror(); |
1657 | 1675 | return -1; |
@@ -75,8 +75,9 @@ discard block |
||
75 | 75 | if ($found) return $result; |
76 | 76 | } */ |
77 | 77 | |
78 | - if (isset($class::$member)) |
|
79 | - return $class::$member; |
|
78 | + if (isset($class::$member)) { |
|
79 | + return $class::$member; |
|
80 | + } |
|
80 | 81 | dol_print_error('', 'Try to get a static member "' . $member . '" in class "' . $class . '" that does not exists or is not static.'); |
81 | 82 | return null; |
82 | 83 | } |
@@ -127,8 +128,9 @@ discard block |
||
127 | 128 | } else { |
128 | 129 | $out = ''; |
129 | 130 | $addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values'); |
130 | - if (in_array($element, $addzero)) |
|
131 | - $out .= '0,'; |
|
131 | + if (in_array($element, $addzero)) { |
|
132 | + $out .= '0,'; |
|
133 | + } |
|
132 | 134 | $out .= Globals::$conf->entity; |
133 | 135 | return $out; |
134 | 136 | } |
@@ -307,32 +309,35 @@ discard block |
||
307 | 309 | { |
308 | 310 | // global $mysoc, $user, Globals::$conf; |
309 | 311 | |
310 | - if (empty($paramname)) |
|
311 | - return 'BadFirstParameterForDolUtils::GETPOST'; |
|
312 | + if (empty($paramname)) { |
|
313 | + return 'BadFirstParameterForDolUtils::GETPOST'; |
|
314 | + } |
|
312 | 315 | if (empty($check)) { |
313 | 316 | DolUtils::dol_syslog("Deprecated use of DolUtils::GETPOST, called with 1st param = " . $paramname . " and 2nd param is '', when calling page " . $_SERVER["PHP_SELF"], LOG_WARNING); |
314 | 317 | // Enable this line to know who call the DolUtils::GETPOST with '' $check parameter. |
315 | 318 | //var_dump(debug_backtrace()[0]); |
316 | 319 | } |
317 | 320 | |
318 | - if (empty($method)) |
|
319 | - $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : ''); |
|
320 | - elseif ($method == 1) |
|
321 | - $out = isset($_GET[$paramname]) ? $_GET[$paramname] : ''; |
|
322 | - elseif ($method == 2) |
|
323 | - $out = isset($_POST[$paramname]) ? $_POST[$paramname] : ''; |
|
324 | - elseif ($method == 3) |
|
325 | - $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : ''); |
|
326 | - elseif ($method == 4) |
|
327 | - $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : '')); |
|
328 | - else |
|
329 | - return 'BadThirdParameterForDolUtils::GETPOST'; |
|
321 | + if (empty($method)) { |
|
322 | + $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : ''); |
|
323 | + } elseif ($method == 1) { |
|
324 | + $out = isset($_GET[$paramname]) ? $_GET[$paramname] : ''; |
|
325 | + } elseif ($method == 2) { |
|
326 | + $out = isset($_POST[$paramname]) ? $_POST[$paramname] : ''; |
|
327 | + } elseif ($method == 3) { |
|
328 | + $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : ''); |
|
329 | + } elseif ($method == 4) { |
|
330 | + $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : '')); |
|
331 | + } else { |
|
332 | + return 'BadThirdParameterForDolUtils::GETPOST'; |
|
333 | + } |
|
330 | 334 | |
331 | 335 | if (empty($method) || $method == 3 || $method == 4) { |
332 | 336 | $relativepathstring = $_SERVER["PHP_SELF"]; |
333 | 337 | // Clean $relativepathstring |
334 | - if (constant('DOL_BASE_URI')) |
|
335 | - $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring); |
|
338 | + if (constant('DOL_BASE_URI')) { |
|
339 | + $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring); |
|
340 | + } |
|
336 | 341 | $relativepathstring = preg_replace('/^\//', '', $relativepathstring); |
337 | 342 | $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring); |
338 | 343 | //var_dump($relativepathstring); |
@@ -381,14 +386,17 @@ discard block |
||
381 | 386 | $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING'])); |
382 | 387 | $foundintru = 0; |
383 | 388 | foreach ($tmpqueryarraytohave as $tmpquerytohave) { |
384 | - if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) |
|
385 | - $foundintru = 1; |
|
389 | + if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) { |
|
390 | + $foundintru = 1; |
|
391 | + } |
|
386 | 392 | } |
387 | - if (!$foundintru) |
|
388 | - $qualified = 1; |
|
393 | + if (!$foundintru) { |
|
394 | + $qualified = 1; |
|
395 | + } |
|
389 | 396 | //var_dump($defkey.'-'.$qualified); |
390 | - } else |
|
391 | - $qualified = 1; |
|
397 | + } else { |
|
398 | + $qualified = 1; |
|
399 | + } |
|
392 | 400 | |
393 | 401 | if ($qualified) { |
394 | 402 | //var_dump($user->default_values[$relativepathstring][$defkey]['createform']); |
@@ -415,20 +423,24 @@ discard block |
||
415 | 423 | $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING'])); |
416 | 424 | $foundintru = 0; |
417 | 425 | foreach ($tmpqueryarraytohave as $tmpquerytohave) { |
418 | - if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) |
|
419 | - $foundintru = 1; |
|
426 | + if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) { |
|
427 | + $foundintru = 1; |
|
428 | + } |
|
420 | 429 | } |
421 | - if (!$foundintru) |
|
422 | - $qualified = 1; |
|
430 | + if (!$foundintru) { |
|
431 | + $qualified = 1; |
|
432 | + } |
|
423 | 433 | //var_dump($defkey.'-'.$qualified); |
424 | - } else |
|
425 | - $qualified = 1; |
|
434 | + } else { |
|
435 | + $qualified = 1; |
|
436 | + } |
|
426 | 437 | |
427 | 438 | if ($qualified) { |
428 | 439 | $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and , |
429 | 440 | foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) { |
430 | - if ($out) |
|
431 | - $out .= ', '; |
|
441 | + if ($out) { |
|
442 | + $out .= ', '; |
|
443 | + } |
|
432 | 444 | if ($paramname == 'sortfield') { |
433 | 445 | $out .= dol_string_nospecial($key, '', $forbidden_chars_to_replace); |
434 | 446 | } |
@@ -448,14 +460,17 @@ discard block |
||
448 | 460 | $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING'])); |
449 | 461 | $foundintru = 0; |
450 | 462 | foreach ($tmpqueryarraytohave as $tmpquerytohave) { |
451 | - if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) |
|
452 | - $foundintru = 1; |
|
463 | + if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) { |
|
464 | + $foundintru = 1; |
|
465 | + } |
|
453 | 466 | } |
454 | - if (!$foundintru) |
|
455 | - $qualified = 1; |
|
467 | + if (!$foundintru) { |
|
468 | + $qualified = 1; |
|
469 | + } |
|
456 | 470 | //var_dump($defkey.'-'.$qualified); |
457 | - } else |
|
458 | - $qualified = 1; |
|
471 | + } else { |
|
472 | + $qualified = 1; |
|
473 | + } |
|
459 | 474 | |
460 | 475 | if ($qualified) { |
461 | 476 | if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) { |
@@ -527,8 +542,10 @@ discard block |
||
527 | 542 | $newout = $user->fk_user; |
528 | 543 | } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') { |
529 | 544 | $newout = Globals::$conf->entity; |
530 | - } else |
|
531 | - $newout = ''; // Key not found, we replace with empty string |
|
545 | + } else { |
|
546 | + $newout = ''; |
|
547 | + } |
|
548 | + // Key not found, we replace with empty string |
|
532 | 549 | |
533 | 550 | |
534 | 551 | |
@@ -587,18 +604,20 @@ discard block |
||
587 | 604 | } |
588 | 605 | break; |
589 | 606 | case 'intcomma': |
590 | - if (preg_match('/[^0-9,-]+/i', $out)) |
|
591 | - $out = ''; |
|
607 | + if (preg_match('/[^0-9,-]+/i', $out)) { |
|
608 | + $out = ''; |
|
609 | + } |
|
592 | 610 | break; |
593 | 611 | case 'alpha': |
594 | 612 | if (!is_array($out)) { |
595 | 613 | $out = trim($out); |
596 | 614 | // '"' is dangerous because param in url can close the href= or src= and add javascript functions. |
597 | 615 | // '../' is dangerous because it allows dir transversals |
598 | - if (preg_match('/"/', $out)) |
|
599 | - $out = ''; |
|
600 | - else if (preg_match('/\.\.\//', $out)) |
|
601 | - $out = ''; |
|
616 | + if (preg_match('/"/', $out)) { |
|
617 | + $out = ''; |
|
618 | + } else if (preg_match('/\.\.\//', $out)) { |
|
619 | + $out = ''; |
|
620 | + } |
|
602 | 621 | } |
603 | 622 | break; |
604 | 623 | case 'san_alpha': |
@@ -607,27 +626,31 @@ discard block |
||
607 | 626 | case 'aZ': |
608 | 627 | if (!is_array($out)) { |
609 | 628 | $out = trim($out); |
610 | - if (preg_match('/[^a-z]+/i', $out)) |
|
611 | - $out = ''; |
|
629 | + if (preg_match('/[^a-z]+/i', $out)) { |
|
630 | + $out = ''; |
|
631 | + } |
|
612 | 632 | } |
613 | 633 | break; |
614 | 634 | case 'aZ09': |
615 | 635 | if (!is_array($out)) { |
616 | 636 | $out = trim($out); |
617 | - if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) |
|
618 | - $out = ''; |
|
637 | + if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) { |
|
638 | + $out = ''; |
|
639 | + } |
|
619 | 640 | } |
620 | 641 | break; |
621 | 642 | case 'aZ09comma': // great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh |
622 | 643 | if (!is_array($out)) { |
623 | 644 | $out = trim($out); |
624 | - if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) |
|
625 | - $out = ''; |
|
645 | + if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) { |
|
646 | + $out = ''; |
|
647 | + } |
|
626 | 648 | } |
627 | 649 | break; |
628 | 650 | case 'array': |
629 | - if (!is_array($out) || empty($out)) |
|
630 | - $out = array(); |
|
651 | + if (!is_array($out) || empty($out)) { |
|
652 | + $out = array(); |
|
653 | + } |
|
631 | 654 | break; |
632 | 655 | case 'nohtml': // Recommended for most scalar parameters |
633 | 656 | $out = dol_string_nohtmltag($out, 0); |
@@ -637,16 +660,18 @@ discard block |
||
637 | 660 | $out = trim($out); |
638 | 661 | // '"' is dangerous because param in url can close the href= or src= and add javascript functions. |
639 | 662 | // '../' is dangerous because it allows dir transversals |
640 | - if (preg_match('/"/', $out)) |
|
641 | - $out = ''; |
|
642 | - else if (preg_match('/\.\.\//', $out)) |
|
643 | - $out = ''; |
|
663 | + if (preg_match('/"/', $out)) { |
|
664 | + $out = ''; |
|
665 | + } else if (preg_match('/\.\.\//', $out)) { |
|
666 | + $out = ''; |
|
667 | + } |
|
644 | 668 | $out = dol_string_nohtmltag($out); |
645 | 669 | } |
646 | 670 | break; |
647 | 671 | case 'custom': |
648 | - if (empty($filter)) |
|
649 | - return 'BadFourthParameterForDolUtils::GETPOST'; |
|
672 | + if (empty($filter)) { |
|
673 | + return 'BadFourthParameterForDolUtils::GETPOST'; |
|
674 | + } |
|
650 | 675 | $out = filter_var($out, $filter, $options); |
651 | 676 | break; |
652 | 677 | } |
@@ -764,11 +789,11 @@ discard block |
||
764 | 789 | } |
765 | 790 | } |
766 | 791 | if ($returnemptyifnotfound) { // Not found into alternate dir |
767 | - if ($returnemptyifnotfound == 1 || !file_exists($res)) |
|
768 | - return ''; |
|
792 | + if ($returnemptyifnotfound == 1 || !file_exists($res)) { |
|
793 | + return ''; |
|
794 | + } |
|
769 | 795 | } |
770 | - } |
|
771 | - else { // For an url path |
|
796 | + } else { // For an url path |
|
772 | 797 | // We try to get local path of file on filesystem from url |
773 | 798 | // Note that trying to know if a file on disk exist by forging path on disk from url |
774 | 799 | // works only for some web server and some setup. This is bugged when |
@@ -862,12 +887,14 @@ discard block |
||
862 | 887 | static function dol_size($size, $type = '') |
863 | 888 | { |
864 | 889 | //global Globals::$conf; |
865 | - if (empty(Globals::$conf->dol_optimize_smallscreen)) |
|
866 | - return $size; |
|
867 | - if ($type == 'width' && $size > 250) |
|
868 | - return 250; |
|
869 | - else |
|
870 | - return 10; |
|
890 | + if (empty(Globals::$conf->dol_optimize_smallscreen)) { |
|
891 | + return $size; |
|
892 | + } |
|
893 | + if ($type == 'width' && $size > 250) { |
|
894 | + return 250; |
|
895 | + } else { |
|
896 | + return 10; |
|
897 | + } |
|
871 | 898 | } |
872 | 899 | |
873 | 900 | /** |
@@ -967,9 +994,10 @@ discard block |
||
967 | 994 | { |
968 | 995 | $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°'); // more complete than dol_sanitizeFileName |
969 | 996 | $forbidden_chars_to_remove = array(); |
970 | - if (is_array($badcharstoreplace)) |
|
971 | - $forbidden_chars_to_replace = $badcharstoreplace; |
|
972 | -//$forbidden_chars_to_remove=array("(",")"); |
|
997 | + if (is_array($badcharstoreplace)) { |
|
998 | + $forbidden_chars_to_replace = $badcharstoreplace; |
|
999 | + } |
|
1000 | + //$forbidden_chars_to_remove=array("(",")"); |
|
973 | 1001 | |
974 | 1002 | return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str)); |
975 | 1003 | } |
@@ -1005,9 +1033,9 @@ discard block |
||
1005 | 1033 | if (empty($mode)) { |
1006 | 1034 | $substitjs["'"] = "\\'"; |
1007 | 1035 | $substitjs['"'] = "\\'"; |
1008 | - } else if ($mode == 1) |
|
1009 | - $substitjs["'"] = "\\'"; |
|
1010 | - else if ($mode == 2) { |
|
1036 | + } else if ($mode == 1) { |
|
1037 | + $substitjs["'"] = "\\'"; |
|
1038 | + } else if ($mode == 2) { |
|
1011 | 1039 | $substitjs['"'] = '\\"'; |
1012 | 1040 | } else if ($mode == 3) { |
1013 | 1041 | $substitjs["'"] = "\\'"; |
@@ -1029,10 +1057,12 @@ discard block |
||
1029 | 1057 | { |
1030 | 1058 | // escape quotes and backslashes, newlines, etc. |
1031 | 1059 | $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8'); // TODO Use htmlspecialchars_decode instead, that make only required change for html tags |
1032 | - if (!$keepb) |
|
1033 | - $tmp = strtr($tmp, array("<b>" => '', '</b>' => '')); |
|
1034 | - if (!$keepn) |
|
1035 | - $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n')); |
|
1060 | + if (!$keepb) { |
|
1061 | + $tmp = strtr($tmp, array("<b>" => '', '</b>' => '')); |
|
1062 | + } |
|
1063 | + if (!$keepn) { |
|
1064 | + $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n')); |
|
1065 | + } |
|
1036 | 1066 | return htmlentities($tmp, ENT_COMPAT, 'UTF-8'); // TODO Use htmlspecialchars instead, that make only required change for html tags |
1037 | 1067 | } |
1038 | 1068 | |
@@ -1082,8 +1112,9 @@ discard block |
||
1082 | 1112 | { |
1083 | 1113 | // global Globals::$conf, $user; |
1084 | 1114 | // If syslog module enabled |
1085 | - if (empty(Globals::$conf->syslog->enabled)) |
|
1086 | - return; |
|
1115 | + if (empty(Globals::$conf->syslog->enabled)) { |
|
1116 | + return; |
|
1117 | + } |
|
1087 | 1118 | |
1088 | 1119 | if ($ident < 0) { |
1089 | 1120 | foreach (Globals::$conf->loghandlers as $loghandlerinstance) { |
@@ -1097,8 +1128,9 @@ discard block |
||
1097 | 1128 | if (!in_array($level, $logLevels, true)) { |
1098 | 1129 | throw new Exception('Incorrect log level'); |
1099 | 1130 | } |
1100 | - if ($level > Globals::$conf->global->SYSLOG_LEVEL) |
|
1101 | - return; |
|
1131 | + if ($level > Globals::$conf->global->SYSLOG_LEVEL) { |
|
1132 | + return; |
|
1133 | + } |
|
1102 | 1134 | |
1103 | 1135 | $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log |
1104 | 1136 | // If adding log inside HTML page is required |
@@ -1123,24 +1155,30 @@ discard block |
||
1123 | 1155 | ); |
1124 | 1156 | |
1125 | 1157 | // This is when server run behind a reverse proxy |
1126 | - if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) |
|
1127 | - $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']); |
|
1128 | -// This is when server run normally on a server |
|
1129 | - else if (!empty($_SERVER["REMOTE_ADDR"])) |
|
1130 | - $data['ip'] = $_SERVER['REMOTE_ADDR']; |
|
1131 | -// This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache) |
|
1132 | - else if (!empty($_SERVER['SERVER_ADDR'])) |
|
1133 | - $data['ip'] = $_SERVER['SERVER_ADDR']; |
|
1134 | -// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it). |
|
1135 | - else if (!empty($_SERVER['COMPUTERNAME'])) |
|
1136 | - $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']); |
|
1137 | -// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it). |
|
1138 | - else if (!empty($_SERVER['LOGNAME'])) |
|
1139 | - $data['ip'] = '???@' . $_SERVER['LOGNAME']; |
|
1140 | -// Loop on each log handler and send output |
|
1158 | + if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) { |
|
1159 | + $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']); |
|
1160 | + } |
|
1161 | + // This is when server run normally on a server |
|
1162 | + else if (!empty($_SERVER["REMOTE_ADDR"])) { |
|
1163 | + $data['ip'] = $_SERVER['REMOTE_ADDR']; |
|
1164 | + } |
|
1165 | + // This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache) |
|
1166 | + else if (!empty($_SERVER['SERVER_ADDR'])) { |
|
1167 | + $data['ip'] = $_SERVER['SERVER_ADDR']; |
|
1168 | + } |
|
1169 | + // This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it). |
|
1170 | + else if (!empty($_SERVER['COMPUTERNAME'])) { |
|
1171 | + $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']); |
|
1172 | + } |
|
1173 | + // This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it). |
|
1174 | + else if (!empty($_SERVER['LOGNAME'])) { |
|
1175 | + $data['ip'] = '???@' . $_SERVER['LOGNAME']; |
|
1176 | + } |
|
1177 | + // Loop on each log handler and send output |
|
1141 | 1178 | foreach (Globals::$conf->loghandlers as $loghandlerinstance) { |
1142 | - if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) |
|
1143 | - continue; |
|
1179 | + if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) { |
|
1180 | + continue; |
|
1181 | + } |
|
1144 | 1182 | $loghandlerinstance->export($data, $suffixinfilename); |
1145 | 1183 | } |
1146 | 1184 | unset($data); |
@@ -1196,13 +1234,15 @@ discard block |
||
1196 | 1234 | |
1197 | 1235 | // Show title |
1198 | 1236 | $showtitle = 1; |
1199 | - if (!empty(Globals::$conf->dol_optimize_smallscreen)) |
|
1200 | - $showtitle = 0; |
|
1237 | + if (!empty(Globals::$conf->dol_optimize_smallscreen)) { |
|
1238 | + $showtitle = 0; |
|
1239 | + } |
|
1201 | 1240 | if (!empty($title) && $showtitle) { |
1202 | 1241 | $limittitle = 30; |
1203 | 1242 | $out .= '<a class="tabTitle">'; |
1204 | - if ($picto) |
|
1205 | - $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' '; |
|
1243 | + if ($picto) { |
|
1244 | + $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' '; |
|
1245 | + } |
|
1206 | 1246 | $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>'; |
1207 | 1247 | $out .= '</a>'; |
1208 | 1248 | } |
@@ -1211,12 +1251,14 @@ discard block |
||
1211 | 1251 | $maxkey = -1; |
1212 | 1252 | if (is_array($links) && !empty($links)) { |
1213 | 1253 | $keys = array_keys($links); |
1214 | - if (count($keys)) |
|
1215 | - $maxkey = max($keys); |
|
1254 | + if (count($keys)) { |
|
1255 | + $maxkey = max($keys); |
|
1256 | + } |
|
1216 | 1257 | } |
1217 | 1258 | |
1218 | - if (!empty(Globals::$conf->dol_optimize_smallscreen)) |
|
1219 | - Globals::$conf->global->MAIN_MAXTABS_IN_CARD = 2; |
|
1259 | + if (!empty(Globals::$conf->dol_optimize_smallscreen)) { |
|
1260 | + Globals::$conf->global->MAIN_MAXTABS_IN_CARD = 2; |
|
1261 | + } |
|
1220 | 1262 | |
1221 | 1263 | // Show tabs |
1222 | 1264 | $bactive = false; |
@@ -1229,8 +1271,9 @@ discard block |
||
1229 | 1271 | for ($i = 0; $i <= $maxkey; $i++) { |
1230 | 1272 | if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) { |
1231 | 1273 | // If active tab is already present |
1232 | - if ($i >= $limittoshow) |
|
1233 | - $limittoshow--; |
|
1274 | + if ($i >= $limittoshow) { |
|
1275 | + $limittoshow--; |
|
1276 | + } |
|
1234 | 1277 | } |
1235 | 1278 | } |
1236 | 1279 | |
@@ -1271,12 +1314,12 @@ discard block |
||
1271 | 1314 | } |
1272 | 1315 | $outmore .= '<div class="popuptab wordwrap" style="display:inherit;">'; |
1273 | 1316 | if (isset($links[$i][2]) && $links[$i][2] == 'image') { |
1274 | - if (!empty($links[$i][0])) |
|
1275 | - $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n"; |
|
1276 | - else |
|
1277 | - $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n"; |
|
1278 | - } |
|
1279 | - else if (!empty($links[$i][1])) { |
|
1317 | + if (!empty($links[$i][0])) { |
|
1318 | + $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n"; |
|
1319 | + } else { |
|
1320 | + $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n"; |
|
1321 | + } |
|
1322 | + } else if (!empty($links[$i][1])) { |
|
1280 | 1323 | $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">'; |
1281 | 1324 | $outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts. |
1282 | 1325 | $outmore .= '</a>' . "\n"; |
@@ -1287,8 +1330,9 @@ discard block |
||
1287 | 1330 | } |
1288 | 1331 | $displaytab = $i; |
1289 | 1332 | } |
1290 | - if ($popuptab) |
|
1291 | - $outmore .= '</div>'; |
|
1333 | + if ($popuptab) { |
|
1334 | + $outmore .= '</div>'; |
|
1335 | + } |
|
1292 | 1336 | |
1293 | 1337 | if ($displaytab > $limittoshow) { |
1294 | 1338 | $left = (Globals::$langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left'); |
@@ -1311,8 +1355,9 @@ discard block |
||
1311 | 1355 | |
1312 | 1356 | $out .= "</div>\n"; |
1313 | 1357 | |
1314 | - if (!$notab || $notab == -1) |
|
1315 | - $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n"; |
|
1358 | + if (!$notab || $notab == -1) { |
|
1359 | + $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n"; |
|
1360 | + } |
|
1316 | 1361 | |
1317 | 1362 | $parameters = array('tabname' => $active, 'out' => $out); |
1318 | 1363 | $reshook = Globals::$hookManager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead" |
@@ -1342,10 +1387,11 @@ discard block |
||
1342 | 1387 | */ |
1343 | 1388 | static function dol_get_fiche_end($notab = 0) |
1344 | 1389 | { |
1345 | - if (!$notab || $notab == -1) |
|
1346 | - return "\n</div>\n"; |
|
1347 | - else |
|
1348 | - return ''; |
|
1390 | + if (!$notab || $notab == -1) { |
|
1391 | + return "\n</div>\n"; |
|
1392 | + } else { |
|
1393 | + return ''; |
|
1394 | + } |
|
1349 | 1395 | } |
1350 | 1396 | |
1351 | 1397 | /** |
@@ -1377,8 +1423,9 @@ discard block |
||
1377 | 1423 | $showimage = 1; |
1378 | 1424 | $entity = (empty($object->entity) ? Globals::$conf->entity : $object->entity); |
1379 | 1425 | $showbarcode = empty(Globals::$conf->barcode->enabled) ? 0 : ($object->barcode ? 1 : 0); |
1380 | - if (!empty(Globals::$conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) |
|
1381 | - $showbarcode = 0; |
|
1426 | + if (!empty(Globals::$conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) { |
|
1427 | + $showbarcode = 0; |
|
1428 | + } |
|
1382 | 1429 | $modulepart = 'unknown'; |
1383 | 1430 | |
1384 | 1431 | if ($object->element == 'societe') { |
@@ -1483,8 +1530,10 @@ discard block |
||
1483 | 1530 | } else { |
1484 | 1531 | $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart); |
1485 | 1532 | } |
1486 | - if (empty($subdir)) |
|
1487 | - $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path |
|
1533 | + if (empty($subdir)) { |
|
1534 | + $subdir = 'errorgettingsubdirofobject'; |
|
1535 | + } |
|
1536 | + // Protection to avoid to return empty path |
|
1488 | 1537 | |
1489 | 1538 | $filepath = $dir_output . $subdir . "/"; |
1490 | 1539 | |
@@ -1505,14 +1554,16 @@ discard block |
||
1505 | 1554 | if (empty(Globals::$conf->global->MAIN_DISABLE_PDF_THUMBS)) { // If you experienc trouble with pdf thumb generation and imagick, you can disable here. |
1506 | 1555 | include_once DOL_BASE_PATH . '/core/lib/files.lib.php'; |
1507 | 1556 | $ret = dol_convert_file($file, 'png', $fileimage); |
1508 | - if ($ret < 0) |
|
1509 | - $error++; |
|
1557 | + if ($ret < 0) { |
|
1558 | + $error++; |
|
1559 | + } |
|
1510 | 1560 | } |
1511 | 1561 | } |
1512 | 1562 | |
1513 | 1563 | $heightforphotref = 70; |
1514 | - if (!empty(Globals::$conf->dol_optimize_smallscreen)) |
|
1515 | - $heightforphotref = 60; |
|
1564 | + if (!empty(Globals::$conf->dol_optimize_smallscreen)) { |
|
1565 | + $heightforphotref = 60; |
|
1566 | + } |
|
1516 | 1567 | // Si fichier png PDF d'1 page trouve |
1517 | 1568 | if (file_exists($fileimage)) { |
1518 | 1569 | $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">'; |
@@ -1548,8 +1599,10 @@ discard block |
||
1548 | 1599 | $width = 14; |
1549 | 1600 | $cssclass = 'photorefcenter'; |
1550 | 1601 | $picto = $object->picto; |
1551 | - if ($object->element == 'project' && !$object->public) |
|
1552 | - $picto = 'project'; // instead of projectpub |
|
1602 | + if ($object->element == 'project' && !$object->public) { |
|
1603 | + $picto = 'project'; |
|
1604 | + } |
|
1605 | + // instead of projectpub |
|
1553 | 1606 | $nophoto = img_picto('', 'object_' . $picto, '', false, 1); |
1554 | 1607 | } |
1555 | 1608 | $morehtmlleft .= '<!-- No photo to show -->'; |
@@ -1560,8 +1613,9 @@ discard block |
||
1560 | 1613 | } |
1561 | 1614 | } |
1562 | 1615 | |
1563 | - if ($showbarcode) |
|
1564 | - $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>'; |
|
1616 | + if ($showbarcode) { |
|
1617 | + $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>'; |
|
1618 | + } |
|
1565 | 1619 | |
1566 | 1620 | if ($object->element == 'societe') { |
1567 | 1621 | if (!empty(Globals::$conf->use_javascript_ajax) && $user->rights->societe->creer && !empty(Globals::$conf->global->MAIN_DIRECT_STATUS_UPDATE)) { |
@@ -1585,35 +1639,37 @@ discard block |
||
1585 | 1639 | } |
1586 | 1640 | } elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) { |
1587 | 1641 | $tmptxt = $object->getLibStatut(6, $object->totalpaye); |
1588 | - if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone') |
|
1589 | - $tmptxt = $object->getLibStatut(5, $object->totalpaye); |
|
1642 | + if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone') { |
|
1643 | + $tmptxt = $object->getLibStatut(5, $object->totalpaye); |
|
1644 | + } |
|
1590 | 1645 | $morehtmlstatus .= $tmptxt; |
1591 | - } |
|
1592 | - elseif ($object->element == 'contrat' || $object->element == 'contract') { |
|
1593 | - if ($object->statut == 0) |
|
1594 | - $morehtmlstatus .= $object->getLibStatut(5); |
|
1595 | - else |
|
1596 | - $morehtmlstatus .= $object->getLibStatut(4); |
|
1597 | - } |
|
1598 | - elseif ($object->element == 'facturerec') { |
|
1599 | - if ($object->frequency == 0) |
|
1600 | - $morehtmlstatus .= $object->getLibStatut(2); |
|
1601 | - else |
|
1602 | - $morehtmlstatus .= $object->getLibStatut(5); |
|
1603 | - } |
|
1604 | - elseif ($object->element == 'project_task') { |
|
1646 | + } elseif ($object->element == 'contrat' || $object->element == 'contract') { |
|
1647 | + if ($object->statut == 0) { |
|
1648 | + $morehtmlstatus .= $object->getLibStatut(5); |
|
1649 | + } else { |
|
1650 | + $morehtmlstatus .= $object->getLibStatut(4); |
|
1651 | + } |
|
1652 | + } elseif ($object->element == 'facturerec') { |
|
1653 | + if ($object->frequency == 0) { |
|
1654 | + $morehtmlstatus .= $object->getLibStatut(2); |
|
1655 | + } else { |
|
1656 | + $morehtmlstatus .= $object->getLibStatut(5); |
|
1657 | + } |
|
1658 | + } elseif ($object->element == 'project_task') { |
|
1605 | 1659 | $object->fk_statut = 1; |
1606 | - if ($object->progress > 0) |
|
1607 | - $object->fk_statut = 2; |
|
1608 | - if ($object->progress >= 100) |
|
1609 | - $object->fk_statut = 3; |
|
1660 | + if ($object->progress > 0) { |
|
1661 | + $object->fk_statut = 2; |
|
1662 | + } |
|
1663 | + if ($object->progress >= 100) { |
|
1664 | + $object->fk_statut = 3; |
|
1665 | + } |
|
1610 | 1666 | $tmptxt = $object->getLibStatut(5); |
1611 | 1667 | $morehtmlstatus .= $tmptxt; // No status on task |
1612 | - } |
|
1613 | - else { // Generic case |
|
1668 | + } else { // Generic case |
|
1614 | 1669 | $tmptxt = $object->getLibStatut(6); |
1615 | - if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone') |
|
1616 | - $tmptxt = $object->getLibStatut(5); |
|
1670 | + if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || Globals::$conf->browser->layout == 'phone') { |
|
1671 | + $tmptxt = $object->getLibStatut(5); |
|
1672 | + } |
|
1617 | 1673 | $morehtmlstatus .= $tmptxt; |
1618 | 1674 | } |
1619 | 1675 | |
@@ -1627,13 +1683,15 @@ discard block |
||
1627 | 1683 | } |
1628 | 1684 | |
1629 | 1685 | // Add alias for thirdparty |
1630 | - if (!empty($object->name_alias)) |
|
1631 | - $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>'; |
|
1686 | + if (!empty($object->name_alias)) { |
|
1687 | + $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>'; |
|
1688 | + } |
|
1632 | 1689 | |
1633 | 1690 | // Add label |
1634 | 1691 | if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task') { |
1635 | - if (!empty($object->label)) |
|
1636 | - $morehtmlref .= '<div class="refidno">' . $object->label . '</div>'; |
|
1692 | + if (!empty($object->label)) { |
|
1693 | + $morehtmlref .= '<div class="refidno">' . $object->label . '</div>'; |
|
1694 | + } |
|
1637 | 1695 | } |
1638 | 1696 | |
1639 | 1697 | if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files') { |
@@ -1666,15 +1724,19 @@ discard block |
||
1666 | 1724 | { |
1667 | 1725 | // global Globals::$conf, Globals::$langs; |
1668 | 1726 | $ret = ''; |
1669 | - if ($fieldrequired) |
|
1670 | - $ret .= '<span class="fieldrequired">'; |
|
1671 | - if ((Globals::$conf->dol_use_jmobile != 4)) |
|
1672 | - $ret .= '<label for="' . $fieldkey . '">'; |
|
1727 | + if ($fieldrequired) { |
|
1728 | + $ret .= '<span class="fieldrequired">'; |
|
1729 | + } |
|
1730 | + if ((Globals::$conf->dol_use_jmobile != 4)) { |
|
1731 | + $ret .= '<label for="' . $fieldkey . '">'; |
|
1732 | + } |
|
1673 | 1733 | $ret .= Globals::$langs->trans($langkey); |
1674 | - if ((Globals::$conf->dol_use_jmobile != 4)) |
|
1675 | - $ret .= '</label>'; |
|
1676 | - if ($fieldrequired) |
|
1677 | - $ret .= '</span>'; |
|
1734 | + if ((Globals::$conf->dol_use_jmobile != 4)) { |
|
1735 | + $ret .= '</label>'; |
|
1736 | + } |
|
1737 | + if ($fieldrequired) { |
|
1738 | + $ret .= '</span>'; |
|
1739 | + } |
|
1678 | 1740 | return $ret; |
1679 | 1741 | } |
1680 | 1742 | |
@@ -1689,8 +1751,9 @@ discard block |
||
1689 | 1751 | { |
1690 | 1752 | // global $bc; |
1691 | 1753 | $ret = ' ' . $bc[$var]; |
1692 | - if ($moreclass) |
|
1693 | - $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret); |
|
1754 | + if ($moreclass) { |
|
1755 | + $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret); |
|
1756 | + } |
|
1694 | 1757 | return $ret; |
1695 | 1758 | } |
1696 | 1759 | |
@@ -1721,18 +1784,18 @@ discard block |
||
1721 | 1784 | if ($object->state) { |
1722 | 1785 | $ret .= ($ret ? ", " : '') . $object->state; |
1723 | 1786 | } |
1724 | - if ($object->zip) |
|
1725 | - $ret .= ($ret ? ", " : '') . $object->zip; |
|
1726 | - } |
|
1727 | - else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country |
|
1787 | + if ($object->zip) { |
|
1788 | + $ret .= ($ret ? ", " : '') . $object->zip; |
|
1789 | + } |
|
1790 | + } else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country |
|
1728 | 1791 | $ret .= ($ret ? $sep : '' ) . $object->town; |
1729 | 1792 | if ($object->state) { |
1730 | 1793 | $ret .= ($ret ? ", " : '') . $object->state; |
1731 | 1794 | } |
1732 | - if ($object->zip) |
|
1733 | - $ret .= ($ret ? $sep : '' ) . $object->zip; |
|
1734 | - } |
|
1735 | - else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country |
|
1795 | + if ($object->zip) { |
|
1796 | + $ret .= ($ret ? $sep : '' ) . $object->zip; |
|
1797 | + } |
|
1798 | + } else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country |
|
1736 | 1799 | $ret .= ($ret ? $sep : '' ) . $object->zip; |
1737 | 1800 | $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : ''); |
1738 | 1801 | if ($object->state) { |
@@ -1749,8 +1812,9 @@ discard block |
||
1749 | 1812 | $ret .= ($ret ? ", " : '') . $object->state; |
1750 | 1813 | } |
1751 | 1814 | } |
1752 | - if (!is_object($outputlangs)) |
|
1753 | - $outputlangs = Globals::$langs; |
|
1815 | + if (!is_object($outputlangs)) { |
|
1816 | + $outputlangs = Globals::$langs; |
|
1817 | + } |
|
1754 | 1818 | if ($withcountry) { |
1755 | 1819 | Globals::$langs->load("dict"); |
1756 | 1820 | $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : ''); |
@@ -1771,8 +1835,9 @@ discard block |
||
1771 | 1835 | { |
1772 | 1836 | if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range |
1773 | 1837 | return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts); |
1774 | - } else |
|
1775 | - return 'Error date into a not supported range'; |
|
1838 | + } else { |
|
1839 | + return 'Error date into a not supported range'; |
|
1840 | + } |
|
1776 | 1841 | } |
1777 | 1842 | |
1778 | 1843 | /** |
@@ -1818,10 +1883,12 @@ discard block |
||
1818 | 1883 | } |
1819 | 1884 | } |
1820 | 1885 | } |
1821 | - if (!is_object($outputlangs)) |
|
1822 | - $outputlangs = Globals::$langs; |
|
1823 | - if (!$format) |
|
1824 | - $format = 'daytextshort'; |
|
1886 | + if (!is_object($outputlangs)) { |
|
1887 | + $outputlangs = Globals::$langs; |
|
1888 | + } |
|
1889 | + if (!$format) { |
|
1890 | + $format = 'daytextshort'; |
|
1891 | + } |
|
1825 | 1892 | $reduceformat = (!empty(Globals::$conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour'))) ? 1 : 0; |
1826 | 1893 | $formatwithoutreduce = preg_replace('/reduceformat/', '', $format); |
1827 | 1894 | if ($formatwithoutreduce != $format) { |
@@ -1830,40 +1897,46 @@ discard block |
||
1830 | 1897 | } // so format 'dayreduceformat' is processed like day |
1831 | 1898 | // Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default. |
1832 | 1899 | // TODO Add format daysmallyear and dayhoursmallyear |
1833 | - if ($format == 'day') |
|
1834 | - $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : Globals::$conf->format_date_short); |
|
1835 | - else if ($format == 'hour') |
|
1836 | - $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : Globals::$conf->format_hour_short); |
|
1837 | - else if ($format == 'hourduration') |
|
1838 | - $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : Globals::$conf->format_hour_short_duration); |
|
1839 | - else if ($format == 'daytext') |
|
1840 | - $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : Globals::$conf->format_date_text); |
|
1841 | - else if ($format == 'daytextshort') |
|
1842 | -// Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781 |
|
1843 | - $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : Globals::$conf->format_date_text_short); |
|
1844 | - else if ($format == 'dayhour') |
|
1845 | - $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : Globals::$conf->format_date_hour_short ?? "%d/%m/%Y %H:%M"); |
|
1846 | - else if ($format == 'dayhoursec') |
|
1847 | - $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : Globals::$conf->format_date_hour_sec_short); |
|
1848 | - else if ($format == 'dayhourtext') |
|
1849 | - $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : Globals::$conf->format_date_hour_text); |
|
1850 | - else if ($format == 'dayhourtextshort') |
|
1851 | - $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : Globals::$conf->format_date_hour_text_short); |
|
1852 | -// Format not sensitive to language |
|
1853 | - else if ($format == 'dayhourlog') |
|
1854 | - $format = '%Y%m%d%H%M%S'; |
|
1855 | - else if ($format == 'dayhourldap') |
|
1856 | - $format = '%Y%m%d%H%M%SZ'; |
|
1857 | - else if ($format == 'dayhourxcard') |
|
1858 | - $format = '%Y%m%dT%H%M%SZ'; |
|
1859 | - else if ($format == 'dayxcard') |
|
1860 | - $format = '%Y%m%d'; |
|
1861 | - else if ($format == 'dayrfc') |
|
1862 | - $format = '%Y-%m-%d'; // DATE_RFC3339 |
|
1863 | - else if ($format == 'dayhourrfc') |
|
1864 | - $format = '%Y-%m-%dT%H:%M:%SZ'; // DATETIME RFC3339 |
|
1865 | - else if ($format == 'standard') |
|
1866 | - $format = '%Y-%m-%d %H:%M:%S'; |
|
1900 | + if ($format == 'day') { |
|
1901 | + $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : Globals::$conf->format_date_short); |
|
1902 | + } else if ($format == 'hour') { |
|
1903 | + $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : Globals::$conf->format_hour_short); |
|
1904 | + } else if ($format == 'hourduration') { |
|
1905 | + $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : Globals::$conf->format_hour_short_duration); |
|
1906 | + } else if ($format == 'daytext') { |
|
1907 | + $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : Globals::$conf->format_date_text); |
|
1908 | + } else if ($format == 'daytextshort') { |
|
1909 | + // Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781 |
|
1910 | + $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : Globals::$conf->format_date_text_short); |
|
1911 | + } else if ($format == 'dayhour') { |
|
1912 | + $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : Globals::$conf->format_date_hour_short ?? "%d/%m/%Y %H:%M"); |
|
1913 | + } else if ($format == 'dayhoursec') { |
|
1914 | + $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : Globals::$conf->format_date_hour_sec_short); |
|
1915 | + } else if ($format == 'dayhourtext') { |
|
1916 | + $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : Globals::$conf->format_date_hour_text); |
|
1917 | + } else if ($format == 'dayhourtextshort') { |
|
1918 | + $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : Globals::$conf->format_date_hour_text_short); |
|
1919 | + } |
|
1920 | + // Format not sensitive to language |
|
1921 | + else if ($format == 'dayhourlog') { |
|
1922 | + $format = '%Y%m%d%H%M%S'; |
|
1923 | + } else if ($format == 'dayhourldap') { |
|
1924 | + $format = '%Y%m%d%H%M%SZ'; |
|
1925 | + } else if ($format == 'dayhourxcard') { |
|
1926 | + $format = '%Y%m%dT%H%M%SZ'; |
|
1927 | + } else if ($format == 'dayxcard') { |
|
1928 | + $format = '%Y%m%d'; |
|
1929 | + } else if ($format == 'dayrfc') { |
|
1930 | + $format = '%Y-%m-%d'; |
|
1931 | + } |
|
1932 | + // DATE_RFC3339 |
|
1933 | + else if ($format == 'dayhourrfc') { |
|
1934 | + $format = '%Y-%m-%dT%H:%M:%SZ'; |
|
1935 | + } |
|
1936 | + // DATETIME RFC3339 |
|
1937 | + else if ($format == 'standard') { |
|
1938 | + $format = '%Y-%m-%d %H:%M:%S'; |
|
1939 | + } |
|
1867 | 1940 | |
1868 | 1941 | if ($reduceformat) { |
1869 | 1942 | $format = str_replace('%Y', '%y', $format); |
@@ -1871,8 +1944,10 @@ discard block |
||
1871 | 1944 | } |
1872 | 1945 | |
1873 | 1946 | // If date undefined or "", we return "" |
1874 | - if (DolUtils::dol_strlen($time) == 0) |
|
1875 | - return ''; // $time=0 allowed (it means 01/01/1970 00:00:00) |
|
1947 | + if (DolUtils::dol_strlen($time) == 0) { |
|
1948 | + return ''; |
|
1949 | + } |
|
1950 | + // $time=0 allowed (it means 01/01/1970 00:00:00) |
|
1876 | 1951 | |
1877 | 1952 | |
1878 | 1953 | |
@@ -1950,8 +2025,9 @@ discard block |
||
1950 | 2025 | $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with static function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring. |
1951 | 2026 | |
1952 | 2027 | $ret = adodb_strftime($format, $timetouse, $to_gmt); |
1953 | - } else |
|
1954 | - $ret = 'Bad value ' . $time . ' for date'; |
|
2028 | + } else { |
|
2029 | + $ret = 'Bad value ' . $time . ' for date'; |
|
2030 | + } |
|
1955 | 2031 | } |
1956 | 2032 | |
1957 | 2033 | if (preg_match('/__b__/i', $format)) { |
@@ -2022,10 +2098,14 @@ discard block |
||
2022 | 2098 | // global Globals::$conf; |
2023 | 2099 | |
2024 | 2100 | $usealternatemethod = false; |
2025 | - if ($timestamp <= 0) |
|
2026 | - $usealternatemethod = true; // <= 1970 |
|
2027 | - if ($timestamp >= 2145913200) |
|
2028 | - $usealternatemethod = true; // >= 2038 |
|
2101 | + if ($timestamp <= 0) { |
|
2102 | + $usealternatemethod = true; |
|
2103 | + } |
|
2104 | + // <= 1970 |
|
2105 | + if ($timestamp >= 2145913200) { |
|
2106 | + $usealternatemethod = true; |
|
2107 | + } |
|
2108 | + // >= 2038 |
|
2029 | 2109 | |
2030 | 2110 | if ($usealternatemethod) { |
2031 | 2111 | $arrayinfo = adodb_getdate($timestamp, $fast); |
@@ -2060,27 +2140,36 @@ discard block |
||
2060 | 2140 | // global Globals::$conf; |
2061 | 2141 | //print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -"; |
2062 | 2142 | // Clean parameters |
2063 | - if ($hour == -1 || empty($hour)) |
|
2064 | - $hour = 0; |
|
2065 | - if ($minute == -1 || empty($minute)) |
|
2066 | - $minute = 0; |
|
2067 | - if ($second == -1 || empty($second)) |
|
2068 | - $second = 0; |
|
2143 | + if ($hour == -1 || empty($hour)) { |
|
2144 | + $hour = 0; |
|
2145 | + } |
|
2146 | + if ($minute == -1 || empty($minute)) { |
|
2147 | + $minute = 0; |
|
2148 | + } |
|
2149 | + if ($second == -1 || empty($second)) { |
|
2150 | + $second = 0; |
|
2151 | + } |
|
2069 | 2152 | |
2070 | 2153 | // Check parameters |
2071 | 2154 | if ($check) { |
2072 | - if (!$month || !$day) |
|
2073 | - return ''; |
|
2074 | - if ($day > 31) |
|
2075 | - return ''; |
|
2076 | - if ($month > 12) |
|
2077 | - return ''; |
|
2078 | - if ($hour < 0 || $hour > 24) |
|
2079 | - return ''; |
|
2080 | - if ($minute < 0 || $minute > 60) |
|
2081 | - return ''; |
|
2082 | - if ($second < 0 || $second > 60) |
|
2083 | - return ''; |
|
2155 | + if (!$month || !$day) { |
|
2156 | + return ''; |
|
2157 | + } |
|
2158 | + if ($day > 31) { |
|
2159 | + return ''; |
|
2160 | + } |
|
2161 | + if ($month > 12) { |
|
2162 | + return ''; |
|
2163 | + } |
|
2164 | + if ($hour < 0 || $hour > 24) { |
|
2165 | + return ''; |
|
2166 | + } |
|
2167 | + if ($minute < 0 || $minute > 60) { |
|
2168 | + return ''; |
|
2169 | + } |
|
2170 | + if ($second < 0 || $second > 60) { |
|
2171 | + return ''; |
|
2172 | + } |
|
2084 | 2173 | } |
2085 | 2174 | |
2086 | 2175 | if (method_exists('DateTime', 'getTimestamp')) { |
@@ -2137,8 +2226,10 @@ discard block |
||
2137 | 2226 | |
2138 | 2227 | // Note that gmmktime and mktime return same value (GMT) when used without parameters |
2139 | 2228 | //if ($mode == 'gmt') $ret=gmmktime(); // Strict Standards: gmmktime(): You should be using the time() static function instead |
2140 | - if ($mode == 'gmt') |
|
2141 | - $ret = time(); // Time for now at greenwich. |
|
2229 | + if ($mode == 'gmt') { |
|
2230 | + $ret = time(); |
|
2231 | + } |
|
2232 | + // Time for now at greenwich. |
|
2142 | 2233 | else if ($mode == 'tzserver') { // Time for now with PHP server timezone added |
2143 | 2234 | require_once DOL_BASE_PATH . '/core/lib/date.lib.php'; |
2144 | 2235 | $tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time |
@@ -2172,8 +2263,9 @@ discard block |
||
2172 | 2263 | // global Globals::$conf, Globals::$langs; |
2173 | 2264 | $level = 1024; |
2174 | 2265 | |
2175 | - if (!empty(Globals::$conf->dol_optimize_smallscreen)) |
|
2176 | - $shortunit = 1; |
|
2266 | + if (!empty(Globals::$conf->dol_optimize_smallscreen)) { |
|
2267 | + $shortunit = 1; |
|
2268 | + } |
|
2177 | 2269 | |
2178 | 2270 | // Set value text |
2179 | 2271 | if (empty($shortvalue) || $size < ($level * 10)) { |
@@ -2208,19 +2300,23 @@ discard block |
||
2208 | 2300 | { |
2209 | 2301 | // global Globals::$langs; |
2210 | 2302 | |
2211 | - if (empty($url)) |
|
2212 | - return ''; |
|
2303 | + if (empty($url)) { |
|
2304 | + return ''; |
|
2305 | + } |
|
2213 | 2306 | |
2214 | 2307 | $link = '<a href="'; |
2215 | - if (!preg_match('/^http/i', $url)) |
|
2216 | - $link .= 'http://'; |
|
2308 | + if (!preg_match('/^http/i', $url)) { |
|
2309 | + $link .= 'http://'; |
|
2310 | + } |
|
2217 | 2311 | $link .= $url; |
2218 | 2312 | $link .= '"'; |
2219 | - if ($target) |
|
2220 | - $link .= ' target="' . $target . '"'; |
|
2313 | + if ($target) { |
|
2314 | + $link .= ' target="' . $target . '"'; |
|
2315 | + } |
|
2221 | 2316 | $link .= '>'; |
2222 | - if (!preg_match('/^http/i', $url)) |
|
2223 | - $link .= 'http://'; |
|
2317 | + if (!preg_match('/^http/i', $url)) { |
|
2318 | + $link .= 'http://'; |
|
2319 | + } |
|
2224 | 2320 | $link .= dol_trunc($url, $max); |
2225 | 2321 | $link .= '</a>'; |
2226 | 2322 | return '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto(Globals::$langs->trans("Url"), 'object_globe.png') . ' ' : '') . $link . '</div>'; |
@@ -2244,13 +2340,15 @@ discard block |
||
2244 | 2340 | |
2245 | 2341 | $newemail = $email; |
2246 | 2342 | |
2247 | - if (empty($email)) |
|
2248 | - return ' '; |
|
2343 | + if (empty($email)) { |
|
2344 | + return ' '; |
|
2345 | + } |
|
2249 | 2346 | |
2250 | 2347 | if (!empty($addlink)) { |
2251 | 2348 | $newemail = '<a style="text-overflow: ellipsis;" href="'; |
2252 | - if (!preg_match('/^mailto:/i', $email)) |
|
2253 | - $newemail .= 'mailto:'; |
|
2349 | + if (!preg_match('/^mailto:/i', $email)) { |
|
2350 | + $newemail .= 'mailto:'; |
|
2351 | + } |
|
2254 | 2352 | $newemail .= $email; |
2255 | 2353 | $newemail .= '">'; |
2256 | 2354 | $newemail .= dol_trunc($email, $max); |
@@ -2263,13 +2361,14 @@ discard block |
||
2263 | 2361 | if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create) { |
2264 | 2362 | $type = 'AC_EMAIL'; |
2265 | 2363 | $link = ''; |
2266 | - if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFOREMAIL)) |
|
2267 | - $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&backtopage=1&actioncode=' . $type . '&contactid=' . $cid . '&socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>'; |
|
2268 | - if ($link) |
|
2269 | - $newemail = '<div>' . $newemail . ' ' . $link . '</div>'; |
|
2364 | + if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFOREMAIL)) { |
|
2365 | + $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&backtopage=1&actioncode=' . $type . '&contactid=' . $cid . '&socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>'; |
|
2366 | + } |
|
2367 | + if ($link) { |
|
2368 | + $newemail = '<div>' . $newemail . ' ' . $link . '</div>'; |
|
2369 | + } |
|
2270 | 2370 | } |
2271 | - } |
|
2272 | - else { |
|
2371 | + } else { |
|
2273 | 2372 | if ($showinvalid && !isValidEmail($email)) { |
2274 | 2373 | Globals::$langs->load("errors"); |
2275 | 2374 | $newemail .= img_warning(Globals::$langs->trans("ErrorBadEMail", $email)); |
@@ -2301,8 +2400,9 @@ discard block |
||
2301 | 2400 | |
2302 | 2401 | $newskype = $value; |
2303 | 2402 | |
2304 | - if (empty($value)) |
|
2305 | - return ' '; |
|
2403 | + if (empty($value)) { |
|
2404 | + return ' '; |
|
2405 | + } |
|
2306 | 2406 | |
2307 | 2407 | if (!empty($type)) { |
2308 | 2408 | $newskype = '<div class="divsocialnetwork inline-block valignmiddle">'; |
@@ -2323,13 +2423,13 @@ discard block |
||
2323 | 2423 | if (($cid || $socid) && !empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') { |
2324 | 2424 | $addlink = 'AC_SKYPE'; |
2325 | 2425 | $link = ''; |
2326 | - if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORSKYPE)) |
|
2327 | - $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&backtopage=1&actioncode=' . $addlink . '&contactid=' . $cid . '&socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>'; |
|
2426 | + if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORSKYPE)) { |
|
2427 | + $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&backtopage=1&actioncode=' . $addlink . '&contactid=' . $cid . '&socid=' . $socid . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>'; |
|
2428 | + } |
|
2328 | 2429 | $newskype .= ($link ? ' ' . $link : ''); |
2329 | 2430 | } |
2330 | 2431 | $newskype .= '</div>'; |
2331 | - } |
|
2332 | - else { |
|
2432 | + } else { |
|
2333 | 2433 | Globals::$langs->load("errors"); |
2334 | 2434 | $newskype .= img_warning(Globals::$langs->trans("ErrorBadSocialNetworkValue", $value)); |
2335 | 2435 | } |
@@ -2358,12 +2458,14 @@ discard block |
||
2358 | 2458 | if (empty($phone)) { |
2359 | 2459 | return ''; |
2360 | 2460 | } |
2361 | - if (empty($countrycode)) |
|
2362 | - $countrycode = $mysoc->country_code; |
|
2461 | + if (empty($countrycode)) { |
|
2462 | + $countrycode = $mysoc->country_code; |
|
2463 | + } |
|
2363 | 2464 | |
2364 | 2465 | // Short format for small screens |
2365 | - if (Globals::$conf->dol_optimize_smallscreen) |
|
2366 | - $separ = ''; |
|
2466 | + if (Globals::$conf->dol_optimize_smallscreen) { |
|
2467 | + $separ = ''; |
|
2468 | + } |
|
2367 | 2469 | |
2368 | 2470 | $newphone = $phone; |
2369 | 2471 | if (strtoupper($countrycode) == "FR") { |
@@ -2529,15 +2631,18 @@ discard block |
||
2529 | 2631 | $newphone = '<a href="tel:' . $phone . '"'; |
2530 | 2632 | $newphone .= '>' . $phone . '</a>'; |
2531 | 2633 | } else if (!empty(Globals::$conf->clicktodial->enabled) && $addlink == 'AC_TEL') { // If click to dial, we use click to dial url |
2532 | - if (empty($user->clicktodial_loaded)) |
|
2533 | - $user->fetch_clicktodial(); |
|
2634 | + if (empty($user->clicktodial_loaded)) { |
|
2635 | + $user->fetch_clicktodial(); |
|
2636 | + } |
|
2534 | 2637 | |
2535 | 2638 | // Define urlmask |
2536 | 2639 | $urlmask = 'ErrorClickToDialModuleNotConfigured'; |
2537 | - if (!empty(Globals::$conf->global->CLICKTODIAL_URL)) |
|
2538 | - $urlmask = Globals::$conf->global->CLICKTODIAL_URL; |
|
2539 | - if (!empty($user->clicktodial_url)) |
|
2540 | - $urlmask = $user->clicktodial_url; |
|
2640 | + if (!empty(Globals::$conf->global->CLICKTODIAL_URL)) { |
|
2641 | + $urlmask = Globals::$conf->global->CLICKTODIAL_URL; |
|
2642 | + } |
|
2643 | + if (!empty($user->clicktodial_url)) { |
|
2644 | + $urlmask = $user->clicktodial_url; |
|
2645 | + } |
|
2541 | 2646 | |
2542 | 2647 | $clicktodial_poste = (!empty($user->clicktodial_poste) ? urlencode($user->clicktodial_poste) : ''); |
2543 | 2648 | $clicktodial_login = (!empty($user->clicktodial_login) ? urlencode($user->clicktodial_login) : ''); |
@@ -2552,8 +2657,9 @@ discard block |
||
2552 | 2657 | $url = make_substitutions($url, $substitarray); |
2553 | 2658 | $newphonesav = $newphone; |
2554 | 2659 | $newphone = '<a href="' . $url . '"'; |
2555 | - if (!empty(Globals::$conf->global->CLICKTODIAL_FORCENEWTARGET)) |
|
2556 | - $newphone .= ' target="_blank"'; |
|
2660 | + if (!empty(Globals::$conf->global->CLICKTODIAL_FORCENEWTARGET)) { |
|
2661 | + $newphone .= ' target="_blank"'; |
|
2662 | + } |
|
2557 | 2663 | $newphone .= '>' . $newphonesav . '</a>'; |
2558 | 2664 | } |
2559 | 2665 | |
@@ -2561,12 +2667,15 @@ discard block |
||
2561 | 2667 | if (!empty(Globals::$conf->agenda->enabled) && $user->rights->agenda->myactions->create) { |
2562 | 2668 | $type = 'AC_TEL'; |
2563 | 2669 | $link = ''; |
2564 | - if ($addlink == 'AC_FAX') |
|
2565 | - $type = 'AC_FAX'; |
|
2566 | - if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORPHONE)) |
|
2567 | - $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&backtopage=1&actioncode=' . $type . ($cid ? '&contactid=' . $cid : '') . ($socid ? '&socid=' . $socid : '') . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>'; |
|
2568 | - if ($link) |
|
2569 | - $newphone = '<div>' . $newphone . ' ' . $link . '</div>'; |
|
2670 | + if ($addlink == 'AC_FAX') { |
|
2671 | + $type = 'AC_FAX'; |
|
2672 | + } |
|
2673 | + if (!empty(Globals::$conf->global->AGENDA_ADDACTIONFORPHONE)) { |
|
2674 | + $link = '<a href="' . DOL_BASE_URI . '/comm/action/card.php?action=create&backtopage=1&actioncode=' . $type . ($cid ? '&contactid=' . $cid : '') . ($socid ? '&socid=' . $socid : '') . '">' . img_object(Globals::$langs->trans("AddAction"), "calendar") . '</a>'; |
|
2675 | + } |
|
2676 | + if ($link) { |
|
2677 | + $newphone = '<div>' . $newphone . ' ' . $link . '</div>'; |
|
2678 | + } |
|
2570 | 2679 | } |
2571 | 2680 | } |
2572 | 2681 | |
@@ -2593,15 +2702,17 @@ discard block |
||
2593 | 2702 | $picto = ''; |
2594 | 2703 | } |
2595 | 2704 | } |
2596 | - if ($adddivfloat) |
|
2597 | - $rep .= '<div class="nospan float" style="margin-right: 10px">'; |
|
2598 | - else |
|
2599 | - $rep .= '<span style="margin-right: 10px;">'; |
|
2705 | + if ($adddivfloat) { |
|
2706 | + $rep .= '<div class="nospan float" style="margin-right: 10px">'; |
|
2707 | + } else { |
|
2708 | + $rep .= '<span style="margin-right: 10px;">'; |
|
2709 | + } |
|
2600 | 2710 | $rep .= ($withpicto ? img_picto($titlealt, 'object_' . $picto . '.png') . ' ' : '') . $newphone; |
2601 | - if ($adddivfloat) |
|
2602 | - $rep .= '</div>'; |
|
2603 | - else |
|
2604 | - $rep .= '</span>'; |
|
2711 | + if ($adddivfloat) { |
|
2712 | + $rep .= '</div>'; |
|
2713 | + } else { |
|
2714 | + $rep .= '</span>'; |
|
2715 | + } |
|
2605 | 2716 | } |
2606 | 2717 | |
2607 | 2718 | return $rep; |
@@ -2631,8 +2742,9 @@ discard block |
||
2631 | 2742 | if ($countrycode) { // If success, countrycode is us, fr, ... |
2632 | 2743 | if (file_exists(DOL_BASE_PATH . '/theme/common/flags/' . $countrycode . '.png')) { |
2633 | 2744 | $ret .= ' ' . img_picto($countrycode . ' ' . Globals::$langs->trans("AccordingToGeoIPDatabase"), DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1); |
2634 | - } else |
|
2635 | - $ret .= ' (' . $countrycode . ')'; |
|
2745 | + } else { |
|
2746 | + $ret .= ' (' . $countrycode . ')'; |
|
2747 | + } |
|
2636 | 2748 | } |
2637 | 2749 | } |
2638 | 2750 | |
@@ -2729,26 +2841,33 @@ discard block |
||
2729 | 2841 | $out .= Globals::$hookManager->resPrint; |
2730 | 2842 | } |
2731 | 2843 | if (empty($reshook)) { |
2732 | - if (empty($charfornl)) |
|
2733 | - $out .= nl2br($address); |
|
2734 | - else |
|
2735 | - $out .= preg_replace('/[\r\n]+/', $charfornl, $address); |
|
2844 | + if (empty($charfornl)) { |
|
2845 | + $out .= nl2br($address); |
|
2846 | + } else { |
|
2847 | + $out .= preg_replace('/[\r\n]+/', $charfornl, $address); |
|
2848 | + } |
|
2736 | 2849 | |
2737 | 2850 | $showgmap = $showomap = 0; |
2738 | 2851 | |
2739 | 2852 | // TODO Add a hook here |
2740 | - if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS)) |
|
2741 | - $showgmap = 1; |
|
2742 | - if ($mode == 'contact' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) |
|
2743 | - $showgmap = 1; |
|
2744 | - if ($mode == 'member' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) |
|
2745 | - $showgmap = 1; |
|
2746 | - if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS)) |
|
2747 | - $showomap = 1; |
|
2748 | - if ($mode == 'contact' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) |
|
2749 | - $showomap = 1; |
|
2750 | - if ($mode == 'member' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) |
|
2751 | - $showomap = 1; |
|
2853 | + if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS)) { |
|
2854 | + $showgmap = 1; |
|
2855 | + } |
|
2856 | + if ($mode == 'contact' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) { |
|
2857 | + $showgmap = 1; |
|
2858 | + } |
|
2859 | + if ($mode == 'member' && !empty(Globals::$conf->google->enabled) && !empty(Globals::$conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) { |
|
2860 | + $showgmap = 1; |
|
2861 | + } |
|
2862 | + if (($mode == 'thirdparty' || $mode == 'societe') && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS)) { |
|
2863 | + $showomap = 1; |
|
2864 | + } |
|
2865 | + if ($mode == 'contact' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) { |
|
2866 | + $showomap = 1; |
|
2867 | + } |
|
2868 | + if ($mode == 'member' && !empty(Globals::$conf->openstreetmap->enabled) && !empty(Globals::$conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) { |
|
2869 | + $showomap = 1; |
|
2870 | + } |
|
2752 | 2871 | |
2753 | 2872 | if ($showgmap) { |
2754 | 2873 | $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1); |
@@ -2760,10 +2879,11 @@ discard block |
||
2760 | 2879 | } |
2761 | 2880 | } |
2762 | 2881 | } |
2763 | - if ($noprint) |
|
2764 | - return $out; |
|
2765 | - else |
|
2766 | - print $out; |
|
2882 | + if ($noprint) { |
|
2883 | + return $out; |
|
2884 | + } else { |
|
2885 | + print $out; |
|
2886 | + } |
|
2767 | 2887 | } |
2768 | 2888 | |
2769 | 2889 | /** |
@@ -2775,10 +2895,12 @@ discard block |
||
2775 | 2895 | */ |
2776 | 2896 | static function isValidEmail($address, $acceptsupervisorkey = 0) |
2777 | 2897 | { |
2778 | - if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') |
|
2779 | - return true; |
|
2780 | - if (filter_var($address, FILTER_VALIDATE_EMAIL)) |
|
2781 | - return true; |
|
2898 | + if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') { |
|
2899 | + return true; |
|
2900 | + } |
|
2901 | + if (filter_var($address, FILTER_VALIDATE_EMAIL)) { |
|
2902 | + return true; |
|
2903 | + } |
|
2782 | 2904 | |
2783 | 2905 | return false; |
2784 | 2906 | } |
@@ -2800,10 +2922,12 @@ discard block |
||
2800 | 2922 | $mxhosts = array(); |
2801 | 2923 | $weight = array(); |
2802 | 2924 | getmxrr(idn_to_ascii($domain), $mxhosts, $weight); |
2803 | - if (count($mxhosts) > 1) |
|
2804 | - return 1; |
|
2805 | - if (count($mxhosts) == 1 && !empty($mxhosts[0])) |
|
2806 | - return 1; |
|
2925 | + if (count($mxhosts) > 1) { |
|
2926 | + return 1; |
|
2927 | + } |
|
2928 | + if (count($mxhosts) == 1 && !empty($mxhosts[0])) { |
|
2929 | + return 1; |
|
2930 | + } |
|
2807 | 2931 | |
2808 | 2932 | return 0; |
2809 | 2933 | } |
@@ -2832,10 +2956,11 @@ discard block |
||
2832 | 2956 | */ |
2833 | 2957 | static function dol_strlen($string, $stringencoding = 'UTF-8') |
2834 | 2958 | { |
2835 | - if (function_exists('mb_strlen')) |
|
2836 | - return mb_strlen($string, $stringencoding); |
|
2837 | - else |
|
2838 | - return strlen($string); |
|
2959 | + if (function_exists('mb_strlen')) { |
|
2960 | + return mb_strlen($string, $stringencoding); |
|
2961 | + } else { |
|
2962 | + return strlen($string); |
|
2963 | + } |
|
2839 | 2964 | } |
2840 | 2965 | |
2841 | 2966 | /** |
@@ -2852,8 +2977,9 @@ discard block |
||
2852 | 2977 | { |
2853 | 2978 | // global Globals::$langs; |
2854 | 2979 | |
2855 | - if (empty($stringencoding)) |
|
2856 | - $stringencoding = Globals::$langs->charset_output; |
|
2980 | + if (empty($stringencoding)) { |
|
2981 | + $stringencoding = Globals::$langs->charset_output; |
|
2982 | + } |
|
2857 | 2983 | |
2858 | 2984 | $ret = ''; |
2859 | 2985 | if (empty($trunconbytes)) { |
@@ -2889,48 +3015,55 @@ discard block |
||
2889 | 3015 | { |
2890 | 3016 | // global Globals::$conf; |
2891 | 3017 | |
2892 | - if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC)) |
|
2893 | - return $string; |
|
3018 | + if ($size == 0 || !empty(Globals::$conf->global->MAIN_DISABLE_TRUNC)) { |
|
3019 | + return $string; |
|
3020 | + } |
|
2894 | 3021 | |
2895 | - if (empty($stringencoding)) |
|
2896 | - $stringencoding = 'UTF-8'; |
|
2897 | -// reduce for small screen |
|
2898 | - if (Globals::$conf->dol_optimize_smallscreen == 1 && $display == 1) |
|
2899 | - $size = round($size / 3); |
|
3022 | + if (empty($stringencoding)) { |
|
3023 | + $stringencoding = 'UTF-8'; |
|
3024 | + } |
|
3025 | + // reduce for small screen |
|
3026 | + if (Globals::$conf->dol_optimize_smallscreen == 1 && $display == 1) { |
|
3027 | + $size = round($size / 3); |
|
3028 | + } |
|
2900 | 3029 | |
2901 | 3030 | // We go always here |
2902 | 3031 | if ($trunc == 'right') { |
2903 | 3032 | $newstring = DolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string; |
2904 | - if (DolUtils::dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ... |
|
2905 | - return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...'); |
|
2906 | - else |
|
2907 | - //return 'u'.$size.'-'.$newstring.'-'.DolUtils::dol_strlen($newstring,$stringencoding).'-'.$string; |
|
2908 | - return $string; |
|
2909 | - } |
|
2910 | - elseif ($trunc == 'middle') { |
|
3033 | + if (DolUtils::dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) { |
|
3034 | + // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ... |
|
3035 | + return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...'); |
|
3036 | + } else { |
|
3037 | + //return 'u'.$size.'-'.$newstring.'-'.DolUtils::dol_strlen($newstring,$stringencoding).'-'.$string; |
|
3038 | + return $string; |
|
3039 | + } |
|
3040 | + } elseif ($trunc == 'middle') { |
|
2911 | 3041 | $newstring = DolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string; |
2912 | 3042 | if (DolUtils::dol_strlen($newstring, $stringencoding) > 2 && DolUtils::dol_strlen($newstring, $stringencoding) > ($size + 1)) { |
2913 | 3043 | $size1 = round($size / 2); |
2914 | 3044 | $size2 = round($size / 2); |
2915 | 3045 | return dol_substr($newstring, 0, $size1, $stringencoding) . '...' . dol_substr($newstring, DolUtils::dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding); |
2916 | - } else |
|
2917 | - return $string; |
|
2918 | - } |
|
2919 | - elseif ($trunc == 'left') { |
|
3046 | + } else { |
|
3047 | + return $string; |
|
3048 | + } |
|
3049 | + } elseif ($trunc == 'left') { |
|
2920 | 3050 | $newstring = DolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string; |
2921 | - if (DolUtils::dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ... |
|
2922 | - return '...' . dol_substr($newstring, DolUtils::dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding); |
|
2923 | - else |
|
2924 | - return $string; |
|
2925 | - } |
|
2926 | - elseif ($trunc == 'wrap') { |
|
3051 | + if (DolUtils::dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) { |
|
3052 | + // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ... |
|
3053 | + return '...' . dol_substr($newstring, DolUtils::dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding); |
|
3054 | + } else { |
|
3055 | + return $string; |
|
3056 | + } |
|
3057 | + } elseif ($trunc == 'wrap') { |
|
2927 | 3058 | $newstring = DolUtils::dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string; |
2928 | - if (DolUtils::dol_strlen($newstring, $stringencoding) > ($size + 1)) |
|
2929 | - return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, DolUtils::dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc); |
|
2930 | - else |
|
2931 | - return $string; |
|
2932 | - } else |
|
2933 | - return 'BadParam3CallingDolTrunc'; |
|
3059 | + if (DolUtils::dol_strlen($newstring, $stringencoding) > ($size + 1)) { |
|
3060 | + return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, DolUtils::dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc); |
|
3061 | + } else { |
|
3062 | + return $string; |
|
3063 | + } |
|
3064 | + } else { |
|
3065 | + return 'BadParam3CallingDolTrunc'; |
|
3066 | + } |
|
2934 | 3067 | } |
2935 | 3068 | |
2936 | 3069 | /** |
@@ -3140,8 +3273,9 @@ discard block |
||
3140 | 3273 | { |
3141 | 3274 | // global Globals::$conf; |
3142 | 3275 | |
3143 | - if (!preg_match('/(\.png|\.gif)$/i', $picto)) |
|
3144 | - $picto .= '.png'; |
|
3276 | + if (!preg_match('/(\.png|\.gif)$/i', $picto)) { |
|
3277 | + $picto .= '.png'; |
|
3278 | + } |
|
3145 | 3279 | |
3146 | 3280 | //$path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto; |
3147 | 3281 | $path = DOL_BASE_URI . '/theme/' . Globals::$conf->theme . '/img/weather/' . $picto; |
@@ -3217,8 +3351,9 @@ discard block |
||
3217 | 3351 | $numaction = 0; |
3218 | 3352 | } |
3219 | 3353 | } |
3220 | - if (!is_numeric($numaction)) |
|
3221 | - $numaction = 0; |
|
3354 | + if (!is_numeric($numaction)) { |
|
3355 | + $numaction = 0; |
|
3356 | + } |
|
3222 | 3357 | |
3223 | 3358 | return img_picto($titlealt, 'stcomm' . $numaction . '.png'); |
3224 | 3359 | } |
@@ -3234,8 +3369,9 @@ discard block |
||
3234 | 3369 | { |
3235 | 3370 | // global Globals::$conf, Globals::$langs; |
3236 | 3371 | |
3237 | - if ($titlealt == 'default') |
|
3238 | - $titlealt = Globals::$langs->trans('Show'); |
|
3372 | + if ($titlealt == 'default') { |
|
3373 | + $titlealt = Globals::$langs->trans('Show'); |
|
3374 | + } |
|
3239 | 3375 | |
3240 | 3376 | return img_picto($titlealt, 'pdf' . $size . '.png'); |
3241 | 3377 | } |
@@ -3251,8 +3387,9 @@ discard block |
||
3251 | 3387 | { |
3252 | 3388 | // global Globals::$conf, Globals::$langs; |
3253 | 3389 | |
3254 | - if ($titlealt == 'default') |
|
3255 | - $titlealt = Globals::$langs->trans('Add'); |
|
3390 | + if ($titlealt == 'default') { |
|
3391 | + $titlealt = Globals::$langs->trans('Add'); |
|
3392 | + } |
|
3256 | 3393 | |
3257 | 3394 | return img_picto($titlealt, 'edit_add.png', $other); |
3258 | 3395 | } |
@@ -3268,8 +3405,9 @@ discard block |
||
3268 | 3405 | { |
3269 | 3406 | // global Globals::$conf, Globals::$langs; |
3270 | 3407 | |
3271 | - if ($titlealt == 'default') |
|
3272 | - $titlealt = Globals::$langs->trans('Remove'); |
|
3408 | + if ($titlealt == 'default') { |
|
3409 | + $titlealt = Globals::$langs->trans('Remove'); |
|
3410 | + } |
|
3273 | 3411 | |
3274 | 3412 | return img_picto($titlealt, 'edit_remove.png', $other); |
3275 | 3413 | } |
@@ -3286,8 +3424,9 @@ discard block |
||
3286 | 3424 | { |
3287 | 3425 | // global Globals::$conf, Globals::$langs; |
3288 | 3426 | |
3289 | - if ($titlealt == 'default') |
|
3290 | - $titlealt = Globals::$langs->trans('Modify'); |
|
3427 | + if ($titlealt == 'default') { |
|
3428 | + $titlealt = Globals::$langs->trans('Modify'); |
|
3429 | + } |
|
3291 | 3430 | |
3292 | 3431 | return img_picto($titlealt, 'edit.png', ($float ? 'style="float: ' . (Globals::$langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right') . '"' : "") . ($other ? ' ' . $other : '')); |
3293 | 3432 | } |
@@ -3304,8 +3443,9 @@ discard block |
||
3304 | 3443 | { |
3305 | 3444 | // global Globals::$conf, Globals::$langs; |
3306 | 3445 | |
3307 | - if ($titlealt == 'default') |
|
3308 | - $titlealt = Globals::$langs->trans('View'); |
|
3446 | + if ($titlealt == 'default') { |
|
3447 | + $titlealt = Globals::$langs->trans('View'); |
|
3448 | + } |
|
3309 | 3449 | |
3310 | 3450 | $moreatt = ($float ? 'style="float: right" ' : '') . $other; |
3311 | 3451 | |
@@ -3323,8 +3463,9 @@ discard block |
||
3323 | 3463 | { |
3324 | 3464 | // global Globals::$conf, Globals::$langs; |
3325 | 3465 | |
3326 | - if ($titlealt == 'default') |
|
3327 | - $titlealt = Globals::$langs->trans('Delete'); |
|
3466 | + if ($titlealt == 'default') { |
|
3467 | + $titlealt = Globals::$langs->trans('Delete'); |
|
3468 | + } |
|
3328 | 3469 | |
3329 | 3470 | return img_picto($titlealt, 'delete.png', $other); |
3330 | 3471 | //return '<span class="fa fa-trash fa-2x fa-fw" style="font-size: 1.7em;" title="'.$titlealt.'"></span>'; |
@@ -3340,8 +3481,9 @@ discard block |
||
3340 | 3481 | static function img_printer($titlealt = "default", $other = '') |
3341 | 3482 | { |
3342 | 3483 | // global Globals::$conf, Globals::$langs; |
3343 | - if ($titlealt == "default") |
|
3344 | - $titlealt = Globals::$langs->trans("Print"); |
|
3484 | + if ($titlealt == "default") { |
|
3485 | + $titlealt = Globals::$langs->trans("Print"); |
|
3486 | + } |
|
3345 | 3487 | return img_picto($titlealt, 'printer.png', $other); |
3346 | 3488 | } |
3347 | 3489 | |
@@ -3356,8 +3498,9 @@ discard block |
||
3356 | 3498 | { |
3357 | 3499 | // global Globals::$conf, Globals::$langs; |
3358 | 3500 | |
3359 | - if ($titlealt == 'default') |
|
3360 | - $titlealt = Globals::$langs->trans('Split'); |
|
3501 | + if ($titlealt == 'default') { |
|
3502 | + $titlealt = Globals::$langs->trans('Split'); |
|
3503 | + } |
|
3361 | 3504 | |
3362 | 3505 | return img_picto($titlealt, 'split.png', $other); |
3363 | 3506 | } |
@@ -3374,10 +3517,11 @@ discard block |
||
3374 | 3517 | // global Globals::$conf, Globals::$langs; |
3375 | 3518 | |
3376 | 3519 | if ($usealttitle) { |
3377 | - if (is_string($usealttitle)) |
|
3378 | - $usealttitle = DolUtils::dol_escape_htmltag($usealttitle); |
|
3379 | - else |
|
3380 | - $usealttitle = Globals::$langs->trans('Info'); |
|
3520 | + if (is_string($usealttitle)) { |
|
3521 | + $usealttitle = DolUtils::dol_escape_htmltag($usealttitle); |
|
3522 | + } else { |
|
3523 | + $usealttitle = Globals::$langs->trans('Info'); |
|
3524 | + } |
|
3381 | 3525 | } |
3382 | 3526 | |
3383 | 3527 | return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"'); |
@@ -3393,8 +3537,9 @@ discard block |
||
3393 | 3537 | { |
3394 | 3538 | // global Globals::$conf, Globals::$langs; |
3395 | 3539 | |
3396 | - if ($titlealt == 'default') |
|
3397 | - $titlealt = Globals::$langs->trans('Informations'); |
|
3540 | + if ($titlealt == 'default') { |
|
3541 | + $titlealt = Globals::$langs->trans('Informations'); |
|
3542 | + } |
|
3398 | 3543 | |
3399 | 3544 | return img_picto($titlealt, 'info.png', 'style="vertical-align: middle;"'); |
3400 | 3545 | } |
@@ -3410,8 +3555,9 @@ discard block |
||
3410 | 3555 | { |
3411 | 3556 | // global Globals::$conf, Globals::$langs; |
3412 | 3557 | |
3413 | - if ($titlealt == 'default') |
|
3414 | - $titlealt = Globals::$langs->trans('Warning'); |
|
3558 | + if ($titlealt == 'default') { |
|
3559 | + $titlealt = Globals::$langs->trans('Warning'); |
|
3560 | + } |
|
3415 | 3561 | |
3416 | 3562 | //return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>'; |
3417 | 3563 | return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"' . ($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' ' . $moreatt) : '')); |
@@ -3427,8 +3573,9 @@ discard block |
||
3427 | 3573 | { |
3428 | 3574 | // global Globals::$conf, Globals::$langs; |
3429 | 3575 | |
3430 | - if ($titlealt == 'default') |
|
3431 | - $titlealt = Globals::$langs->trans('Error'); |
|
3576 | + if ($titlealt == 'default') { |
|
3577 | + $titlealt = Globals::$langs->trans('Error'); |
|
3578 | + } |
|
3432 | 3579 | |
3433 | 3580 | return img_picto($titlealt, 'error.png', 'class="valigntextbottom"'); |
3434 | 3581 | } |
@@ -3444,8 +3591,9 @@ discard block |
||
3444 | 3591 | { |
3445 | 3592 | // global Globals::$conf, Globals::$langs; |
3446 | 3593 | |
3447 | - if ($titlealt == 'default') |
|
3448 | - $titlealt = Globals::$langs->trans('Next'); |
|
3594 | + if ($titlealt == 'default') { |
|
3595 | + $titlealt = Globals::$langs->trans('Next'); |
|
3596 | + } |
|
3449 | 3597 | |
3450 | 3598 | //return img_picto($titlealt, 'next.png', $moreatt); |
3451 | 3599 | return '<span class="fa fa-chevron-right paddingright paddingleft" title="' . DolUtils::dol_escape_htmltag($titlealt) . '"></span>'; |
@@ -3462,8 +3610,9 @@ discard block |
||
3462 | 3610 | { |
3463 | 3611 | // global Globals::$conf, Globals::$langs; |
3464 | 3612 | |
3465 | - if ($titlealt == 'default') |
|
3466 | - $titlealt = Globals::$langs->trans('Previous'); |
|
3613 | + if ($titlealt == 'default') { |
|
3614 | + $titlealt = Globals::$langs->trans('Previous'); |
|
3615 | + } |
|
3467 | 3616 | |
3468 | 3617 | //return img_picto($titlealt, 'previous.png', $moreatt); |
3469 | 3618 | return '<span class="fa fa-chevron-left paddingright paddingleft" title="' . DolUtils::dol_escape_htmltag($titlealt) . '"></span>'; |
@@ -3481,8 +3630,9 @@ discard block |
||
3481 | 3630 | { |
3482 | 3631 | // global Globals::$conf, Globals::$langs; |
3483 | 3632 | |
3484 | - if ($titlealt == 'default') |
|
3485 | - $titlealt = Globals::$langs->trans('Down'); |
|
3633 | + if ($titlealt == 'default') { |
|
3634 | + $titlealt = Globals::$langs->trans('Down'); |
|
3635 | + } |
|
3486 | 3636 | |
3487 | 3637 | return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"'); |
3488 | 3638 | } |
@@ -3499,8 +3649,9 @@ discard block |
||
3499 | 3649 | { |
3500 | 3650 | // global Globals::$conf, Globals::$langs; |
3501 | 3651 | |
3502 | - if ($titlealt == 'default') |
|
3503 | - $titlealt = Globals::$langs->trans('Up'); |
|
3652 | + if ($titlealt == 'default') { |
|
3653 | + $titlealt = Globals::$langs->trans('Up'); |
|
3654 | + } |
|
3504 | 3655 | |
3505 | 3656 | return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"'); |
3506 | 3657 | } |
@@ -3517,8 +3668,9 @@ discard block |
||
3517 | 3668 | { |
3518 | 3669 | // global Globals::$conf, Globals::$langs; |
3519 | 3670 | |
3520 | - if ($titlealt == 'default') |
|
3521 | - $titlealt = Globals::$langs->trans('Left'); |
|
3671 | + if ($titlealt == 'default') { |
|
3672 | + $titlealt = Globals::$langs->trans('Left'); |
|
3673 | + } |
|
3522 | 3674 | |
3523 | 3675 | return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt); |
3524 | 3676 | } |
@@ -3535,8 +3687,9 @@ discard block |
||
3535 | 3687 | { |
3536 | 3688 | // global Globals::$conf, Globals::$langs; |
3537 | 3689 | |
3538 | - if ($titlealt == 'default') |
|
3539 | - $titlealt = Globals::$langs->trans('Right'); |
|
3690 | + if ($titlealt == 'default') { |
|
3691 | + $titlealt = Globals::$langs->trans('Right'); |
|
3692 | + } |
|
3540 | 3693 | |
3541 | 3694 | return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt); |
3542 | 3695 | } |
@@ -3552,11 +3705,13 @@ discard block |
||
3552 | 3705 | { |
3553 | 3706 | // global Globals::$conf, Globals::$langs; |
3554 | 3707 | |
3555 | - if ($titlealt == 'default') |
|
3556 | - $titlealt = Globals::$langs->trans('Active'); |
|
3708 | + if ($titlealt == 'default') { |
|
3709 | + $titlealt = Globals::$langs->trans('Active'); |
|
3710 | + } |
|
3557 | 3711 | |
3558 | - if ($allow == 1) |
|
3559 | - return img_picto($titlealt, 'tick.png'); |
|
3712 | + if ($allow == 1) { |
|
3713 | + return img_picto($titlealt, 'tick.png'); |
|
3714 | + } |
|
3560 | 3715 | |
3561 | 3716 | return '-'; |
3562 | 3717 | } |
@@ -3604,8 +3759,9 @@ discard block |
||
3604 | 3759 | $mimeimg = dol_mimetype($file, '', 2); |
3605 | 3760 | $mimefa = dol_mimetype($file, '', 4); |
3606 | 3761 | |
3607 | - if (empty($titlealt)) |
|
3608 | - $titlealt = 'Mime type: ' . $mimetype; |
|
3762 | + if (empty($titlealt)) { |
|
3763 | + $titlealt = 'Mime type: ' . $mimetype; |
|
3764 | + } |
|
3609 | 3765 | |
3610 | 3766 | //return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"'); |
3611 | 3767 | return '<i class="fa fa-' . $mimefa . ' paddingright"></i>'; |
@@ -3627,13 +3783,15 @@ discard block |
||
3627 | 3783 | |
3628 | 3784 | // global Globals::$conf, Globals::$langs; |
3629 | 3785 | |
3630 | - if ($titlealt == 'default') |
|
3631 | - $titlealt = Globals::$langs->trans('Call'); |
|
3786 | + if ($titlealt == 'default') { |
|
3787 | + $titlealt = Globals::$langs->trans('Call'); |
|
3788 | + } |
|
3632 | 3789 | |
3633 | - if ($option == 1) |
|
3634 | - $img = 'call'; |
|
3635 | - else |
|
3636 | - $img = 'call_out'; |
|
3790 | + if ($option == 1) { |
|
3791 | + $img = 'call'; |
|
3792 | + } else { |
|
3793 | + $img = 'call_out'; |
|
3794 | + } |
|
3637 | 3795 | |
3638 | 3796 | return img_picto($titlealt, $img); |
3639 | 3797 | } |
@@ -3649,8 +3807,9 @@ discard block |
||
3649 | 3807 | { |
3650 | 3808 | // global Globals::$conf, Globals::$langs; |
3651 | 3809 | |
3652 | - if ($titlealt == 'default') |
|
3653 | - $titlealt = Globals::$langs->trans('Search'); |
|
3810 | + if ($titlealt == 'default') { |
|
3811 | + $titlealt = Globals::$langs->trans('Search'); |
|
3812 | + } |
|
3654 | 3813 | |
3655 | 3814 | $img = img_picto($titlealt, 'search.png', $other, false, 1); |
3656 | 3815 | |
@@ -3671,8 +3830,9 @@ discard block |
||
3671 | 3830 | { |
3672 | 3831 | // global Globals::$conf, Globals::$langs; |
3673 | 3832 | |
3674 | - if ($titlealt == 'default') |
|
3675 | - $titlealt = Globals::$langs->trans('Search'); |
|
3833 | + if ($titlealt == 'default') { |
|
3834 | + $titlealt = Globals::$langs->trans('Search'); |
|
3835 | + } |
|
3676 | 3836 | |
3677 | 3837 | $img = img_picto($titlealt, 'searchclear.png', $other, false, 1); |
3678 | 3838 | |
@@ -4100,12 +4260,15 @@ discard block |
||
4100 | 4260 | $savtotalnboflines = $totalnboflines; |
4101 | 4261 | $totalnboflines = abs($totalnboflines); |
4102 | 4262 | |
4103 | - if ($picto == 'setup') |
|
4104 | - $picto = 'title_setup.png'; |
|
4105 | - if ((Globals::$conf->browser->name == 'ie') && $picto == 'title_generic.png') |
|
4106 | - $picto = 'title.gif'; |
|
4107 | - if ($limit < 0) |
|
4108 | - $limit = Globals::$conf->liste_limit; |
|
4263 | + if ($picto == 'setup') { |
|
4264 | + $picto = 'title_setup.png'; |
|
4265 | + } |
|
4266 | + if ((Globals::$conf->browser->name == 'ie') && $picto == 'title_generic.png') { |
|
4267 | + $picto = 'title.gif'; |
|
4268 | + } |
|
4269 | + if ($limit < 0) { |
|
4270 | + $limit = Globals::$conf->liste_limit; |
|
4271 | + } |
|
4109 | 4272 | if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0))) { |
4110 | 4273 | $nextpage = 1; |
4111 | 4274 | } else { |
@@ -4119,11 +4282,13 @@ discard block |
||
4119 | 4282 | // Left |
4120 | 4283 | //if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>'; |
4121 | 4284 | print '<td class="nobordernopadding valignmiddle">'; |
4122 | - if ($picto && $titre) |
|
4123 | - print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath); |
|
4285 | + if ($picto && $titre) { |
|
4286 | + print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath); |
|
4287 | + } |
|
4124 | 4288 | print '<div class="titre inline-block">' . $titre; |
4125 | - if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') |
|
4126 | - print ' (' . $totalnboflines . ')'; |
|
4289 | + if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') { |
|
4290 | + print ' (' . $totalnboflines . ')'; |
|
4291 | + } |
|
4127 | 4292 | print '</div></td>'; |
4128 | 4293 | |
4129 | 4294 | // Center |
@@ -4133,21 +4298,24 @@ discard block |
||
4133 | 4298 | |
4134 | 4299 | // Right |
4135 | 4300 | print '<td class="nobordernopadding valignmiddle" align="right">'; |
4136 | - if ($sortfield) |
|
4137 | - $options .= "&sortfield=" . urlencode($sortfield); |
|
4138 | - if ($sortorder) |
|
4139 | - $options .= "&sortorder=" . urlencode($sortorder); |
|
4140 | -// Show navigation bar |
|
4301 | + if ($sortfield) { |
|
4302 | + $options .= "&sortfield=" . urlencode($sortfield); |
|
4303 | + } |
|
4304 | + if ($sortorder) { |
|
4305 | + $options .= "&sortorder=" . urlencode($sortorder); |
|
4306 | + } |
|
4307 | + // Show navigation bar |
|
4141 | 4308 | $pagelist = ''; |
4142 | 4309 | if ($savlimit != 0 && ($page > 0 || $num > $limit)) { |
4143 | 4310 | if ($totalnboflines) { // If we know total nb of lines |
4144 | 4311 | // Define nb of extra page links before and after selected page + ... + first or last |
4145 | 4312 | $maxnbofpage = (empty(Globals::$conf->dol_optimize_smallscreen) ? 4 : 1); |
4146 | 4313 | |
4147 | - if ($limit > 0) |
|
4148 | - $nbpages = ceil($totalnboflines / $limit); |
|
4149 | - else |
|
4150 | - $nbpages = 1; |
|
4314 | + if ($limit > 0) { |
|
4315 | + $nbpages = ceil($totalnboflines / $limit); |
|
4316 | + } else { |
|
4317 | + $nbpages = 1; |
|
4318 | + } |
|
4151 | 4319 | $cpt = ($page - $maxnbofpage); |
4152 | 4320 | if ($cpt < 0) { |
4153 | 4321 | $cpt = 0; |
@@ -4155,10 +4323,11 @@ discard block |
||
4155 | 4323 | |
4156 | 4324 | if ($cpt >= 1) { |
4157 | 4325 | $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=0' . $options . '">1</a></li>'; |
4158 | - if ($cpt > 2) |
|
4159 | - $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>'; |
|
4160 | - else if ($cpt == 2) |
|
4161 | - $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>'; |
|
4326 | + if ($cpt > 2) { |
|
4327 | + $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>'; |
|
4328 | + } else if ($cpt == 2) { |
|
4329 | + $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>'; |
|
4330 | + } |
|
4162 | 4331 | } |
4163 | 4332 | |
4164 | 4333 | do { |
@@ -4171,14 +4340,14 @@ discard block |
||
4171 | 4340 | } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage); |
4172 | 4341 | |
4173 | 4342 | if ($cpt < $nbpages) { |
4174 | - if ($cpt < $nbpages - 2) |
|
4175 | - $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>'; |
|
4176 | - else if ($cpt == $nbpages - 2) |
|
4177 | - $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>'; |
|
4343 | + if ($cpt < $nbpages - 2) { |
|
4344 | + $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>'; |
|
4345 | + } else if ($cpt == $nbpages - 2) { |
|
4346 | + $pagelist .= '<li' . ( (Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>'; |
|
4347 | + } |
|
4178 | 4348 | $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 1) . $options . '">' . $nbpages . '</a></li>'; |
4179 | 4349 | } |
4180 | - } |
|
4181 | - else { |
|
4350 | + } else { |
|
4182 | 4351 | $pagelist .= '<li' . ((Globals::$conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . ((Globals::$conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . "</li>"; |
4183 | 4352 | } |
4184 | 4353 | } |
@@ -4214,18 +4383,21 @@ discard block |
||
4214 | 4383 | $pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000'; |
4215 | 4384 | //$pagesizechoices.=',0:'.Globals::$langs->trans("All"); // Not yet supported |
4216 | 4385 | //$pagesizechoices.=',2:2'; |
4217 | - if (!empty(Globals::$conf->global->MAIN_PAGESIZE_CHOICES)) |
|
4218 | - $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES; |
|
4386 | + if (!empty(Globals::$conf->global->MAIN_PAGESIZE_CHOICES)) { |
|
4387 | + $pagesizechoices = Globals::$conf->global->MAIN_PAGESIZE_CHOICES; |
|
4388 | + } |
|
4219 | 4389 | |
4220 | 4390 | print '<li class="pagination">'; |
4221 | 4391 | print '<select class="flat selectlimit" name="limit" title="' . DolUtils::dol_escape_htmltag(Globals::$langs->trans("MaxNbOfRecordPerPage")) . '">'; |
4222 | 4392 | $tmpchoice = explode(',', $pagesizechoices); |
4223 | 4393 | $tmpkey = $limit . ':' . $limit; |
4224 | - if (!in_array($tmpkey, $tmpchoice)) |
|
4225 | - $tmpchoice[] = $tmpkey; |
|
4394 | + if (!in_array($tmpkey, $tmpchoice)) { |
|
4395 | + $tmpchoice[] = $tmpkey; |
|
4396 | + } |
|
4226 | 4397 | $tmpkey = Globals::$conf->liste_limit . ':' . Globals::$conf->liste_limit; |
4227 | - if (!in_array($tmpkey, $tmpchoice)) |
|
4228 | - $tmpchoice[] = $tmpkey; |
|
4398 | + if (!in_array($tmpkey, $tmpchoice)) { |
|
4399 | + $tmpchoice[] = $tmpkey; |
|
4400 | + } |
|
4229 | 4401 | asort($tmpchoice, SORT_NUMERIC); |
4230 | 4402 | $found = false; |
4231 | 4403 | foreach ($tmpchoice as $val) { |
@@ -4301,14 +4473,15 @@ discard block |
||
4301 | 4473 | } |
4302 | 4474 | |
4303 | 4475 | // If rate is '9/9/9' we don't change it. If rate is '9.000' we apply price() |
4304 | - if (!preg_match('/\//', $rate)) |
|
4305 | - $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : ''); |
|
4306 | - else { |
|
4476 | + if (!preg_match('/\//', $rate)) { |
|
4477 | + $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : ''); |
|
4478 | + } else { |
|
4307 | 4479 | // TODO Split on / and output with a price2num to have clean numbers without ton of 000. |
4308 | 4480 | $ret = $rate . ($addpercent ? '%' : ''); |
4309 | 4481 | } |
4310 | - if (($info_bits & 1) && $usestarfornpr >= 0) |
|
4311 | - $ret .= ' *'; |
|
4482 | + if (($info_bits & 1) && $usestarfornpr >= 0) { |
|
4483 | + $ret .= ' *'; |
|
4484 | + } |
|
4312 | 4485 | $ret .= $morelabel; |
4313 | 4486 | return $ret; |
4314 | 4487 | } |
@@ -4332,11 +4505,14 @@ discard block |
||
4332 | 4505 | { |
4333 | 4506 | // global Globals::$langs, Globals::$conf; |
4334 | 4507 | // Clean parameters |
4335 | - if (empty($amount)) |
|
4336 | - $amount = 0; // To have a numeric value if amount not defined or = '' |
|
4508 | + if (empty($amount)) { |
|
4509 | + $amount = 0; |
|
4510 | + } |
|
4511 | + // To have a numeric value if amount not defined or = '' |
|
4337 | 4512 | $amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number) |
4338 | - if ($rounding < 0) |
|
4339 | - $rounding = min(Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT, Globals::$conf->global->MAIN_MAX_DECIMALS_TOT); |
|
4513 | + if ($rounding < 0) { |
|
4514 | + $rounding = min(Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT, Globals::$conf->global->MAIN_MAX_DECIMALS_TOT); |
|
4515 | + } |
|
4340 | 4516 | $nbdecimal = $rounding; |
4341 | 4517 | |
4342 | 4518 | // Output separators by default (french) |
@@ -4344,18 +4520,22 @@ discard block |
||
4344 | 4520 | $thousand = ' '; |
4345 | 4521 | |
4346 | 4522 | // If $outlangs not forced, we use use language |
4347 | - if (!is_object($outlangs)) |
|
4348 | - $outlangs = Globals::$langs; |
|
4349 | - |
|
4350 | - if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") |
|
4351 | - $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal"); |
|
4352 | - if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") |
|
4353 | - $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand"); |
|
4354 | - if ($thousand == 'None') |
|
4355 | - $thousand = ''; |
|
4356 | - else if ($thousand == 'Space') |
|
4357 | - $thousand = ' '; |
|
4358 | -//print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>"; |
|
4523 | + if (!is_object($outlangs)) { |
|
4524 | + $outlangs = Globals::$langs; |
|
4525 | + } |
|
4526 | + |
|
4527 | + if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") { |
|
4528 | + $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal"); |
|
4529 | + } |
|
4530 | + if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") { |
|
4531 | + $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand"); |
|
4532 | + } |
|
4533 | + if ($thousand == 'None') { |
|
4534 | + $thousand = ''; |
|
4535 | + } else if ($thousand == 'Space') { |
|
4536 | + $thousand = ' '; |
|
4537 | + } |
|
4538 | + //print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>"; |
|
4359 | 4539 | //print "amount=".$amount."-"; |
4360 | 4540 | $amount = str_replace(',', '.', $amount); // should be useless |
4361 | 4541 | //print $amount."-"; |
@@ -4366,9 +4546,10 @@ discard block |
||
4366 | 4546 | $end = ''; |
4367 | 4547 | |
4368 | 4548 | // We increase nbdecimal if there is more decimal than asked (to not loose information) |
4369 | - if (DolUtils::dol_strlen($decpart) > $nbdecimal) |
|
4370 | - $nbdecimal = DolUtils::dol_strlen($decpart); |
|
4371 | -// Si on depasse max |
|
4549 | + if (DolUtils::dol_strlen($decpart) > $nbdecimal) { |
|
4550 | + $nbdecimal = DolUtils::dol_strlen($decpart); |
|
4551 | + } |
|
4552 | + // Si on depasse max |
|
4372 | 4553 | if ($trunc && $nbdecimal > Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN) { |
4373 | 4554 | $nbdecimal = Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN; |
4374 | 4555 | if (preg_match('/\.\.\./i', Globals::$conf->global->MAIN_MAX_DECIMALS_SHOWN)) { |
@@ -4378,8 +4559,9 @@ discard block |
||
4378 | 4559 | } |
4379 | 4560 | |
4380 | 4561 | // If force rounding |
4381 | - if ($forcerounding >= 0) |
|
4382 | - $nbdecimal = $forcerounding; |
|
4562 | + if ($forcerounding >= 0) { |
|
4563 | + $nbdecimal = $forcerounding; |
|
4564 | + } |
|
4383 | 4565 | |
4384 | 4566 | // Format number |
4385 | 4567 | $output = number_format($amount, $nbdecimal, $dec, $thousand); |
@@ -4390,13 +4572,14 @@ discard block |
||
4390 | 4572 | // Add symbol of currency if requested |
4391 | 4573 | $cursymbolbefore = $cursymbolafter = ''; |
4392 | 4574 | if ($currency_code) { |
4393 | - if ($currency_code == 'auto') |
|
4394 | - $currency_code = Globals::$conf->currency; |
|
4575 | + if ($currency_code == 'auto') { |
|
4576 | + $currency_code = Globals::$conf->currency; |
|
4577 | + } |
|
4395 | 4578 | |
4396 | 4579 | $listofcurrenciesbefore = array('USD', 'GBP', 'AUD', 'MXN', 'PEN', 'CNY'); |
4397 | - if (in_array($currency_code, $listofcurrenciesbefore)) |
|
4398 | - $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code); |
|
4399 | - else { |
|
4580 | + if (in_array($currency_code, $listofcurrenciesbefore)) { |
|
4581 | + $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code); |
|
4582 | + } else { |
|
4400 | 4583 | $tmpcur = $outlangs->getCurrencySymbol($currency_code); |
4401 | 4584 | $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur); |
4402 | 4585 | } |
@@ -4429,15 +4612,18 @@ discard block |
||
4429 | 4612 | // Decimal delimiter for PHP and database SQL requests must be '.' |
4430 | 4613 | $dec = ','; |
4431 | 4614 | $thousand = ' '; |
4432 | - if (Globals::$langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") |
|
4433 | - $dec = Globals::$langs->transnoentitiesnoconv("SeparatorDecimal"); |
|
4434 | - if (Globals::$langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") |
|
4435 | - $thousand = Globals::$langs->transnoentitiesnoconv("SeparatorThousand"); |
|
4436 | - if ($thousand == 'None') |
|
4437 | - $thousand = ''; |
|
4438 | - elseif ($thousand == 'Space') |
|
4439 | - $thousand = ' '; |
|
4440 | -//print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>"; |
|
4615 | + if (Globals::$langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") { |
|
4616 | + $dec = Globals::$langs->transnoentitiesnoconv("SeparatorDecimal"); |
|
4617 | + } |
|
4618 | + if (Globals::$langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") { |
|
4619 | + $thousand = Globals::$langs->transnoentitiesnoconv("SeparatorThousand"); |
|
4620 | + } |
|
4621 | + if ($thousand == 'None') { |
|
4622 | + $thousand = ''; |
|
4623 | + } elseif ($thousand == 'Space') { |
|
4624 | + $thousand = ' '; |
|
4625 | + } |
|
4626 | + //print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>"; |
|
4441 | 4627 | // Convert value to universal number format (no thousand separator, '.' as decimal separator) |
4442 | 4628 | if ($alreadysqlnb != 1) { // If not a PHP number or unknown, we change format |
4443 | 4629 | //print 'PP'.$amount.' - '.$dec.' - '.$thousand.' - '.intval($amount).'<br>'; |
@@ -4452,8 +4638,10 @@ discard block |
||
4452 | 4638 | } |
4453 | 4639 | //print "QQ".$amount.'<br>'; |
4454 | 4640 | // Now make replace (the main goal of function) |
4455 | - if ($thousand != ',' && $thousand != '.') |
|
4456 | - $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users |
|
4641 | + if ($thousand != ',' && $thousand != '.') { |
|
4642 | + $amount = str_replace(',', '.', $amount); |
|
4643 | + } |
|
4644 | + // To accept 2 notations for french users |
|
4457 | 4645 | $amount = str_replace(' ', '', $amount); // To avoid spaces |
4458 | 4646 | $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is . |
4459 | 4647 | $amount = str_replace($dec, '.', $amount); |
@@ -4462,20 +4650,24 @@ discard block |
||
4462 | 4650 | // Now, make a rounding if required |
4463 | 4651 | if ($rounding) { |
4464 | 4652 | $nbofdectoround = ''; |
4465 | - if ($rounding == 'MU') |
|
4466 | - $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT; |
|
4467 | - elseif ($rounding == 'MT') |
|
4468 | - $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_TOT; |
|
4469 | - elseif ($rounding == 'MS') |
|
4470 | - $nbofdectoround = empty(Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK; |
|
4471 | - elseif (is_numeric($rounding)) |
|
4472 | - $nbofdectoround = $rounding; |
|
4473 | -//print "RR".$amount.' - '.$nbofdectoround.'<br>'; |
|
4474 | - if (DolUtils::dol_strlen($nbofdectoround)) |
|
4475 | - $amount = round($amount, $nbofdectoround); // $nbofdectoround can be 0. |
|
4476 | - else |
|
4477 | - return 'ErrorBadParameterProvidedToFunction'; |
|
4478 | -//print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>'; |
|
4653 | + if ($rounding == 'MU') { |
|
4654 | + $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_UNIT; |
|
4655 | + } elseif ($rounding == 'MT') { |
|
4656 | + $nbofdectoround = Globals::$conf->global->MAIN_MAX_DECIMALS_TOT; |
|
4657 | + } elseif ($rounding == 'MS') { |
|
4658 | + $nbofdectoround = empty(Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : Globals::$conf->global->MAIN_MAX_DECIMALS_STOCK; |
|
4659 | + } elseif (is_numeric($rounding)) { |
|
4660 | + $nbofdectoround = $rounding; |
|
4661 | + } |
|
4662 | + //print "RR".$amount.' - '.$nbofdectoround.'<br>'; |
|
4663 | + if (DolUtils::dol_strlen($nbofdectoround)) { |
|
4664 | + $amount = round($amount, $nbofdectoround); |
|
4665 | + } |
|
4666 | + // $nbofdectoround can be 0. |
|
4667 | + else { |
|
4668 | + return 'ErrorBadParameterProvidedToFunction'; |
|
4669 | + } |
|
4670 | + //print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>'; |
|
4479 | 4671 | // Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number |
4480 | 4672 | // to format defined by LC_NUMERIC after a calculation and we want source format to be defined by Dolibarr setup. |
4481 | 4673 | if (is_numeric($amount)) { |
@@ -4488,8 +4680,10 @@ discard block |
||
4488 | 4680 | //print "TT".$amount.'<br>'; |
4489 | 4681 | // Always make replace because each math static function (like round) replace |
4490 | 4682 | // with local values and we want a number that has a SQL string format x.y |
4491 | - if ($thousand != ',' && $thousand != '.') |
|
4492 | - $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users |
|
4683 | + if ($thousand != ',' && $thousand != '.') { |
|
4684 | + $amount = str_replace(',', '.', $amount); |
|
4685 | + } |
|
4686 | + // To accept 2 notations for french users |
|
4493 | 4687 | $amount = str_replace(' ', '', $amount); // To avoid spaces |
4494 | 4688 | $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is . |
4495 | 4689 | $amount = str_replace($dec, '.', $amount); |
@@ -4548,8 +4742,9 @@ discard block |
||
4548 | 4742 | { |
4549 | 4743 | // global $db, Globals::$conf, $mysoc; |
4550 | 4744 | |
4551 | - if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) |
|
4552 | - $thirdparty_seller = $mysoc; |
|
4745 | + if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) { |
|
4746 | + $thirdparty_seller = $mysoc; |
|
4747 | + } |
|
4553 | 4748 | |
4554 | 4749 | DolUtils::dol_syslog("get_localtax tva=" . $vatrate . " local=" . $local . " thirdparty_buyer id=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '') . "/country_code=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '') . " thirdparty_seller id=" . $thirdparty_seller->id . "/country_code=" . $thirdparty_seller->country_code . " thirdparty_seller localtax1_assuj=" . $thirdparty_seller->localtax1_assuj . " thirdparty_seller localtax2_assuj=" . $thirdparty_seller->localtax2_assuj); |
4555 | 4750 | |
@@ -4567,37 +4762,43 @@ discard block |
||
4567 | 4762 | // Some test to guess with no need to make database access |
4568 | 4763 | if ($mysoc->country_code == 'ES') { // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax |
4569 | 4764 | if ($local == 1) { |
4570 | - if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") |
|
4571 | - return 0; |
|
4765 | + if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") { |
|
4766 | + return 0; |
|
4767 | + } |
|
4572 | 4768 | if ($thirdparty_seller->id == $mysoc->id) { |
4573 | - if (!$thirdparty_buyer->localtax1_assuj) |
|
4574 | - return 0; |
|
4575 | - } |
|
4576 | - else { |
|
4577 | - if (!$thirdparty_seller->localtax1_assuj) |
|
4578 | - return 0; |
|
4769 | + if (!$thirdparty_buyer->localtax1_assuj) { |
|
4770 | + return 0; |
|
4771 | + } |
|
4772 | + } else { |
|
4773 | + if (!$thirdparty_seller->localtax1_assuj) { |
|
4774 | + return 0; |
|
4775 | + } |
|
4579 | 4776 | } |
4580 | 4777 | } |
4581 | 4778 | |
4582 | 4779 | if ($local == 2) { |
4583 | 4780 | //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0; |
4584 | - if (!$mysoc->localtax2_assuj) |
|
4585 | - return 0; // If main vat is 0, IRPF may be different than 0. |
|
4781 | + if (!$mysoc->localtax2_assuj) { |
|
4782 | + return 0; |
|
4783 | + } |
|
4784 | + // If main vat is 0, IRPF may be different than 0. |
|
4586 | 4785 | if ($thirdparty_seller->id == $mysoc->id) { |
4587 | - if (!$thirdparty_buyer->localtax2_assuj) |
|
4588 | - return 0; |
|
4589 | - } |
|
4590 | - else { |
|
4591 | - if (!$thirdparty_seller->localtax2_assuj) |
|
4592 | - return 0; |
|
4786 | + if (!$thirdparty_buyer->localtax2_assuj) { |
|
4787 | + return 0; |
|
4788 | + } |
|
4789 | + } else { |
|
4790 | + if (!$thirdparty_seller->localtax2_assuj) { |
|
4791 | + return 0; |
|
4792 | + } |
|
4593 | 4793 | } |
4594 | 4794 | } |
4595 | - } |
|
4596 | - else { |
|
4597 | - if ($local == 1 && !$thirdparty_seller->localtax1_assuj) |
|
4598 | - return 0; |
|
4599 | - if ($local == 2 && !$thirdparty_seller->localtax2_assuj) |
|
4600 | - return 0; |
|
4795 | + } else { |
|
4796 | + if ($local == 1 && !$thirdparty_seller->localtax1_assuj) { |
|
4797 | + return 0; |
|
4798 | + } |
|
4799 | + if ($local == 2 && !$thirdparty_seller->localtax2_assuj) { |
|
4800 | + return 0; |
|
4801 | + } |
|
4601 | 4802 | } |
4602 | 4803 | |
4603 | 4804 | // For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on. |
@@ -4639,19 +4840,23 @@ discard block |
||
4639 | 4840 | $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c"; |
4640 | 4841 | $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $thirdparty_seller->country_code . "'"; |
4641 | 4842 | $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1"; |
4642 | - if ($vatratecode) |
|
4643 | - $sql .= " AND t.code ='" . $vatratecode . "'"; // If we have the code, we use it in priority |
|
4644 | - else |
|
4645 | - $sql .= " AND t.recuperableonly ='" . $vatnpr . "'"; |
|
4843 | + if ($vatratecode) { |
|
4844 | + $sql .= " AND t.code ='" . $vatratecode . "'"; |
|
4845 | + } |
|
4846 | + // If we have the code, we use it in priority |
|
4847 | + else { |
|
4848 | + $sql .= " AND t.recuperableonly ='" . $vatnpr . "'"; |
|
4849 | + } |
|
4646 | 4850 | DolUtils::dol_syslog("get_localtax", LOG_DEBUG); |
4647 | 4851 | $resql = $db->query($sql); |
4648 | 4852 | |
4649 | 4853 | if ($resql) { |
4650 | 4854 | $obj = $db->fetch_object($resql); |
4651 | - if ($local == 1) |
|
4652 | - return $obj->localtax1; |
|
4653 | - elseif ($local == 2) |
|
4654 | - return $obj->localtax2; |
|
4855 | + if ($local == 1) { |
|
4856 | + return $obj->localtax1; |
|
4857 | + } elseif ($local == 2) { |
|
4858 | + return $obj->localtax2; |
|
4859 | + } |
|
4655 | 4860 | } |
4656 | 4861 | |
4657 | 4862 | return 0; |
@@ -4697,10 +4902,11 @@ discard block |
||
4697 | 4902 | $resql = $db->query($sql); |
4698 | 4903 | if ($resql) { |
4699 | 4904 | $obj = $db->fetch_object($resql); |
4700 | - if ($local == 1) |
|
4701 | - return $obj->localtax1; |
|
4702 | - elseif ($local == 2) |
|
4703 | - return $obj->localtax2; |
|
4905 | + if ($local == 1) { |
|
4906 | + return $obj->localtax1; |
|
4907 | + } elseif ($local == 2) { |
|
4908 | + return $obj->localtax2; |
|
4909 | + } |
|
4704 | 4910 | } |
4705 | 4911 | |
4706 | 4912 | return 0; |
@@ -4726,9 +4932,9 @@ discard block |
||
4726 | 4932 | // Search local taxes |
4727 | 4933 | $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy"; |
4728 | 4934 | $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t"; |
4729 | - if ($firstparamisid) |
|
4730 | - $sql .= " WHERE t.rowid = " . (int) $vatrate; |
|
4731 | - else { |
|
4935 | + if ($firstparamisid) { |
|
4936 | + $sql .= " WHERE t.rowid = " . (int) $vatrate; |
|
4937 | + } else { |
|
4732 | 4938 | $vatratecleaned = $vatrate; |
4733 | 4939 | $vatratecode = ''; |
4734 | 4940 | if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) { // If vat is "xx (yy)" |
@@ -4741,19 +4947,22 @@ discard block |
||
4741 | 4947 | else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */ |
4742 | 4948 | $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'"; |
4743 | 4949 | $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1"; |
4744 | - if ($vatratecode) |
|
4745 | - $sql .= " AND t.code = '" . $vatratecode . "'"; |
|
4950 | + if ($vatratecode) { |
|
4951 | + $sql .= " AND t.code = '" . $vatratecode . "'"; |
|
4952 | + } |
|
4746 | 4953 | } |
4747 | 4954 | |
4748 | 4955 | $resql = $db->query($sql); |
4749 | 4956 | if ($resql) { |
4750 | 4957 | $obj = $db->fetch_object($resql); |
4751 | - if ($obj) |
|
4752 | - return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy); |
|
4753 | - else |
|
4754 | - return array(); |
|
4755 | - } else |
|
4756 | - dol_print_error($db); |
|
4958 | + if ($obj) { |
|
4959 | + return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy); |
|
4960 | + } else { |
|
4961 | + return array(); |
|
4962 | + } |
|
4963 | + } else { |
|
4964 | + dol_print_error($db); |
|
4965 | + } |
|
4757 | 4966 | |
4758 | 4967 | return array(); |
4759 | 4968 | } |
@@ -4783,9 +4992,9 @@ discard block |
||
4783 | 4992 | // Search local taxes |
4784 | 4993 | $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy"; |
4785 | 4994 | $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t"; |
4786 | - if ($firstparamisid) |
|
4787 | - $sql .= " WHERE t.rowid = " . (int) $vatrate; |
|
4788 | - else { |
|
4995 | + if ($firstparamisid) { |
|
4996 | + $sql .= " WHERE t.rowid = " . (int) $vatrate; |
|
4997 | + } else { |
|
4789 | 4998 | $vatratecleaned = $vatrate; |
4790 | 4999 | $vatratecode = ''; |
4791 | 5000 | if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) { // If vat is "x.x (yy)" |
@@ -4794,13 +5003,17 @@ discard block |
||
4794 | 5003 | } |
4795 | 5004 | |
4796 | 5005 | $sql .= ", " . MAIN_DB_PREFIX . "c_country as c"; |
4797 | - if ($mysoc->country_code == 'ES') |
|
4798 | - $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'"; // local tax in spain use the buyer country ?? |
|
4799 | - else |
|
4800 | - $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'"; |
|
5006 | + if ($mysoc->country_code == 'ES') { |
|
5007 | + $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'"; |
|
5008 | + } |
|
5009 | + // local tax in spain use the buyer country ?? |
|
5010 | + else { |
|
5011 | + $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'"; |
|
5012 | + } |
|
4801 | 5013 | $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1"; |
4802 | - if ($vatratecode) |
|
4803 | - $sql .= " AND t.code = '" . $vatratecode . "'"; |
|
5014 | + if ($vatratecode) { |
|
5015 | + $sql .= " AND t.code = '" . $vatratecode . "'"; |
|
5016 | + } |
|
4804 | 5017 | } |
4805 | 5018 | |
4806 | 5019 | $resql = $db->query($sql); |
@@ -4846,17 +5059,17 @@ discard block |
||
4846 | 5059 | if ($idprodfournprice > 0) { // We want vat for product for a "supplier" object |
4847 | 5060 | $product->get_buyprice($idprodfournprice, 0, 0, 0); |
4848 | 5061 | $ret = $product->vatrate_supplier; |
4849 | - if ($product->default_vat_code) |
|
4850 | - $ret .= ' (' . $product->default_vat_code . ')'; |
|
4851 | - } |
|
4852 | - else { |
|
5062 | + if ($product->default_vat_code) { |
|
5063 | + $ret .= ' (' . $product->default_vat_code . ')'; |
|
5064 | + } |
|
5065 | + } else { |
|
4853 | 5066 | $ret = $product->tva_tx; // Default vat of product we defined |
4854 | - if ($product->default_vat_code) |
|
4855 | - $ret .= ' (' . $product->default_vat_code . ')'; |
|
5067 | + if ($product->default_vat_code) { |
|
5068 | + $ret .= ' (' . $product->default_vat_code . ')'; |
|
5069 | + } |
|
4856 | 5070 | } |
4857 | 5071 | $found = 1; |
4858 | - } |
|
4859 | - else { |
|
5072 | + } else { |
|
4860 | 5073 | // TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet. |
4861 | 5074 | // May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on |
4862 | 5075 | } |
@@ -4876,14 +5089,18 @@ discard block |
||
4876 | 5089 | $obj = $db->fetch_object($resql); |
4877 | 5090 | if ($obj) { |
4878 | 5091 | $ret = $obj->vat_rate; |
4879 | - if ($obj->default_vat_code) |
|
4880 | - $ret .= ' (' . $obj->default_vat_code . ')'; |
|
5092 | + if ($obj->default_vat_code) { |
|
5093 | + $ret .= ' (' . $obj->default_vat_code . ')'; |
|
5094 | + } |
|
4881 | 5095 | } |
4882 | 5096 | $db->free($sql); |
4883 | - } else |
|
4884 | - dol_print_error($db); |
|
4885 | - } else |
|
4886 | - $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails |
|
5097 | + } else { |
|
5098 | + dol_print_error($db); |
|
5099 | + } |
|
5100 | + } else { |
|
5101 | + $ret = Globals::$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; |
|
5102 | + } |
|
5103 | + // Forced value if autodetect fails |
|
4887 | 5104 | } |
4888 | 5105 | |
4889 | 5106 | DolUtils::dol_syslog("get_product_vat_for_country: ret=" . $ret); |
@@ -4938,13 +5155,15 @@ discard block |
||
4938 | 5155 | if ($resql) { |
4939 | 5156 | $obj = $db->fetch_object($resql); |
4940 | 5157 | if ($obj) { |
4941 | - if ($local == 1) |
|
4942 | - $ret = $obj->localtax1; |
|
4943 | - elseif ($local == 2) |
|
4944 | - $ret = $obj->localtax2; |
|
5158 | + if ($local == 1) { |
|
5159 | + $ret = $obj->localtax1; |
|
5160 | + } elseif ($local == 2) { |
|
5161 | + $ret = $obj->localtax2; |
|
5162 | + } |
|
4945 | 5163 | } |
4946 | - } else |
|
4947 | - dol_print_error($db); |
|
5164 | + } else { |
|
5165 | + dol_print_error($db); |
|
5166 | + } |
|
4948 | 5167 | } |
4949 | 5168 | |
4950 | 5169 | DolUtils::dol_syslog("get_product_localtax_for_country: ret=" . $ret); |
@@ -5047,15 +5266,16 @@ discard block |
||
5047 | 5266 | // global $db; |
5048 | 5267 | |
5049 | 5268 | if ($idprodfournprice > 0) { |
5050 | - if (!class_exists('ProductFournisseur')) |
|
5051 | - require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php'; |
|
5269 | + if (!class_exists('ProductFournisseur')) { |
|
5270 | + require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php'; |
|
5271 | + } |
|
5052 | 5272 | $prodprice = new ProductFournisseur($db); |
5053 | 5273 | $prodprice->fetch_product_fournisseur_price($idprodfournprice); |
5054 | 5274 | return $prodprice->fourn_tva_npr; |
5055 | - } |
|
5056 | - elseif ($idprod > 0) { |
|
5057 | - if (!class_exists('Product')) |
|
5058 | - require_once DOL_BASE_PATH . 'product/class/product.class.php'; |
|
5275 | + } elseif ($idprod > 0) { |
|
5276 | + if (!class_exists('Product')) { |
|
5277 | + require_once DOL_BASE_PATH . 'product/class/product.class.php'; |
|
5278 | + } |
|
5059 | 5279 | $prod = new Product($db); |
5060 | 5280 | $prod->fetch($idprod); |
5061 | 5281 | return $prod->tva_npr; |
@@ -5081,30 +5301,35 @@ discard block |
||
5081 | 5301 | { |
5082 | 5302 | // global $mysoc; |
5083 | 5303 | |
5084 | - if (!is_object($thirdparty_seller)) |
|
5085 | - return -1; |
|
5086 | - if (!is_object($thirdparty_buyer)) |
|
5087 | - return -1; |
|
5304 | + if (!is_object($thirdparty_seller)) { |
|
5305 | + return -1; |
|
5306 | + } |
|
5307 | + if (!is_object($thirdparty_buyer)) { |
|
5308 | + return -1; |
|
5309 | + } |
|
5088 | 5310 | |
5089 | 5311 | if ($local == 1) { // Localtax 1 |
5090 | 5312 | if ($mysoc->country_code == 'ES') { |
5091 | - if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) |
|
5092 | - return 0; |
|
5093 | - } |
|
5094 | - else { |
|
5313 | + if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) { |
|
5314 | + return 0; |
|
5315 | + } |
|
5316 | + } else { |
|
5095 | 5317 | // Si vendeur non assujeti a Localtax1, localtax1 par default=0 |
5096 | - if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) |
|
5097 | - return 0; |
|
5098 | - if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') |
|
5099 | - return 0; |
|
5100 | - } |
|
5101 | - } |
|
5102 | - elseif ($local == 2) { //I Localtax 2 |
|
5318 | + if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) { |
|
5319 | + return 0; |
|
5320 | + } |
|
5321 | + if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') { |
|
5322 | + return 0; |
|
5323 | + } |
|
5324 | + } |
|
5325 | + } elseif ($local == 2) { //I Localtax 2 |
|
5103 | 5326 | // Si vendeur non assujeti a Localtax2, localtax2 par default=0 |
5104 | - if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) |
|
5105 | - return 0; |
|
5106 | - if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') |
|
5107 | - return 0; |
|
5327 | + if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) { |
|
5328 | + return 0; |
|
5329 | + } |
|
5330 | + if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') { |
|
5331 | + return 0; |
|
5332 | + } |
|
5108 | 5333 | } |
5109 | 5334 | |
5110 | 5335 | if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code) { |
@@ -5129,31 +5354,38 @@ discard block |
||
5129 | 5354 | $classname = ''; |
5130 | 5355 | if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') { // A mettre avant test sur no a cause du == 0 |
5131 | 5356 | $result = Globals::$langs->trans('yes'); |
5132 | - if ($case == 1 || $case == 3) |
|
5133 | - $result = Globals::$langs->trans("Yes"); |
|
5134 | - if ($case == 2) |
|
5135 | - $result = '<input type="checkbox" value="1" checked disabled>'; |
|
5136 | - if ($case == 3) |
|
5137 | - $result = '<input type="checkbox" value="1" checked disabled> ' . $result; |
|
5357 | + if ($case == 1 || $case == 3) { |
|
5358 | + $result = Globals::$langs->trans("Yes"); |
|
5359 | + } |
|
5360 | + if ($case == 2) { |
|
5361 | + $result = '<input type="checkbox" value="1" checked disabled>'; |
|
5362 | + } |
|
5363 | + if ($case == 3) { |
|
5364 | + $result = '<input type="checkbox" value="1" checked disabled> ' . $result; |
|
5365 | + } |
|
5138 | 5366 | |
5139 | 5367 | $classname = 'ok'; |
5140 | - } |
|
5141 | - elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') { |
|
5368 | + } elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') { |
|
5142 | 5369 | $result = Globals::$langs->trans("no"); |
5143 | - if ($case == 1 || $case == 3) |
|
5144 | - $result = Globals::$langs->trans("No"); |
|
5145 | - if ($case == 2) |
|
5146 | - $result = '<input type="checkbox" value="0" disabled>'; |
|
5147 | - if ($case == 3) |
|
5148 | - $result = '<input type="checkbox" value="0" disabled> ' . $result; |
|
5149 | - |
|
5150 | - if ($color == 2) |
|
5151 | - $classname = 'ok'; |
|
5152 | - else |
|
5153 | - $classname = 'error'; |
|
5154 | - } |
|
5155 | - if ($color) |
|
5156 | - return '<font class="' . $classname . '">' . $result . '</font>'; |
|
5370 | + if ($case == 1 || $case == 3) { |
|
5371 | + $result = Globals::$langs->trans("No"); |
|
5372 | + } |
|
5373 | + if ($case == 2) { |
|
5374 | + $result = '<input type="checkbox" value="0" disabled>'; |
|
5375 | + } |
|
5376 | + if ($case == 3) { |
|
5377 | + $result = '<input type="checkbox" value="0" disabled> ' . $result; |
|
5378 | + } |
|
5379 | + |
|
5380 | + if ($color == 2) { |
|
5381 | + $classname = 'ok'; |
|
5382 | + } else { |
|
5383 | + $classname = 'error'; |
|
5384 | + } |
|
5385 | + } |
|
5386 | + if ($color) { |
|
5387 | + return '<font class="' . $classname . '">' . $result . '</font>'; |
|
5388 | + } |
|
5157 | 5389 | return $result; |
5158 | 5390 | } |
5159 | 5391 | |
@@ -5179,23 +5411,27 @@ discard block |
||
5179 | 5411 | $path = ''; |
5180 | 5412 | |
5181 | 5413 | $arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment'); |
5182 | - if (!empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) |
|
5183 | - $arrayforoldpath[] = 'product'; |
|
5414 | + if (!empty(Globals::$conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) { |
|
5415 | + $arrayforoldpath[] = 'product'; |
|
5416 | + } |
|
5184 | 5417 | if (!empty($level) && in_array($modulepart, $arrayforoldpath)) { |
5185 | 5418 | // This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided. |
5186 | - if (empty($alpha)) |
|
5187 | - $num = preg_replace('/([^0-9])/i', '', $num); |
|
5188 | - else |
|
5189 | - $num = preg_replace('/^.*\-/i', '', $num); |
|
5419 | + if (empty($alpha)) { |
|
5420 | + $num = preg_replace('/([^0-9])/i', '', $num); |
|
5421 | + } else { |
|
5422 | + $num = preg_replace('/^.*\-/i', '', $num); |
|
5423 | + } |
|
5190 | 5424 | $num = substr("000" . $num, -$level); |
5191 | - if ($level == 1) |
|
5192 | - $path = substr($num, 0, 1); |
|
5193 | - if ($level == 2) |
|
5194 | - $path = substr($num, 1, 1) . '/' . substr($num, 0, 1); |
|
5195 | - if ($level == 3) |
|
5196 | - $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1); |
|
5197 | - } |
|
5198 | - else { |
|
5425 | + if ($level == 1) { |
|
5426 | + $path = substr($num, 0, 1); |
|
5427 | + } |
|
5428 | + if ($level == 2) { |
|
5429 | + $path = substr($num, 1, 1) . '/' . substr($num, 0, 1); |
|
5430 | + } |
|
5431 | + if ($level == 3) { |
|
5432 | + $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1); |
|
5433 | + } |
|
5434 | + } else { |
|
5199 | 5435 | // TODO |
5200 | 5436 | // We will enhance here a common way of forging path for document storage |
5201 | 5437 | // Here, object->id, object->ref and modulepart are required. |
@@ -5206,8 +5442,9 @@ discard block |
||
5206 | 5442 | } |
5207 | 5443 | } |
5208 | 5444 | |
5209 | - if (empty($withoutslash) && !empty($path)) |
|
5210 | - $path .= '/'; |
|
5445 | + if (empty($withoutslash) && !empty($path)) { |
|
5446 | + $path .= '/'; |
|
5447 | + } |
|
5211 | 5448 | |
5212 | 5449 | return $path; |
5213 | 5450 | } |
@@ -5227,8 +5464,9 @@ discard block |
||
5227 | 5464 | DolUtils::dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO); |
5228 | 5465 | |
5229 | 5466 | $dir_osencoded = dol_osencode($dir); |
5230 | - if (@is_dir($dir_osencoded)) |
|
5231 | - return 0; |
|
5467 | + if (@is_dir($dir_osencoded)) { |
|
5468 | + return 0; |
|
5469 | + } |
|
5232 | 5470 | |
5233 | 5471 | $nberr = 0; |
5234 | 5472 | $nbcreated = 0; |
@@ -5243,12 +5481,15 @@ discard block |
||
5243 | 5481 | $cdir = explode("/", $dir); |
5244 | 5482 | $num = count($cdir); |
5245 | 5483 | for ($i = 0; $i < $num; $i++) { |
5246 | - if ($i > 0) |
|
5247 | - $ccdir .= '/' . $cdir[$i]; |
|
5248 | - else |
|
5249 | - $ccdir .= $cdir[$i]; |
|
5250 | - if (preg_match("/^.:$/", $ccdir, $regs)) |
|
5251 | - continue; // Si chemin Windows incomplet, on poursuit par rep suivant |
|
5484 | + if ($i > 0) { |
|
5485 | + $ccdir .= '/' . $cdir[$i]; |
|
5486 | + } else { |
|
5487 | + $ccdir .= $cdir[$i]; |
|
5488 | + } |
|
5489 | + if (preg_match("/^.:$/", $ccdir, $regs)) { |
|
5490 | + continue; |
|
5491 | + } |
|
5492 | + // Si chemin Windows incomplet, on poursuit par rep suivant |
|
5252 | 5493 | |
5253 | 5494 | |
5254 | 5495 | |
@@ -5350,8 +5591,9 @@ discard block |
||
5350 | 5591 | */ |
5351 | 5592 | static function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0) |
5352 | 5593 | { |
5353 | - if ($removelinefeed == 2) |
|
5354 | - $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean); |
|
5594 | + if ($removelinefeed == 2) { |
|
5595 | + $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean); |
|
5596 | + } |
|
5355 | 5597 | $temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean); |
5356 | 5598 | |
5357 | 5599 | if ($strip_tags) { |
@@ -5368,8 +5610,9 @@ discard block |
||
5368 | 5610 | $temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto); |
5369 | 5611 | |
5370 | 5612 | // Supprime aussi les retours |
5371 | - if ($removelinefeed == 1) |
|
5372 | - $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp); |
|
5613 | + if ($removelinefeed == 1) { |
|
5614 | + $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp); |
|
5615 | + } |
|
5373 | 5616 | |
5374 | 5617 | // et les espaces doubles |
5375 | 5618 | while (strpos($temp, " ")) { |
@@ -5455,18 +5698,21 @@ discard block |
||
5455 | 5698 | if ($charset == 'UTF-8') { |
5456 | 5699 | $pattern = '/(<br[^>]*>)/Uu'; |
5457 | 5700 | } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support |
5458 | - else |
|
5459 | - $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag. |
|
5701 | + else { |
|
5702 | + $pattern = '/(<br[^>]*>)/U'; |
|
5703 | + } |
|
5704 | + // /U is to have UNGREEDY regex to limit to one html tag. |
|
5460 | 5705 | $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); |
5461 | 5706 | |
5462 | 5707 | $firstline = ''; |
5463 | 5708 | $i = 0; |
5464 | 5709 | $nba = count($a); // 2x nb of lines in $a because $a contains also a line for each new line separator |
5465 | 5710 | while (($i < $nba) && ($i < ($nboflines * 2))) { |
5466 | - if ($i % 2 == 0) |
|
5467 | - $firstline .= $a[$i]; |
|
5468 | - elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) |
|
5469 | - $firstline .= ($ishtml ? "<br>\n" : "\n"); |
|
5711 | + if ($i % 2 == 0) { |
|
5712 | + $firstline .= $a[$i]; |
|
5713 | + } elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) { |
|
5714 | + $firstline .= ($ishtml ? "<br>\n" : "\n"); |
|
5715 | + } |
|
5470 | 5716 | $i++; |
5471 | 5717 | } |
5472 | 5718 | unset($a); |
@@ -5515,15 +5761,18 @@ discard block |
||
5515 | 5761 | $newstring = $stringtoencode; |
5516 | 5762 | if (DolUtils::dol_textishtml($stringtoencode)) { // Check if text is already HTML or not |
5517 | 5763 | $newstring = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $newstring); // Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF. |
5518 | - if ($removelasteolbr) |
|
5519 | - $newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one) |
|
5764 | + if ($removelasteolbr) { |
|
5765 | + $newstring = preg_replace('/<br>$/i', '', $newstring); |
|
5766 | + } |
|
5767 | + // Remove last <br> (remove only last one) |
|
5520 | 5768 | $newstring = strtr($newstring, array('&' => '__and__', '<' => '__lt__', '>' => '__gt__', '"' => '__dquot__')); |
5521 | 5769 | $newstring = DolUtils::dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding |
5522 | 5770 | $newstring = strtr($newstring, array('__and__' => '&', '__lt__' => '<', '__gt__' => '>', '__dquot__' => '"')); |
5523 | - } |
|
5524 | - else { |
|
5525 | - if ($removelasteolbr) |
|
5526 | - $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several) |
|
5771 | + } else { |
|
5772 | + if ($removelasteolbr) { |
|
5773 | + $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); |
|
5774 | + } |
|
5775 | + // Remove last \n (may remove several) |
|
5527 | 5776 | $newstring = dol_nl2br(DolUtils::dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode); |
5528 | 5777 | } |
5529 | 5778 | // Other substitutions that htmlentities does not do |
@@ -5625,8 +5874,9 @@ discard block |
||
5625 | 5874 | */ |
5626 | 5875 | static function dol_nboflines($s, $maxchar = 0) |
5627 | 5876 | { |
5628 | - if ($s == '') |
|
5629 | - return 0; |
|
5877 | + if ($s == '') { |
|
5878 | + return 0; |
|
5879 | + } |
|
5630 | 5880 | $arraystring = explode("\n", $s); |
5631 | 5881 | $nb = count($arraystring); |
5632 | 5882 | |
@@ -5645,15 +5895,18 @@ discard block |
||
5645 | 5895 | static function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8') |
5646 | 5896 | { |
5647 | 5897 | $repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " "); |
5648 | - if (DolUtils::dol_textishtml($text)) |
|
5649 | - $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " "); |
|
5898 | + if (DolUtils::dol_textishtml($text)) { |
|
5899 | + $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " "); |
|
5900 | + } |
|
5650 | 5901 | |
5651 | 5902 | $text = strtr($text, $repTable); |
5652 | 5903 | if ($charset == 'UTF-8') { |
5653 | 5904 | $pattern = '/(<br[^>]*>)/Uu'; |
5654 | 5905 | } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support |
5655 | - else |
|
5656 | - $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag. |
|
5906 | + else { |
|
5907 | + $pattern = '/(<br[^>]*>)/U'; |
|
5908 | + } |
|
5909 | + // /U is to have UNGREEDY regex to limit to one html tag. |
|
5657 | 5910 | $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); |
5658 | 5911 | |
5659 | 5912 | $nblines = (int) floor((count($a) + 1) / 2); |
@@ -5700,39 +5953,47 @@ discard block |
||
5700 | 5953 | static function dol_textishtml($msg, $option = 0) |
5701 | 5954 | { |
5702 | 5955 | if ($option == 1) { |
5703 | - if (preg_match('/<html/i', $msg)) |
|
5704 | - return true; |
|
5705 | - elseif (preg_match('/<body/i', $msg)) |
|
5706 | - return true; |
|
5707 | - elseif (preg_match('/<br/i', $msg)) |
|
5708 | - return true; |
|
5956 | + if (preg_match('/<html/i', $msg)) { |
|
5957 | + return true; |
|
5958 | + } elseif (preg_match('/<body/i', $msg)) { |
|
5959 | + return true; |
|
5960 | + } elseif (preg_match('/<br/i', $msg)) { |
|
5961 | + return true; |
|
5962 | + } |
|
5709 | 5963 | return false; |
5710 | - } |
|
5711 | - else { |
|
5712 | - if (preg_match('/<html/i', $msg)) |
|
5713 | - return true; |
|
5714 | - elseif (preg_match('/<body/i', $msg)) |
|
5715 | - return true; |
|
5716 | - elseif (preg_match('/<(b|em|i|u)>/i', $msg)) |
|
5717 | - return true; |
|
5718 | - elseif (preg_match('/<br\/>/i', $msg)) |
|
5719 | - return true; |
|
5720 | - elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) |
|
5721 | - return true; |
|
5722 | - elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) |
|
5723 | - return true; |
|
5724 | - elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) |
|
5725 | - return true; |
|
5726 | - elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) |
|
5727 | - return true; // must accept <img src="http://example.com/aaa.png" /> |
|
5728 | - elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) |
|
5729 | - return true; // must accept <a href="http://example.com/aaa.png" /> |
|
5730 | - elseif (preg_match('/<h[0-9]>/i', $msg)) |
|
5731 | - return true; |
|
5732 | - elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg)) |
|
5733 | - return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp) |
|
5734 | - elseif (preg_match('/&#[0-9]{2,3};/i', $msg)) |
|
5735 | - return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp) |
|
5964 | + } else { |
|
5965 | + if (preg_match('/<html/i', $msg)) { |
|
5966 | + return true; |
|
5967 | + } elseif (preg_match('/<body/i', $msg)) { |
|
5968 | + return true; |
|
5969 | + } elseif (preg_match('/<(b|em|i|u)>/i', $msg)) { |
|
5970 | + return true; |
|
5971 | + } elseif (preg_match('/<br\/>/i', $msg)) { |
|
5972 | + return true; |
|
5973 | + } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) { |
|
5974 | + return true; |
|
5975 | + } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) { |
|
5976 | + return true; |
|
5977 | + } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) { |
|
5978 | + return true; |
|
5979 | + } elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) { |
|
5980 | + return true; |
|
5981 | + } |
|
5982 | + // must accept <img src="http://example.com/aaa.png" /> |
|
5983 | + elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) { |
|
5984 | + return true; |
|
5985 | + } |
|
5986 | + // must accept <a href="http://example.com/aaa.png" /> |
|
5987 | + elseif (preg_match('/<h[0-9]>/i', $msg)) { |
|
5988 | + return true; |
|
5989 | + } elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg)) { |
|
5990 | + return true; |
|
5991 | + } |
|
5992 | + // Html entities names (http://www.w3schools.com/tags/ref_entities.asp) |
|
5993 | + elseif (preg_match('/&#[0-9]{2,3};/i', $msg)) { |
|
5994 | + return true; |
|
5995 | + } |
|
5996 | + // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp) |
|
5736 | 5997 | |
5737 | 5998 | return false; |
5738 | 5999 | } |
@@ -5884,12 +6145,14 @@ discard block |
||
5884 | 6145 | $birthday = DolUtils::dol_print_date($object->birth, 'day'); |
5885 | 6146 | |
5886 | 6147 | $substitutionarray['__MEMBER_ID__'] = $object->id; |
5887 | - if (method_exists($object, 'getCivilityLabel')) |
|
5888 | - $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel(); |
|
6148 | + if (method_exists($object, 'getCivilityLabel')) { |
|
6149 | + $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel(); |
|
6150 | + } |
|
5889 | 6151 | $substitutionarray['__MEMBER_FIRSTNAME__'] = $msgishtml ? DolUtils::dol_htmlentitiesbr($object->firstname) : $object->firstname; |
5890 | 6152 | $substitutionarray['__MEMBER_LASTNAME__'] = $msgishtml ? DolUtils::dol_htmlentitiesbr($object->lastname) : $object->lastname; |
5891 | - if (method_exists($object, 'getFullName')) |
|
5892 | - $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? DolUtils::dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs); |
|
6153 | + if (method_exists($object, 'getFullName')) { |
|
6154 | + $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? DolUtils::dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs); |
|
6155 | + } |
|
5893 | 6156 | $substitutionarray['__MEMBER_COMPANY__'] = $msgishtml ? DolUtils::dol_htmlentitiesbr($object->societe) : $object->societe; |
5894 | 6157 | $substitutionarray['__MEMBER_ADDRESS__'] = $msgishtml ? DolUtils::dol_htmlentitiesbr($object->address) : $object->address; |
5895 | 6158 | $substitutionarray['__MEMBER_ZIP__'] = $msgishtml ? DolUtils::dol_htmlentitiesbr($object->zip) : $object->zip; |
@@ -5937,10 +6200,12 @@ discard block |
||
5937 | 6200 | $dateplannedstart = ''; |
5938 | 6201 | $datenextexpiration = ''; |
5939 | 6202 | foreach ($object->lines as $line) { |
5940 | - if ($line->date_ouverture_prevue > $dateplannedstart) |
|
5941 | - $dateplannedstart = $line->date_ouverture_prevue; |
|
5942 | - if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) |
|
5943 | - $datenextexpiration = $line->date_fin_prevue; |
|
6203 | + if ($line->date_ouverture_prevue > $dateplannedstart) { |
|
6204 | + $dateplannedstart = $line->date_ouverture_prevue; |
|
6205 | + } |
|
6206 | + if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) { |
|
6207 | + $datenextexpiration = $line->date_fin_prevue; |
|
6208 | + } |
|
5944 | 6209 | } |
5945 | 6210 | $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = DolUtils::dol_print_date($dateplannedstart, 'dayrfc'); |
5946 | 6211 | $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = DolUtils::dol_print_date($dateplannedstart, 'standard'); |
@@ -5950,8 +6215,9 @@ discard block |
||
5950 | 6215 | |
5951 | 6216 | // Create dynamic tags for __EXTRAFIELD_FIELD__ |
5952 | 6217 | if ($object->table_element && $object->id > 0) { |
5953 | - if (!is_object($extrafields)) |
|
5954 | - $extrafields = new ExtraFields($db); |
|
6218 | + if (!is_object($extrafields)) { |
|
6219 | + $extrafields = new ExtraFields($db); |
|
6220 | + } |
|
5955 | 6221 | $extrafields->fetch_name_optionals_label($object->table_element, true); |
5956 | 6222 | |
5957 | 6223 | if ($object->fetch_optionals() > 0) { |
@@ -5972,12 +6238,15 @@ discard block |
||
5972 | 6238 | require_once DOL_BASE_PATH . '/core/lib/payments.lib.php'; |
5973 | 6239 | $outputlangs->loadLangs(array('paypal', 'other')); |
5974 | 6240 | $typeforonlinepayment = 'free'; |
5975 | - if (is_object($object) && $object->element == 'commande') |
|
5976 | - $typeforonlinepayment = 'order'; |
|
5977 | - if (is_object($object) && $object->element == 'facture') |
|
5978 | - $typeforonlinepayment = 'invoice'; |
|
5979 | - if (is_object($object) && $object->element == 'member') |
|
5980 | - $typeforonlinepayment = 'member'; |
|
6241 | + if (is_object($object) && $object->element == 'commande') { |
|
6242 | + $typeforonlinepayment = 'order'; |
|
6243 | + } |
|
6244 | + if (is_object($object) && $object->element == 'facture') { |
|
6245 | + $typeforonlinepayment = 'invoice'; |
|
6246 | + } |
|
6247 | + if (is_object($object) && $object->element == 'member') { |
|
6248 | + $typeforonlinepayment = 'member'; |
|
6249 | + } |
|
5981 | 6250 | $url = getOnlinePaymentUrl(0, $typeforonlinepayment, $substitutionarray['__REF__']); |
5982 | 6251 | $paymenturl = $url; |
5983 | 6252 | } |
@@ -5987,16 +6256,19 @@ discard block |
||
5987 | 6256 | |
5988 | 6257 | if (!empty(Globals::$conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') { |
5989 | 6258 | $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element); |
5990 | - } else |
|
5991 | - $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = ''; |
|
6259 | + } else { |
|
6260 | + $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = ''; |
|
6261 | + } |
|
5992 | 6262 | if (!empty(Globals::$conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande') { |
5993 | 6263 | $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element); |
5994 | - } else |
|
5995 | - $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = ''; |
|
6264 | + } else { |
|
6265 | + $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = ''; |
|
6266 | + } |
|
5996 | 6267 | if (!empty(Globals::$conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture') { |
5997 | 6268 | $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element); |
5998 | - } else |
|
5999 | - $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = ''; |
|
6269 | + } else { |
|
6270 | + $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = ''; |
|
6271 | + } |
|
6000 | 6272 | } |
6001 | 6273 | } |
6002 | 6274 | if (empty($exclude) || !in_array('objectamount', $exclude)) { |
@@ -6006,18 +6278,22 @@ discard block |
||
6006 | 6278 | $substitutionarray['__AMOUNT__'] = is_object($object) ? $object->total_ttc : ''; |
6007 | 6279 | $substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : ''; |
6008 | 6280 | $substitutionarray['__AMOUNT_VAT__'] = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : ''; |
6009 | - if ($onlykey != 2 || $mysoc->useLocalTax(1)) |
|
6010 | - $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : ''; |
|
6011 | - if ($onlykey != 2 || $mysoc->useLocalTax(2)) |
|
6012 | - $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : ''; |
|
6281 | + if ($onlykey != 2 || $mysoc->useLocalTax(1)) { |
|
6282 | + $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : ''; |
|
6283 | + } |
|
6284 | + if ($onlykey != 2 || $mysoc->useLocalTax(2)) { |
|
6285 | + $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : ''; |
|
6286 | + } |
|
6013 | 6287 | |
6014 | 6288 | $substitutionarray['__AMOUNT_FORMATED__'] = is_object($object) ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : ''; |
6015 | 6289 | $substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : ''; |
6016 | 6290 | $substitutionarray['__AMOUNT_VAT_FORMATED__'] = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : price($object->total_tva, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency)) : ''; |
6017 | - if ($onlykey != 2 || $mysoc->useLocalTax(1)) |
|
6018 | - $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : ''; |
|
6019 | - if ($onlykey != 2 || $mysoc->useLocalTax(2)) |
|
6020 | - $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : ''; |
|
6291 | + if ($onlykey != 2 || $mysoc->useLocalTax(1)) { |
|
6292 | + $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : ''; |
|
6293 | + } |
|
6294 | + if ($onlykey != 2 || $mysoc->useLocalTax(2)) { |
|
6295 | + $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, Globals::$conf->currency) : ''; |
|
6296 | + } |
|
6021 | 6297 | |
6022 | 6298 | // TODO Add keys for foreign multicurrency |
6023 | 6299 | // For backward compatibility |
@@ -6087,23 +6363,27 @@ discard block |
||
6087 | 6363 | { |
6088 | 6364 | // global Globals::$conf, Globals::$langs; |
6089 | 6365 | |
6090 | - if (!is_array($substitutionarray)) |
|
6091 | - return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions'; |
|
6366 | + if (!is_array($substitutionarray)) { |
|
6367 | + return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions'; |
|
6368 | + } |
|
6092 | 6369 | |
6093 | - if (empty($outputlangs)) |
|
6094 | - $outputlangs = Globals::$langs; |
|
6370 | + if (empty($outputlangs)) { |
|
6371 | + $outputlangs = Globals::$langs; |
|
6372 | + } |
|
6095 | 6373 | |
6096 | 6374 | // Make substitution for language keys |
6097 | 6375 | if (is_object($outputlangs)) { |
6098 | 6376 | while (preg_match('/__\(([^\)]+)\)__/', $text, $reg)) { |
6099 | 6377 | $msgishtml = 0; |
6100 | - if (DolUtils::dol_textishtml($text, 1)) |
|
6101 | - $msgishtml = 1; |
|
6378 | + if (DolUtils::dol_textishtml($text, 1)) { |
|
6379 | + $msgishtml = 1; |
|
6380 | + } |
|
6102 | 6381 | |
6103 | 6382 | // If key is __(TranslationKey|langfile)__, then force load of langfile.lang |
6104 | 6383 | $tmp = explode('|', $reg[1]); |
6105 | - if (!empty($tmp[1])) |
|
6106 | - $outputlangs->load($tmp[1]); |
|
6384 | + if (!empty($tmp[1])) { |
|
6385 | + $outputlangs->load($tmp[1]); |
|
6386 | + } |
|
6107 | 6387 | |
6108 | 6388 | $text = preg_replace('/__\(' . preg_quote($reg[1], '/') . '\)__/', $msgishtml ? DolUtils::dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text); |
6109 | 6389 | } |
@@ -6113,23 +6393,29 @@ discard block |
||
6113 | 6393 | // it is also converted. |
6114 | 6394 | while (preg_match('/__\[([^\]]+)\]__/', $text, $reg)) { |
6115 | 6395 | $msgishtml = 0; |
6116 | - if (DolUtils::dol_textishtml($text, 1)) |
|
6117 | - $msgishtml = 1; |
|
6396 | + if (DolUtils::dol_textishtml($text, 1)) { |
|
6397 | + $msgishtml = 1; |
|
6398 | + } |
|
6118 | 6399 | |
6119 | 6400 | $keyfound = $reg[1]; |
6120 | - if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) |
|
6121 | - $newval = '*****forbidden*****'; |
|
6122 | - else |
|
6123 | - $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound; |
|
6401 | + if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) { |
|
6402 | + $newval = '*****forbidden*****'; |
|
6403 | + } else { |
|
6404 | + $newval = empty(Globals::$conf->global->$keyfound) ? '' : Globals::$conf->global->$keyfound; |
|
6405 | + } |
|
6124 | 6406 | $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? DolUtils::dol_htmlentitiesbr($newval) : $newval, $text); |
6125 | 6407 | } |
6126 | 6408 | |
6127 | 6409 | // Make substitition for array $substitutionarray |
6128 | 6410 | foreach ($substitutionarray as $key => $value) { |
6129 | - if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) |
|
6130 | - $value = ''; // Protection |
|
6131 | - if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) |
|
6132 | - $value = ''; // Protection |
|
6411 | + if ($key == '__SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) { |
|
6412 | + $value = ''; |
|
6413 | + } |
|
6414 | + // Protection |
|
6415 | + if ($key == '__USER_SIGNATURE__' && (!empty(Globals::$conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) { |
|
6416 | + $value = ''; |
|
6417 | + } |
|
6418 | + // Protection |
|
6133 | 6419 | |
6134 | 6420 | $text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example |
6135 | 6421 | } |
@@ -6175,8 +6461,9 @@ discard block |
||
6175 | 6461 | $dir = dol_buildpath($reldir, 0); |
6176 | 6462 | |
6177 | 6463 | // Check if directory exists |
6178 | - if (!dol_is_dir($dir)) |
|
6179 | - continue; |
|
6464 | + if (!dol_is_dir($dir)) { |
|
6465 | + continue; |
|
6466 | + } |
|
6180 | 6467 | |
6181 | 6468 | $substitfiles = dol_dir_list($dir, 'files', 0, 'functions_'); |
6182 | 6469 | foreach ($substitfiles as $substitfile) { |
@@ -6188,8 +6475,9 @@ discard block |
||
6188 | 6475 | require_once $dir . $substitfile['name']; |
6189 | 6476 | // Call the user's function, and only if it is defined |
6190 | 6477 | $function_name = $module . "_" . $callfunc; |
6191 | - if (function_exists($function_name)) |
|
6192 | - $function_name($substitutionarray, $outputlangs, $object, $parameters); |
|
6478 | + if (function_exists($function_name)) { |
|
6479 | + $function_name($substitutionarray, $outputlangs, $object, $parameters); |
|
6480 | + } |
|
6193 | 6481 | } |
6194 | 6482 | } |
6195 | 6483 | } |
@@ -6225,8 +6513,9 @@ discard block |
||
6225 | 6513 | |
6226 | 6514 | $out = ''; |
6227 | 6515 | |
6228 | - if (!is_object($outputlangs)) |
|
6229 | - $outputlangs = Globals::$langs; |
|
6516 | + if (!is_object($outputlangs)) { |
|
6517 | + $outputlangs = Globals::$langs; |
|
6518 | + } |
|
6230 | 6519 | |
6231 | 6520 | if ($date_start && $date_end) { |
6232 | 6521 | $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', DolUtils::dol_print_date($date_start, $format, false, $outputlangs), DolUtils::dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : ''); |
@@ -6255,20 +6544,22 @@ discard block |
||
6255 | 6544 | |
6256 | 6545 | $ret = ''; |
6257 | 6546 | // If order not defined, we use the setup |
6258 | - if ($nameorder < 0) |
|
6259 | - $nameorder = (empty(Globals::$conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0); |
|
6547 | + if ($nameorder < 0) { |
|
6548 | + $nameorder = (empty(Globals::$conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0); |
|
6549 | + } |
|
6260 | 6550 | if ($nameorder && ((string) $nameorder != '2')) { |
6261 | 6551 | $ret .= $firstname; |
6262 | - if ($firstname && $lastname) |
|
6263 | - $ret .= ' '; |
|
6552 | + if ($firstname && $lastname) { |
|
6553 | + $ret .= ' '; |
|
6554 | + } |
|
6264 | 6555 | $ret .= $lastname; |
6265 | - } |
|
6266 | - else if ($nameorder == 2) { |
|
6556 | + } else if ($nameorder == 2) { |
|
6267 | 6557 | $ret .= $firstname; |
6268 | 6558 | } else { |
6269 | 6559 | $ret .= $lastname; |
6270 | - if ($firstname && $lastname) |
|
6271 | - $ret .= ' '; |
|
6560 | + if ($firstname && $lastname) { |
|
6561 | + $ret .= ' '; |
|
6562 | + } |
|
6272 | 6563 | $ret .= $firstname; |
6273 | 6564 | } |
6274 | 6565 | return $ret; |
@@ -6288,13 +6579,14 @@ discard block |
||
6288 | 6579 | { |
6289 | 6580 | //DolUtils::dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING); This is not deprecated, it is used by setEventMessages function |
6290 | 6581 | if (!is_array($mesgs)) { // If mesgs is a string |
6291 | - if ($mesgs) |
|
6292 | - $_SESSION['dol_events'][$style][] = $mesgs; |
|
6293 | - } |
|
6294 | - else { // If mesgs is an array |
|
6582 | + if ($mesgs) { |
|
6583 | + $_SESSION['dol_events'][$style][] = $mesgs; |
|
6584 | + } |
|
6585 | + } else { // If mesgs is an array |
|
6295 | 6586 | foreach ($mesgs as $mesg) { |
6296 | - if ($mesg) |
|
6297 | - $_SESSION['dol_events'][$style][] = $mesg; |
|
6587 | + if ($mesg) { |
|
6588 | + $_SESSION['dol_events'][$style][] = $mesg; |
|
6589 | + } |
|
6298 | 6590 | } |
6299 | 6591 | } |
6300 | 6592 | } |
@@ -6314,13 +6606,16 @@ discard block |
||
6314 | 6606 | if (empty($mesg) && empty($mesgs)) { |
6315 | 6607 | DolUtils::dol_syslog("Try to add a message in stack with empty message", LOG_WARNING); |
6316 | 6608 | } else { |
6317 | - if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) |
|
6318 | - dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages'); |
|
6319 | - if (empty($mesgs)) |
|
6320 | - setEventMessage($mesg, $style); |
|
6321 | - else { |
|
6322 | - if (!empty($mesg) && !in_array($mesg, $mesgs)) |
|
6323 | - setEventMessage($mesg, $style); // Add message string if not already into array |
|
6609 | + if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) { |
|
6610 | + dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages'); |
|
6611 | + } |
|
6612 | + if (empty($mesgs)) { |
|
6613 | + setEventMessage($mesg, $style); |
|
6614 | + } else { |
|
6615 | + if (!empty($mesg) && !in_array($mesg, $mesgs)) { |
|
6616 | + setEventMessage($mesg, $style); |
|
6617 | + } |
|
6618 | + // Add message string if not already into array |
|
6324 | 6619 | setEventMessage($mesgs, $style); |
6325 | 6620 | } |
6326 | 6621 | } |
@@ -6339,22 +6634,25 @@ discard block |
||
6339 | 6634 | { |
6340 | 6635 | // Show mesgs |
6341 | 6636 | if (isset($_SESSION['dol_events']['mesgs'])) { |
6342 | - if (empty($disabledoutputofmessages)) |
|
6343 | - dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']); |
|
6637 | + if (empty($disabledoutputofmessages)) { |
|
6638 | + dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']); |
|
6639 | + } |
|
6344 | 6640 | unset($_SESSION['dol_events']['mesgs']); |
6345 | 6641 | } |
6346 | 6642 | |
6347 | 6643 | // Show errors |
6348 | 6644 | if (isset($_SESSION['dol_events']['errors'])) { |
6349 | - if (empty($disabledoutputofmessages)) |
|
6350 | - dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error'); |
|
6645 | + if (empty($disabledoutputofmessages)) { |
|
6646 | + dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error'); |
|
6647 | + } |
|
6351 | 6648 | unset($_SESSION['dol_events']['errors']); |
6352 | 6649 | } |
6353 | 6650 | |
6354 | 6651 | // Show warnings |
6355 | 6652 | if (isset($_SESSION['dol_events']['warnings'])) { |
6356 | - if (empty($disabledoutputofmessages)) |
|
6357 | - dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning'); |
|
6653 | + if (empty($disabledoutputofmessages)) { |
|
6654 | + dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning'); |
|
6655 | + } |
|
6358 | 6656 | unset($_SESSION['dol_events']['warnings']); |
6359 | 6657 | } |
6360 | 6658 | } |
@@ -6395,8 +6693,9 @@ discard block |
||
6395 | 6693 | foreach ($mesgarray as $message) { |
6396 | 6694 | $ret++; |
6397 | 6695 | $out .= Globals::$langs->trans($message); |
6398 | - if ($ret < count($mesgarray)) |
|
6399 | - $out .= "<br>\n"; |
|
6696 | + if ($ret < count($mesgarray)) { |
|
6697 | + $out .= "<br>\n"; |
|
6698 | + } |
|
6400 | 6699 | } |
6401 | 6700 | } |
6402 | 6701 | if ($mesgstring) { |
@@ -6462,8 +6761,9 @@ discard block |
||
6462 | 6761 | */ |
6463 | 6762 | static function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'ok', $keepembedded = 0) |
6464 | 6763 | { |
6465 | - if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) |
|
6466 | - return; |
|
6764 | + if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) { |
|
6765 | + return; |
|
6766 | + } |
|
6467 | 6767 | |
6468 | 6768 | $iserror = 0; |
6469 | 6769 | $iswarning = 0; |
@@ -6478,14 +6778,17 @@ discard block |
||
6478 | 6778 | break; |
6479 | 6779 | } |
6480 | 6780 | } |
6481 | - } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring)) |
|
6482 | - $iserror++; |
|
6483 | - else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) |
|
6484 | - $iswarning++; |
|
6485 | - if ($style == 'error') |
|
6486 | - $iserror++; |
|
6487 | - if ($style == 'warning') |
|
6488 | - $iswarning++; |
|
6781 | + } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring)) { |
|
6782 | + $iserror++; |
|
6783 | + } else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) { |
|
6784 | + $iswarning++; |
|
6785 | + } |
|
6786 | + if ($style == 'error') { |
|
6787 | + $iserror++; |
|
6788 | + } |
|
6789 | + if ($style == 'warning') { |
|
6790 | + $iswarning++; |
|
6791 | + } |
|
6489 | 6792 | |
6490 | 6793 | if ($iserror || $iswarning) { |
6491 | 6794 | // Remove div from texts |
@@ -6504,8 +6807,9 @@ discard block |
||
6504 | 6807 | $mesgarray = $newmesgarray; |
6505 | 6808 | } |
6506 | 6809 | print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded); |
6507 | - } else |
|
6508 | - print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded); |
|
6810 | + } else { |
|
6811 | + print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded); |
|
6812 | + } |
|
6509 | 6813 | } |
6510 | 6814 | |
6511 | 6815 | /** |
@@ -6546,15 +6850,17 @@ discard block |
||
6546 | 6850 | $sizearray = count($array); |
6547 | 6851 | if ($sizearray > 0) { |
6548 | 6852 | $temp = array(); |
6549 | - foreach (array_keys($array) as $key) |
|
6550 | - $temp[$key] = $array[$key][$index]; |
|
6853 | + foreach (array_keys($array) as $key) { |
|
6854 | + $temp[$key] = $array[$key][$index]; |
|
6855 | + } |
|
6551 | 6856 | |
6552 | - if (!$natsort) |
|
6553 | - ($order == 'asc') ? asort($temp) : arsort($temp); |
|
6554 | - else { |
|
6857 | + if (!$natsort) { |
|
6858 | + ($order == 'asc') ? asort($temp) : arsort($temp); |
|
6859 | + } else { |
|
6555 | 6860 | ($case_sensitive) ? natsort($temp) : natcasesort($temp); |
6556 | - if ($order != 'asc') |
|
6557 | - $temp = array_reverse($temp, true); |
|
6861 | + if ($order != 'asc') { |
|
6862 | + $temp = array_reverse($temp, true); |
|
6863 | + } |
|
6558 | 6864 | } |
6559 | 6865 | |
6560 | 6866 | $sorted = array(); |
@@ -6580,23 +6886,38 @@ discard block |
||
6580 | 6886 | // We must use here a binary strlen static function (so not DolUtils::dol_strlen) |
6581 | 6887 | $strLength = DolUtils::dol_strlen($str); |
6582 | 6888 | for ($i = 0; $i < $strLength; $i++) { |
6583 | - if (ord($str[$i]) < 0x80) |
|
6584 | - continue; // 0bbbbbbb |
|
6585 | - elseif ((ord($str[$i]) & 0xE0) == 0xC0) |
|
6586 | - $n = 1; // 110bbbbb |
|
6587 | - elseif ((ord($str[$i]) & 0xF0) == 0xE0) |
|
6588 | - $n = 2; // 1110bbbb |
|
6589 | - elseif ((ord($str[$i]) & 0xF8) == 0xF0) |
|
6590 | - $n = 3; // 11110bbb |
|
6591 | - elseif ((ord($str[$i]) & 0xFC) == 0xF8) |
|
6592 | - $n = 4; // 111110bb |
|
6593 | - elseif ((ord($str[$i]) & 0xFE) == 0xFC) |
|
6594 | - $n = 5; // 1111110b |
|
6595 | - else |
|
6596 | - return false; // Does not match any model |
|
6889 | + if (ord($str[$i]) < 0x80) { |
|
6890 | + continue; |
|
6891 | + } |
|
6892 | + // 0bbbbbbb |
|
6893 | + elseif ((ord($str[$i]) & 0xE0) == 0xC0) { |
|
6894 | + $n = 1; |
|
6895 | + } |
|
6896 | + // 110bbbbb |
|
6897 | + elseif ((ord($str[$i]) & 0xF0) == 0xE0) { |
|
6898 | + $n = 2; |
|
6899 | + } |
|
6900 | + // 1110bbbb |
|
6901 | + elseif ((ord($str[$i]) & 0xF8) == 0xF0) { |
|
6902 | + $n = 3; |
|
6903 | + } |
|
6904 | + // 11110bbb |
|
6905 | + elseif ((ord($str[$i]) & 0xFC) == 0xF8) { |
|
6906 | + $n = 4; |
|
6907 | + } |
|
6908 | + // 111110bb |
|
6909 | + elseif ((ord($str[$i]) & 0xFE) == 0xFC) { |
|
6910 | + $n = 5; |
|
6911 | + } |
|
6912 | + // 1111110b |
|
6913 | + else { |
|
6914 | + return false; |
|
6915 | + } |
|
6916 | + // Does not match any model |
|
6597 | 6917 | for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ? |
6598 | - if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) |
|
6599 | - return false; |
|
6918 | + if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) { |
|
6919 | + return false; |
|
6920 | + } |
|
6600 | 6921 | } |
6601 | 6922 | } |
6602 | 6923 | return true; |
@@ -6614,15 +6935,21 @@ discard block |
||
6614 | 6935 | // global Globals::$conf; |
6615 | 6936 | |
6616 | 6937 | $tmp = ini_get("unicode.filesystem_encoding"); // Disponible avec PHP 6.0 |
6617 | - if (empty($tmp) && !empty($_SERVER["WINDIR"])) |
|
6618 | - $tmp = 'iso-8859-1'; // By default for windows |
|
6619 | - if (empty($tmp)) |
|
6620 | - $tmp = 'utf-8'; // By default for other |
|
6621 | - if (!empty(Globals::$conf->global->MAIN_FILESYSTEM_ENCODING)) |
|
6622 | - $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING; |
|
6623 | - |
|
6624 | - if ($tmp == 'iso-8859-1') |
|
6625 | - return utf8_decode($str); |
|
6938 | + if (empty($tmp) && !empty($_SERVER["WINDIR"])) { |
|
6939 | + $tmp = 'iso-8859-1'; |
|
6940 | + } |
|
6941 | + // By default for windows |
|
6942 | + if (empty($tmp)) { |
|
6943 | + $tmp = 'utf-8'; |
|
6944 | + } |
|
6945 | + // By default for other |
|
6946 | + if (!empty(Globals::$conf->global->MAIN_FILESYSTEM_ENCODING)) { |
|
6947 | + $tmp = Globals::$conf->global->MAIN_FILESYSTEM_ENCODING; |
|
6948 | + } |
|
6949 | + |
|
6950 | + if ($tmp == 'iso-8859-1') { |
|
6951 | + return utf8_decode($str); |
|
6952 | + } |
|
6626 | 6953 | return $str; |
6627 | 6954 | } |
6628 | 6955 | |
@@ -6643,8 +6970,9 @@ discard block |
||
6643 | 6970 | { |
6644 | 6971 | // global $cache_codes; |
6645 | 6972 | // If key empty |
6646 | - if ($key == '') |
|
6647 | - return ''; |
|
6973 | + if ($key == '') { |
|
6974 | + return ''; |
|
6975 | + } |
|
6648 | 6976 | |
6649 | 6977 | // Check in cache |
6650 | 6978 | if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or '' |
@@ -6656,20 +6984,21 @@ discard block |
||
6656 | 6984 | $sql = "SELECT " . $fieldid . " as valuetoget"; |
6657 | 6985 | $sql .= " FROM " . MAIN_DB_PREFIX . $tablename; |
6658 | 6986 | $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($key) . "'"; |
6659 | - if (!empty($entityfilter)) |
|
6660 | - $sql .= " AND entity IN (" . getEntity($tablename) . ")"; |
|
6987 | + if (!empty($entityfilter)) { |
|
6988 | + $sql .= " AND entity IN (" . getEntity($tablename) . ")"; |
|
6989 | + } |
|
6661 | 6990 | |
6662 | 6991 | $resql = $db->query($sql); |
6663 | 6992 | if ($resql) { |
6664 | 6993 | $obj = $db->fetch_object($resql); |
6665 | - if ($obj) |
|
6666 | - $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget; |
|
6667 | - else |
|
6668 | - $cache_codes[$tablename][$key][$fieldid] = ''; |
|
6994 | + if ($obj) { |
|
6995 | + $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget; |
|
6996 | + } else { |
|
6997 | + $cache_codes[$tablename][$key][$fieldid] = ''; |
|
6998 | + } |
|
6669 | 6999 | $db->free($resql); |
6670 | 7000 | return $cache_codes[$tablename][$key][$fieldid]; |
6671 | - } |
|
6672 | - else { |
|
7001 | + } else { |
|
6673 | 7002 | return -1; |
6674 | 7003 | } |
6675 | 7004 | } |
@@ -6715,16 +7044,17 @@ discard block |
||
6715 | 7044 | // global $soc; // For backward compatibility |
6716 | 7045 | //print $s."<br>\n"; |
6717 | 7046 | if ($returnvalue) { |
6718 | - if ($hideerrors) |
|
6719 | - return @eval('return ' . $s . ';'); |
|
6720 | - else |
|
6721 | - return eval('return ' . $s . ';'); |
|
6722 | - } |
|
6723 | - else { |
|
6724 | - if ($hideerrors) |
|
6725 | - @eval($s); |
|
6726 | - else |
|
6727 | - eval($s); |
|
7047 | + if ($hideerrors) { |
|
7048 | + return @eval('return ' . $s . ';'); |
|
7049 | + } else { |
|
7050 | + return eval('return ' . $s . ';'); |
|
7051 | + } |
|
7052 | + } else { |
|
7053 | + if ($hideerrors) { |
|
7054 | + @eval($s); |
|
7055 | + } else { |
|
7056 | + eval($s); |
|
7057 | + } |
|
6728 | 7058 | } |
6729 | 7059 | } |
6730 | 7060 | |
@@ -6750,8 +7080,9 @@ discard block |
||
6750 | 7080 | { |
6751 | 7081 | // global Globals::$langs; |
6752 | 7082 | |
6753 | - if (empty($codelang)) |
|
6754 | - return ''; |
|
7083 | + if (empty($codelang)) { |
|
7084 | + return ''; |
|
7085 | + } |
|
6755 | 7086 | |
6756 | 7087 | if ($codelang == 'auto') { |
6757 | 7088 | return '<span class="fa fa-globe"></span>'; |
@@ -6765,9 +7096,9 @@ discard block |
||
6765 | 7096 | 'sv_SV' => 'se' |
6766 | 7097 | ); |
6767 | 7098 | |
6768 | - if (isset($langtocountryflag[$codelang])) |
|
6769 | - $flagImage = $langtocountryflag[$codelang]; |
|
6770 | - else { |
|
7099 | + if (isset($langtocountryflag[$codelang])) { |
|
7100 | + $flagImage = $langtocountryflag[$codelang]; |
|
7101 | + } else { |
|
6771 | 7102 | $tmparray = explode('_', $codelang); |
6772 | 7103 | $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1]; |
6773 | 7104 | } |
@@ -6785,15 +7116,20 @@ discard block |
||
6785 | 7116 | { |
6786 | 7117 | // global $mysoc; |
6787 | 7118 | |
6788 | - if (strtoupper($countrycode) == 'MQ') |
|
6789 | - return 'fr_CA'; |
|
6790 | - if (strtoupper($countrycode) == 'SE') |
|
6791 | - return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country |
|
7119 | + if (strtoupper($countrycode) == 'MQ') { |
|
7120 | + return 'fr_CA'; |
|
7121 | + } |
|
7122 | + if (strtoupper($countrycode) == 'SE') { |
|
7123 | + return 'sv_SE'; |
|
7124 | + } |
|
7125 | + // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country |
|
6792 | 7126 | if (strtoupper($countrycode) == 'CH') { |
6793 | - if ($mysoc->country_code == 'FR') |
|
6794 | - return 'fr_CH'; |
|
6795 | - if ($mysoc->country_code == 'DE') |
|
6796 | - return 'de_CH'; |
|
7127 | + if ($mysoc->country_code == 'FR') { |
|
7128 | + return 'fr_CH'; |
|
7129 | + } |
|
7130 | + if ($mysoc->country_code == 'DE') { |
|
7131 | + return 'de_CH'; |
|
7132 | + } |
|
6797 | 7133 | } |
6798 | 7134 | |
6799 | 7135 | // Locale list taken from: |
@@ -6971,8 +7307,9 @@ discard block |
||
6971 | 7307 | ); |
6972 | 7308 | |
6973 | 7309 | $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode); |
6974 | - if (in_array($buildprimarykeytotest, $locales)) |
|
6975 | - return strtolower($countrycode) . '_' . strtoupper($countrycode); |
|
7310 | + if (in_array($buildprimarykeytotest, $locales)) { |
|
7311 | + return strtolower($countrycode) . '_' . strtoupper($countrycode); |
|
7312 | + } |
|
6976 | 7313 | |
6977 | 7314 | foreach ($locales as $locale) { |
6978 | 7315 | $locale_language = locale_get_primary_language($locale); |
@@ -7026,18 +7363,21 @@ discard block |
||
7026 | 7363 | |
7027 | 7364 | if ($mode == 'add' && !preg_match('/^\-/', $values[1])) { |
7028 | 7365 | if (count($values) == 6) { // new declaration with permissions: $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__' |
7029 | - if ($values[0] != $type) |
|
7030 | - continue; |
|
7366 | + if ($values[0] != $type) { |
|
7367 | + continue; |
|
7368 | + } |
|
7031 | 7369 | |
7032 | 7370 | if (verifCond($values[4])) { |
7033 | - if ($values[3]) |
|
7034 | - Globals::$langs->load($values[3]); |
|
7371 | + if ($values[3]) { |
|
7372 | + Globals::$langs->load($values[3]); |
|
7373 | + } |
|
7035 | 7374 | if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) { |
7036 | 7375 | $substitutionarray = array(); |
7037 | 7376 | complete_substitutions_array($substitutionarray, Globals::$langs, $object, array('needforkey' => $values[2])); |
7038 | 7377 | $label = make_substitutions($reg[1], $substitutionarray); |
7039 | - } else |
|
7040 | - $label = Globals::$langs->trans($values[2]); |
|
7378 | + } else { |
|
7379 | + $label = Globals::$langs->trans($values[2]); |
|
7380 | + } |
|
7041 | 7381 | |
7042 | 7382 | //$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1); |
7043 | 7383 | $head[$h][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]); |
@@ -7045,30 +7385,32 @@ discard block |
||
7045 | 7385 | $head[$h][2] = str_replace('+', '', $values[1]); |
7046 | 7386 | $h++; |
7047 | 7387 | } |
7048 | - } |
|
7049 | - else if (count($values) == 5) { // deprecated |
|
7388 | + } else if (count($values) == 5) { // deprecated |
|
7050 | 7389 | DolUtils::dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING); |
7051 | 7390 | |
7052 | - if ($values[0] != $type) |
|
7053 | - continue; |
|
7054 | - if ($values[3]) |
|
7055 | - Globals::$langs->load($values[3]); |
|
7391 | + if ($values[0] != $type) { |
|
7392 | + continue; |
|
7393 | + } |
|
7394 | + if ($values[3]) { |
|
7395 | + Globals::$langs->load($values[3]); |
|
7396 | + } |
|
7056 | 7397 | if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) { |
7057 | 7398 | $substitutionarray = array(); |
7058 | 7399 | complete_substitutions_array($substitutionarray, Globals::$langs, $object, array('needforkey' => $values[2])); |
7059 | 7400 | $label = make_substitutions($reg[1], $substitutionarray); |
7060 | - } else |
|
7061 | - $label = Globals::$langs->trans($values[2]); |
|
7401 | + } else { |
|
7402 | + $label = Globals::$langs->trans($values[2]); |
|
7403 | + } |
|
7062 | 7404 | |
7063 | 7405 | $head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1); |
7064 | 7406 | $head[$h][1] = $label; |
7065 | 7407 | $head[$h][2] = str_replace('+', '', $values[1]); |
7066 | 7408 | $h++; |
7067 | 7409 | } |
7068 | - } |
|
7069 | - else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) { |
|
7070 | - if ($values[0] != $type) |
|
7071 | - continue; |
|
7410 | + } else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) { |
|
7411 | + if ($values[0] != $type) { |
|
7412 | + continue; |
|
7413 | + } |
|
7072 | 7414 | $tabname = str_replace('-', '', $values[1]); |
7073 | 7415 | foreach ($head as $key => $val) { |
7074 | 7416 | $condition = (!empty($values[3]) ? verifCond($values[3]) : 1); |
@@ -7110,10 +7452,11 @@ discard block |
||
7110 | 7452 | // global $action; |
7111 | 7453 | // global $micro_start_time; |
7112 | 7454 | |
7113 | - if ($zone == 'private') |
|
7114 | - print "\n" . '<!-- Common footer for private page -->' . "\n"; |
|
7115 | - else |
|
7116 | - print "\n" . '<!-- Common footer for public page -->' . "\n"; |
|
7455 | + if ($zone == 'private') { |
|
7456 | + print "\n" . '<!-- Common footer for private page -->' . "\n"; |
|
7457 | + } else { |
|
7458 | + print "\n" . '<!-- Common footer for public page -->' . "\n"; |
|
7459 | + } |
|
7117 | 7460 | |
7118 | 7461 | // A div to store page_y POST parameter so we can read it using javascript |
7119 | 7462 | print "\n<!-- A div to store page_y POST paramater -->\n"; |
@@ -7122,8 +7465,9 @@ discard block |
||
7122 | 7465 | $parameters = array(); |
7123 | 7466 | $reshook = Globals::$hookManager->executeHooks('printCommonFooter', $parameters); // Note that $action and $object may have been modified by some hooks |
7124 | 7467 | if (empty($reshook)) { |
7125 | - if (!empty(Globals::$conf->global->MAIN_HTML_FOOTER)) |
|
7126 | - print Globals::$conf->global->MAIN_HTML_FOOTER . "\n"; |
|
7468 | + if (!empty(Globals::$conf->global->MAIN_HTML_FOOTER)) { |
|
7469 | + print Globals::$conf->global->MAIN_HTML_FOOTER . "\n"; |
|
7470 | + } |
|
7127 | 7471 | |
7128 | 7472 | print "\n"; |
7129 | 7473 | if (!empty(Globals::$conf->use_javascript_ajax)) { |
@@ -7146,8 +7490,9 @@ discard block |
||
7146 | 7490 | print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n"; |
7147 | 7491 | $relativepathstring = $_SERVER["PHP_SELF"]; |
7148 | 7492 | // Clean $relativepathstring |
7149 | - if (constant('DOL_BASE_URI')) |
|
7150 | - $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring); |
|
7493 | + if (constant('DOL_BASE_URI')) { |
|
7494 | + $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_BASE_URI'), '/') . '/', '', $relativepathstring); |
|
7495 | + } |
|
7151 | 7496 | $relativepathstring = preg_replace('/^\//', '', $relativepathstring); |
7152 | 7497 | $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring); |
7153 | 7498 | $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING'])); |
@@ -7158,14 +7503,17 @@ discard block |
||
7158 | 7503 | $tmpqueryarraytohave = explode('&', $defkey); |
7159 | 7504 | $foundintru = 0; |
7160 | 7505 | foreach ($tmpqueryarraytohave as $tmpquerytohave) { |
7161 | - if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) |
|
7162 | - $foundintru = 1; |
|
7506 | + if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) { |
|
7507 | + $foundintru = 1; |
|
7508 | + } |
|
7163 | 7509 | } |
7164 | - if (!$foundintru) |
|
7165 | - $qualified = 1; |
|
7510 | + if (!$foundintru) { |
|
7511 | + $qualified = 1; |
|
7512 | + } |
|
7166 | 7513 | //var_dump($defkey.'-'.$qualified); |
7167 | - } else |
|
7168 | - $qualified = 1; |
|
7514 | + } else { |
|
7515 | + $qualified = 1; |
|
7516 | + } |
|
7169 | 7517 | |
7170 | 7518 | if ($qualified) { |
7171 | 7519 | foreach ($defval as $paramkey => $paramval) { |
@@ -7184,14 +7532,17 @@ discard block |
||
7184 | 7532 | $tmpqueryarraytohave = explode('&', $defkey); |
7185 | 7533 | $foundintru = 0; |
7186 | 7534 | foreach ($tmpqueryarraytohave as $tmpquerytohave) { |
7187 | - if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) |
|
7188 | - $foundintru = 1; |
|
7535 | + if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) { |
|
7536 | + $foundintru = 1; |
|
7537 | + } |
|
7189 | 7538 | } |
7190 | - if (!$foundintru) |
|
7191 | - $qualified = 1; |
|
7539 | + if (!$foundintru) { |
|
7540 | + $qualified = 1; |
|
7541 | + } |
|
7192 | 7542 | //var_dump($defkey.'-'.$qualified); |
7193 | - } else |
|
7194 | - $qualified = 1; |
|
7543 | + } else { |
|
7544 | + $qualified = 1; |
|
7545 | + } |
|
7195 | 7546 | |
7196 | 7547 | if ($qualified) { |
7197 | 7548 | foreach ($defval as $paramkey => $paramval) { |
@@ -7230,8 +7581,9 @@ discard block |
||
7230 | 7581 | print "\n"; |
7231 | 7582 | print "/* JS CODE TO ENABLE to add memory info */\n"; |
7232 | 7583 | print 'window.console && console.log("'; |
7233 | - if (!empty(Globals::$conf->global->MEMCACHED_SERVER)) |
|
7234 | - print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - '; |
|
7584 | + if (!empty(Globals::$conf->global->MEMCACHED_SERVER)) { |
|
7585 | + print 'MEMCACHED_SERVER=' . Globals::$conf->global->MEMCACHED_SERVER . ' - '; |
|
7586 | + } |
|
7235 | 7587 | print 'MAIN_OPTIMIZE_SPEED=' . (isset(Globals::$conf->global->MAIN_OPTIMIZE_SPEED) ? Globals::$conf->global->MAIN_OPTIMIZE_SPEED : 'off'); |
7236 | 7588 | if (!empty($micro_start_time)) { // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in// global variable. |
7237 | 7589 | $micro_end_time = microtime(true); |
@@ -7361,8 +7713,9 @@ discard block |
||
7361 | 7713 | |
7362 | 7714 | $crits = explode(' ', $value); |
7363 | 7715 | $res = ''; |
7364 | - if (!is_array($fields)) |
|
7365 | - $fields = array($fields); |
|
7716 | + if (!is_array($fields)) { |
|
7717 | + $fields = array($fields); |
|
7718 | + } |
|
7366 | 7719 | |
7367 | 7720 | $nboffields = count($fields); |
7368 | 7721 | $end2 = count($crits); |
@@ -7425,8 +7778,9 @@ discard block |
||
7425 | 7778 | $tmpcrits = explode('|', $crit); |
7426 | 7779 | $i3 = 0; |
7427 | 7780 | foreach ($tmpcrits as $tmpcrit) { |
7428 | - if (empty($tmpcrit)) |
|
7429 | - continue; |
|
7781 | + if (empty($tmpcrit)) { |
|
7782 | + continue; |
|
7783 | + } |
|
7430 | 7784 | |
7431 | 7785 | $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : ''); |
7432 | 7786 | |
@@ -7462,8 +7816,9 @@ discard block |
||
7462 | 7816 | } |
7463 | 7817 | $i++; |
7464 | 7818 | } |
7465 | - if ($newres) |
|
7466 | - $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : ''); |
|
7819 | + if ($newres) { |
|
7820 | + $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : ''); |
|
7821 | + } |
|
7467 | 7822 | $j++; |
7468 | 7823 | } |
7469 | 7824 | $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")"; |
@@ -7503,29 +7858,37 @@ discard block |
||
7503 | 7858 | static function getImageFileNameForSize($file, $extName, $extImgTarget = '') |
7504 | 7859 | { |
7505 | 7860 | $dirName = dirname($file); |
7506 | - if ($dirName == '.') |
|
7507 | - $dirName = ''; |
|
7861 | + if ($dirName == '.') { |
|
7862 | + $dirName = ''; |
|
7863 | + } |
|
7508 | 7864 | |
7509 | 7865 | $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // We remove extension, whatever is its case |
7510 | 7866 | $fileName = basename($fileName); |
7511 | 7867 | |
7512 | - if (empty($extImgTarget)) |
|
7513 | - $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : ''); |
|
7514 | - if (empty($extImgTarget)) |
|
7515 | - $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : ''); |
|
7516 | - if (empty($extImgTarget)) |
|
7517 | - $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : ''); |
|
7518 | - if (empty($extImgTarget)) |
|
7519 | - $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : ''); |
|
7520 | - if (empty($extImgTarget)) |
|
7521 | - $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : ''); |
|
7522 | - |
|
7523 | - if (!$extImgTarget) |
|
7524 | - return $file; |
|
7868 | + if (empty($extImgTarget)) { |
|
7869 | + $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : ''); |
|
7870 | + } |
|
7871 | + if (empty($extImgTarget)) { |
|
7872 | + $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : ''); |
|
7873 | + } |
|
7874 | + if (empty($extImgTarget)) { |
|
7875 | + $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : ''); |
|
7876 | + } |
|
7877 | + if (empty($extImgTarget)) { |
|
7878 | + $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : ''); |
|
7879 | + } |
|
7880 | + if (empty($extImgTarget)) { |
|
7881 | + $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : ''); |
|
7882 | + } |
|
7883 | + |
|
7884 | + if (!$extImgTarget) { |
|
7885 | + return $file; |
|
7886 | + } |
|
7525 | 7887 | |
7526 | 7888 | $subdir = ''; |
7527 | - if ($extName) |
|
7528 | - $subdir = 'thumbs/'; |
|
7889 | + if ($extName) { |
|
7890 | + $subdir = 'thumbs/'; |
|
7891 | + } |
|
7529 | 7892 | |
7530 | 7893 | return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb |
7531 | 7894 | } |
@@ -7543,8 +7906,9 @@ discard block |
||
7543 | 7906 | { |
7544 | 7907 | // global Globals::$conf, Globals::$langs; |
7545 | 7908 | |
7546 | - if (empty(Globals::$conf->use_javascript_ajax)) |
|
7547 | - return ''; |
|
7909 | + if (empty(Globals::$conf->use_javascript_ajax)) { |
|
7910 | + return ''; |
|
7911 | + } |
|
7548 | 7912 | |
7549 | 7913 | $mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml'); |
7550 | 7914 | //$mime_preview[]='vnd.oasis.opendocument.presentation'; |
@@ -7552,17 +7916,19 @@ discard block |
||
7552 | 7916 | $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview); |
7553 | 7917 | |
7554 | 7918 | if ($alldata == 1) { |
7555 | - if ($num_mime !== false) |
|
7556 | - return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),); |
|
7557 | - else |
|
7558 | - return array(); |
|
7919 | + if ($num_mime !== false) { |
|
7920 | + return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),); |
|
7921 | + } else { |
|
7922 | + return array(); |
|
7923 | + } |
|
7559 | 7924 | } |
7560 | 7925 | |
7561 | 7926 | // old behavior |
7562 | - if ($num_mime !== false) |
|
7563 | - return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js(Globals::$langs->trans('Preview')) . '\')'; |
|
7564 | - else |
|
7565 | - return ''; |
|
7927 | + if ($num_mime !== false) { |
|
7928 | + return 'javascript:document_preview(\'' . dol_escape_js(DOL_BASE_URI . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js(Globals::$langs->trans('Preview')) . '\')'; |
|
7929 | + } else { |
|
7930 | + return ''; |
|
7931 | + } |
|
7566 | 7932 | } |
7567 | 7933 | |
7568 | 7934 | /** |
@@ -7580,8 +7946,9 @@ discard block |
||
7580 | 7946 | jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } ); |
7581 | 7947 | }); |
7582 | 7948 | </script>'; |
7583 | - if ($addlink) |
|
7584 | - $out .= ' <a href="' . $addlink . '" target="_blank">' . Globals::$langs->trans("Link") . '</a>'; |
|
7949 | + if ($addlink) { |
|
7950 | + $out .= ' <a href="' . $addlink . '" target="_blank">' . Globals::$langs->trans("Link") . '</a>'; |
|
7951 | + } |
|
7585 | 7952 | return $out; |
7586 | 7953 | } |
7587 | 7954 | |
@@ -7963,8 +8330,9 @@ discard block |
||
7963 | 8330 | if (!isset($dictvalues[$tablename])) { |
7964 | 8331 | $dictvalues[$tablename] = array(); |
7965 | 8332 | $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1'; |
7966 | - if ($checkentity) |
|
7967 | - $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')'; |
|
8333 | + if ($checkentity) { |
|
8334 | + $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')'; |
|
8335 | + } |
|
7968 | 8336 | |
7969 | 8337 | $resql = $db->query($sql); |
7970 | 8338 | if ($resql) { |
@@ -7976,11 +8344,14 @@ discard block |
||
7976 | 8344 | } |
7977 | 8345 | } |
7978 | 8346 | |
7979 | - if (!empty($dictvalues[$tablename][$id])) |
|
7980 | - return $dictvalues[$tablename][$id]->{$field}; // Found |
|
8347 | + if (!empty($dictvalues[$tablename][$id])) { |
|
8348 | + return $dictvalues[$tablename][$id]->{$field}; |
|
8349 | + } |
|
8350 | + // Found |
|
7981 | 8351 | else { // Not found |
7982 | - if ($id > 0) |
|
7983 | - return $id; |
|
8352 | + if ($id > 0) { |
|
8353 | + return $id; |
|
8354 | + } |
|
7984 | 8355 | return ''; |
7985 | 8356 | } |
7986 | 8357 | } |
@@ -8010,8 +8381,9 @@ discard block |
||
8010 | 8381 | $b = hexdec($hexb); |
8011 | 8382 | } |
8012 | 8383 | $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0; // HSL algorithm |
8013 | - if ($bright > 0.6) |
|
8014 | - $res = 1; |
|
8384 | + if ($bright > 0.6) { |
|
8385 | + $res = 1; |
|
8386 | + } |
|
8015 | 8387 | } |
8016 | 8388 | return $res; |
8017 | 8389 | } |
@@ -8029,8 +8401,10 @@ discard block |
||
8029 | 8401 | // global Globals::$conf; |
8030 | 8402 | //print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms']; |
8031 | 8403 | //print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal); |
8032 | - if (empty($menuentry['enabled'])) |
|
8033 | - return 0; // Entry disabled by condition |
|
8404 | + if (empty($menuentry['enabled'])) { |
|
8405 | + return 0; |
|
8406 | + } |
|
8407 | + // Entry disabled by condition |
|
8034 | 8408 | if ($type_user && $menuentry['module']) { |
8035 | 8409 | $tmploops = explode('|', $menuentry['module']); |
8036 | 8410 | $found = 0; |
@@ -8040,15 +8414,23 @@ discard block |
||
8040 | 8414 | break; |
8041 | 8415 | } |
8042 | 8416 | } |
8043 | - if (!$found) |
|
8044 | - return 0; // Entry is for menus all excluded to external users |
|
8045 | - } |
|
8046 | - if (!$menuentry['perms'] && $type_user) |
|
8047 | - return 0; // No permissions and user is external |
|
8048 | - if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) |
|
8049 | - return 0; // No permissions and option to hide when not allowed, even for internal user, is on |
|
8050 | - if (!$menuentry['perms']) |
|
8051 | - return 2; // No permissions and user is external |
|
8417 | + if (!$found) { |
|
8418 | + return 0; |
|
8419 | + } |
|
8420 | + // Entry is for menus all excluded to external users |
|
8421 | + } |
|
8422 | + if (!$menuentry['perms'] && $type_user) { |
|
8423 | + return 0; |
|
8424 | + } |
|
8425 | + // No permissions and user is external |
|
8426 | + if (!$menuentry['perms'] && !empty(Globals::$conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) { |
|
8427 | + return 0; |
|
8428 | + } |
|
8429 | + // No permissions and option to hide when not allowed, even for internal user, is on |
|
8430 | + if (!$menuentry['perms']) { |
|
8431 | + return 2; |
|
8432 | + } |
|
8433 | + // No permissions and user is external |
|
8052 | 8434 | return 1; |
8053 | 8435 | } |
8054 | 8436 |