diff --git a/src/App.php b/src/App.php
index dad5e9c20..966797f01 100644
--- a/src/App.php
+++ b/src/App.php
@@ -12,6 +12,29 @@ class App
/** @var int Identificativo dell'elemento corrente */
protected static $current_element;
+ protected static $assets = [
+ // CSS
+ 'css' => [
+ 'app.min.css',
+ 'style.min.css',
+ 'themes.min.css',
+ [
+ 'href' => 'print.min.css',
+ 'media' => 'print',
+ ],
+ ],
+
+ // JS
+ 'js' => [
+ 'app.min.js',
+ 'custom.min.js',
+ 'i18n/parsleyjs/|lang|.min.js',
+ 'i18n/select2/|lang|.min.js',
+ 'i18n/moment/|lang|.min.js',
+ 'i18n/fullcalendar/|lang|.min.js',
+ ],
+ ];
+
/**
* Restituisce l'identificativo del modulo attualmente in utilizzo.
*
@@ -20,7 +43,7 @@ class App
public static function getCurrentModule()
{
if (empty(self::$current_module)) {
- self::$current_module = filter('id_module');
+ self::$current_module = Modules::get(filter('id_module'));
}
return self::$current_module;
@@ -41,16 +64,263 @@ class App
}
/**
- * Restituisce la configurazione dell'installazione.
+ * Restituisce la configurazione di default del gestionale.
*
* @return array
*/
- public function getConfig()
+ protected static function getDefaultConfig()
{
- if (file_exists(DOCROOT.'/config.inc.php')) {
- include DOCROOT.'/config.inc.php';
+ if (file_exists(DOCROOT.'/config.example.php')) {
+ include DOCROOT.'/config.example.php';
}
return get_defined_vars();
}
+
+ /**
+ * Restituisce la configurazione dell'installazione.
+ *
+ * @return array
+ */
+ public static function getConfig()
+ {
+ if (file_exists(DOCROOT.'/config.inc.php')) {
+ include DOCROOT.'/config.inc.php';
+
+ $config = get_defined_vars();
+ } else {
+ $config = [];
+ }
+
+ $defaultConfig = self::getDefaultConfig();
+
+ return array_merge($defaultConfig, $config);
+ }
+
+ /**
+ * Individuazione dei percorsi di base.
+ *
+ * @return array
+ */
+ public static function definePaths($docroot)
+ {
+ // Individuazione di $rootdir
+ $rootdir = substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/')).'/';
+ if (strrpos($rootdir, '/'.basename($docroot).'/') !== false) {
+ $rootdir = substr($rootdir, 0, strrpos($rootdir, '/'.basename($docroot).'/')).'/'.basename($docroot);
+ } else {
+ $rootdir = '/';
+ }
+ $rootdir = rtrim($rootdir, '/');
+ $rootdir = str_replace('%2F', '/', rawurlencode($rootdir));
+
+ // Individuazione di $baseurl
+ $baseurl = (isHTTPS(true) ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'].$rootdir;
+
+ // Impostazione delle variabili globali
+ define('DOCROOT', $docroot);
+ define('ROOTDIR', $rootdir);
+ define('BASEURL', $baseurl);
+ }
+
+ /**
+ * Restituisce la configurazione dell'installazione.
+ *
+ * @return array
+ */
+ public static function getPaths()
+ {
+ $assets = ROOTDIR.'/assets/dist';
+
+ return [
+ 'assets' => $assets,
+ 'css' => $assets.'/css',
+ 'js' => $assets.'/js',
+ 'img' => $assets.'/img',
+ ];
+ }
+
+ /**
+ * Restituisce la configurazione dell'installazione.
+ *
+ * @return array
+ */
+ public static function getAssets()
+ {
+ // Assets aggiuntivi
+ $config = self::getConfig();
+
+ $css = array_unique(array_merge(self::$assets['css'], $config['assets']['css']));
+ $js = array_unique(array_merge(self::$assets['js'], $config['assets']['js']));
+
+ // Impostazione dei percorsi
+ $paths = self::getPaths();
+ $lang = Translator::getInstance()->getCurrentLocale();
+
+ foreach ($css as $key => $value) {
+ if (is_array($value)) {
+ $path = $value['href'];
+ } else {
+ $path = $value;
+ }
+
+ $path = $paths['css'].'/'.$path;
+ $path = str_replace('|lang|', $lang, $path);
+
+ if (is_array($value)) {
+ $value['href'] = $path;
+ } else {
+ $value = $path;
+ }
+
+ $css[$key] = $value;
+ }
+
+ foreach ($js as $key => $value) {
+ $value = $paths['js'].'/'.$value;
+ $value = str_replace('|lang|', $lang, $value);
+
+ $js[$key] = $value;
+ }
+
+ // JS aggiuntivi per gli utenti connessi
+ if (Auth::check()) {
+ $js[] = ROOTDIR.'/lib/functions.js';
+ $js[] = ROOTDIR.'/lib/init.js';
+ }
+
+ return [
+ 'css' => $css,
+ 'js' => $js,
+ ];
+ }
+
+ /**
+ * Restituisce un'insieme di array comprendenti le informazioni per la costruzione della query del modulo indicato.
+ *
+ * @param int $id
+ *
+ * @return array
+ */
+ public static function readQuery($element)
+ {
+ if (str_contains($element['option'], '|select|')) {
+ $result = self::readNewQuery($element);
+ } else {
+ $result = self::readOldQuery($element);
+ }
+
+ return $result;
+ }
+
+ protected static function readNewQuery($element)
+ {
+ $fields = [];
+ $summable = [];
+ $search_inside = [];
+ $search = [];
+ $slow = [];
+ $order_by = [];
+
+ $query = $element['option'];
+ $views = self::getViews($element);
+
+ $select = [];
+
+ foreach ($views as $view) {
+ $select[] = $view['query'].(!empty($view['name']) ? " AS '".$view['name']."'" : '');
+
+ if ($view['enabled']) {
+ $view['name'] = trim($view['name']);
+ $view['search_inside'] = trim($view['search_inside']);
+ $view['order_by'] = trim($view['order_by']);
+
+ $fields[] = trim($view['name']);
+
+ $search_inside[] = !empty($view['search_inside']) ? $view['search_inside'] : $view['name'];
+ $order_by[] = !empty($view['order_by']) ? $view['order_by'] : $view['name'];
+ $search[] = $view['search'];
+ $slow[] = $view['slow'];
+ $format[] = $view['format'];
+
+ if ($view['summable']) {
+ $summable[] = 'SUM(`'.trim($view['name']."`) AS 'sum_".(count($fields) - 1)."'");
+ }
+ }
+ }
+
+ $select = empty($select) ? '*' : implode(', ', $select);
+
+ $query = str_replace('|select|', $select, $query);
+
+ return [
+ 'query' => $query,
+ 'fields' => $fields,
+ 'search_inside' => $search_inside,
+ 'order_by' => $order_by,
+ 'search' => $search,
+ 'slow' => $slow,
+ 'format' => $format,
+ 'summable' => [],
+ ];
+ }
+
+ protected static function readOldQuery($element)
+ {
+ $options = str_replace(["\r", "\n", "\t"], ' ', $element['option']);
+ $options = json_decode($options, true);
+ $options = $options['main_query'][0];
+
+ $query = $options['query'];
+ $fields = explode(',', $options['fields']);
+ foreach ($fields as $key => $value) {
+ $fields[$key] = trim($value);
+ $search[] = 1;
+ $slow[] = 0;
+ $format[] = 0;
+ }
+
+ $search_inside = $fields;
+ $order_by = $fields;
+
+ return [
+ 'query' => $query,
+ 'fields' => $fields,
+ 'search_inside' => $search_inside,
+ 'order_by' => $order_by,
+ 'search' => $search,
+ 'slow' => $slow,
+ 'format' => $format,
+ 'summable' => [],
+ ];
+ }
+
+ protected static function getViews($element)
+ {
+ $database = Database::getConnection();
+
+ $user = Auth::user();
+
+ $views = $database->fetchArray('SELECT * FROM `zz_views` WHERE `id_module`='.prepare($element['id']).' AND
+ `id` IN (
+ SELECT `id_vista` FROM `zz_group_view` WHERE `id_gruppo`=(
+ SELECT `idgruppo` FROM `zz_users` WHERE `id`='.prepare($user['id']).'
+ ))
+ ORDER BY `order` ASC');
+
+ return $views;
+ }
+
+ public static function replacePlaceholder($query, $custom = null)
+ {
+ $user = Auth::user();
+
+ $id = empty($custom) ? $user['idanagrafica'] : $custom;
+
+ $query = str_replace(['|idagente|', '|idtecnico|', '|idanagrafica|'], prepare($id), $query);
+
+ $query = str_replace(['|period_start|', '|period_end|'], [$_SESSION['period_start'], $_SESSION['period_end']], $query);
+
+ return $query;
+ }
}
diff --git a/src/Auth.php b/src/Auth.php
index 8f246e8d0..33e20d725 100644
--- a/src/Auth.php
+++ b/src/Auth.php
@@ -207,6 +207,7 @@ class Auth extends \Util\Singleton
$results = $database->fetchArray('SELECT id AS id_utente, idanagrafica, username, (SELECT nome FROM zz_groups WHERE zz_groups.id=zz_users.idgruppo) AS gruppo FROM zz_users WHERE id = '.prepare($user_id).' AND enabled = 1 LIMIT 1', false, ['session' => false]);
if (!empty($results)) {
+ $results[0]['id'] = $results[0]['id_utente'];
$results[0]['is_admin'] = ($results[0]['gruppo'] == 'Amministratori');
$this->infos = $results[0];
diff --git a/src/Modules.php b/src/Modules.php
index 62c3efc32..8b1275265 100644
--- a/src/Modules.php
+++ b/src/Modules.php
@@ -49,8 +49,13 @@ class Modules
$additionals[$result['id']]['HVN'] = [];
}
+ $result['options'] = App::replacePlaceholder($result['options']);
+ $result['options2'] = App::replacePlaceholder($result['options2']);
+
+ $result['option'] = empty($result['options2']) ? $result['options'] : $result['options2'];
+
if (!empty($result['clause'])) {
- $result['clause'] = self::replacePlaceholder($result['clause']);
+ $result['clause'] = App::replacePlaceholder($result['clause']);
$additionals[$result['id']][$result['position']][] = $result['clause'];
}
@@ -173,141 +178,6 @@ class Modules
return $result;
}
- /**
- * Restituisce l'identificativo del modulo attualmente in utilizzo.
- *
- * @return int
- */
- public static function getCurrentModule()
- {
- if (empty(self::$current_module)) {
- self::$current_module = filter('id_module');
- }
-
- return self::get(self::$current_module);
- }
-
- /**
- * Restituisce l'identificativo dell'elemento attualmente in utilizzo.
- *
- * @return int
- */
- public static function getCurrentElement()
- {
- if (empty(self::$current_element)) {
- self::$current_element = filter('id_record');
- }
-
- return self::$current_element;
- }
-
- /**
- * Restituisce un'insieme di array comprendenti le informazioni per la costruzione della query del modulo indicato.
- *
- * @param int $id
- *
- * @return array
- */
- public static function getQuery($id)
- {
- if (empty(self::$queries[$id])) {
- $database = Database::getConnection();
- $module = self::get($id);
-
- $fields = [];
- $summable = [];
- $search_inside = [];
- $search = [];
- $slow = [];
- $order_by = [];
- $select = '*';
-
- $options = !empty($module['options2']) ? $module['options2'] : $module['options'];
- if (str_contains($options, '|select|')) {
- $query = $options;
-
- $user = Auth::user();
-
- $datas = $database->fetchArray('SELECT * FROM `zz_views` WHERE `id_module`='.prepare($id).' AND `id` IN (SELECT `id_vista` FROM `zz_group_view` WHERE `id_gruppo`=(SELECT `idgruppo` FROM `zz_users` WHERE `id`='.prepare($user['id_utente']).')) ORDER BY `order` ASC');
-
- if (!empty($datas)) {
- $select = '';
-
- foreach ($datas as $data) {
- $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($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'];
-
- if ($data['summable']) {
- $summable[] = 'SUM(`'.trim($data['name']."`) AS 'sum_".(count($fields) - 1)."'");
- }
- }
- }
-
- $select = substr($select, 0, strlen($select) - 2);
- }
- } else {
- $options = self::readOldQuery($options);
-
- $query = $options['query'];
- $fields = explode(',', $options['fields']);
- foreach ($fields as $key => $value) {
- $fields[$key] = trim($value);
- $search[] = 1;
- $slow[] = 0;
- $format[] = 0;
- }
-
- $search_inside = $fields;
- $order_by = $fields;
- }
-
- $result = [];
- $result['query'] = $query;
- $result['select'] = $select;
- $result['fields'] = $fields;
- $result['search_inside'] = $search_inside;
- $result['order_by'] = $order_by;
- $result['search'] = $search;
- $result['slow'] = $slow;
- $result['format'] = $format;
- $result['summable'] = $summable;
-
- self::$queries[$id] = $result;
- }
-
- return self::$queries[$id];
- }
-
- public static function readOldQuery($options)
- {
- $options = str_replace(["\r", "\n", "\t"], ' ', $options);
- $options = json_decode($options, true);
-
- return $options['main_query'][0];
- }
-
- public static function replacePlaceholder($query, $custom = null)
- {
- $user = Auth::user();
-
- $custom = empty($custom) ? $user['idanagrafica'] : $custom;
- $result = str_replace(['|idagente|', '|idtecnico|', '|idanagrafica|'], prepare($custom), $query);
-
- return $result;
- }
-
/**
* Restituisce tutte le informazioni dei moduli installati in una scala gerarchica fino alla profondità indicata.
*
@@ -399,7 +269,7 @@ class Modules
if (empty(self::$menu) || self::$depth != $depth) {
$menus = self::getHierarchy($depth);
- $module_name = self::getCurrentModule()['name'];
+ $module_name = App::getCurrentModule()['name'];
$result = '';
foreach ($menus as $menu) {
diff --git a/src/Plugins.php b/src/Plugins.php
index 2b011b2f0..47acc5a91 100644
--- a/src/Plugins.php
+++ b/src/Plugins.php
@@ -27,6 +27,11 @@ class Plugins
$plugins = [];
foreach ($results as $result) {
+ $result['options'] = App::replacePlaceholder($result['options'], filter('id_parent'));
+ $result['options2'] = App::replacePlaceholder($result['options2'], filter('id_parent'));
+
+ $result['option'] = empty($result['options2']) ? $result['options'] : $result['options2'];
+
$plugins[$result['id']] = $result;
$plugins[$result['name']] = $result['id'];
}
@@ -52,58 +57,4 @@ class Plugins
return self::getPlugins()[$plugin];
}
-
- /**
- * Restituisce un'insieme di array comprendenti le informazioni per la costruzione della query del modulo indicato.
- *
- * @param int $id
- *
- * @return array
- */
- public static function getQuery($id)
- {
- if (empty(self::$queries[$id])) {
- $database = Database::getConnection();
-
- $module = self::get($id);
-
- $fields = [];
- $summable = [];
- $search_inside = [];
- $search = [];
- $slow = [];
- $order_by = [];
- $select = '*';
-
- $options = !empty($module['options2']) ? $module['options2'] : $module['options'];
- $options = Modules::readOldQuery($options);
-
- $query = $options['query'];
- $fields = explode(',', $options['fields']);
- foreach ($fields as $key => $value) {
- $fields[$key] = trim($value);
- $search[] = 1;
- $slow[] = 0;
- $format[] = 0;
- }
-
- $search_inside = $fields;
- $order_by = $fields;
-
- $result = [];
- $result['query'] = $query;
- $result['select'] = $select;
- $result['fields'] = $fields;
- $result['search_inside'] = $search_inside;
- $result['order_by'] = $order_by;
- $result['search'] = $search;
- $result['slow'] = $slow;
- $result['format'] = $format;
- $result['summable'] = $summable;
-
- self::$queries[$id] = $result;
- }
-
- return self::$queries[$id];
- }
}
diff --git a/templates/riepilogo_interventi/pdfgen.riepilogo_interventi.php b/templates/riepilogo_interventi/pdfgen.riepilogo_interventi.php
index 3e4c10025..ea0d5d8d2 100644
--- a/templates/riepilogo_interventi/pdfgen.riepilogo_interventi.php
+++ b/templates/riepilogo_interventi/pdfgen.riepilogo_interventi.php
@@ -5,13 +5,10 @@ include_once __DIR__.'/../../core.php';
$module = Modules::get('Interventi');
$id_module = $module['id'];
-$total = Modules::getQuery($id_module);
+$total = App::readQuery($module);
// Lettura parametri modulo
$module_query = $total['query'];
-$module_query = str_replace('|period_start|', $_SESSION['period_start'], $module_query);
-$module_query = str_replace('|period_end|', $_SESSION['period_end'], $module_query);
-$module_query = str_replace('|select|', $total['select'], $module_query);
$search_filters = [];
diff --git a/test.php b/test.php
deleted file mode 100644
index 1e9571c30..000000000
--- a/test.php
+++ /dev/null
@@ -1,17 +0,0 @@
-toArray());
-exit();
-print_r($user->modules()->get()->toArray());
-print_r($user->toArray());
-$modules = Models\Module::all();
-
-foreach ($modules as $module) {
- print_r($module->title.': '.$module->permission.'
');
- //print_r($module->views.'
');
-}
-
-exit();
+ 