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

Fix percorsi componenti my_impianti -> impianti

This commit is contained in:
Luca 2020-09-18 18:21:44 +02:00
parent 14f67f7245
commit 2fdc68e67f
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/articoli/actions.php
View File

@ -131,7 +131,7 @@ switch (post('op')) {
// Salvataggio info componente (campo `contenuto`)
if (!empty($componente)) {
$contenuto_precedente_esistente = !empty($articolo->contenuto);
$contenuto = file_get_contents(DOCROOT.'/files/my_impianti/'.$componente);
$contenuto = file_get_contents(DOCROOT.'/files/impianti/'.$componente);
$contenuto_componente = Ini::read($contenuto);
// Lettura dei campi esistenti per preservarne il valore

4
modules/articoli/edit.php
View File

@ -243,11 +243,11 @@ echo '
<div class="form-group">
<label for="componente_filename">'.tr('Seleziona un componente').':</label>';
echo "
<select class=\"form-control superselect\" id=\"componente_filename\" name=\"componente_filename\" onchange=\"$.post('".$rootdir."/modules/my_impianti/actions.php', {op: 'load_componente', idarticolo: '".$id_record."', filename: $(this).find('option:selected').val() }, function(response){ $('#info_componente').html( response ); start_superselect(); $('.datepicker').datetimepicker({ locale: globals.locale, format: 'L' } ); } );\">\n";
<select class=\"form-control superselect\" id=\"componente_filename\" name=\"componente_filename\" onchange=\"$.post('".$rootdir."/modules/impianti/actions.php', {op: 'load_componente', idarticolo: '".$id_record."', filename: $(this).find('option:selected').val() }, function(response){ $('#info_componente').html( response ); start_superselect(); $('.datepicker').datetimepicker({ locale: globals.locale, format: 'L' } ); } );\">\n";
echo '
<option value="0">'.tr('Nessuno').'</option>';
$cmp = Ini::getList($docroot.'/files/my_impianti/');
$cmp = Ini::getList($docroot.'/files/impianti/');
if (count($cmp) > 0) {
for ($c = 0; $c < count($cmp); ++$c) {

2
modules/gestione_componenti/actions.php
View File

@ -19,7 +19,7 @@
include_once __DIR__.'/../../core.php';
$path = $docroot.'/files/my_impianti/';
$path = $docroot.'/files/impianti/';
switch (post('op')) {
case 'update':

4
modules/gestione_componenti/init.php
View File

@ -19,9 +19,9 @@
include_once __DIR__.'/../../core.php';
$cmp = \Util\Ini::getList($docroot.'/files/my_impianti/');
$cmp = \Util\Ini::getList($docroot.'/files/impianti/');
if (!empty($id_record) && isset($cmp[$id_record - 1])) {
$record['nomefile'] = $cmp[$id_record - 1][0];
$record['contenuto'] = file_get_contents($docroot.'/files/my_impianti/'.$record['nomefile']);
$record['contenuto'] = file_get_contents($docroot.'/files/impianti/'.$record['nomefile']);
}

4
modules/impianti/actions.php
View File

@ -124,8 +124,8 @@ switch ($op) {
}
// ...altrimenti carico dal file .ini
elseif (file_exists($docroot.'/files/my_impianti/'.$filename)) {
$contenuto = file_get_contents($docroot.'/files/my_impianti/'.$filename);
elseif (file_exists($docroot.'/files/impianti/'.$filename)) {
$contenuto = file_get_contents($docroot.'/files/impianti/'.$filename);
}
crea_form_componente($contenuto);

8
modules/impianti/plugins/my_impianti.componenti.php
View File

@ -46,8 +46,8 @@ switch (filter('op')) {
$filename = get('filename');
if (!empty($filename)) {
$contenuto = file_get_contents(DOCROOT.'/files/my_impianti/'.$filename);
$nome = Ini::getValue(Ini::readFile(DOCROOT.'/files/my_impianti/'.$filename), 'Nome');
$contenuto = file_get_contents(DOCROOT.'/files/impianti/'.$filename);
$nome = Ini::getValue(Ini::readFile(DOCROOT.'/files/impianti/'.$filename), 'Nome');
$query = 'INSERT INTO my_impianto_componenti(filename, idimpianto, contenuto, nome, data) VALUES('.prepare($filename).', '.prepare($id_record).', '.prepare($contenuto).', '.prepare($nome).', NOW())';
$dbo->query($query);
@ -63,8 +63,8 @@ switch (filter('op')) {
$filename = get('filename');
$id = get('id');
$nome = Ini::getValue(Ini::readFile(DOCROOT.'/files/my_impianti/'.$filename), 'Nome');
$contenuto = file_get_contents(DOCROOT.'/files/my_impianti/'.$filename);
$nome = Ini::getValue(Ini::readFile(DOCROOT.'/files/impianti/'.$filename), 'Nome');
$contenuto = file_get_contents(DOCROOT.'/files/impianti/'.$filename);
// Verifico che questo componente non sia già stato sostituito
$query = 'SELECT * FROM my_impianto_componenti WHERE idsostituto = '.prepare($id);

2
src/Util/Ini.php
View File

@ -82,7 +82,7 @@ class Ini
*/
public static function readFile($filename)
{
$filename = (file_exists($filename)) ? $filename : DOCROOT.'/files/my_impianti/'.$filename;
$filename = (file_exists($filename)) ? $filename : DOCROOT.'/files/impianti/'.$filename;
$contents = file_get_contents($filename);