wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #59 from fmms/master

Browse source 
Starting point to take care of Checkstyle warnings
This commit is contained in:
icewind1991 2012-10-23 06:58:15 -07:00
commit fbe059afd3
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_external/lib/config.php
View file

@ -231,7 +231,7 @@ class OC_Mount_Config {
$file = OC::$SERVERROOT.'/config/mount.php';
}
if (is_file($file)) {
$mountPoints = include($file);
$mountPoints = include $file;
if (is_array($mountPoints)) {
return $mountPoints;
}

2
lib/filesystem.php
View file

@ -210,7 +210,7 @@ class OC_Filesystem{
static private function loadSystemMountPoints($user) {
if(is_file(OC::$SERVERROOT.'/config/mount.php')) {
$mountConfig=include(OC::$SERVERROOT.'/config/mount.php');
$mountConfig=include OC::$SERVERROOT.'/config/mount.php';
if(isset($mountConfig['global'])) {
foreach($mountConfig['global'] as $mountPoint=>$options) {
self::mount($options['class'],$options['options'],$mountPoint);

4
lib/helper.php
View file

@ -350,8 +350,8 @@ class OC_Helper {
if(strpos($path,'.')) {
//try to guess the type by the file extension
if(!self::$mimetypes || self::$mimetypes != include('mimetypes.list.php')) {
self::$mimetypes=include('mimetypes.list.php');
if(!self::$mimetypes || self::$mimetypes != include 'mimetypes.list.php') {
self::$mimetypes=include 'mimetypes.list.php';
}
$extension=strtolower(strrchr(basename($path), "."));
$extension=substr($extension,1);//remove leading .

4
lib/installer.php
View file

@ -187,7 +187,7 @@ class OC_Installer{
//run appinfo/install.php
if((!isset($data['noinstall']) or $data['noinstall']==false) and file_exists($basedir.'/appinfo/install.php')) {
include($basedir.'/appinfo/install.php');
include $basedir.'/appinfo/install.php';
}
//set the installed version
@ -320,7 +320,7 @@ class OC_Installer{
//run appinfo/install.php
if(is_file(OC_App::getAppPath($app)."/appinfo/install.php")) {
include(OC_App::getAppPath($app)."/appinfo/install.php");
include OC_App::getAppPath($app)."/appinfo/install.php";
}
$info=OC_App::getAppInfo($app);
OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion($app));

4
lib/l10n.php
View file

@ -120,7 +120,7 @@ class OC_L10N{
OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/') ||
OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) {
// Include the file, save the data from $CONFIG
include(strip_tags($i18ndir).strip_tags($lang).'.php');
include strip_tags($i18ndir).strip_tags($lang).'.php';
if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
$this->translations = $TRANSLATIONS;
}
@ -128,7 +128,7 @@ class OC_L10N{
if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')) {
// Include the file, save the data from $CONFIG
include(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php');
include OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php';
if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)) {
$this->localizations = array_merge($this->localizations, $LOCALIZATIONS);
}

2
lib/migrate.php
View file

@ -66,7 +66,7 @@ class OC_Migrate{
foreach($apps as $app) {
$path = OC_App::getAppPath($app) . '/appinfo/migrate.php';
if( file_exists( $path ) ) {
include( $path );
include $path;
}
}
}

4
lib/template.php
View file

@ -405,7 +405,7 @@ class OC_Template{
// Execute the template
ob_start();
include( $this->template ); // <-- we have to use include because we pass $_!
include $this->template; // <-- we have to use include because we pass $_!
$data = ob_get_contents();
@ob_end_clean();
@ -430,7 +430,7 @@ class OC_Template{
// Include
ob_start();
include( $this->path.$file.'.php' );
include $this->path.$file.'.php';
$data = ob_get_contents();
@ob_end_clean();

2
lib/util.php
View file

@ -68,7 +68,7 @@ class OC_Util {
$user_root = OC_User::getHome($user);
$userdirectory = $user_root . '/files';
if (is_file($user_root.'/mount.php')) {
$mountConfig = include($user_root.'/mount.php');
$mountConfig = include $user_root.'/mount.php';
if (isset($mountConfig['user'][$user])) {
foreach ($mountConfig['user'][$user] as $mountPoint => $options) {
OC_Filesystem::mount($options['class'], $options['options'], $mountPoint);