Skip to content

Commit e3978d1

Browse files
Dasc3erDasc3er
committed
Rename base_path to base_path_osm for Laravel compatibility
1 parent e804625 commit e3978d1

152 files changed

Lines changed: 325 additions & 327 deletions

File tree

Some content is hidden

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

‎actions.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@
108108
$upload = Upload::find($id_allegato);
109109

110110
$response = [
111-
'fileName' => base_path().'/files/gestione_documentale/'.basename($upload->filename),
111+
'fileName' => base_path_osm().'/files/gestione_documentale/'.basename($upload->filename),
112112
'uploaded' => 1,
113-
'url' => base_path().'/files/gestione_documentale/'.$upload->filename,
113+
'url' => base_path_osm().'/files/gestione_documentale/'.$upload->filename,
114114
];
115115

116116
// Upload da form
@@ -178,10 +178,10 @@
178178
// Determina il redirect appropriato in base al tipo di accesso
179179
if (Permissions::isTokenAccess() && !empty($_SESSION['token_access']['id_module_target']) && !empty($_SESSION['token_access']['id_record_target'])) {
180180
// Per accesso tramite token, redirect a shared_editor.php
181-
redirect_url(base_path().'/shared_editor.php?id_module='.$id_module.'&id_record='.$id_record.((!empty($options['id_plugin'])) ? '#tab_'.$options['id_plugin'] : ''));
181+
redirect_url(base_path_osm().'/shared_editor.php?id_module='.$id_module.'&id_record='.$id_record.((!empty($options['id_plugin'])) ? '#tab_'.$options['id_plugin'] : ''));
182182
} else {
183183
// Per accesso normale, redirect a editor.php
184-
redirect_url(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.((!empty($options['id_plugin'])) ? '#tab_'.$options['id_plugin'] : ''));
184+
redirect_url(base_path_osm().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.((!empty($options['id_plugin'])) ? '#tab_'.$options['id_plugin'] : ''));
185185
}
186186
}
187187
}
@@ -523,7 +523,7 @@
523523
$bulk = empty($bulk) ? [] : $bulk;
524524

525525
if (in_array(post('op'), array_keys($bulk))) {
526-
redirect_url(base_path().'/controller.php?id_module='.$id_module, 'js');
526+
redirect_url(base_path_osm().'/controller.php?id_module='.$id_module, 'js');
527527
} else {
528528
// Esecuzione delle operazioni del modulo
529529
($include_file = $structure->filepath('actions.php')) ? include $include_file : null;

‎ajax_dataload.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
$image = $directory.$r['_img_'];
199199
$image_thumbnail = $directory.$fileinfo['filename'].'_thumb600.'.$fileinfo['extension'];
200200

201-
$url = file_exists(base_dir().$image_thumbnail) ? base_path().$image_thumbnail : base_path().$image;
201+
$url = file_exists(base_dir().$image_thumbnail) ? base_path_osm().$image_thumbnail : base_path_osm().$image;
202202

203203
$value = '<img src="'.$url.'" style="max-height: 80px; max-width:120px">';
204204
}
@@ -234,11 +234,11 @@
234234

235235
// Link per i moduli
236236
if (empty($id_plugin)) {
237-
$column['data-link'] = base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.$hash;
237+
$column['data-link'] = base_path_osm().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.$hash;
238238
}
239239
// Link per i plugin
240240
else {
241-
$column['data-link'] = base_path().'/add.php?id_module='.$id_module.'&id_record='.$id_record.'&id_plugin='.$id_plugin.'&id_parent='.$id_parent.'&edit=1'.$hash;
241+
$column['data-link'] = base_path_osm().'/add.php?id_module='.$id_module.'&id_record='.$id_record.'&id_plugin='.$id_plugin.'&id_parent='.$id_parent.'&edit=1'.$hash;
242242

243243
$column['data-type'] = 'dialog';
244244
}
@@ -251,7 +251,7 @@
251251
}
252252

253253
// Replace base_link() per le query
254-
$value = str_replace('base_link()', base_path(), $value);
254+
$value = str_replace('base_link()', base_path_osm(), $value);
255255
$result[] = str_replace('|attr|', implode(' ', $attributes), '<div |attr|>'.$value.'</div>');
256256
}
257257

