diff --git a/__cms__/code/cms/page.php b/__cms__/code/cms/page.php index ca3c506..f102463 100644 --- a/__cms__/code/cms/page.php +++ b/__cms__/code/cms/page.php @@ -39,7 +39,7 @@ class Page { public function envoyer() { // Yeeeeeeeeeeeeeeeeeeeeeeha ! Et on envoie ! if ($this->type == "page") { - Squelette::enrober($this); + echo Squelette::enrober($this); } else if ($this->type == "sendfile") { Stockage::get_prop_sendfile($this->sendfile_chemin, $this->sendfile_prop); } else if ($this->type == "redirect") { diff --git a/__cms__/code/stockage/systeme-fichiers.php b/__cms__/code/stockage/systeme-fichiers.php index 88f9b08..ef886f3 100644 --- a/__cms__/code/stockage/systeme-fichiers.php +++ b/__cms__/code/stockage/systeme-fichiers.php @@ -48,6 +48,13 @@ class Système_fichiers { } public static function envoyer_fichier_directement($chemin_fs) { + // TODO : utiliser http://www.php.net/manual/en/function.readfile.php#86244 pour les téléchargements partiels + // TODO : utiliser http://www.php.net/manual/en/function.readfile.php#52722 pour les types mimes + // TODO : ou bien http://www.php.net/manual/en/function.header.php#48538 pour les types mimes + // (ou mieux, l'utiliser au cas où on ne trouve pas dans le fichier d'apache). + // TODO : stocker le type mime dans $chemin_fs . '__mime' et utiliser celui-là si possible, sinon les méthodes ci-dessus. + // Licence des bouts de code du manuel PHP : CC-Attribution http://php.net/manual/en/about.notes.php + header("Content-Type: image/jpg"); return readfile($chemin_fs); } } diff --git a/__cms__/donnees/galerie/periode 1/evenement a/photo a/__prop__image b/__cms__/donnees/galerie/periode 1/evenement a/photo a/__prop__image new file mode 100644 index 0000000..c52711d Binary files /dev/null and b/__cms__/donnees/galerie/periode 1/evenement a/photo a/__prop__image differ diff --git a/__cms__/donnees/galerie/periode 1/evenement a/photo a/__prop__image_mini b/__cms__/donnees/galerie/periode 1/evenement a/photo a/__prop__image_mini index 4bacd6c..b253cdd 100644 Binary files a/__cms__/donnees/galerie/periode 1/evenement a/photo a/__prop__image_mini and b/__cms__/donnees/galerie/periode 1/evenement a/photo a/__prop__image_mini differ diff --git a/__cms__/donnees/galerie/periode 1/evenement a/photo a/mini.jpg b/__cms__/donnees/galerie/periode 1/evenement a/photo a/mini.jpg deleted file mode 100644 index b253cdd..0000000 Binary files a/__cms__/donnees/galerie/periode 1/evenement a/photo a/mini.jpg and /dev/null differ diff --git a/__cms__/donnees/galerie/periode 1/evenement a/photo b/__prop__image b/__cms__/donnees/galerie/periode 1/evenement a/photo b/__prop__image new file mode 100644 index 0000000..525275e Binary files /dev/null and b/__cms__/donnees/galerie/periode 1/evenement a/photo b/__prop__image differ diff --git a/__cms__/donnees/galerie/periode 1/evenement a/photo b/__prop__image_mini b/__cms__/donnees/galerie/periode 1/evenement a/photo b/__prop__image_mini index 4bacd6c..7f3e49c 100644 Binary files a/__cms__/donnees/galerie/periode 1/evenement a/photo b/__prop__image_mini and b/__cms__/donnees/galerie/periode 1/evenement a/photo b/__prop__image_mini differ diff --git a/__cms__/donnees/galerie/periode 1/evenement a/photo b/mini.jpg b/__cms__/donnees/galerie/periode 1/evenement a/photo b/mini.jpg deleted file mode 100644 index 7f3e49c..0000000 Binary files a/__cms__/donnees/galerie/periode 1/evenement a/photo b/mini.jpg and /dev/null differ diff --git a/__cms__/donnees/galerie/periode 1/evenement a/photo c/__prop__image b/__cms__/donnees/galerie/periode 1/evenement a/photo c/__prop__image new file mode 100644 index 0000000..836f4a5 Binary files /dev/null and b/__cms__/donnees/galerie/periode 1/evenement a/photo c/__prop__image differ diff --git a/__cms__/donnees/galerie/periode 1/evenement a/photo c/__prop__image_mini b/__cms__/donnees/galerie/periode 1/evenement a/photo c/__prop__image_mini index 4bacd6c..fbe970c 100644 Binary files a/__cms__/donnees/galerie/periode 1/evenement a/photo c/__prop__image_mini and b/__cms__/donnees/galerie/periode 1/evenement a/photo c/__prop__image_mini differ diff --git a/__cms__/donnees/galerie/periode 1/evenement a/photo c/mini.jpg b/__cms__/donnees/galerie/periode 1/evenement a/photo c/mini.jpg deleted file mode 100644 index fbe970c..0000000 Binary files a/__cms__/donnees/galerie/periode 1/evenement a/photo c/mini.jpg and /dev/null differ diff --git a/__cms__/donnees/galerie/periode 2/evenement machin/photo a/__prop__image b/__cms__/donnees/galerie/periode 2/evenement machin/photo a/__prop__image new file mode 100644 index 0000000..78c065e Binary files /dev/null and b/__cms__/donnees/galerie/periode 2/evenement machin/photo a/__prop__image differ diff --git a/__cms__/donnees/galerie/periode 2/evenement machin/photo a/__prop__image_mini b/__cms__/donnees/galerie/periode 2/evenement machin/photo a/__prop__image_mini index 4bacd6c..4d3c197 100644 Binary files a/__cms__/donnees/galerie/periode 2/evenement machin/photo a/__prop__image_mini and b/__cms__/donnees/galerie/periode 2/evenement machin/photo a/__prop__image_mini differ diff --git a/__cms__/donnees/galerie/periode 2/evenement machin/photo a/mini.jpg b/__cms__/donnees/galerie/periode 2/evenement machin/photo a/mini.jpg deleted file mode 100644 index 4d3c197..0000000 Binary files a/__cms__/donnees/galerie/periode 2/evenement machin/photo a/mini.jpg and /dev/null differ diff --git a/__cms__/donnees/galerie/periode 2/evenement machin/photo b/__prop__image b/__cms__/donnees/galerie/periode 2/evenement machin/photo b/__prop__image new file mode 100644 index 0000000..3117894 Binary files /dev/null and b/__cms__/donnees/galerie/periode 2/evenement machin/photo b/__prop__image differ diff --git a/__cms__/donnees/galerie/periode 2/evenement machin/photo b/__prop__image_mini b/__cms__/donnees/galerie/periode 2/evenement machin/photo b/__prop__image_mini index 4bacd6c..75b4ac2 100644 Binary files a/__cms__/donnees/galerie/periode 2/evenement machin/photo b/__prop__image_mini and b/__cms__/donnees/galerie/periode 2/evenement machin/photo b/__prop__image_mini differ diff --git a/__cms__/donnees/galerie/periode 2/evenement machin/photo b/mini.jpg b/__cms__/donnees/galerie/periode 2/evenement machin/photo b/mini.jpg deleted file mode 100644 index 75b4ac2..0000000 Binary files a/__cms__/donnees/galerie/periode 2/evenement machin/photo b/mini.jpg and /dev/null differ diff --git a/__cms__/donnees/galerie/periode 2/evenement machin/photo c/__prop__image b/__cms__/donnees/galerie/periode 2/evenement machin/photo c/__prop__image new file mode 100644 index 0000000..2e5fea1 Binary files /dev/null and b/__cms__/donnees/galerie/periode 2/evenement machin/photo c/__prop__image differ diff --git a/__cms__/donnees/galerie/periode 2/evenement machin/photo c/__prop__image_mini b/__cms__/donnees/galerie/periode 2/evenement machin/photo c/__prop__image_mini index 4bacd6c..58f4f1f 100644 Binary files a/__cms__/donnees/galerie/periode 2/evenement machin/photo c/__prop__image_mini and b/__cms__/donnees/galerie/periode 2/evenement machin/photo c/__prop__image_mini differ diff --git a/__cms__/donnees/galerie/periode 2/evenement machin/photo c/mini.jpg b/__cms__/donnees/galerie/periode 2/evenement machin/photo c/mini.jpg deleted file mode 100644 index 58f4f1f..0000000 Binary files a/__cms__/donnees/galerie/periode 2/evenement machin/photo c/mini.jpg and /dev/null differ diff --git a/__cms__/donnees/galerie/periode 2/evenement truc/photo a/__prop__image b/__cms__/donnees/galerie/periode 2/evenement truc/photo a/__prop__image new file mode 100644 index 0000000..ae14b51 Binary files /dev/null and b/__cms__/donnees/galerie/periode 2/evenement truc/photo a/__prop__image differ diff --git a/__cms__/donnees/galerie/periode 2/evenement truc/photo a/__prop__image_mini b/__cms__/donnees/galerie/periode 2/evenement truc/photo a/__prop__image_mini index 4bacd6c..4e1a955 100644 Binary files a/__cms__/donnees/galerie/periode 2/evenement truc/photo a/__prop__image_mini and b/__cms__/donnees/galerie/periode 2/evenement truc/photo a/__prop__image_mini differ diff --git a/__cms__/donnees/galerie/periode 2/evenement truc/photo a/mini.jpg b/__cms__/donnees/galerie/periode 2/evenement truc/photo a/mini.jpg deleted file mode 100644 index 4e1a955..0000000 Binary files a/__cms__/donnees/galerie/periode 2/evenement truc/photo a/mini.jpg and /dev/null differ diff --git a/__cms__/donnees/galerie/periode 2/evenement truc/photo b/__prop__image b/__cms__/donnees/galerie/periode 2/evenement truc/photo b/__prop__image new file mode 100644 index 0000000..6d88c4a Binary files /dev/null and b/__cms__/donnees/galerie/periode 2/evenement truc/photo b/__prop__image differ diff --git a/__cms__/donnees/galerie/periode 2/evenement truc/photo b/__prop__image_mini b/__cms__/donnees/galerie/periode 2/evenement truc/photo b/__prop__image_mini index 4bacd6c..57505c4 100644 Binary files a/__cms__/donnees/galerie/periode 2/evenement truc/photo b/__prop__image_mini and b/__cms__/donnees/galerie/periode 2/evenement truc/photo b/__prop__image_mini differ diff --git a/__cms__/donnees/galerie/periode 2/evenement truc/photo b/mini.jpg b/__cms__/donnees/galerie/periode 2/evenement truc/photo b/mini.jpg deleted file mode 100644 index 57505c4..0000000 Binary files a/__cms__/donnees/galerie/periode 2/evenement truc/photo b/mini.jpg and /dev/null differ diff --git a/__cms__/donnees/galerie/periode 2/evenement truc/photo c/__prop__image b/__cms__/donnees/galerie/periode 2/evenement truc/photo c/__prop__image new file mode 100644 index 0000000..0a45dd8 Binary files /dev/null and b/__cms__/donnees/galerie/periode 2/evenement truc/photo c/__prop__image differ diff --git a/__cms__/donnees/galerie/periode 2/evenement truc/photo c/__prop__image_mini b/__cms__/donnees/galerie/periode 2/evenement truc/photo c/__prop__image_mini index 4bacd6c..88f706a 100644 Binary files a/__cms__/donnees/galerie/periode 2/evenement truc/photo c/__prop__image_mini and b/__cms__/donnees/galerie/periode 2/evenement truc/photo c/__prop__image_mini differ diff --git a/__cms__/donnees/galerie/periode 2/evenement truc/photo c/mini.jpg b/__cms__/donnees/galerie/periode 2/evenement truc/photo c/mini.jpg deleted file mode 100644 index 88f706a..0000000 Binary files a/__cms__/donnees/galerie/periode 2/evenement truc/photo c/mini.jpg and /dev/null differ diff --git a/galerie/periode 1/evenement a/photo a/mini.jpg b/galerie/periode 1/evenement a/photo a/mini.jpg deleted file mode 100644 index b253cdd..0000000 Binary files a/galerie/periode 1/evenement a/photo a/mini.jpg and /dev/null differ diff --git a/galerie/periode 1/evenement a/photo b/mini.jpg b/galerie/periode 1/evenement a/photo b/mini.jpg deleted file mode 100644 index 7f3e49c..0000000 Binary files a/galerie/periode 1/evenement a/photo b/mini.jpg and /dev/null differ diff --git a/galerie/periode 1/evenement a/photo c/mini.jpg b/galerie/periode 1/evenement a/photo c/mini.jpg deleted file mode 100644 index fbe970c..0000000 Binary files a/galerie/periode 1/evenement a/photo c/mini.jpg and /dev/null differ diff --git a/galerie/periode 2/evenement machin/photo a/mini.jpg b/galerie/periode 2/evenement machin/photo a/mini.jpg deleted file mode 100644 index 4d3c197..0000000 Binary files a/galerie/periode 2/evenement machin/photo a/mini.jpg and /dev/null differ diff --git a/galerie/periode 2/evenement machin/photo b/mini.jpg b/galerie/periode 2/evenement machin/photo b/mini.jpg deleted file mode 100644 index 75b4ac2..0000000 Binary files a/galerie/periode 2/evenement machin/photo b/mini.jpg and /dev/null differ diff --git a/galerie/periode 2/evenement machin/photo c/mini.jpg b/galerie/periode 2/evenement machin/photo c/mini.jpg deleted file mode 100644 index 58f4f1f..0000000 Binary files a/galerie/periode 2/evenement machin/photo c/mini.jpg and /dev/null differ diff --git a/galerie/periode 2/evenement truc/photo a/mini.jpg b/galerie/periode 2/evenement truc/photo a/mini.jpg deleted file mode 100644 index 4e1a955..0000000 Binary files a/galerie/periode 2/evenement truc/photo a/mini.jpg and /dev/null differ diff --git a/galerie/periode 2/evenement truc/photo b/mini.jpg b/galerie/periode 2/evenement truc/photo b/mini.jpg deleted file mode 100644 index 57505c4..0000000 Binary files a/galerie/periode 2/evenement truc/photo b/mini.jpg and /dev/null differ diff --git a/galerie/periode 2/evenement truc/photo c/mini.jpg b/galerie/periode 2/evenement truc/photo c/mini.jpg deleted file mode 100644 index 88f706a..0000000 Binary files a/galerie/periode 2/evenement truc/photo c/mini.jpg and /dev/null differ