From 19e6a8ac23f079ab84855962dcaa9352ee24626d Mon Sep 17 00:00:00 2001 From: Dasc3er Date: Tue, 22 Sep 2020 14:54:14 +0200 Subject: [PATCH] Correzioni minori su namespace --- src/HTMLBuilder/Manager/WidgetManager.php | 6 ++++-- src/Models/Clause.php | 3 ++- src/Models/View.php | 3 ++- src/Modules.php | 19 ++++++++++--------- src/Prints.php | 7 ++++--- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/HTMLBuilder/Manager/WidgetManager.php b/src/HTMLBuilder/Manager/WidgetManager.php index d6f79da5f..812f7b230 100755 --- a/src/HTMLBuilder/Manager/WidgetManager.php +++ b/src/HTMLBuilder/Manager/WidgetManager.php @@ -19,6 +19,8 @@ namespace HTMLBuilder\Manager; +use Util\Query; + /** * @since 2.4 */ @@ -96,7 +98,7 @@ class WidgetManager implements ManagerInterface $query = str_replace('1=1', '1=1 '.$additionals, $query); } - $query = \Util\Query::replacePlaceholder($query); + $query = Query::replacePlaceholder($query); // Individuazione del risultato della query $database = database(); @@ -163,7 +165,7 @@ class WidgetManager implements ManagerInterface elseif ($widget['more_link_type'] == 'javascript') { $link = $widget['more_link']; - $link = \Util\Query::replacePlaceholder($link); + $link = Query::replacePlaceholder($link); $result .= 'onclick="'.$link.'"'; } diff --git a/src/Models/Clause.php b/src/Models/Clause.php index b6c9fb85f..f238b5fd4 100755 --- a/src/Models/Clause.php +++ b/src/Models/Clause.php @@ -20,6 +20,7 @@ namespace Models; use Common\Model; +use Util\Query; class Clause extends Model { @@ -39,6 +40,6 @@ class Clause extends Model public function getClauseAttribute($value) { - return Util\Query::replacePlaceholder($value); + return Query::replacePlaceholder($value); } } diff --git a/src/Models/View.php b/src/Models/View.php index 8d58dac10..44caa57a8 100755 --- a/src/Models/View.php +++ b/src/Models/View.php @@ -20,6 +20,7 @@ namespace Models; use Common\Model; +use Util\Query; class View extends Model { @@ -27,7 +28,7 @@ class View extends Model public function getQueryAttribute($value) { - return Util\Query::replacePlaceholder($value); + return Query::replacePlaceholder($value); } /* Relazioni Eloquent */ diff --git a/src/Modules.php b/src/Modules.php index b914c57a8..563bf76c7 100755 --- a/src/Modules.php +++ b/src/Modules.php @@ -18,6 +18,7 @@ */ use Models\Module; +use Util\Query; /** * Classe per la gestione delle informazioni relative ai moduli installati. @@ -137,7 +138,7 @@ class Modules $results = $database->fetchArray('SELECT * FROM `zz_group_module` WHERE `idgruppo` = (SELECT `idgruppo` FROM `zz_users` WHERE `id` = '.prepare($user['id']).') AND `enabled` = 1 AND `idmodule` = '.prepare($module['id'])); foreach ($results as $result) { if (!empty($result['clause'])) { - $result['clause'] = Util\Query::replacePlaceholder($result['clause']); + $result['clause'] = Query::replacePlaceholder($result['clause']); $additionals[$result['position']][] = $result['clause']; } @@ -149,7 +150,7 @@ class Modules $id_segment = $_SESSION['module_'.$module['id']]['id_segment']; foreach ($segments as $result) { if (!empty($result['clause']) && $result['id'] == $id_segment) { - $result['clause'] = Util\Query::replacePlaceholder($result['clause']); + $result['clause'] = Query::replacePlaceholder($result['clause']); $additionals[$result['position']][] = $result['clause']; } @@ -263,13 +264,13 @@ class Modules /** * Costruisce un link HTML per il modulo e il record indicati. * - * @param string|int $modulo - * @param int $id_record - * @param string $testo - * @param string $alternativo - * @param string $extra - * @param bool $blank - * @param string $anchor + * @param string|int $modulo + * @param int $id_record + * @param string $testo + * @param bool|string $alternativo + * @param string $extra + * @param bool $blank + * @param string $anchor * * @return string */ diff --git a/src/Prints.php b/src/Prints.php index 758027f0c..7fea18dc6 100755 --- a/src/Prints.php +++ b/src/Prints.php @@ -18,6 +18,7 @@ */ use Mpdf\Mpdf; +use Util\Query; /** * Classe per la gestione delle informazioni relative alle stampe installate. @@ -152,11 +153,11 @@ class Prints if (!empty($infos['is_record'])) { $module = Modules::get($infos['id_module']); - Util\Query::setSegments(false); - $query = Util\Query::getQuery($module, [ + Query::setSegments(false); + $query = Query::getQuery($module, [ 'id' => $id_record, ]); - Util\Query::setSegments(true); + Query::setSegments(true); $has_access = !empty($query) ? $dbo->fetchNum($query) !== 0 : true; }