@@ -108,12 +108,12 @@ discard block |
||
108 | 108 | // Complete long filename |
109 | 109 | foreach ($filters as $key => $value) |
110 | 110 | { |
111 | - //if ($key == 'notolderthan') $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename |
|
111 | + //if ($key == 'notolderthan') $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename |
|
112 | 112 | if ($key == 'year') $filename.='-year'.$value; |
113 | - if ($key == 'id') $filename.='-id'.$value; |
|
114 | - if ($key == 'idfrom') $filename.='-idfrom'.$value; |
|
115 | - if ($key == 'idto') $filename.='-idto'.$value; |
|
116 | - if ($key == 'project') $filename.='-project'.$value; |
|
113 | + if ($key == 'id') $filename.='-id'.$value; |
|
114 | + if ($key == 'idfrom') $filename.='-idfrom'.$value; |
|
115 | + if ($key == 'idto') $filename.='-idto'.$value; |
|
116 | + if ($key == 'project') $filename.='-project'.$value; |
|
117 | 117 | if ($key == 'logina') $filename.='-logina'.$value; // Author |
118 | 118 | if ($key == 'logint') $filename.='-logint'.$value; // Assigned to |
119 | 119 | } |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | $langs->load("main"); |
128 | 128 | $langs->load("errors"); |
129 | 129 | llxHeaderVierge(); |
130 | - print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>'; |
|
130 | + print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX",'format').'</div>'; |
|
131 | 131 | llxFooterVierge(); |
132 | 132 | exit; |
133 | 133 | } |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | $result=readfile($outputfile); |
163 | 163 | if (! $result) print 'File '.$outputfile.' was empty.'; |
164 | 164 | |
165 | - //header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename)); |
|
165 | + //header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename)); |
|
166 | 166 | exit; |
167 | 167 | } |
168 | 168 | else |
@@ -152,7 +152,7 @@ |
||
152 | 152 | */ |
153 | 153 | function llxFooterVierge() |
154 | 154 | { |
155 | - printCommonFooter('public'); |
|
155 | + printCommonFooter('public'); |
|
156 | 156 | |
157 | 157 | print "</body>\n"; |
158 | 158 | print "</html>\n"; |
@@ -58,10 +58,10 @@ discard block |
||
58 | 58 | |
59 | 59 | header("Content-type: text/html; charset=".$conf->file->character_set_client); |
60 | 60 | print "<html>\n"; |
61 | - print "<head>\n"; |
|
62 | - print "<title>".$title."</title>\n"; |
|
63 | - if ($head) print $head."\n"; |
|
64 | - print "</head>\n"; |
|
61 | + print "<head>\n"; |
|
62 | + print "<title>".$title."</title>\n"; |
|
63 | + if ($head) print $head."\n"; |
|
64 | + print "</head>\n"; |
|
65 | 65 | print '<body class="public_body">'."\n"; |
66 | 66 | } |
67 | 67 | |
@@ -72,9 +72,9 @@ discard block |
||
72 | 72 | */ |
73 | 73 | function llxFooterVierge() |
74 | 74 | { |
75 | - printCommonFooter('public'); |
|
75 | + printCommonFooter('public'); |
|
76 | 76 | |
77 | - print "</body>\n"; |
|
77 | + print "</body>\n"; |
|
78 | 78 | print "</html>\n"; |
79 | 79 | } |
80 | 80 |
@@ -77,7 +77,7 @@ |
||
77 | 77 | |
78 | 78 | $resql=$db->query($sql); |
79 | 79 | |
80 | - //Update status communication of contact prospect |
|
80 | + //Update status communication of contact prospect |
|
81 | 81 | $sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE fk_stcomm != -1 AND rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)"; |
82 | 82 | dol_syslog("public/emailing/mailing-read.php : Mail read contact : ".$sql, LOG_DEBUG); |
83 | 83 |
@@ -87,7 +87,7 @@ |
||
87 | 87 | $resql=$db->query($sql); |
88 | 88 | if (! $resql) dol_print_error($db); |
89 | 89 | |
90 | - // Update status communication of contact prospect |
|
90 | + // Update status communication of contact prospect |
|
91 | 91 | $sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag = '".$db->escape($tag)."' AND source_type='contact' AND source_id is not null)"; |
92 | 92 | dol_syslog("public/emailing/mailing-unsubscribe.php : Mail unsubcribe contact : ".$sql, LOG_DEBUG); |
93 | 93 |
@@ -140,12 +140,12 @@ discard block |
||
140 | 140 | $appli=constant('DOL_APPLICATION_TITLE'); |
141 | 141 | if (! empty($conf->global->MAIN_APPLICATION_TITLE)) |
142 | 142 | { |
143 | - $appli=$conf->global->MAIN_APPLICATION_TITLE; |
|
144 | - if (preg_match('/\d\.\d/', $appli)) |
|
145 | - { |
|
146 | - if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")"; // If new title contains a version that is different than core |
|
147 | - } |
|
148 | - else $appli.=" ".DOL_VERSION; |
|
143 | + $appli=$conf->global->MAIN_APPLICATION_TITLE; |
|
144 | + if (preg_match('/\d\.\d/', $appli)) |
|
145 | + { |
|
146 | + if (! preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli.=" (".DOL_VERSION.")"; // If new title contains a version that is different than core |
|
147 | + } |
|
148 | + else $appli.=" ".DOL_VERSION; |
|
149 | 149 | } |
150 | 150 | else $appli.=" ".DOL_VERSION; |
151 | 151 | |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | } |
168 | 168 | $content.="<br>\n"; |
169 | 169 | $content.=$langs->transnoentitiesnoconv("TechnicalInformation").":<br>\n"; |
170 | - $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n"; |
|
170 | + $content.=$langs->transnoentitiesnoconv("OnlinePaymentSystem").': '.$paymentmethod."<br>\n"; |
|
171 | 171 | $content.=$langs->transnoentitiesnoconv("ReturnURLAfterPayment").': '.$urlback."<br>\n"; |
172 | 172 | $content.="tag=".$fulltag."<br>\n"; |
173 | 173 |
@@ -245,13 +245,13 @@ |
||
245 | 245 | |
246 | 246 | if (empty($object->ref)) // For survey, id is a hex string |
247 | 247 | { |
248 | - $langs->load("errors"); |
|
249 | - print $langs->trans("ErrorRecordNotFound"); |
|
248 | + $langs->load("errors"); |
|
249 | + print $langs->trans("ErrorRecordNotFound"); |
|
250 | 250 | |
251 | - llxFooterSurvey(); |
|
251 | + llxFooterSurvey(); |
|
252 | 252 | |
253 | - $db->close(); |
|
254 | - exit(); |
|
253 | + $db->close(); |
|
254 | + exit(); |
|
255 | 255 | } |
256 | 256 | |
257 | 257 | // Define format of choices |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | } |
56 | 56 | else |
57 | 57 | { |
58 | - $arraycss=array(); |
|
59 | - $arrayjs=array(); |
|
60 | - /* |
|
58 | + $arraycss=array(); |
|
59 | + $arrayjs=array(); |
|
60 | + /* |
|
61 | 61 | $arraycss=array('/includes/jquery/plugins/datatables/media/css/jquery.dataTables.css', |
62 | 62 | '/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css', |
63 | 63 | '/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css' |
@@ -214,12 +214,12 @@ discard block |
||
214 | 214 | |
215 | 215 | if (! empty($moreforfilter)) |
216 | 216 | { |
217 | - print '<div class="liste_titre liste_titre_bydiv centpercent">'; |
|
218 | - print $moreforfilter; |
|
219 | - $parameters=array(); |
|
220 | - $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook |
|
221 | - print $hookmanager->resPrint; |
|
222 | - print '</div>'; |
|
217 | + print '<div class="liste_titre liste_titre_bydiv centpercent">'; |
|
218 | + print $moreforfilter; |
|
219 | + $parameters=array(); |
|
220 | + $reshook=$hookmanager->executeHooks('printFieldPreListTitle',$parameters); // Note that $action and $object may have been modified by hook |
|
221 | + print $hookmanager->resPrint; |
|
222 | + print '</div>'; |
|
223 | 223 | } |
224 | 224 | |
225 | 225 | ?> |
@@ -252,12 +252,12 @@ discard block |
||
252 | 252 | $(document).ready(function(){ |
253 | 253 | $('#idtableexample2').dataTable( { |
254 | 254 | <?php |
255 | - if ($optioncss=='print') { |
|
256 | - print '\'dom\': \'lfrtip\','; |
|
257 | - } else { |
|
258 | - print '\'dom\': \'Blfrtip\','; |
|
259 | - } |
|
260 | - ?> |
|
255 | + if ($optioncss=='print') { |
|
256 | + print '\'dom\': \'lfrtip\','; |
|
257 | + } else { |
|
258 | + print '\'dom\': \'Blfrtip\','; |
|
259 | + } |
|
260 | + ?> |
|
261 | 261 | "colReorder": true, |
262 | 262 | 'buttons': [ |
263 | 263 | 'colvis','copy', 'csv', 'excel', 'pdf', 'print' |
@@ -36,15 +36,15 @@ |
||
36 | 36 | |
37 | 37 | if (! GETPOST('transkey') && ! GETPOST('transphrase')) |
38 | 38 | { |
39 | - print 'Sorry, it seems your internet connexion is off.<br>'; |
|
40 | - print 'You need to be connected to network to use this software.<br>'; |
|
39 | + print 'Sorry, it seems your internet connexion is off.<br>'; |
|
40 | + print 'You need to be connected to network to use this software.<br>'; |
|
41 | 41 | } |
42 | 42 | else |
43 | 43 | { |
44 | - $langs->load("error"); |
|
45 | - $langs->load("other"); |
|
44 | + $langs->load("error"); |
|
45 | + $langs->load("other"); |
|
46 | 46 | |
47 | - if (GETPOST('transphrase')) print GETPOST('transphrase'); |
|
48 | - if (GETPOST('transkey')) print $langs->trans(GETPOST('transkey')); |
|
47 | + if (GETPOST('transphrase')) print GETPOST('transphrase'); |
|
48 | + if (GETPOST('transkey')) print $langs->trans(GETPOST('transkey')); |
|
49 | 49 | } |
50 | 50 |