‎config/csrf_config.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
'GET' => 0,
2828
'POST' => 0,
2929
],
30-
'jsUrl' => base_path().'/assets/dist/js/csrf/csrfprotector.js',
30+
'jsUrl' => base_path_osm().'/assets/dist/js/csrf/csrfprotector.js',
3131
'tokenLength' => 10,
3232
'cookieConfig' => [
33-
'path' => base_path(),
33+
'path' => base_path_osm(),
3434
'secure' => isHTTPS(true),
3535
],
3636
'verifyGetFor' => [],

‎controller.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
include_once __DIR__.'/core.php';
2424

2525
if (!empty($id_record) && !empty($id_module)) {
26-
redirect_url(base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record);
26+
redirect_url(base_path_osm().'/editor.php?id_module='.$id_module.'&id_record='.$id_record);
2727
} elseif (empty($id_module)) {
28-
redirect_url(base_path().'/index.php');
28+
redirect_url(base_path_osm().'/index.php');
2929
}
3030

3131
include_once App::filepath('include|custom|', 'top.php');

‎core.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
ini_set('session.use_trans_sid', '0');
6363
ini_set('session.use_only_cookies', '1');
6464

65-
session_set_cookie_params(0, base_path(), null, isHTTPS(true));
65+
session_set_cookie_params(0, base_path_osm(), null, isHTTPS(true));
6666
session_start();
6767
}
6868

@@ -178,7 +178,7 @@
178178
Permissions::skip();
179179
}
180180

181-
if (!$continue && getURLPath() != slashes(base_path().'/index.php') && !Permissions::getSkip()) {
181+
if (!$continue && getURLPath() != slashes(base_path_osm().'/index.php') && !Permissions::getSkip()) {
182182
if (Auth::check()) {
183183
Auth::logout();
184184
}
@@ -192,7 +192,7 @@
192192
}
193193
}
194194

195-
redirect_url(base_path().'/index.php');
195+
redirect_url(base_path_osm().'/index.php');
196196
exit;
197197
}
198198

‎editor.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
$module_header_html = '';
2828

2929
if (empty($id_record) && !empty($id_module) && empty($id_plugin)) {
30-
redirect_url(base_path().'/controller.php?id_module='.$id_module);
30+
redirect_url(base_path_osm().'/controller.php?id_module='.$id_module);
3131
} elseif (empty($id_record) && empty($id_module) && empty($id_plugin)) {
32-
redirect_url(base_path().'/index.php');
32+
redirect_url(base_path_osm().'/index.php');
3333
}
3434

3535
include_once App::filepath('include|custom|', 'top.php');
@@ -79,7 +79,7 @@
7979
</h3>
8080
<br>
8181
82-
<a class="btn btn-default" href="'.base_path().'/controller.php?id_module='.$id_module.'">
82+
<a class="btn btn-default" href="'.base_path_osm().'/controller.php?id_module='.$id_module.'">
8383
<i class="fa fa-chevron-left"></i> '.tr('Indietro').'
8484
</a>
8585
</div>';
@@ -168,7 +168,7 @@
168168
echo '
169169
170170
<div id="pulsanti">
171-
<a class="btn btn-default" id="back" href="'.base_path().'/controller.php?id_module='.$id_module.'">
171+
<a class="btn btn-default" id="back" href="'.base_path_osm().'/controller.php?id_module='.$id_module.'">
172172
<i class="fa fa-chevron-left"></i> '.tr("Torna all'elenco").'
173173
</a>';
174174

@@ -197,11 +197,11 @@
197197

198198
echo '
199199
<div class="btn-group">
200-
<a class="btn btn-default'.($prev ? '' : ' disabled').'" href="'.base_path().'/editor.php?id_module='.$id_module.'&id_record='.$prev.'">
200+
<a class="btn btn-default'.($prev ? '' : ' disabled').'" href="'.base_path_osm().'/editor.php?id_module='.$id_module.'&id_record='.$prev.'">
201201
<i class="fa fa-arrow-circle-left"></i>
202202
</a>
203203
<span class="btn btn-default disabled">'.($key + 1).'/'.count($posizioni).'</span>
204-
<a class="btn btn-default'.($next ? '' : ' disabled').'" href="'.base_path().'/editor.php?id_module='.$id_module.'&id_record='.$next.'">
204+
<a class="btn btn-default'.($next ? '' : ' disabled').'" href="'.base_path_osm().'/editor.php?id_module='.$id_module.'&id_record='.$next.'">
205205
<i class="fa fa-arrow-circle-right"></i>
206206
</a>
207207
</div>
@@ -535,7 +535,7 @@
535535
if (!empty($record)) {
536536
echo '
537537
<hr>
538-
<a class="btn btn-default" href="'.base_path().'/controller.php?id_module='.$id_module.'">
538+
<a class="btn btn-default" href="'.base_path_osm().'/controller.php?id_module='.$id_module.'">
539539
<i class="fa fa-chevron-left"></i> '.tr('Indietro').'
540540
</a>';
541541
}
@@ -608,7 +608,7 @@
608608
?>
609609

