Skip to content

fix: rende il manifest indipendente dal percorso di installazione #1887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sajotrei wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −32
Open

fix: rende il manifest indipendente dal percorso di installazione #1887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 34 additions & 31 deletions include/init/manifest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,43 +18,46 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

$creation = file_put_contents('manifest.json', '');
$manifest_lang = (!empty($lang) && $lang != '|lang|') ? $lang : ($GLOBALS['lang'] ?? 'it_IT');
$manifest_lang = empty($manifest_lang) || $manifest_lang == '|lang|' ? 'it_IT' : $manifest_lang;

if (!$creation) {
$manifest = '{
$manifest = [
'dir' => 'ltr',
'lang' => str_replace('_', '-', $manifest_lang),
'name' => tr('OpenSTAManager'),
'scope' => './',
'display' => 'fullscreen',
'start_url' => './',
'short_name' => 'OSM',
'theme_color' => 'transparent',
'description' => tr('OpenSTAManager'),
'orientation' => 'any',
'background_color' => 'transparent',
'generated' => 'true',
'icons' => [
[
'src' => 'assets/dist/img/logo_completo.png',
'type' => 'image/png',
'sizes' => '489x91',
],
],
];

"dir" : "ltr",
"lang" : "'.((empty($lang) || $lang == '|lang|') ? 'it-IT' : str_replace('_', '-', $lang)).'",
"name" : "'.tr('OpenSTAManager').'",
"scope" : "'.((empty(base_path_osm()) || base_path_osm() == '/') ? '' : '.').'",
"display" : "fullscreen",
"start_url" : "'.((empty(base_path_osm()) || base_path_osm() == '/') ? '/' : './').'",
"short_name" : "OSM",
"theme_color" : "transparent",
"description" : "'.tr('OpenSTAManager').'",
"orientation" : "any",
"background_color" : "transparent",
"generated" : "true",
"icons" : [
{
"src": "'.App::getPaths()['img'].'/logo_completo.png",
"type": "image/png",
"sizes": "489x91"
}
]
}';
$manifest_content = json_encode($manifest, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
$creation = $manifest_content !== false
? file_put_contents(base_dir().'/manifest.json', $manifest_content.PHP_EOL)
: false;

file_put_contents('manifest.json', $manifest);
} else {
if ($creation === false) {
echo '
<div class="card card-center card-danger card-solid text-center">
<div class="card-header with-border">
<h3 class="card-title">'.tr('Permessi di scrittura mancanti').'</h3>
</div>
<div class="card-body">
<p>'.tr('Sembra che non ci siano i permessi di scrittura sul file _FILE_', [
<div class="card-header with-border">
<h3 class="card-title">'.tr('Permessi di scrittura mancanti').'</h3>
</div>
<div class="card-body">
<p>'.tr('Sembra che non ci siano i permessi di scrittura sul file _FILE_', [
'_FILE_' => '<b>manifest.json</b>',
]).'</p>
</div>
</div>
</div>';
}
5 changes: 4 additions & 1 deletion update/2_12.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,7 @@
// File non più presente, reset del valore
$dbo->update('zz_settings', ['valore' => ''], ['nome' => 'Filigrana stampe']);
}
}
}

// Rigenerazione del manifest per rendere scope e start_url indipendenti dal percorso di installazione
include base_dir().'/include/init/manifest.php';