Create license.txt file

.travis.yml

@@ -8,5 +8,4 @@ install:
     - printf "\n" | pecl install imagick
 before_script:
     - phpenv config-add scripts/build/phpconf.ini
-    - ./scripts/build/prepare.sh
 script: phpunit -c tests/phpunit.xml

README.md

@@ -1 +1,26 @@
-
+Unsee.cc - Secure and private image hosting
+==============
+
+This is the official Git repository for the Unsee image hosting. The deployment on production server is as simple as:
+```
+git fetch
+git reset --hard origin/master
+rm application/configs/env.php
+```
+This is done for the sake of ease and transparency.
+
+
+Installation
+---------
+To run your copy of Unsee locally you'll probably need 
+
+Requirements
+-----
+- *nix environment
+- Nginx
+ - Secure link module
+- Php
+ - Redis module
+ - Imagick module
+- Redis
+- Image magick

application/Bootstrap.php

@@ -12,6 +12,10 @@ protected function _initEnv()
         if (empty($_SERVER['HTTP_USER_AGENT'])) {
             $_SERVER['HTTP_USER_AGENT'] = 'cli';
         }
+
+        if (empty($_SERVER['SERVER_NAME'])) {
+            $_SERVER['SERVER_NAME'] = 'unsee.cc';
+        }
     }
 
     protected function _initDocType()

application/configs/application.ini

@@ -27,12 +27,10 @@ redis.port = '6379'
 
 hash.vovels = 'aiueo';
 hash.consonants = 'stnmrgzdbp';
-hash.syllables = 3;
+hash.syllables = 4;
 
 timezone = 'Europe/Kiev';
 
-storagePath = APPLICATION_PATH "/../storage/"
-
 ; Image config
 settings.info.title.type = 'text';
 settings.info.description.type = 'textarea';
@@ -78,4 +76,5 @@ resources.frontController.params.displayExceptions = 1
 phpSettings.display_startup_errors = 1
 phpSettings.display_errors = 1
 resources.frontController.params.displayExceptions = 1
-domainName = "unsee.cc.local"
+domainName = "unsee.cc.local"
+combineAssets = 0;

application/configs/lang.xml

@@ -40,6 +40,14 @@
             <tuv xml:lang="ru"><seg>после просмотра</seg></tuv>
             <tuv xml:lang="en"><seg>after first view</seg></tuv>
         </tu>
+        <tu tuid="after_ten">
+            <tuv xml:lang="ru"><seg>10 минут</seg></tuv>
+            <tuv xml:lang="en"><seg>in 10 minutes</seg></tuv>
+        </tu>
+        <tu tuid="after_thirty">
+            <tuv xml:lang="ru"><seg>30 минут</seg></tuv>
+            <tuv xml:lang="en"><seg>in 30 minutes</seg></tuv>
+        </tu>
         <tu tuid="after_hour">
             <tuv xml:lang="ru"><seg>через час</seg></tuv>
             <tuv xml:lang="en"><seg>in one hour</seg></tuv>
@@ -292,7 +300,7 @@
         </tu>
         <tu tuid="click_settings">
             <tuv xml:lang="ru"><seg>Нажмите здесь, чтобы изменить настройки</seg></tuv>
-            <tuv xml:lang="en"><seg>Click to change settings</seg></tuv>
+            <tuv xml:lang="en"><seg>Click here to change settings</seg></tuv>
         </tu>
 
         <!-- Image settings translations -->
@@ -362,7 +370,7 @@
         </tu>
         <tu tuid="settings_security_no_download_caption">
             <tuv xml:lang="ru"><seg>Не позволять пользователям совершать правый клик по картинке чтобы сохранить её</seg></tuv>
-            <tuv xml:lang="en"><seg>Restrict right-clicking images to save them</seg></tuv>
+            <tuv xml:lang="en"><seg>Restrict right-clicking images to save them, can't be disabled for single-view images</seg></tuv>
         </tu>
 
         <tu tuid="settings_security_password">
@@ -535,7 +543,7 @@
         </tu>
 
         <tu tuid="minute_one">
-            <tuv xml:lang="ru"><seg>минута</seg></tuv>
+            <tuv xml:lang="ru"><seg>минуту</seg></tuv>
             <tuv xml:lang="en"><seg>minute</seg></tuv>
         </tu>
         <tu tuid="minute_couple">
@@ -559,5 +567,13 @@
             <tuv xml:lang="ru"><seg>Применить</seg></tuv>
             <tuv xml:lang="en"><seg>Apply</seg></tuv>
         </tu>
+        <tu tuid="upload_more_owner">
+            <tuv xml:lang="ru"><seg>Можно загрузить ещё картинок перетащив их на страницу</seg></tuv>
+            <tuv xml:lang="en"><seg>You can upload more images by dropping them on the page</seg></tuv>
+        </tu>
+        <tu tuid="upload_more_anonymous">
+            <tuv xml:lang="ru"><seg>Можно загрузить свои изображения перетащив их на страницу</seg></tuv>
+            <tuv xml:lang="en"><seg>You can add your own images by dropping them on the page</seg></tuv>
+        </tu>
     </body>
