Changeset 25674 for extensions/UserCollections/include/UserCollection.class.php

Timestamp:

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

Author:

mistic100

Message:

fixc empty share key field after addition
fix javascript errors

File:

• extensions/UserCollections/include/UserCollection.class.php (modified) (6 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;
     }