Changeset 6206 for extensions/autoupdate/branches/1.7

Timestamp:

May 17, 2010, 6:19:42 PM (15 years ago)

Author:

patdenice

Message:

Keep compatibility with php4 for branch 1.7

File:

• extensions/autoupdate/branches/1.7/include/functions.inc.php (modified) (5 diffs)

extensions/autoupdate/branches/1.7/include/functions.inc.php

@@ -205 +205 @@
   $path = $conf['local_data_dir'].'/autoupdate';
 
-  if (mkgetdir($path)
+  if (mkgetdir($conf['local_data_dir'])
+    and mkgetdir($path)
     and ($zip = tempnam($path, 'zip'))
     and ($archive = new pclZip($zip))
@@ -246 +247 @@
   $path = $conf['local_data_dir'].'/autoupdate';
 
-  if (@mkgetdir($path)
+  if (mkgetdir($conf['local_data_dir'])
+    and mkgetdir($path)
     and ($backupFile = tempnam($path, 'sql'))
     and ($dumper = new MySQLDump($conf['db_base'],$backupFile,false,false)))
@@ -320 +322 @@
     $path = $conf['local_data_dir'].'/autoupdate';
     $filename = $path.'/'.$code.'.zip';
-    @mkgetdir($path);
+    mkgetdir($conf['local_data_dir']);
+    mkgetdir($path);
 
     $chunk_num = 0;
@@ -385 +388 @@
           {
             array_push($page['infos'], sprintf(l10n('autoupdate_success'), $upgrade_to));
-            $step = 3;
+            $step = 4;
           }
           else
@@ -564 +567 @@
   {
     $umask = umask(0);
-    $mkd = @mkdir($dir, 0755, ($flags&MKGETDIR_RECURSIVE) ? true:false );
+    $mkd = @mkdir($dir, 0755 );
     umask($umask);
     if ($mkd==false)
     {
-      !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no write access'));
+      !($flags&MKGETDIR_DIE_ON_ERROR) or die( "$dir ".l10n('no write access'));
       return false;
     }
-    if( $flags&MKGETDIR_PROTECT_HTACCESS )
-    {
-      $file = $dir.'/.htaccess';
-      file_exists($file) or @file_put_contents( $file, 'deny from all' );
-    }
-    if( $flags&MKGETDIR_PROTECT_INDEX )
-    {
-      $file = $dir.'/index.htm';
-      file_exists($file) or @file_put_contents( $file, 'Not allowed!' );
-    }
   }
   if ( !is_writable($dir) )
   {
-    !($flags&MKGETDIR_DIE_ON_ERROR) or fatal_error( "$dir ".l10n('no write access'));
+    !($flags&MKGETDIR_DIE_ON_ERROR) or die( "$dir ".l10n('no write access'));
     return false;
   }