Correction de la génération de la liste de skin

Ajout d'une favicon en fonction du type de fichier.
Ajout d'une favicon par défaut si aucune favicon est trouvé

.gitignore

@@ -213,3 +213,11 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
+mypersonaldata/private/
+!mypersonaldata/private/index.html
+mypersonaldata/public/
+!mypersonaldata/public/index.html
+mypersonaldata/zipversions/
+!mypersonaldata/zipversions/index.html
+pass.php
+user_config.php

config.php

@@ -1,12 +1,36 @@
 <?php
- /* The configuration generated with auto_form*/
-
-$GLOBAL['data_folder']='mypersonaldata';
-$GLOBAL['default_data_folder']='public';
-$GLOBAL['rss_title']='Respawn: le flux de la webliothèque';
-$GLOBAL['rss_description']='Le respawn de warriordudimanche.net';
-$GLOBAL['message']='Votre webliothèque perso';
-$GLOBAL['public_title']='Voici la webliothèque publique de Bronco';
-$GLOBAL['skin']='pinterest';
+/* The configuration generated with auto_form*/
+$GLOBAL['data_folder'] = 'mypersonaldata';
+$GLOBAL['default_data_folder'] = 'public';
+$GLOBAL['rss_title'] = 'Respawn: le flux de la webliothèque';
+$GLOBAL['rss_description'] = 'Le respawn de warriordudimanche.net';
+$GLOBAL['message'] = 'Votre webliothèque perso';
+$GLOBAL['public_title'] = 'Voici la webliothèque publique de Bronco';
+$GLOBAL['skin'] = 'pinterest';
 
+// File restriction
+$GLOBAL['image'] = array(
+  'image/png' => 'png',
+  'image/jpg' => 'jpg',
+  'image/jpeg' => 'jpg',
+  'image/jpe' => 'jpg',
+  'image/gif' => 'gif',
+  'image/bmp' => 'bmp',
+  'image/tiff' => 'tiff'
+);
+$GLOBAL['document'] = array(
+  'application/vnd.oasis.opendocument.text' => 'odt',
+  'application/vnd.oasis.opendocument.spreadsheet' => 'ods',
+  'application/pdf' => 'pdf',
+  'application/msword' => 'doc',
+  'application/rtf' => 'rtf',
+  'application/vnd.ms-excel' => 'xls',
+  'application/vnd.ms-powerpoint' => 'ppt'
+);
+$GLOBAL['archive'] = array(
+  'application/zip' => 'zip',
+  'application/x-rar-compressed' => 'rar',
+  'application/x-msdownload' => 'exe',
+  'application/x-msdownload' => 'msi'
+);
 ?>

config_page.php

@@ -48,7 +48,10 @@ $autoform_config=array(
 	'reset_button_label'
 );
 
