Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/index.php

-revision 221, Wed Feb  1 23:44:54 2006 UTC
+revision 222, Thu Feb  2 14:50:48 2006 UTC
 Line 57
      var $rootPath = '';
      var $Itemid = 0;
      var $option = '';
+     var $subdirectory;
      var $current_user = null;
      var $do_gzip_compress = false;
-Line 135
+Line 136
                  fclose($f);
                  eval($code);
                  $subdir = substr(dirname(__FILE__), strlen($_SERVER['DOCUMENT_ROOT']));
-                 $subdir = str_replace('\\', '/', $subdir);
+                 $this->subdirectory = str_replace('\\', '/', $subdir);
-                 $this->mosConfig_live_site = 'http://'.$_SERVER['SERVER_NAME'].$subdir;
+                 $this->mosConfig_live_site = 'http://'.$_SERVER['SERVER_NAME'].$this->subdirectory;
                  $this->mosConfig_absolute_path = $this->rootPath;
                  preg_match_all('/\$this\-\>([A-Za-z_][A-Za-z0-9_]*)/', $code, $matches);
                  foreach ($matches[1] as $match) $GLOBALS[$match] = $this->$match;
-Line 196
+Line 197
              }
          }
-         DEFINE('_ISO','charset='.$this->language['encoding']);
+         if (!defined('_ISO')) DEFINE('_ISO','charset='.$this->language['encoding']);
-         DEFINE('_DATE_FORMAT_LC', $this->language['dateformat']); //Uses PHP's strftime Command Format
+         if (!defined('_DATE_FORMAT_LC')) DEFINE('_DATE_FORMAT_LC', $this->language['dateformat']); //Uses PHP's strftime Command Format
-         DEFINE('_DATE_FORMAT_LC2', $this->language['dateformat']." %H:%M");
+         if (!defined('_DATE_FORMAT_LC2')) DEFINE('_DATE_FORMAT_LC2', $this->language['dateformat']." %H:%M");
          //header('Content-Type: text/html; charset=utf-8');
          $domain = $this->mosConfig_lang;
-Line 295
+Line 296
              if (strpos($url, '?')) $url .= '&mosmsg='.urlencode($message);
              else $url .= '?mosmsg='.urlencode($message);
          }
+ //die('Ready to redirect to '.$url);
          if (headers_sent()) echo "<script>document.location.href='$url';</script>\n";
          else {
              @ob_end_clean(); // clear output buffer
-Line 315
+Line 317
                          <?php
          }
          if ($return = mosGetParam( $_REQUEST, 'return', '' )) {
+ echo 'About to redirect (return)';
              $this->redirect( $return );
          }
          else {
+ echo 'About to redirect (live site)';
              $this->redirect( $this->mosConfig_live_site.'/index.php' );
          }
      }
-Line 676
+Line 680
      }
      function deleteFile ($file) {
-         if (file_exists($file)) unlink($file);
+         if (file_exists($file)) {
+                 @chmod($file, 0644);
+                         return unlink($file);
+                 }
+                 return true;
      }
      function deleteDirectory ($dir) {
-         rmdir($dir);
+         if (file_exists($dir)) {
+                 if (is_dir($dir)) {
+                         @chmod($dir, 0755);
+                         return rmdir($dir);
+                     }
+                         return false;
+                 }
+                 return true;
      }
      function createDirectory ($dir) {
+         if (is_dir($dir)) return true;
                  list($upDirectory, $count) = $this->containingDirectory($dir);
-                 if ($count > 1 AND !file_exists($upDirectory)) $this->createDirectory($upDirectory);
+                 if ($count > 1 AND !is_dir($upDirectory)) if (!$this->createDirectory($upDirectory)) return false;
-         mkdir($dir);
+                 $dirperms = mamboCore::get('mosConfig_dirperms');
+                 if ($dirperms) {
+                         $origmask = @umask(0);
+                         $mode = octdec($dirperms);
+                 }
+                 else $mode = 0777;
+         if (!@mkdir($dir, $mode )) $result = false;
+         else {
+                         $result = true;
+                         @chmod ($dir, $mode);
+                 }
+                 if (isset($origmask)) @umask($origmask);
+         return $result;
      }
      function containingDirectory ($dir) {
-Line 750
+Line 778
      function mosChmod($path)
      {
          $fileperms = mamboCore::get('mosConfig_fileperms');
-         $dirperms = mamboCore::get('mosConfig_dirperms');
          if ($fileperms != '') $filemode = octdec($fileperms);
          else $filemode = null;
+         $dirperms = mamboCore::get('mosConfig_dirperms');
          if ($dirperms != '') $dirmode = octdec($dirperms);
          else $dirmode = null;
          if (isset($filemode) OR isset($dirmode))

 Legend:



Removed from v.221
 


changed lines


 
Added in v.222
 Legend:



Removed from v.221
 


changed lines


 
Added in v.222
-Removed from v.221
+Added in v.222

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.6/index.php