Changeset 25674 for extensions/UserCollections

Timestamp:

Nov 24, 2013, 2:48:30 PM (10 years ago)

Author:

mistic100

Message:

fixc empty share key field after addition
fix javascript errors

Location:

extensions/UserCollections

Files:

• include/UserCollection.class.php (modified) (6 diffs)
• include/collections.inc.php (modified) (2 diffs)
• include/install.inc.php (modified) (1 diff)
• template/collection_edit.tpl (modified) (5 diffs)
• template/thumbnails_colorbox.tpl (modified) (1 diff)
• template/thumbnails_css_js.tpl (modified) (2 diffs)

extensions/UserCollections/include/UserCollection.class.php

@@ -327 +327 @@
    * @return: array errors
    */
-  function addShare($share, $abord_on_duplicate=true)
+  function addShare(&$share, $abord_on_duplicate=true)
   {
     global $conf, $page;
@@ -342 +342 @@
     else
     {
-      $share['share_key'] = $this->data['id'].'-'.str2url($share['share_key']);
+      $share['share_key'] = str2url($share['share_key']);
+      $share_key = $this->data['id'].'-'.$share['share_key'];
       
       $query = '
 SELECT id FROM '.COLLECTION_SHARES_TABLE.'
   WHERE col_id = '.$this->data['id'].'
-  AND share_key = "'.$share['share_key'].'"
+  AND share_key = "'.$share_key.'"
 ;';
       $result = pwg_query($query);
@@ -358 +359 @@
         else
         {
-          return USER_COLLEC_PUBLIC . 'view/' . $share['share_key'];
+          return USER_COLLEC_PUBLIC . 'view/' . $share_key;
         }
       }
@@ -373 +374 @@
     if (!empty($share['password']))
     {
-      $share['password'] = sha1($conf['secret_key'].$share['password'].$share['share_key']);
+      $share['password'] = sha1($conf['secret_key'].$share['password'].$share_key);
     }
     
@@ -392 +393 @@
   VALUES(
     '.$this->data['id'].',
-    "'.$share['share_key'].'",
+    "'.$share_key.'",
     "'.pwg_db_real_escape_string($params).'",
     "'.date('Y-m-d H:i:s').'"
@@ -399 +400 @@
       pwg_query($query);
       
-      return USER_COLLEC_PUBLIC . 'view/' . $share['share_key'];
+      return USER_COLLEC_PUBLIC . 'view/' . $share_key;
     }
     

extensions/UserCollections/include/collections.inc.php

@@ -124 +124 @@
     if ($conf['user_collections']['allow_public'])
     {
-      $share = array(
-        'share_key' => get_random_key(16),
-        'password' => null,
-        'deadline' => null,
-        );
-      
       if (isset($_POST['add_share']))
       {
@@ -165 +159 @@
         $share['open'] = true;
       }
-      
+
+      if (!isset($share['share_key']))
+      {
+        $share['share_key'] = get_random_key(16);
+        $share['password'] = null;
+        $share['deadline'] = null;
+      }
+
       $template->assign('share', $share);
     }

extensions/UserCollections/include/install.inc.php

@@ -93 +93 @@
     
     mass_inserts($prefixeTable.'collection_shares',
-      array('col_id','share_key','add_date'),
+      array('col_id','share_key','params','add_date'),
       $inserts
       );

extensions/UserCollections/template/collection_edit.tpl

@@ -18 +18 @@
 
 
-<script>
 {footer_script require='jquery,jquery.ui.timepicker'}
+var bg_color = $('#the_page #content').css('background-color');
+if (!bg_color || bg_color=='transparent') {ldelim}
+  bg_color = $('body').css('background-color');
+}
+
 {if isset($U_SHARE)}
 {literal}
@@ -67 +71 @@
   $share_form.find('.set_share_key').on('click', function() {
       if ($share_form.find('input[name="share_key"]').val().length < 8) {
-          alert("{/literal}{'The key must be at least 8 characters long'|@translate}{literal}");
+          alert("{/literal}{'The key must be at least 8 characters long'|@translate|escape:javascript}{literal}");
       }
       else {
@@ -107 +111 @@
     return false;
   });
-  jQuery("#share_form").css('background-color', jQuery("#the_page #content").css('background-color'));
+  jQuery("#share_form").css('background-color', bg_color);
 {/literal}
 {/if}
@@ -121 +125 @@
     return false;
   });
-  jQuery("#mail_form").css('background-color', jQuery("#the_page #content").css('background-color'));
+  
+  
+  jQuery("#mail_form").css('background-color', bg_color);
 {/literal}
 {/if}
@@ -138 +144 @@
 {/literal}
 {/footer_script}
-</script>
 
 

extensions/UserCollections/template/thumbnails_colorbox.tpl

@@ -10 +10 @@
   title: function() {ldelim}
     var title = $(this).children("img.thumbnail").attr("alt");
-    {if $F_ACTION} title+= ' · <a class="addCollection" data-id="'+ $(this).data('id') +'" rel="nofollow">{'Remove from collection'|@translate}</a>';{/if}
-    title+= ' · <a href="'+ $(this).attr('href') +'" target="_blank">{'jump to photo'|@translate} →</a>';
+    {if $F_ACTION} title+= ' · <a class="addCollection" data-id="'+ $(this).data('id') +'" rel="nofollow">{'Remove from collection'|@translate|escape:javascript}</a>';{/if}
+    title+= ' · <a href="'+ $(this).attr('href') +'" target="_blank">{'jump to photo'|@translate|escape:javascript} →</a>';
     return  title;
   }

extensions/UserCollections/template/thumbnails_css_js.tpl

@@ -23 +23 @@
   // ENTER or ESC pressed
   "keyup": function(event) {ldelim}
-    if (event.which == 27) {
+    if (event.which == 27) {ldelim}
       jQuery(this).val('').hide().prev().show();
       return;
@@ -161 +161 @@
   <div class="switchBoxFooter">
   <span>&#10010;</span> <a class="new">{'Create a new collection'|@translate}</a>
-  <input class="new" placeholder="{'Name'|@translate}" size="25"/>
+  <input type="text" class="new" placeholder="{'Name'|@translate}" size="25"/>
   </div>
 </div>