loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Miglioramento di compatibilità con PHP 5.4 

Miglioramento di compatibilità con PHP 5.4, ottenuto attraverso test su Altervista.
This commit is contained in:
Thomas Zilio 2017-12-31 16:00:23 +01:00
parent f165a8035b
commit 593464603d
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
composer.json
View File

@ -30,7 +30,7 @@
"ifsnop/mysqldump-php": "^2.3",
"intervention/image": "^2.3",
"ircmaxell/password-compat": "^1.0",
"maximebf/debugbar": "^1.13",
"maximebf/debugbar": "~1.14.1",
"monolog/monolog": "^1.22",
"mpdf/mpdf": "^6.1",
"paragonie/random_compat": "^2.0",
@ -38,7 +38,8 @@
"spipu/html2pdf": "^5.0",
"symfony/filesystem": "^3.3",
"symfony/finder": "^3.3",
"symfony/translation": "^3.3"
"symfony/translation": "~3.3.0",
"symfony/var-dumper": "~2.8"
},
"autoload": {
"psr-4": {

2
lib/functions.php
View File

@ -892,6 +892,8 @@ function getURLPath()
if (substr($path, 0, strlen($prefix)) == $prefix) {
$path = substr($path, strlen($prefix));
} else {
$path = str_replace(DOCROOT, ROOTDIR, $path);
}
return slashes($path);

2
modules/dashboard/ajaxreq.php
View File

@ -94,7 +94,7 @@ switch (get('op')) {
$tooltip_text = '<b>'.tr('Numero intervento').'</b>: '.$id.'<br/>';
$tooltip_text .= '<b>'.tr('Ragione sociale').'</b>: '.nl2br($rs[0]['ragione_sociale']).'<br/>';
if (!empty($rs[0]['telefono'] != '')) {
if (!empty($rs[0]['telefono'])) {
$tooltip_text .= '<b>'.tr('Telefono').'</b>: '.nl2br($rs[0]['telefono']).'<br/>';
}

8
modules/dashboard/edit.php
View File

@ -423,7 +423,8 @@ if ($vista == 'mese') {
var calendar = $('#calendar').fullCalendar({
locale: globals.locale,
<?php
if (!empty(get_var('Visualizzare la domenica sul calendario'))) {
$domenica = get_var('Visualizzare la domenica sul calendario');
if (empty($domenica)) {
echo '
hiddenDays: [ 0 ],';
}
@ -438,7 +439,8 @@ if (!empty(get_var('Visualizzare la domenica sul calendario'))) {
slotDuration: '00:15:00',
defaultView: '<?php echo $def; ?>',
<?php
if (!empty(get_var('Abilitare orario lavorativo'))) {
$orario_lavorativo = get_var('Abilitare orario lavorativo');
if (!empty($orario_lavorativo)) {
echo "
minTime: '08:00:00',
maxTime: '20:00:00',";
@ -518,7 +520,6 @@ if (Modules::getPermission('Interventi') == 'rw') {
});
},
<?php
}
?>
eventAfterRender: function(event, element) {
@ -553,7 +554,6 @@ if (get_var('Utilizzare i tooltip sul calendario') == '1') {
}
});
<?php
}
?>
},

8
src/Modules.php
View File

@ -219,10 +219,14 @@ class Modules
$select .= $data['query'].(!empty($data['name']) ? " AS '".$data['name']."', " : '');
if ($data['enabled']) {
$data['name'] = trim($data['name']);
$data['search_inside'] = trim($data['search_inside']);
$data['order_by'] = trim($data['order_by']);
$fields[] = trim($data['name']);
$search_inside[] = !empty(trim($data['search_inside'])) ? trim($data['search_inside']) : trim($data['name']);
$order_by[] = !empty(trim($data['order_by'])) ? trim($data['order_by']) : trim($data['name']);
$search_inside[] = !empty($data['search_inside']) ? $data['search_inside'] : $data['name'];
$order_by[] = !empty($data['order_by']) ? $data['order_by'] : $data['name'];
$search[] = $data['search'];
$slow[] = $data['slow'];
$format[] = $data['format'];