open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move autoloader to it's own class

Browse Source
remotes/origin/stable6
Robin Appelman 12 years ago
parent 175633d380
commit 0b5f6b9c13
2 changed files with 71 additions and 56 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 65
      lib/autoloader.php
  2. 62
      lib/base.php

65
lib/autoloader.php
Unescape View File

@ -0,0 +1,65 @@
<?php
/**
* Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
* This file is licensed under the Affero General Public License version 3 or
* later.
* See the COPYING-README file.
*/
namespace OC;
class Autoloader {
public function load($class) {
$class = trim($class, '\\');
if (array_key_exists($class, \OC::$CLASSPATH)) {
$path = \OC::$CLASSPATH[$class];
/** @TODO: Remove this when necessary
Remove "apps/" from inclusion path for smooth migration to mutli app dir
*/
if (strpos($path, 'apps/') === 0) {
\OC_Log::write('core', 'include path for class "' . $class . '" starts with "apps/"', \OC_Log::DEBUG);
$path = str_replace('apps/', '', $path);
}
} elseif (strpos($class, 'OC_') === 0) {
$path = strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
} elseif (strpos($class, 'OC\\') === 0) {
$path = strtolower(str_replace('\\', '/', substr($class, 3)) . '.php');
} elseif (strpos($class, 'OCP\\') === 0) {
$path = 'public/' . strtolower(str_replace('\\', '/', substr($class, 3)) . '.php');
} elseif (strpos($class, 'OCA\\') === 0) {
foreach (\OC::$APPSROOTS as $appDir) {
$path = strtolower(str_replace('\\', '/', substr($class, 4)) . '.php');
$fullPath = stream_resolve_include_path($appDir['path'] . '/' . $path);
if (file_exists($fullPath)) {
require_once $fullPath;
return false;
}
// If not found in the root of the app directory, insert '/lib' after app id and try again.
$libpath = substr($path, 0, strpos($path, '/')) . '/lib' . substr($path, strpos($path, '/'));
$fullPath = stream_resolve_include_path($appDir['path'] . '/' . $libpath);
if (file_exists($fullPath)) {
require_once $fullPath;
return false;
}
}
} elseif (strpos($class, 'Sabre_') === 0) {
$path = str_replace('_', '/', $class) . '.php';
} elseif (strpos($class, 'Symfony\\Component\\Routing\\') === 0) {
$path = 'symfony/routing/' . str_replace('\\', '/', $class) . '.php';
} elseif (strpos($class, 'Sabre\\VObject') === 0) {
$path = str_replace('\\', '/', $class) . '.php';
} elseif (strpos($class, 'Test_') === 0) {
$path = 'tests/lib/' . strtolower(str_replace('_', '/', substr($class, 5)) . '.php');
} elseif (strpos($class, 'Test\\') === 0) {
$path = 'tests/lib/' . strtolower(str_replace('\\', '/', substr($class, 5)) . '.php');
} else {
return false;
}
if ($fullPath = stream_resolve_include_path($path)) {
require_once $fullPath;
}
return false;
}
}

62
lib/base.php
Unescape View File

@ -75,61 +75,9 @@ class OC {
protected static $router = null;
/**
* SPL autoload
* @var \OC\Autoloader $loader
*/
public static function autoload($className) {
$className = trim($className, '\\');
if (array_key_exists($className, OC::$CLASSPATH)) {
$path = OC::$CLASSPATH[$className];
/** @TODO: Remove this when necessary
Remove "apps/" from inclusion path for smooth migration to mutli app dir
*/
if (strpos($path, 'apps/') === 0) {
OC_Log::write('core', 'include path for class "' . $className . '" starts with "apps/"', OC_Log::DEBUG);
$path = str_replace('apps/', '', $path);
}
} elseif (strpos($className, 'OC_') === 0) {
$path = strtolower(str_replace('_', '/', substr($className, 3)) . '.php');
} elseif (strpos($className, 'OC\\') === 0) {
$path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
} elseif (strpos($className, 'OCP\\') === 0) {
$path = 'public/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
} elseif (strpos($className, 'OCA\\') === 0) {
foreach (self::$APPSROOTS as $appDir) {
$path = strtolower(str_replace('\\', '/', substr($className, 4)) . '.php');
$fullPath = stream_resolve_include_path($appDir['path'] . '/' . $path);
if (file_exists($fullPath)) {
require_once $fullPath;
return false;
}
// If not found in the root of the app directory, insert '/lib' after app id and try again.
$libpath = substr($path, 0, strpos($path, '/')) . '/lib' . substr($path, strpos($path, '/'));
$fullPath = stream_resolve_include_path($appDir['path'] . '/' . $libpath);
if (file_exists($fullPath)) {
require_once $fullPath;
return false;
}
}
} elseif (strpos($className, 'Sabre_') === 0) {
$path = str_replace('_', '/', $className) . '.php';
} elseif (strpos($className, 'Symfony\\Component\\Routing\\') === 0) {
$path = 'symfony/routing/' . str_replace('\\', '/', $className) . '.php';
} elseif (strpos($className, 'Sabre\\VObject') === 0) {
$path = str_replace('\\', '/', $className) . '.php';
} elseif (strpos($className, 'Test_') === 0) {
$path = 'tests/lib/' . strtolower(str_replace('_', '/', substr($className, 5)) . '.php');
} elseif (strpos($className, 'Test\\') === 0) {
$path = 'tests/lib/' . strtolower(str_replace('\\', '/', substr($className, 5)) . '.php');
} else {
return false;
}
if ($fullPath = stream_resolve_include_path($path)) {
require_once $fullPath;
}
return false;
}
public static $loader = null;
public static function initPaths() {
// calculate the root directories
@ -396,7 +344,9 @@ class OC {
public static function init() {
// register autoloader
spl_autoload_register(array('OC', 'autoload'));
require_once 'autoloader.php';
self::$loader=new \OC\Autoloader();
spl_autoload_register(array(self::$loader, 'load'));
OC_Util::issetlocaleworking();
// set some stuff
@ -643,7 +593,7 @@ class OC {
// Deny the redirect if the URL contains a @
// This prevents unvalidated redirects like ?redirect_url=:user@domain.com
if (strpos($location, '@') === FALSE) {
if (strpos($location, '@') === false) {
header('Location: ' . $location);
return;
}

Write Preview
Loading…
Cancel
Save