Mambo > Projects > Mambo CMS > SVN

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

-revision 453, Fri Apr  7 12:51:31 2006 UTC
+revision 486, Fri Apr 21 17:08:02 2006 UTC
 Line 176
          // favourites icon
          if (!isset($this->mosConfig_favicon)) $this->mosConfig_favicon = 'favicon.ico';
          if (!file_exists($this->rootPath.'/images/'.$this->mosConfig_favicon)) $this->mosConfig_favicon = 'favicon.ico';
-         return $this->rootPath.'/images/'.$this->mosConfig_favicon;
+         return $this->mosConfig_live_site.'/images/'.$this->mosConfig_favicon;
      }
      function offlineCheck (&$user, &$database) {
 Line 739
          return true;
      }
-     function createDirectory ($dir) {
+     function setPermissions ($fileSysObject) {
-         if (file_exists($dir)) {
+         if (file_exists($fileSysObject))  {
-             if (is_dir($dir)) return true;
+                 if (is_dir($fileSysObject)) $perms = mamboCore::get('mosConfig_dirperms');
-             else return false;
+                 else $perms = mamboCore::get('mosConfig_fileperms');
-         }
+                 if ($perms) {
-         list($upDirectory, $count) = $this->containingDirectory($dir);
-         if ($count > 1 AND !file_exists($upDirectory)) if (!$this->createDirectory($upDirectory)) return false;
-         if (!is_dir($upDirectory)) return false;
-         $dirperms = mamboCore::get('mosConfig_dirperms');
-         if ($dirperms) {
              $origmask = @umask(0);
-             $mode = octdec($dirperms);
+                         $mode = octdec($perms);
+                         @chmod($fileSysObject, $mode);
+                                 @umask($origmask);
          }
-         else $mode = 0755;
-         if (!@mkdir($dir, $mode )) $result = false;
-         else {
-             $result = true;
-             @chmod ($dir, $mode);
          }
-         if (isset($origmask)) @umask($origmask);
+         }
+         function makeDirectory ($dir) {
+                 $perms = mamboCore::get('mosConfig_dirperms');
+                 $origmask = @umask(0);
+                 if ($perms) $result = @mkdir($dir, octdec($perms));
+                 else $result = @mkdir($dir, 0755);
+                 if ($result) $this->setPermissions($dir);
+                 @umask($origmask);
          return $result;
      }
+         function createDirectory ($dir, $onlyCheck=false) {
+         if (file_exists($dir)) {
+             if (is_dir($dir) AND is_writable($dir)) return true;
+             else return false;
+         }
+         list($upDirectory, $count) = $this->containingDirectory($dir);
+         if ($count > 1 AND !file_exists($upDirectory) AND !($result = $this->createDirectory($upDirectory, $onlyCheck))) return false;
+         if ($onlyCheck AND isset($result)) return true;
+         if (!is_dir($upDirectory) OR !is_writable($upDirectory)) return false;
+         if ($onlyCheck) return true;
+         else return $this->makeDirectory($dir);
+     }
      function containingDirectory ($dir) {
          $dirs = preg_split('*[/|\\\]*', $dir);
          for ($i = count($dirs)-1; $i >= 0; $i--) {
-Line 769
+Line 783
              unset($dirs[$i]);
              if ($text) break;
          }
-         return array(implode('/',$dirs), count($dirs));
+         $result2 = count($dirs);
+         $result1 = implode('/',$dirs).($result2 > 1 ? '' : '/');
+         return array($result1, $result2);
      }
+     function simpleCopy ($from, $to) {
+         if (@copy($from, $to)) {
+                 $this->setPermissions($to);
+                 return true;
+         }
+         else return false;
+         }
      function forceCopy ($from, $to) {
          $todir = dirname($to);
-Line 779
+Line 802
          if (!file_exists($todir)) return false;
          $name = basename($from);
          $this->deleteFile($to.$name);
-         return @copy($from, $to);
+         return $this->simpleCopy ($from, $to);
      }
      function lightCopy ($from, $to) {
-Line 788
+Line 811
          $todir = dirname($to);
          if (!file_exists($todir)) $this->createDirectory($todir);
          if (!file_exists($todir)) return false;
-         return @copy($from, $to);
+                 return $this->simpleCopy ($from, $to);
+     }
+         function acceptCopy ($to) {
+                 $todir = dirname($to);
+                 return $this->createDirectory($todir, true);
      }
-Line 1146
+Line 1174
      function menuCheck( $Itemid, $menu_option, $task, $gid ) {
          // Construct a link to this component - if no menu for it, assume it is OK
          $dblink="index.php?option=$menu_option";
+ //      if ($menu_option == 'com_content' AND $Itemid == 1) return true;
          if ($this->getIDLikeLink($dblink) == 0) return true;
          if ($Itemid) {
              $menu =& $this->getMenuByID($Itemid);
-Line 2507
+Line 2536
  $act = strtolower(mosGetParam($_REQUEST, 'act', ''));
  $section = mosGetParam($_REQUEST, 'section', '');
  $no_html = strtolower(mosGetParam($_REQUEST, 'no_html', ''));
+ $cid = (array) mosGetParam( $_POST, 'cid', array() );
  ini_set('session.use_trans_sid', 0);
  ini_set('session.use_cookies', 1);

 Legend:



Removed from v.453
 


changed lines


 
Added in v.486
 Legend:



Removed from v.453
 


changed lines


 
Added in v.486
-Removed from v.453
+Added in v.486

	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