Skip to content

Commit 625b9eb

Browse files
Dasc3erDasc3er
committed
Normalizzazione file custom
1 parent f3c62c2 commit 625b9eb

41 files changed

Lines changed: 258 additions & 317 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bug.php‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,7 @@
7373

7474
$pageTitle = tr('Bug');
7575

76-
if (file_exists($docroot.'/include/custom/top.php')) {
77-
include $docroot.'/include/custom/top.php';
78-
} else {
79-
include $docroot.'/include/top.php';
80-
}
76+
include_once App::filepath('include|custom|', 'top.php');
8177

8278
if (empty($mail['from_address']) || empty($mail['server'])) {
8379
echo '
@@ -194,8 +190,4 @@
194190
195191
<script type="text/javascript" charset="utf-8" src="'.App::getPaths()['js'].'/ckeditor/ckeditor.js'.'"></script>';
196192

197-
if (file_exists($docroot.'/include/custom/bottom.php')) {
198-
include $docroot.'/include/custom/bottom.php';
199-
} else {
200-
include $docroot.'/include/bottom.php';
201-
}
193+
include_once App::filepath('include|custom|', 'bottom.php');

‎controller.php‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
redirect(ROOTDIR.'/index.php');
99
}
1010

11-
if (file_exists($docroot.'/include/custom/top.php')) {
12-
include $docroot.'/include/custom/top.php';
13-
} else {
14-
include $docroot.'/include/top.php';
15-
}
11+
include_once App::filepath('include|custom|', 'top.php');
1612

1713
// Lettura parametri iniziali del modulo
1814
$module = Modules::get($id_module);
@@ -89,8 +85,4 @@
8985
// Widget in basso
9086
echo '{( "name": "widgets", "id_module": "'.$id_module.'", "position": "right", "place": "controller" )}';
9187

92-
if (file_exists($docroot.'/include/custom/bottom.php')) {
93-
include $docroot.'/include/custom/bottom.php';
94-
} else {
95-
include $docroot.'/include/bottom.php';
96-
}
88+
include_once App::filepath('include|custom|', 'bottom.php');

‎editor.php‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
redirect(ROOTDIR.'/index.php');
99
}
1010

11-
if (file_exists($docroot.'/include/custom/top.php')) {
12-
include $docroot.'/include/custom/top.php';
13-
} else {
14-
include $docroot.'/include/top.php';
15-
}
11+
include_once App::filepath('include|custom|', 'top.php');
1612

