lapervenche/ZwiiCMS
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCMS
Code Issues Pull Requests Projects Releases Activity

10.1 Bug imagetag + majuscules

Browse Source
This commit is contained in:
Fred Tempez 2020-05-21 12:01:46 +02:00
parent 2553a659c5
commit ca963adbbd
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/module/config/config.php
View File

@ -255,21 +255,19 @@ class config extends common {
$site = helper::baseUrl(false); } $site = helper::baseUrl(false); }
$success= false; $success= false;
$googlePagespeedData = helper::urlGetContents('https://www.googleapis.com/pagespeedonline/v2/runPagespeed?url='. $site .'&screenshot=true'); $googlePagespeedData = helper::urlGetContents('https://www.googleapis.com/pagespeedonline/v5/runPagespeed?url='. $site .'&screenshot=true');
if ($googlePagespeedData !== false) { if ($googlePagespeedData !== false) {
$googlePagespeedData = json_decode($googlePagespeedData, true); $googlePagespeedData = json_decode($googlePagespeedData, true);
$screenshot = $googlePagespeedData['screenshot']['data']; $data = str_replace('_','/',$googlePagespeedData['lighthouseResult']['audits']['final-screenshot']['details']['data']);
$screenshot = str_replace(array('_','-'),array('/','+'),$screenshot); $data = str_replace('-','+',$data);
$data = 'data:image/jpeg;base64,'.$screenshot; $img = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $data));
$data = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $data));
// Effacer la miniature // Effacer la miniature
if (file_exists(self::FILE_DIR.'thumb/screenshot.png')) { if (file_exists(self::FILE_DIR.'thumb/screenshot.jpg')) {
unlink (self::FILE_DIR.'thumb/screenshot.png'); unlink (self::FILE_DIR.'thumb/screenshot.jpg');
} }
file_put_contents( self::FILE_DIR.'source/screenshot.png',$data); file_put_contents( self::FILE_DIR.'source/screenshot.jpg',$img);
$success =true; $success =true;
} }
// Valeurs en sortie // Valeurs en sortie
$this->addOutput([ $this->addOutput([
'notification' => $success === true ? 'Image tag réinitialisée' : 'Erreur : image tag non créée', 'notification' => $success === true ? 'Image tag réinitialisée' : 'Erreur : image tag non créée',

4
core/module/config/view/index/index.php
View File

@ -249,8 +249,8 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col12 textAlignCenter"> <div class="col8 offset2 textAlignCenter">
<img src="<?php echo helper::baseUrl(false) . self::FILE_DIR.'source/screenshot.png';?>" data-tippy-content="Cette capture d'écran est nécessaire aux partages sur les réseaux sociaux. Elle est régénérée lorsque le fichier 'screenshot.png' est effacé du gestionnaire de fichiers." /> <img src="<?php echo helper::baseUrl(false) . self::FILE_DIR.'source/screenshot.jpg';?>" data-tippy-content="Cette capture d'écran est nécessaire aux partages sur les réseaux sociaux. Elle est régénérée lorsque le fichier 'screenshot.png' est effacé du gestionnaire de fichiers." />
</div> </div>
</div> </div>
</div> </div>

2
core/module/config/view/manage/manage.php
View File

@ -10,7 +10,7 @@
</div> </div>
<div class="col2 offset8"> <div class="col2 offset8">
<?php echo template::submit('configManageSubmit',[ <?php echo template::submit('configManageSubmit',[
'value' => 'valider', 'value' => 'Valider',
'ico' => 'check' 'ico' => 'check'
]); ?> ]); ?>
</div> </div>

2
core/module/theme/view/admin/admin.php
View File

@ -17,7 +17,7 @@
</div> </div>
<div class="col2"> <div class="col2">
<?php echo template::submit('configAdminSubmit',[ <?php echo template::submit('configAdminSubmit',[
'value' => 'valider', 'value' => 'Valider',
'ico' => 'check' 'ico' => 'check'
]); ?> ]); ?>
</div> </div>

BIN
site/file/source/screenshot.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 18 KiB