610610
function getActiveUsers(){
611-
$.getJSON('<?php echo base_path(); ?>/ajax.php?op=active_users', {
611+
$.getJSON('<?php echo base_path_osm(); ?>/ajax.php?op=active_users', {
612612
id_module: <?php echo $id_module; ?>,
613613
id_record: <?php echo $id_record; ?>
614614
},

‎include/common/articolo.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,22 @@
7979
echo '
8080
<div class="row '.(!empty($options['nascondi_prezzi']) ? 'hidden' : '').'" id="prezzi_articolo">
8181
<div class="col-md-4 text-center">
82-
<button type="button" class="btn btn-sm btn-info btn-block '.($disabled ? 'disabled' : '').'" '.($disabled ? 'disabled' : '').' onclick="$(\'#prezziacquisto\').toggleClass(\'hide\'); $(\'#prezziacquisto\').load(\''.base_path()."/ajax_complete.php?module=Articoli&op=getprezziacquisto&idarticolo=' + ( $('#idarticolo option:selected').val() || $('#idarticolo').val()) + '&limit=5".'\');">
82+
<button type="button" class="btn btn-sm btn-info btn-block '.($disabled ? 'disabled' : '').'" '.($disabled ? 'disabled' : '').' onclick="$(\'#prezziacquisto\').toggleClass(\'hide\'); $(\'#prezziacquisto\').load(\''.base_path_osm()."/ajax_complete.php?module=Articoli&op=getprezziacquisto&idarticolo=' + ( $('#idarticolo option:selected').val() || $('#idarticolo').val()) + '&limit=5".'\');">
8383
<i class="fa fa-shopping-cart"></i> '.tr('Ultimi prezzi di acquisto').'
8484
</button>
8585
<br>
8686
<div id="prezziacquisto" class="hide"></div>
8787
</div>
8888
8989
<div class="col-md-4 text-center">
90-
<button type="button" class="btn btn-sm btn-info btn-block '.($disabled ? 'disabled' : '').'" '.($disabled ? 'disabled' : '').' onclick="$(\'#prezzi\').toggleClass(\'hide\'); $(\'#prezzi\').load(\''.base_path()."/ajax_complete.php?module=Articoli&op=getprezzi&idarticolo=' + ( $('#idarticolo option:selected').val() || $('#idarticolo').val()) + '&idanagrafica=".$options['idanagrafica'].'\');">
90+
<button type="button" class="btn btn-sm btn-info btn-block '.($disabled ? 'disabled' : '').'" '.($disabled ? 'disabled' : '').' onclick="$(\'#prezzi\').toggleClass(\'hide\'); $(\'#prezzi\').load(\''.base_path_osm()."/ajax_complete.php?module=Articoli&op=getprezzi&idarticolo=' + ( $('#idarticolo option:selected').val() || $('#idarticolo').val()) + '&idanagrafica=".$options['idanagrafica'].'\');">
9191
<i class="fa fa-handshake-o"></i> '.($options['dir'] == 'entrata' ? tr('Ultimi prezzi al cliente') : tr('Ultimi prezzi dal fornitore')).'
9292
</button>
9393
<div id="prezzi" class="hide"></div>
9494
</div>
9595
9696
<div class="col-md-4 text-center">
97-
<button type="button" class="btn btn-sm btn-info btn-block '.($disabled ? 'disabled' : '').'" '.($disabled ? 'disabled' : '').' onclick="$(\'#prezzivendita\').toggleClass(\'hide\'); $(\'#prezzivendita\').load(\''.base_path()."/ajax_complete.php?module=Articoli&op=getprezzivendita&idarticolo=' + ( $('#idarticolo option:selected').val() || $('#idarticolo').val()) + '&limit=5".'\');">
97+
<button type="button" class="btn btn-sm btn-info btn-block '.($disabled ? 'disabled' : '').'" '.($disabled ? 'disabled' : '').' onclick="$(\'#prezzivendita\').toggleClass(\'hide\'); $(\'#prezzivendita\').load(\''.base_path_osm()."/ajax_complete.php?module=Articoli&op=getprezzivendita&idarticolo=' + ( $('#idarticolo option:selected').val() || $('#idarticolo').val()) + '&limit=5".'\');">
9898
<i class="fa fa-money"></i> '.tr('Ultimi prezzi di vendita').'
9999
</button>
100100
<br>

‎include/common/form.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
// Form di inserimento riga documento
2222
echo '
23-
<form action="'.base_path().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.'" method="post" id="submit-form">
23+
<form action="'.base_path_osm().'/editor.php?id_module='.$id_module.'&id_record='.$id_record.'" method="post" id="submit-form">
2424
<input type="hidden" name="id_plugin" value="'.$id_plugin.'">
2525
<input type="hidden" name="hash" value="tab_'.$id_plugin.'">
2626
<input type="hidden" name="backto" value="record-edit">

‎include/common/importa.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
$righe_evase = $righe_totali->where('qta_rimanente', '=', 0);
7676
}
7777

78-
$link = !empty($documento_finale) ? base_path().'/editor.php?id_module='.$final_module->id.'&id_record='.$documento_finale->id : base_path().'/controller.php?id_module='.$final_module->id;
78+
$link = !empty($documento_finale) ? base_path_osm().'/editor.php?id_module='.$final_module->id.'&id_record='.$documento_finale->id : base_path_osm().'/controller.php?id_module='.$final_module->id;
7979

8080
echo '
8181
<form action="'.$link.'" method="post">

‎include/init/configuration.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,14 @@
151151
<p>'.tr('Non è possibile creare il file di configurazione _FILE_ per mancanza di permessi di scrittura', [
152152
'_FILE_' => '<b>config.inc.php</b>',
153153
]).'</p>
154-
<form action="'.base_path().'/index.php?action=updateconfig&firstuse=true" method="post">
154+
<form action="'.base_path_osm().'/index.php?action=updateconfig&firstuse=true" method="post">
155155
<div class="hide">
156156
<input type="hidden" name="db_name" value="'.$db_name.'">
157157
<input type="hidden" name="db_password" value="'.$db_password.'">
158158
<input type="hidden" name="db_username" value="'.$db_username.'">;
159159
<input type="hidden" name="db_host" value="'.$db_host.'">
160160
</div>
161-
<a class="btn btn-warning btn-lg" href="'.base_path().'/index.php"><i class="fa fa-arrow-left"></i> '.tr('Indietro').'</a>
161+
<a class="btn btn-warning btn-lg" href="'.base_path_osm().'/index.php"><i class="fa fa-arrow-left"></i> '.tr('Indietro').'</a>
162162
<button class="btn btn-info btn-lg"><i class="fa fa-refresh"></i> '.tr('Riprova').'</button>
163163
</form>
164164
<hr>
@@ -183,7 +183,7 @@
183183
else {
184184
// Creazione manifest.json
185185
include_once App::filepath('include/init', 'manifest.php');
186-
redirect_url(base_path().'/index.php');
186+
redirect_url(base_path_osm().'/index.php');
187187
exit;
188188
}
189189
}
@@ -199,7 +199,7 @@
199199
<div class="card-body">
200200
<p>'.tr('Impossibile stabilire una connessione con il database').'.</p>
201201
<p>'.tr('Verifica che i dati di accesso siano corretti e che il database esista').'.</p>
202-
<a class="btn btn-info btn-lg" href="'.base_path().'/index.php"><i class="fa fa-refresh"></i> '.tr('Riprova').'</a>
202+
<a class="btn btn-info btn-lg" href="'.base_path_osm().'/index.php"><i class="fa fa-refresh"></i> '.tr('Riprova').'</a>
203203
</div>
204204
</div>';
205205
}
@@ -220,7 +220,7 @@
220220
'_FILE_' => '<b>config.inc.php</b>',
221221
]).'.</p>
222222
<p>'.tr("Se il problema persiste, contatta l'assistenza").'.</p>
223-
<a class="btn btn-info btn-lg" href="'.base_path().'/index.php"><i class="fa fa-refresh"></i> '.tr('Riprova').'</a>
223+
<a class="btn btn-info btn-lg" href="'.base_path_osm().'/index.php"><i class="fa fa-refresh"></i> '.tr('Riprova').'</a>
224224
</div>
225225
</div>';
226226
}
@@ -314,7 +314,7 @@
314314
$("#test").prop("disabled", true);
315315
$("#install").prop("disabled", true);
316316
$(this).closest("form").ajaxSubmit({
317-
url: "'.base_path().'/index.php",
317+
url: "'.base_path_osm().'/index.php",
318318
data: {
319319
test: 1,
320320
},

0 commit comments

Comments
 (0)