1713
// Lettura parametri iniziali del modulo
1814
$module = Modules::get($id_module);
@@ -308,8 +304,4 @@ function(data) {
308304
</script>
309305
<?php
310306

311-
if (file_exists($docroot.'/include/custom/bottom.php')) {
312-
include $docroot.'/include/custom/bottom.php';
313-
} else {
314-
include $docroot.'/include/bottom.php';
315-
}
307+
include_once App::filepath('include|custom|', 'bottom.php');

‎include/configuration.php‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@
1111

1212
$pageTitle = tr('Configurazione');
1313

14-
if (file_exists($docroot.'/include/custom/top.php')) {
15-
include_once $docroot.'/include/custom/top.php';
16-
} else {
17-
include_once $docroot.'/include/top.php';
18-
}
14+
include_once App::filepath('include|custom|', 'top.php');
1915

2016
// Controllo sull'esistenza di nuovi parametri di configurazione
2117
if (post('db_host') !== null) {
@@ -238,15 +234,15 @@
238234
239235
return result;
240236
});
241-
237+
242238
$("#install").on("click", function(){
243239
244240
if($(this).closest("form").parsley().validate()){
245241
prev_html = $("#install").html();
246242
$("#install").html("<i class=\'fa fa-spinner fa-pulse fa-fw\'></i> '.tr("Attendere").'...");
247243
$("#install").prop(\'disabled\', true);
248244
$("#test").prop(\'disabled\', true);
249-
245+
250246
$("#config_form").submit();
251247
}
252248
@@ -263,14 +259,14 @@
263259
data: {
264260
test: 1,
265261
},
266-
type: "post",
262+
type: "post",
267263
success: function(data){
268264
data = parseFloat(data.trim());
269-
265+
270266
$("#test").html(prev_html);
271267
$("#test").prop(\'disabled\', false);
272268
$("#install").prop(\'disabled\', false);
273-
269+
274270
if(data == 0){
275271
swal("'.tr('Errore della configurazione').'", "'.tr('La configurazione non è corretta').'.", "error");
276272
} else if(data == 1){
@@ -583,10 +579,6 @@
583579
</div>';
584580
}
585581

586-
if (file_exists($docroot.'/include/custom/bottom.php')) {
587-
include_once $docroot.'/include/custom/bottom.php';
588-
} else {
589-
include_once $docroot.'/include/bottom.php';
590-
}
582+
include_once App::filepath('include|custom|', 'bottom.php');
591583

592584
exit();

‎include/update.php‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,7 @@
119119
if (Update::isUpdateLocked() && filter('force') === null) {
120120
$pageTitle = tr('Aggiornamento in corso!');
121121

122-
if (file_exists($docroot.'/include/custom/top.php')) {
123-
include_once $docroot.'/include/custom/top.php';
124-
} else {
125-
include_once $docroot.'/include/top.php';
126-
}
122+
include_once App::filepath('include|custom|', 'top.php');
127123

128124
echo '
129125
<div class="box box-center box-danger box-solid text-center">
@@ -137,11 +133,7 @@
137133
</div>
138134
</div>';
139135

140-
if (file_exists($docroot.'/include/custom/bottom.php')) {
141-
include_once $docroot.'/include/custom/bottom.php';
142-
} else {
143-
include_once $docroot.'/include/bottom.php';
144-
}
136+
include_once App::filepath('include|custom|', 'bottom.php');
145137

146138
exit();
147139
}
@@ -151,11 +143,7 @@
151143
$button = !$dbo->isInstalled() ? tr('Installa!') : tr('Aggiorna!');
152144
$pageTitle = !$dbo->isInstalled() ? tr('Installazione') : tr('Aggiornamento');
153145

154-
if (file_exists($docroot.'/include/custom/top.php')) {
155-
include_once $docroot.'/include/custom/top.php';
156-
} else {
157-
include_once $docroot.'/include/top.php';
158-
}
146+
include_once App::filepath('include|custom|', 'top.php');
159147

160148
echo '
161149
<div class="box box-center-large box-warning text-center">

‎index.php‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@
5959

6060
$pageTitle = tr('Login');
6161

62-
if (file_exists($docroot.'/include/custom/top.php')) {
63-
include_once $docroot.'/include/custom/top.php';
64-
} else {
65-
include_once $docroot.'/include/top.php';
66-
}
62+
include_once App::filepath('include|custom|', 'top.php');
6763

6864
// Controllo se è una beta e in caso mostro un warning
6965
if (str_contains($version, 'beta')) {
@@ -175,8 +171,4 @@ function brute() {
175171
});
176172
</script>';
177173

178-
if (file_exists($docroot.'/include/custom/bottom.php')) {
179-
include_once $docroot.'/include/custom/bottom.php';
180-
} else {
181-
include_once $docroot.'/include/bottom.php';
182-
}
174+
include_once App::filepath('include|custom|', 'bottom.php');

‎info.php‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,7 @@
66

77
$paths = App::getPaths();
88

9-
if (file_exists($docroot.'/include/custom/top.php')) {
10-
include $docroot.'/include/custom/top.php';
11-
} else {
12-
include $docroot.'/include/top.php';
13-
}
9+
include_once App::filepath('include|custom|', 'top.php');
1410

1511
echo '
1612
<div class="box">
@@ -168,8 +164,4 @@
168164
</div>
169165
</div>';
170166

171-
if (file_exists($docroot.'/include/custom/bottom.php')) {
172-
include $docroot.'/include/custom/bottom.php';
173-
} else {
174-
include $docroot.'/include/bottom.php';
175-
}
167+
include_once App::filepath('include|custom|', 'bottom.php');

‎log.php‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@
44

55
$pageTitle = tr('Log');
66

7-
if (file_exists($docroot.'/include/custom/top.php')) {
8-
include $docroot.'/include/custom/top.php';
9-
} else {
10-
include $docroot.'/include/top.php';
11-
}
7+
include_once App::filepath('include|custom|', 'top.php');
128

139
echo '
1410
<div class="box">
@@ -81,8 +77,4 @@
8177
</div>
8278
<!-- /.box -->';
8379

84-
if (file_exists($docroot.'/include/custom/bottom.php')) {
85-
include $docroot.'/include/custom/bottom.php';
86-
} else {
87-
include $docroot.'/include/bottom.php';
88-
}
80+
include_once App::filepath('include|custom|', 'bottom.php');

‎modules/anagrafiche/plugins/statistiche.php‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@
22

33
include_once __DIR__.'/../../../core.php';
44

5+
include_once Modules::filepath('Preventivi', 'modutil.php');
6+
57
// Interventi
68
if (in_array('Cliente', explode(',', $records[0]['tipianagrafica']))) {
7-
//Clienti
8-
$rsi = $dbo->fetchArray('SELECT ragione_sociale, (SELECT MIN(orario_inizio) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id) AS data, (SELECT SUM(prezzo_ore_consuntivo+prezzo_km_consuntivo+prezzo_dirittochiamata) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id) AS totale FROM in_interventi INNER JOIN an_anagrafiche ON in_interventi.idanagrafica=an_anagrafiche.idanagrafica WHERE in_interventi.idanagrafica='.prepare($id_record));
9-
10-
}else if (in_array('Tecnico', explode(',', $records[0]['tipianagrafica']))) {
11-
12-
//Tecnici
13-
$rsi = $dbo->fetchArray('SELECT ragione_sociale, (SELECT MIN(orario_inizio) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id) AS data, (SELECT SUM(prezzo_ore_consuntivo+prezzo_km_consuntivo+prezzo_dirittochiamata) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id AND in_interventi_tecnici.idtecnico = '.prepare($id_record).' ) AS totale FROM in_interventi INNER JOIN an_anagrafiche ON in_interventi.idanagrafica=an_anagrafiche.idanagrafica INNER JOIN in_interventi_tecnici ON in_interventi.id = in_interventi_tecnici.idintervento WHERE in_interventi_tecnici.idtecnico='.prepare($id_record));
14-
9+
//Clienti
10+
$rsi = $dbo->fetchArray('SELECT ragione_sociale, (SELECT MIN(orario_inizio) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id) AS data, (SELECT SUM(prezzo_ore_consuntivo+prezzo_km_consuntivo+prezzo_dirittochiamata) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id) AS totale FROM in_interventi INNER JOIN an_anagrafiche ON in_interventi.idanagrafica=an_anagrafiche.idanagrafica WHERE in_interventi.idanagrafica='.prepare($id_record));
11+
} elseif (in_array('Tecnico', explode(',', $records[0]['tipianagrafica']))) {
12+
//Tecnici
13+
$rsi = $dbo->fetchArray('SELECT ragione_sociale, (SELECT MIN(orario_inizio) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id) AS data, (SELECT SUM(prezzo_ore_consuntivo+prezzo_km_consuntivo+prezzo_dirittochiamata) FROM in_interventi_tecnici WHERE idintervento=in_interventi.id AND in_interventi_tecnici.idtecnico = '.prepare($id_record).' ) AS totale FROM in_interventi INNER JOIN an_anagrafiche ON in_interventi.idanagrafica=an_anagrafiche.idanagrafica INNER JOIN in_interventi_tecnici ON in_interventi.id = in_interventi_tecnici.idintervento WHERE in_interventi_tecnici.idtecnico='.prepare($id_record));
1514
}
1615
$totale_interventi = 0;
1716
$data_start = strtotime('now');
@@ -51,13 +50,12 @@
5150

5251
// Preventivi
5352
$rsi = $dbo->fetchArray('SELECT co_preventivi.id AS idpreventivo, data_accettazione AS data, ragione_sociale, budget FROM co_preventivi INNER JOIN an_anagrafiche ON co_preventivi.idanagrafica=an_anagrafiche.idanagrafica WHERE co_preventivi.idanagrafica='.prepare($id_record));
54-
include_once $docroot.'/modules/preventivi/modutil.php';
5553
$totale_preventivi = 0;
5654
$data_start = strtotime('now');
5755

5856
for ($i = 0; $i < count($rsi); ++$i) {
5957
//$totale_preventivi += $rsi[$i]['budget'];
60-
$totale_preventivi += get_imponibile_preventivo($rsi[$i]['idpreventivo']);
58+
$totale_preventivi += get_imponibile_preventivo($rsi[$i]['idpreventivo']);
6159
// Calcolo data più bassa per la ricerca
6260
if (strtotime($rsi[$i]['data']) < $data_start) {
6361
$data_start = strtotime($rsi[$i]['data']);

‎modules/articoli/edit.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
include_once __DIR__.'/../../core.php';
44

5+
// Necesario per funzione \Util\Ini::getList
6+
include_once Modules::filepath('MyImpianti', 'modutil.php');
7+
58
$_SESSION['superselect']['id_categoria'] = $records[0]['id_categoria'];
69

710
?><form action="" method="post" id="edit-form" enctype="multipart/form-data">
@@ -183,9 +186,6 @@
183186
<div class="panel-body">
184187
<?php
185188

186-
/* necesario per funzione \Util\Ini::getList */
187-
include $docroot.'/modules/my_impianti/modutil.php';
188-
189189
echo '
190190
<div class="row">
191191
<div class="col-md-4">

0 commit comments

Comments
 (0)