WebSVN – LeadersLinked - Backend – Diff – /module/LeadersLinked/src/Controller/HabitContentController.php

+                }
                 $habitContentMapper = HabitContentMapper::getInstance($this->adapter);
                 $paginator = $habitContentMapper->fetchAllDataTableByCompanyId($currentCompany->id, $search,  $page, $records_x_page, $order_field, $order_direction);
-                $storage = Storage::getInstance($this->config);
+                $storage = Storage::getInstance($this->config, $this->adapter);
                 $path = $storage->getPathHabitContent();
                 $files = $this->getRequest()->getFiles()->toArray();
                 $type = '';
                 $filename = '';
                 if (isset($files['file']) && empty($files['file']['error'])) {
                     $tmp_filename  = $files['file']['tmp_name'];
-                    $filename      = $this->normalizeString($files['file']['name']);
+                    $filename      = \LeadersLinked\Library\Functions::normalizeStringFilename($files['file']['name']);
                     $mime_type = mime_content_type($tmp_filename);
                     if ($mime_type == 'image/jpg' || $mime_type == 'image/jpeg' || $mime_type == 'image/png') {
                         $type = HabitContent::TYPE_IMAGE;
                     } else if ($mime_type == 'video/quicktime' ||  $mime_type == 'video/webm' || $mime_type == 'video/mpeg' || $mime_type == 'video/mpg' || $mime_type == 'video/mp4') {
                         $type = HabitContent::TYPE_VIDEO;
                     } else if ($mime_type == 'application/pdf') {
                         $type = HabitContent::TYPE_DOCUMENT;
+                    }
-                }
+                }
                 $habitContentMapper = HabitContentMapper::getInstance($this->adapter);
                 if($habitContentMapper->insert($habitContent)) {
-                    $habitContent = $habitContentMapper->fetchOne($habitContent->id);
+                    $habitContent = $habitContentMapper->fetchOne($habitContent->id);
-                    $storage = Storage::getInstance($this->config);
-                    $target_path = $storage->getPathHabitContent();
-                    $interal_path   = 'data' . DIRECTORY_SEPARATOR . 'storage' . DIRECTORY_SEPARATOR . 'tmp';
-                    if(!file_exists($interal_path)) {
-                        mkdir($interal_path, 0775);
-                    }
                     $full_tmp_filename = $interal_path . DIRECTORY_SEPARATOR . $filename;
+                    $storage        = Storage::getInstance($this->config, $this->adapter);
-                    move_uploaded_file($tmp_filename,$full_tmp_filename);
+                    $target_path    = $storage->getPathHabitContent();
                     if ($type == HabitContent::TYPE_DOCUMENT) {
-                        if($storage->putFile($target_path, $habitContent->uuid,  $full_tmp_filename)) {
-                            $habitContent->file = $filename;
+                        if($storage->moveAndPutFile($tmp_filename, $target_path, $habitContent->uuid,  $filename)) {
+                            $habitContent->file = $filename;
                             $habitContent->type = $type;
+                            $habitContentMapper->update($habitContent);
-                            $habitContentMapper->update($habitContent);
+                        }
-                        }
+                    } else if ($type == HabitContent::TYPE_IMAGE) {
-                    } else if ($type == HabitContent::TYPE_IMAGE) {
+                        $image = Image::getInstance($this->config);
-                        $image = Image::getInstance($this->config);
-                        $target_path = $image->getStorage()->getPathFeed();
+                        $filename = substr($filename, 0, strrpos($filename, '.'))  . '.png';
                         $full_tmp_filename = $image->uploadProcessWithOutChangeSize($tmp_filename, $filename);
                         $filename = substr($filename, 0, strrpos($filename, '.'))  . '.png';
+                        if($full_tmp_filename) {
-                        $unlink_source = true;
+                            if($storage->putFile($target_path, $habitContent->uuid,  $full_tmp_filename)) {
-                        if($image->uploadImageRaw($full_tmp_filename, $target_path, $habitContent->uuid, $filename, $unlink_source)) {
+                                $habitContent->file = $filename;
-                            $habitContent->file = $filename;
+                                $habitContent->type = $type;
                 'data'   => 'ERROR_UNAUTHORIZED'
             ]);
+        }
+        if($request->isPost()) {
         if($request->isPost()) {
             $result =  $habitContentMapper->delete($habitContent);
             if($result) {
                 $this->logger->info('Se borro el Content : ' .  $habitContent->name, ['user_id' => $currentUser->id, 'ip' => Functions::getUserIP()]);
+                if($habitContent->file) {
-                if($habitContent->file) {
                     $storage = \LeadersLinked\Library\Storage::getInstance($this->config, $this->adapter);
                     $image = Image::getInstance($this->config);
-                    $target_path = $image->getStorage()->getPathHabitContent();
+                    $target_path = $storage->getPathHabitContent();
-                    $image->getStorage()->deleteFile($target_path, $habitContent->uuid, $habitContent->file);
+                    $storage->deleteDirectory($target_path, $habitContent->uuid);
                 'data'   => 'ERROR_UNAUTHORIZED'
             ]);
+        }
         if($request->isGet()) {
-            $storage = Storage::getInstance($this->config);
+            $storage = Storage::getInstance($this->config, $this->adapter);
+        }
         return new JsonModel($data);
-    }
-    /**
-     *
-     * @param string $str
-     * @return string
-     */
-    private function normalizeString($str = '')
-    {
-        $basename  = substr($str, 0, strrpos($str, '.'));
-        $basename  = str_replace('.', '-', $basename);
+    }
-        $extension  = substr($str, strrpos($str, '.'));
-        $str = $basename . $extension;
-        $str = strip_tags($str);
-        $str = preg_replace('/[\r\n\t ]+/', ' ', $str);
-        $str = preg_replace('/[\"\*\/\:\<\>\?\'\|\,]+/', ' ', $str);
-        $str = strtolower($str);
-        $str = html_entity_decode($str, ENT_QUOTES, "utf-8");
-        $str = htmlentities($str, ENT_QUOTES, "utf-8");
-        $str = preg_replace("/(&)([a-z])([a-z]+;)/i", '$2', $str);
-        $str = str_replace(' ', '-', $str);
-        $str = rawurlencode($str);
-        $str = str_replace('%', '-', $str);
         return trim(strtolower($str));

Proyectos de Subversion LeadersLinked - Backend

(root)/module/LeadersLinked/src/Controller/HabitContentController.php – Rev 17017 → 17018