X-Git-Url: http://git.dj3c1t.com/?a=blobdiff_plain;f=app%2Fcontrollers%2Fusers%2Falbums.php;fp=app%2Fcontrollers%2Fusers%2Falbums.php;h=de892dddc5d6e49b76b59eadf6daa9074a5dbada;hb=2802d2dbcb5a1ea3c269d6fb4df9fbfb0f13f93d;hp=b26e200e8261d676a87a3c4f8e64e6f85fe13b88;hpb=9391cb9ccb3dd2884e7be2f15aa729733288f1e5;p=mw_sourceml

diff --git a/app/controllers/users/albums.php b/app/controllers/users/albums.php
index b26e200..de892dd 100644
--- a/app/controllers/users/albums.php
+++ b/app/controllers/users/albums.php
@@ -54,8 +54,8 @@
       $select["order_by"] = "ordre";
       $select["start"] = isset($_GET[$env->param("start")]) && $_GET[$env->param("start")] ? $_GET[$env->param("start")] : 0;
       if(isset($_GET[$env->param("groupe")]) && $_GET[$env->param("groupe")]) $select["id_groupe"] = $_GET[$env->param("groupe")];
-      if(($albums = $data->sources($select)) !== false)
-      { foreach($albums["list"] as $id_album => $album)
+      if(($albums = $data->sources($select)) !== false){
+        foreach($albums["list"] as $id_album => $album)
         { $albums["list"][$id_album]["permissions"] = $data->source_permissions($albums["list"][$id_album], $this->user["id"]);
         }
         if($_POST)
@@ -151,8 +151,8 @@
     function edit(){
       $env = $this->env();
       $data = $env->data();
-      $this->album["premissions"] = $data->source_permissions($this->album, $this->user["id"]);
-      if($this->album["premissions"]["editeur"])
+      $this->album["permissions"] = $data->source_permissions($this->album, $this->user["id"]);
+      if($this->album["permissions"]["editeur"])
       { if($data->check_user_uploads_dir())
         { $web_path = $env->path("web");
           $upload_dir = $env->path("content")."uploads/".$this->user["id"];
@@ -162,9 +162,10 @@
             "ordre" => $this->album["ordre"],
             "date_creation" => $this->album["date_creation"],
             "description" => $this->album["description"],
-            "image" => $this->album["image"]
+            "image" => isset($this->album["image"]) ? $this->album["image"] : null
           );
           $env->set_out("groupe", $data->get_admin_groupe($this->album["groupes"]));
+          
           if($_POST)
           { if(($groupe = $data->groupe($_POST["id_groupe"])) !== false)
             { $env->set_out("groupe", $groupe);
@@ -176,6 +177,7 @@
               );
               $source_infos["date_creation"] = $_POST["annee_date_creation"]."-".$_POST["mois_date_creation"]."-".$_POST["jour_date_creation"];
               $source_infos["description"] = $_POST["description"];
+              $this->album["documents"] = array();
               foreach($_POST as $post_key => $post_value)
               { if(substr($post_key, 0, 13) == "document_nom_")
                 { if($id_document = substr($post_key, 13))
@@ -242,8 +244,8 @@
     function del(){
       $env = $this->env();
       $data = $env->data();
-      $this->album["premissions"] = $data->source_permissions($this->album, $this->user["id"]);
-      if($this->album["premissions"]["admin"])
+      $this->album["permissions"] = $data->source_permissions($this->album, $this->user["id"]);
+      if($this->album["permissions"]["admin"])
       { if($data->del_source($this->album["id"]))
         { $env->redirect
           ( $env->url("users/albums"),