Changeset 17177 for extensions/BatchDownloader/include/BatchDownloader.class.php

Timestamp:

Jul 27, 2012, 4:44:19 PM (12 years ago)

Author:

mistic100

Message:

rewrite all urls to be compatible with "question_mark_in_urls"

File:

• extensions/BatchDownloader/include/BatchDownloader.class.php (modified) (4 diffs)

extensions/BatchDownloader/include/BatchDownloader.class.php

@@ -425 +425 @@
     }
     
+    $root_url = get_root_url();
+    
     $out = '';
     for ($i=1; $i<=$this->data['nb_zip']; $i++)
@@ -432 +434 @@
       if ($this->data['status'] == 'done' or $i < $this->data['last_zip']+1)
       {
-        $out.= '<img src="'.BATCH_DOWNLOAD_PATH.'template/drive.png"> Archive #'.$i.' (already downloaded)';
+        $out.= '<img src="'.$root_url.BATCH_DOWNLOAD_PATH.'template/drive.png"> Archive #'.$i.' (already downloaded)';
       }
       else if ($i == $this->data['last_zip']+1)
@@ -438 +440 @@
           $out.= '<a href="'.add_url_params($url, array('set_id'=>$this->data['id'],'zip'=>$i)).'" rel="nofollow" style="font-weight:bold;"' 
             .($i!=1 ? 'onClick="return confirm(\'Starting download Archive #'.$i.' will destroy Archive #'.($i-1).', be sure you finish the download. Continue ?\');"' : null).
-            '><img src="'.BATCH_DOWNLOAD_PATH.'template/drive_go.png"> Archive #'.$i.' (ready)</a>';
+            '><img src="'.$root_url.BATCH_DOWNLOAD_PATH.'template/drive_go.png"> Archive #'.$i.' (ready)</a>';
       }
       else
       {
-        $out.= '<img src="'.BATCH_DOWNLOAD_PATH.'template/drive.png"> Archive #'.$i.' (pending)';
+        $out.= '<img src="'.$root_url.BATCH_DOWNLOAD_PATH.'template/drive.png"> Archive #'.$i.' (pending)';
       }
       
@@ -609 +611 @@
           if (!class_exists('UserCollection')) throw new Exception();
           $UserCollection = new UserCollection($this->data['type_id']);
-          $set['NAME'] = l10n('Collection').': <a href="'.USER_COLLEC_PUBLIC.'view/'.$UserCollection->getParam('id').'">'.$UserCollection->getParam('name').'</a>';
+          $infos = $UserCollection->getCollectionInfo();
+          $set['NAME'] = l10n('Collection').': <a href="'.$infos['U_PUBLIC'].'">'.$UserCollection->getParam('name').'</a>';
         }
         catch (Exception $e)