-</tmx>
+</tmx>

application/controllers/IndexController.php

@@ -5,9 +5,10 @@
  */
 class IndexController extends Zend_Controller_Action
 {
+
     public function init()
     {
-        
+
         $this->view->headScript()->appendFile('js/vendor/jquery-1.8.3.min.js');
         $this->view->headScript()->appendFile('js/vendor/modernizr-2.6.2.min.js');
         $this->view->headScript()->appendFile('js/vendor/jquery.iframe-transport.js');
@@ -21,4 +22,9 @@ public function init()
         $this->view->headLink()->appendStylesheet('css/main.css');
         $this->view->headLink()->appendStylesheet('css/sizes.css');
     }
-}
+
+    public function indexAction()
+    {
+
+    }
+}

application/controllers/UploadController.php

@@ -24,47 +24,95 @@ public function indexAction()
 
         $upload->addValidator('Count', false, array('min' => 1, 'max' => 100));
         $upload->addValidator('IsImage', false);
-        $upload->addValidator('Size', false, array('max' => '8MB', 'bytestring' => false));
+        $upload->addValidator('Size', false, array('max' => '10MB', 'bytestring' => false));
         $translate = Zend_Registry::get('Zend_Translate');
+        $updating = false;
 
         try {
             if (!$upload->receive()) {
-                throw new Exception();
+                throw new Exception($translate->translate('error_uploading'));
             } else {
                 $files = $upload->getFileInfo();
 
-                // Tell the page the name of the new hash
-                $response->hash = $this->getNewHashName();
 
-                foreach ($files as $file => &$info) {
-                    if (!$upload->isUploaded($file)) {
-                        $info = null;
-                    } else {
-                        $imgDoc = new Unsee_Image();
-                        $imgDoc->hash = $response->hash;
-                        $imgDoc->setFile($info['tmp_name']);
+                // Updating hash with new images
+                if (!empty($_POST['hash']) && Unsee_Hash::isValid($_POST['hash'])) {
+                    $hashDoc = new Unsee_Hash($_POST['hash']);
+                    $updating = true;
+                    $response = array();
+
+                    if (!Unsee_Session::isOwner($hashDoc) && !$hashDoc->allow_anonymous_images) {
+                        die('[]');
                     }
+                } else {
+                    // Creating a new hash
+                    $hashDoc = new Unsee_Hash();
+                    $this->setExpiration($hashDoc);
+                    $response->hash = $hashDoc->key;
+                }
+
+                $imageAdded = false;
+
+                foreach ($files as $file => $info) {
+                    if ($upload->isUploaded($file)) {
+                        $imgDoc = new Unsee_Image($hashDoc);
+                        $res = $imgDoc->setFile($info['tmp_name']);
+                        $imgDoc->setSecureParams(); //hack to populate correct secureTtd
+
+                        if ($updating) {
+                            $ticket = new Unsee_Ticket();
+                            $ticket->issue($imgDoc);
+
+                            $newImg = new stdClass();
+                            $newImg->hashKey = $hashDoc->key;
+                            $newImg->key = $imgDoc->key;
+                            $newImg->src = '/image/' . $imgDoc->key . '/' . $imgDoc->secureMd5 . '/' . $imgDoc->secureTtd . '/';
+                            $newImg->width = $imgDoc->width;
+                            $newImg->ticket = md5(Unsee_Session::getCurrent() . $hashDoc->key);
+
+                            $response[] = $newImg;
+                        }
+
+                        if ($res) {
+                            $imageAdded = true;
+                        }
+
+                        // Remove uploaded file from temporary dir if it wasn't removed
+                        if (file_exists($info['tmp_name'])) {
+                            @unlink($info['tmp_name']);
+                        }
+                    }
+                }
+
+                if (!$imageAdded) {
+                    throw new Exception('No images were added');
                 }
             }
         } catch (Exception $e) {
-            $response->error = $translate->translate('error_uploading');
+            $response->error = $e->getMessage();
         }
         $this->_helper->json->sendJson($response);
     }
 
     /**
-     * Creates a new hash document and returns it's name
-     * @return type
+     * Sets the TTL for the provided hash
+     * @param Unsee_Hash $hashDoc
+     * @return boolean
      */
-    private function getNewHashName()
+    private function setExpiration($hashDoc)
     {
-        // Creating a new hash item (/bababa/)
-        $hashDoc = new Unsee_Hash();
-
-        if (isset($_POST['time']) && in_array($_POST['time'], Unsee_Hash::$_ttlTypes)) {
-            $hashDoc->ttl = $_POST['time'];
+        // Custom ttl was set
+        if (!empty($_POST['time']) && in_array($_POST['time'], Unsee_Hash::$ttlTypes)) {
+            $amount = array_search($_POST['time'], Unsee_Hash::$ttlTypes);
+            if ($amount > 0) {
+                // Disable single view, which is ON by default
+                $hashDoc->max_views = 0;
+                $hashDoc->ttl = $_POST['time'];
+                // Expire in specified interval, instead of a day
+                $hashDoc->expireAt(time() + $amount);
+            }
         }
 
-        return $hashDoc->key;
+        return true;
     }
 }