Changeset 18973 for extensions/BatchDownloader/include

Timestamp:

Nov 7, 2012, 10:05:44 PM (11 years ago)

Author:

mistic100

Message:

small code cleaning, use mkgetdir(), add missing language string

Location:

extensions/BatchDownloader/include

Files:

• BatchDownloader.class.php (modified) (3 diffs)
• install.inc.php (modified) (1 diff)

extensions/BatchDownloader/include/BatchDownloader.class.php

@@ -322 +322 @@
       foreach ($images_to_add as $row)
       {        
-        $zip->addFile(PHPWG_ROOT_PATH . $row['path'], $row['id'].'_'.get_filename_wo_extension($row['file']).'.'.get_extension($row['path']));
+        $zip->addFile(PHPWG_ROOT_PATH . $row['path'], $row['id'].'_'.stripslashes(get_filename_wo_extension($row['file'])).'.'.get_extension($row['path']));
         
         array_push($images_added, $row['id']);
@@ -437 +437 @@
       {
           $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).
+            .($i!=1 ? ' onClick="return confirm(\''.addslashes(sprintf(l10n('Starting download Archive #%d will destroy Archive #%d, be sure you finish the download. Continue ?'), $i, $i-1)).'\');"' : null).
             '><img src="'.$root_url.BATCH_DOWNLOAD_PATH.'template/drive_go.png"> Archive #'.$i.' (ready)</a>';
       }
@@ -460 +460 @@
     if (!file_exists(BATCH_DOWNLOAD_LOCAL . 'u-' .$this->data['user_id']. '/'))
     {
-      mkdir(BATCH_DOWNLOAD_LOCAL . 'u-' .$this->data['user_id']. '/', 0755, true);
+      mkgetdir(BATCH_DOWNLOAD_LOCAL . 'u-' .$this->data['user_id']. '/');
     }
     

extensions/BatchDownloader/include/install.inc.php

@@ -28 +28 @@
 
   // archives directory
-  if ( file_exists($conf['data_location']) and !file_exists($conf['data_location'] . 'download_archives/') )
+  if ( file_exists($conf['data_location']) )
   {
-    mkdir($conf['data_location'] . 'download_archives/', 0755);
+    mkgetdir($conf['data_location'] . 'download_archives/', MKGETDIR_DEFAULT&~MKGETDIR_DIE_ON_ERROR);
   }