-foreach (glob('design/*') as $skin){
+foreach (glob('design/*',GLOB_ONLYDIR) as $skin){
+  if(basename($skin) === 'icons'){
+   continue;
+  }
 	$skin=basename($skin);if ($skin!='index.html'){$skins[]=$skin;}
 }
 $autoform_config['skin']=$skins;
@@ -129,13 +132,17 @@ function render_form($var){
 }
 include('auto_restrict.php');
 include('config.php');
+if(file_exists('user_config.php')){
+ include('user_config.php');
+}
 unset($GLOBAL['private_data_folder']);
 unset($GLOBAL['public_data_folder']);
+unset($GLOBAL['image'],$GLOBAL['document'],$GLOBAL['archive']);
 $GLOBAL['default_data_folder']=basename($GLOBAL['default_data_folder']);
 
 $message='';
 if ($_POST){
-	$auto_form['filename']='config.php';
+	$auto_form['filename']='user_config.php';
 	$auto_form['filecontent']="<?php \n /* The configuration generated with auto_form*/\n\n";
 	$auto_form['variable_name']='$GLOBAL';
 	$all_keys=explode(' | ',$_POST['all_keys']);

design/icons/AUTHORS

@@ -0,0 +1,5 @@
+Faenza is designed and developed by Matthieu James <matthieu.james@gmail.com>.
+
+Faenza icons are all licensed under the GPL.
+
+Thanks to Holger Seelig and clemyeats for their help for having some text preview inside icons in Nautilus.

design/icons/bmp.png

@@ -0,0 +1 @@
+png.png

design/icons/doc.png

@@ -0,0 +1 @@
+odt.png

design/icons/gif.png

@@ -0,0 +1 @@
+png.png

design/icons/jpg.png

@@ -0,0 +1 @@
+png.png

design/icons/msi.png

@@ -0,0 +1 @@
+exe.png

design/icons/rar.png

@@ -0,0 +1 @@
+zip.png

design/icons/tiff.png

@@ -0,0 +1 @@
+png.png

design/icons/xls.png

@@ -0,0 +1 @@
+ods.png

index.php

@@ -35,6 +35,9 @@ if (isset($_GET['tag'])){$search_tags=strip_tags($_GET['tag']);}else{$search_tag
 // CONFIGURABLE OPTIONS
 // adapter la configuration dans le fichier config.php
 include('config.php');
+if(file_exists('user_config.php')){
+ include('user_config.php');
+}
 
 $GLOBAL['version']='2.2';
 $GLOBAL['respawn_url']=returncurrenturl();
@@ -229,9 +232,21 @@ if (!$GLOBAL['public']){ // private
 			else {
 				$GLOBAL['target_folder'] = $GLOBAL['default_data_folder'].'/'.$new_folder;
 			}
-
-			/*GESTION DU PDF ICI*/
-			if (strtolower(substr($_GET['q'],-4))=='.pdf'){
+      $urlInfo =pathinfo($GLOBAL['url']);
+      $title = $urlInfo['filename'];
+      $finfo = new finfo(FILEINFO_MIME_TYPE);
+      $mineType = $finfo->buffer($GLOBAL['main_page_data']);
+      if(array_key_exists($mineType, $GLOBAL['image'])){
+      $ext = $GLOBAL['image'][$mineType];
+      file_put_contents($GLOBAL['target_folder'].'/'.$title.'.'.$ext, $GLOBAL['main_page_data']);
+      file_put_contents($GLOBAL['target_folder'].'/index.php','<!DOCTYPE html><html><head><title>'.$title.'</title></head><body><img src="'.$title.'.'.$ext.'" alt="Save image from '.$GLOBAL['url'].'"/></body></html>');
+      } elseif(array_key_exists($mineType, $GLOBAL['document'])){
+        $ext = $GLOBAL['document'][$mineType];
+        $title=basename($_GET['q']);
+        file_put_contents($GLOBAL['target_folder'].'/'.$title,$GLOBAL['main_page_data']);
+        file_put_contents($GLOBAL['target_folder'].'/index.php','<?php header("location: '.$title.'");?>');
+			} elseif(array_key_exists($mineType, $GLOBAL['archive'])){
+        $ext = $GLOBAL['archive'][$mineType];
         $title=basename($_GET['q']);
         file_put_contents($GLOBAL['target_folder'].'/'.$title,$GLOBAL['main_page_data']);
         file_put_contents($GLOBAL['target_folder'].'/index.php','<?php header("location: '.$title.'");?>');
@@ -371,12 +386,14 @@ if (!$GLOBAL['public']){ // private
 					$n++;
 					$count = count($liste_css);
 				}
+        $mineType = '';
 			}
-			// enregistre un fichier d’informations concernant la page (date, url, titre)
+			// enregistre un fichier d’informations concernant la page (date, url, titre, extension du fichier)
 			$info  = '';
 			$info .= 'URL="'.$GLOBAL['url'].'"'."\n";
 			$info .= 'TITLE="'.$title.'"'."\n";
 			$info .= 'DATE="'.time().'"'."\n";
+      $info .= 'TYPE="'.$ext.'"'."\n";
 			file_put_contents($GLOBAL['target_folder'].'/'.'index.ini', $info);
 			/*$GLOBAL['done']['d'] = 'ajout';
 			$GLOBAL['done']['lien'] = $GLOBAL['target_folder'].'/';	*/
@@ -792,6 +809,36 @@ function rand_new_name($name) {
 	return 'f_'.str_shuffle('abcd').mt_rand(100, 999).'--'.preg_replace('#[^\w.]#', '_', substr($name, 15)).'.'.pathinfo($name, PATHINFO_EXTENSION);
 }
 
+function returnLocalFavicon($path,$fileType){
+  $favicon = glob($path.'*favicon.*');
+  if(empty($favicon)){
+    if(file_exists('design/icons/'.$fileType.'.png')){
+    return 'design/icons/'.$fileType.'.png';
+    } else {
+     return 'design/icons/html.png';
+    }
+  } else {
+   return $favicon[0];
+  }
+}
+
+/**
+ * Améliore la sortie print
+ *
+ * @author Tatane http://www.tatane.info/index.php/print_rn
+ * @author http://www.blog.cactuscrew.com/77-print_rn.html
+ * @param $data (array) tableau à examiner
+ * @param $name (string) nom a affiché
+ * @return false affiche les clef valeur du tableau $data
+ */
+function n_print($data, $name = '') {
+  $aBackTrace = debug_backtrace();
+  echo '<h2>', $name, '</h2>';
+  echo '<fieldset style="border: 1px solid orange; padding: 5px;color: #333; background-color: #fff;">';
+  echo '<legend style="border:1px solid orange;padding: 1px;background-color:#eee;color:orange;">',             basename($aBackTrace[0]['file']), ' ligne => ', $aBackTrace[0]['line'], '</legend>';
+  echo '<pre>',           htmlentities(print_r($data, 1)), '</pre>';
+  echo '</fieldset><br />';
+}
 
 if ($GLOBAL['done']['d'] !== FALSE) {
 	switch($GLOBAL['done']['d']) {
@@ -887,9 +934,7 @@ if ($GLOBAL['done']['d'] !== FALSE) {
 				if (is_dir($GLOBAL['public_data_folder'].'/'.$liste_pages[$i]) and ($liste_pages[$i] != '.') and ($liste_pages[$i] != '..')) {
 					// each folder should contain such a file "index.ini".
 					$ini_file = $GLOBAL['public_data_folder'].'/'.$liste_pages[$i].'/index.ini';
-					$favicon = glob($GLOBAL['public_data_folder'].'/'.$liste_pages[$i].'/*favicon.*');
 
-					$favicon = (isset($favicon[0])) ? $favicon[0] : '';
 					if ( is_file($ini_file) and is_readable($ini_file) ) {
 						$infos = parse_ini_file($ini_file);
 					} else {
@@ -900,7 +945,7 @@ if ($GLOBAL['done']['d'] !== FALSE) {
 					} else {
 						$titre = 'titre'; $url = '#'; $date = 'date inconnue';
 					}
-
+          $favicon = returnLocalFavicon($GLOBAL['public_data_folder'].'/'.$liste_pages[$i].'/',$infos['TYPE']);
 					$tags=$taglinks='';
 					if (isset($GLOBAL['tag_array']['public'][$liste_pages[$i]])){$tags=$GLOBAL['tag_array']['public'][$liste_pages[$i]];$taglinks=tag2links($GLOBAL['tag_array']['public'][$liste_pages[$i]]);}
 					echo "\t".'<li>';
@@ -937,8 +982,6 @@ if ($GLOBAL['done']['d'] !== FALSE) {
 					if (is_dir($GLOBAL['private_data_folder'].'/'.$liste_pages[$i]) and ($liste_pages[$i] != '.') and ($liste_pages[$i] != '..')) {
 						// each folder should contain such a file "index.ini".
 						$ini_file = $GLOBAL['private_data_folder'].'/'.$liste_pages[$i].'/index.ini';
-						$favicon=glob($GLOBAL['private_data_folder'].'/'.$liste_pages[$i].'/*favicon.*');
-						$favicon = (isset($favicon[0])) ? $favicon[0] : '';
 						if ( is_file($ini_file) and is_readable($ini_file) ) {
 							$infos = parse_ini_file($ini_file);
 						} else {
@@ -949,6 +992,7 @@ if ($GLOBAL['done']['d'] !== FALSE) {
 						} else {
 							$titre = 'titre'; $url = '#'; $date = 'date inconnue';
 						}
+            $favicon = returnLocalFavicon($GLOBAL['public_data_folder'].'/'.$liste_pages[$i].'/',$infos['TYPE']);
 						$tags=$taglinks='';
 						if (isset($GLOBAL['tag_array']['private'][$liste_pages[$i]])){$tags=$GLOBAL['tag_array']['private'][$liste_pages[$i]];$taglinks=tag2links($GLOBAL['tag_array']['private'][$liste_pages[$i]]);}