Merge branch 'master' of https://github.com/devcode-it/openstamanager
This commit is contained in:
commit
c2f8d5f389
|
@ -34,7 +34,11 @@ function customStructure()
|
||||||
|
|
||||||
// Controlli di personalizzazione fisica
|
// Controlli di personalizzazione fisica
|
||||||
foreach ($dirs as $dir) {
|
foreach ($dirs as $dir) {
|
||||||
$files = glob(base_dir().'/'.$dir.'/*/custom/**/*.{php,html}', GLOB_BRACE);
|
$files = glob(base_dir().'/'.$dir.'/*/custom/*.{php,html}', GLOB_BRACE);
|
||||||
|
$recursive_files = glob(base_dir().'/'.$dir.'/*/custom/**/*.{php,html}', GLOB_BRACE);
|
||||||
|
|
||||||
|
$files = array_merge($files, $recursive_files);
|
||||||
|
|
||||||
foreach ($files as $file) {
|
foreach ($files as $file) {
|
||||||
$file = str_replace(base_dir().'/', '', $file);
|
$file = str_replace(base_dir().'/', '', $file);
|
||||||
$result = explode('/custom/', $file)[0];
|
$result = explode('/custom/', $file)[0];
|
||||||
|
@ -46,7 +50,11 @@ function customStructure()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Gestione cartella include
|
// Gestione cartella include
|
||||||
$files = glob(base_dir().'/include/custom/**/*.{php,html}', GLOB_BRACE);
|
$files = glob(base_dir().'/include/custom/*.{php,html}', GLOB_BRACE);
|
||||||
|
$recursive_files = glob(base_dir().'/include/custom/**/*.{php,html}', GLOB_BRACE);
|
||||||
|
|
||||||
|
$files = array_merge($files, $recursive_files);
|
||||||
|
|
||||||
foreach ($files as $file) {
|
foreach ($files as $file) {
|
||||||
$file = str_replace(base_dir().'/', '', $file);
|
$file = str_replace(base_dir().'/', '', $file);
|
||||||
$result = explode('/custom/', $file)[0];
|
$result = explode('/custom/', $file)[0];
|
||||||
|
|
Loading…
Reference in New Issue