Merge branch '2.1' into backend

UAPV · May 5, 2011 · 81ad61e · 81ad61e
2 parents e9e6136 + a344873
commit 81ad61e
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 27 deletions.
diff --git a/app/controllers/Main.php b/app/controllers/Main.php
@@ -36,16 +36,17 @@ public function indexAction () {
         $progressMonitor = fz_config_get ('app', 'progress_monitor');
         $progressMonitor = new $progressMonitor ();
 
-        set ('upload_id'        , md5 (uniqid (mt_rand (), true)));
-        set ('start_from'       , Zend_Date::now ()->get (Zend_Date::DATE_SHORT));
-        set ('refresh_rate'     , 1200);
-        set ('files'            , Fz_Db::getTable ('File')
-                                    ->findByOwnerOrderByUploadDateDesc ($user));
-        set ('use_progress_bar' , $progressMonitor->isInstalled ());
-        set ('upload_id_name'   , $progressMonitor->getUploadIdName ());
-        set ('free_space_left'  , $freeSpaceLeft);
-        set ('max_upload_size'  , $maxUploadSize);
-        set ('disk_usage'  , array (
+        set ('upload_id'            , md5 (uniqid (mt_rand (), true)));
+        set ('start_from'           , Zend_Date::now ()->get (Zend_Date::DATE_SHORT));
+        set ('refresh_rate'         , 1200);
+        set ('files'                , Fz_Db::getTable ('File')
+                                        ->findByOwnerOrderByUploadDateDesc ($user));
+        set ('use_progress_bar'     , $progressMonitor->isInstalled ());
+        set ('upload_id_name'       , $progressMonitor->getUploadIdName ());
+        set ('free_space_left'      , $freeSpaceLeft);
+        set ('max_upload_size'      , $maxUploadSize);
+        set ('sharing_destinations' , fz_config_get ('app', 'sharing_destinations', array()));
+        set ('disk_usage'           , array (
             'space' => '<b id="disk-usage-value">'.bytesToShorthand (Fz_Db::getTable('File')->getTotalDiskSpaceByUser ($user)).'</b>',
             'quota' => fz_config_get('app', 'user_quota')));
         return html ('main/index.php');

diff --git a/app/views/file/_mailForm.php b/app/views/file/_mailForm.php
@@ -9,14 +9,10 @@
     <textarea cols="80" rows="10" name="msg" value="<?php echo params ('msg') ?>"></textarea>
   </p>
   <p>
-    <a href="#" class="open-email-client" target="_blank"><?php echo __('Open in my email client') ?></a>
-    <script type="text/javascript">
-      $(document).ready (function () {
-        $('.open-email-client').click (function (e) {
-          $('.ui-dialog-content').dialog('close');
-        });
-      });
-    </script>
+    <a href="<?php echo isset ($file) ? 'mailto:?body='.__('You can download the file I uploaded here').' : '.$file->getDownloadUrl () : '#' ?>"
+       class="open-email-client" target="_blank">
+      <?php echo __('Open in my email client') ?>
+    </a>
   </p>
   <p class="submit">
     <input type="submit" class="awesome blue large" value="<?php echo __('Send') ?>" />

diff --git a/app/views/main/index.php b/app/views/main/index.php
@@ -68,14 +68,22 @@
     <p id="share-link"><a href=""></a></p>
     <p class="instruction"><?php echo __('or share using') ?> :</p>
     <ul id="share-destinations">
-        <li class="email"   ><a href="" data-url="%url%/email"><?php echo __('your email') ?></a></li>
-        <!-- TODO make next share destinations configurable ! -->
+        <?php if (in_array ('email', $sharing_destinations)): ?>
+          <li class="email"   ><a href="" data-url="%url%/email"><?php echo __('your email') ?></a></li>
+        <?php endif; ?>
+        <?php if (in_array ('facebook', $sharing_destinations)): ?>
         <li class="facebook"><a href="" target="_blank" data-url="http://www.facebook.com/sharer.php?u=%url%&t=%filename%"><?php echo __('Facebook') ?></a></li>
+        <?php endif; ?>
+        <?php if (in_array ('twitter', $sharing_destinations)): ?>
         <li class="twitter" ><a href="" target="_blank" data-url="http://twitter.com/home?status=%filename% %url%"><?php echo __('Twitter') ?></a></li>
+        <?php endif; ?>
     </ul>
     <div class="cleartboth"></div>
 </div>
 
+<div id="email-modal" class="fz-modal" style="display: none;">
+  <?php echo partial ('file/_mailForm.php') ?>
+</div>
 
 <script type="text/javascript">
     $(document).ready (function () {

diff --git a/config/filez.default.ini b/config/filez.default.ini
@@ -15,6 +15,7 @@ user_factory_class = Fz_User_Factory_Ldap
 user_quota = 2G
 https=login_only
 progress_monitor=Fz_UploadMonitor_Apc
+sharing_destinations[] = 'email'
 
 [db]
 dsn  = "mysql:host=localhost;dbname=filez"

diff --git a/doc/CHANGELOG.markdown b/doc/CHANGELOG.markdown
@@ -8,6 +8,12 @@ Filez-2.1.0
 * Fixed the max length of a hash to 10
 * Added german translation
 * Redesigned file list
+* Added other share destination (FB, twitter) optional
+* Added German translation (thanks to @spiorf)
+* Added Italian translation (thanks to @tini)
+* Added optional Antivirus check (thanks to @daserzw)
+* Added admin backend (thanks to @almaghi)
+* Added automatic database update
 
 Filez-2.0.2
 

diff --git a/resources/js/filez.js b/resources/js/filez.js
@@ -108,16 +108,23 @@ $.fn.initFileActions = function () {
                 .replace ('%filename%', $.trim(filename)));
         });
 
+        $('#share-modal #share-destinations li.email a').click (function (e) {
+            e.preventDefault ();
+            $('#share-modal').dialog ('close');
+
+            $('form', modal).attr ('action', $(this).attr ('href'));
+            $('.open-email-client')
+                .attr ('href', 'mailto:?body='+settings.messages.emailMessage+' : '+fileUrl)
+                .click (function (e) { $('.ui-dialog-content').dialog('close'); });
+
+            $('#email-modal').dialog ('open');
+        });
+
         $('#share-modal').dialog ('option', 'title', filename);
+        $('#email-modal').dialog ('option', 'title', filename);
 
         modal.dialog ('open');
-        /*
-        $('form', modal).attr ('action', $(this).attr ('href'));
-        $('.open-email-client', modal).attr ('href', 'mailto:'
-            +'?body='+settings.messages.emailMessage+' : '+fileUrl);
-        */
-        return false;
-    }),
+    });
 
     $('a.delete', this).click (function (e) {
         if (confirm (settings.messages.confirmDelete))