webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-08-07 23:03:00 +03:00
Code Activity

Change application namespace to BookStack

Browse Source
This commit is contained in:
Dan Brown
2015-09-10 19:31:09 +01:00
parent b61c1d8df0
commit 88049476fe
69 changed files with 195 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Activity.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow;
namespace BookStack;
use Illuminate\Database\Eloquent\Model;
@@ -32,7 +32,7 @@ class Activity extends Model
*/
public function user()
{
return $this->belongsTo('Oxbow\User');
return $this->belongsTo('BookStack\User');
}
/**

6
app/Book.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow;
namespace BookStack;
class Book extends Entity
{
@@ -19,12 +19,12 @@ class Book extends Entity
public function pages()
{
return $this->hasMany('Oxbow\Page');
return $this->hasMany('BookStack\Page');
}
public function chapters()
{
return $this->hasMany('Oxbow\Chapter');
return $this->hasMany('BookStack\Chapter');
}
public function children()

6
app/Chapter.php
View File

@@ -1,4 +1,4 @@
<?php namespace Oxbow;
<?php namespace BookStack;
class Chapter extends Entity
@@ -8,12 +8,12 @@ class Chapter extends Entity
public function book()
{
return $this->belongsTo('Oxbow\Book');
return $this->belongsTo('BookStack\Book');
}
public function pages()
{
return $this->hasMany('Oxbow\Page')->orderBy('priority', 'ASC');
return $this->hasMany('BookStack\Page')->orderBy('priority', 'ASC');
}
public function getUrl()

2
app/Console/Commands/Inspire.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow\Console\Commands;
namespace BookStack\Console\Commands;
use Illuminate\Console\Command;
use Illuminate\Foundation\Inspiring;

4
app/Console/Kernel.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow\Console;
namespace BookStack\Console;
use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
@@ -13,7 +13,7 @@ class Kernel extends ConsoleKernel
* @var array
*/
protected $commands = [
\Oxbow\Console\Commands\Inspire::class,
\BookStack\Console\Commands\Inspire::class,
];
/**

4
app/EmailConfirmation.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow;
namespace BookStack;
use Illuminate\Database\Eloquent\Model;
@@ -10,6 +10,6 @@ class EmailConfirmation extends Model
public function user()
{
return $this->belongsTo('Oxbow\User');
return $this->belongsTo('BookStack\User');
}
}

8
app/Entity.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow;
namespace BookStack;
use Illuminate\Database\Eloquent\Model;
@@ -12,7 +12,7 @@ abstract class Entity extends Model
*/
public function createdBy()
{
return $this->belongsTo('Oxbow\User', 'created_by');
return $this->belongsTo('BookStack\User', 'created_by');
}
/**
@@ -21,7 +21,7 @@ abstract class Entity extends Model
*/
public function updatedBy()
{
return $this->belongsTo('Oxbow\User', 'updated_by');
return $this->belongsTo('BookStack\User', 'updated_by');
}
/**
@@ -41,7 +41,7 @@ abstract class Entity extends Model
*/
public function activity()
{
return $this->morphMany('Oxbow\Activity', 'entity')->orderBy('created_at', 'desc');
return $this->morphMany('BookStack\Activity', 'entity')->orderBy('created_at', 'desc');
}
/**

2
app/Events/Event.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow\Events;
namespace BookStack\Events;
abstract class Event
{

2
app/Exceptions/ConfirmationEmailException.php
View File

@@ -1,4 +1,4 @@
<?php namespace Oxbow\Exceptions;
<?php namespace BookStack\Exceptions;
class ConfirmationEmailException extends NotifyException

2
app/Exceptions/Handler.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow\Exceptions;
namespace BookStack\Exceptions;
use Exception;
use Symfony\Component\HttpKernel\Exception\HttpException;

2
app/Exceptions/NotifyException.php
View File

@@ -1,4 +1,4 @@
<?php namespace Oxbow\Exceptions;
<?php namespace BookStack\Exceptions;
class NotifyException extends \Exception

2
app/Exceptions/SocialDriverNotConfigured.php
View File

@@ -1,4 +1,4 @@
<?php namespace Oxbow\Exceptions;
<?php namespace BookStack\Exceptions;
class SocialDriverNotConfigured extends \Exception

2
app/Exceptions/SocialSignInException.php
View File

@@ -1,4 +1,4 @@
<?php namespace Oxbow\Exceptions;
<?php namespace BookStack\Exceptions;
class SocialSignInException extends NotifyException

2
app/Exceptions/UserRegistrationException.php
View File

@@ -1,4 +1,4 @@
<?php namespace Oxbow\Exceptions;
<?php namespace BookStack\Exceptions;
class UserRegistrationException extends NotifyException

18
app/Http/Controllers/Auth/AuthController.php
View File

@@ -1,16 +1,16 @@
<?php
namespace Oxbow\Http\Controllers\Auth;
namespace BookStack\Http\Controllers\Auth;
use Illuminate\Http\Request;
use Oxbow\Exceptions\SocialSignInException;
use Oxbow\Exceptions\UserRegistrationException;
use Oxbow\Repos\UserRepo;
use Oxbow\Services\EmailConfirmationService;
use Oxbow\Services\SocialAuthService;
use Oxbow\SocialAccount;
use BookStack\Exceptions\SocialSignInException;
use BookStack\Exceptions\UserRegistrationException;
use BookStack\Repos\UserRepo;
use BookStack\Services\EmailConfirmationService;
use BookStack\Services\SocialAuthService;
use BookStack\SocialAccount;
use Validator;
use Oxbow\Http\Controllers\Controller;
use BookStack\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ThrottlesLogins;
use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
@@ -131,7 +131,7 @@ class AuthController extends Controller
* @param bool|false|SocialAccount $socialAccount
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
* @throws UserRegistrationException
* @throws \Oxbow\Exceptions\ConfirmationEmailException
* @throws \BookStack\Exceptions\ConfirmationEmailException
*/
protected function registerUser(array $userData, $socialAccount = false)
{

4
app/Http/Controllers/Auth/PasswordController.php
View File

@@ -1,8 +1,8 @@
<?php
namespace Oxbow\Http\Controllers\Auth;
namespace BookStack\Http\Controllers\Auth;
use Oxbow\Http\Controllers\Controller;
use BookStack\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;
class PasswordController extends Controller

10
app/Http/Controllers/BookController.php
View File

@@ -1,16 +1,16 @@
<?php
namespace Oxbow\Http\Controllers;
namespace BookStack\Http\Controllers;
use Activity;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Str;
use Oxbow\Http\Requests;
use Oxbow\Repos\BookRepo;
use Oxbow\Repos\ChapterRepo;
use Oxbow\Repos\PageRepo;
use BookStack\Http\Requests;
use BookStack\Repos\BookRepo;
use BookStack\Repos\ChapterRepo;
use BookStack\Repos\PageRepo;
class BookController extends Controller
{

10
app/Http/Controllers/ChapterController.php
View File

@@ -1,15 +1,15 @@
<?php
namespace Oxbow\Http\Controllers;
namespace BookStack\Http\Controllers;
use Activity;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Oxbow\Http\Requests;
use Oxbow\Http\Controllers\Controller;
use Oxbow\Repos\BookRepo;
use Oxbow\Repos\ChapterRepo;
use BookStack\Http\Requests;
use BookStack\Http\Controllers\Controller;
use BookStack\Repos\BookRepo;
use BookStack\Repos\ChapterRepo;
class ChapterController extends Controller
{

4
app/Http/Controllers/Controller.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow\Http\Controllers;
namespace BookStack\Http\Controllers;
use HttpRequestException;
use Illuminate\Foundation\Bus\DispatchesJobs;
@@ -9,7 +9,7 @@ use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Session;
use Oxbow\User;
use BookStack\User;
abstract class Controller extends BaseController
{

12
app/Http/Controllers/HomeController.php
View File

@@ -1,14 +1,14 @@
<?php
namespace Oxbow\Http\Controllers;
namespace BookStack\Http\Controllers;
use Illuminate\Http\Request;
use Oxbow\Http\Requests;
use Oxbow\Http\Controllers\Controller;
use Oxbow\Repos\BookRepo;
use Oxbow\Services\ActivityService;
use Oxbow\Services\Facades\Activity;
use BookStack\Http\Requests;
use BookStack\Http\Controllers\Controller;
use BookStack\Repos\BookRepo;
use BookStack\Services\ActivityService;
use BookStack\Services\Facades\Activity;
class HomeController extends Controller
{

8
app/Http/Controllers/ImageController.php
View File

@@ -1,15 +1,15 @@
<?php
namespace Oxbow\Http\Controllers;
namespace BookStack\Http\Controllers;
use Illuminate\Filesystem\Filesystem as File;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Intervention\Image\Facades\Image as ImageTool;
use Illuminate\Support\Facades\DB;
use Oxbow\Http\Requests;
use Oxbow\Image;
use Oxbow\Repos\PageRepo;
use BookStack\Http\Requests;
use BookStack\Image;
use BookStack\Repos\PageRepo;
class ImageController extends Controller
{

10
app/Http/Controllers/PageController.php
View File

@@ -1,15 +1,15 @@
<?php
namespace Oxbow\Http\Controllers;
namespace BookStack\Http\Controllers;
use Activity;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Oxbow\Http\Requests;
use Oxbow\Repos\BookRepo;
use Oxbow\Repos\ChapterRepo;
use Oxbow\Repos\PageRepo;
use BookStack\Http\Requests;
use BookStack\Repos\BookRepo;
use BookStack\Repos\ChapterRepo;
use BookStack\Repos\PageRepo;
class PageController extends Controller
{

12
app/Http/Controllers/SearchController.php
View File

@@ -1,14 +1,14 @@
<?php
namespace Oxbow\Http\Controllers;
namespace BookStack\Http\Controllers;
use Illuminate\Http\Request;
use Oxbow\Http\Requests;
use Oxbow\Http\Controllers\Controller;
use Oxbow\Repos\BookRepo;
use Oxbow\Repos\ChapterRepo;
use Oxbow\Repos\PageRepo;
use BookStack\Http\Requests;
use BookStack\Http\Controllers\Controller;
use BookStack\Repos\BookRepo;
use BookStack\Repos\ChapterRepo;
use BookStack\Repos\PageRepo;
class SearchController extends Controller
{

6
app/Http/Controllers/SettingController.php
View File

@@ -1,11 +1,11 @@
<?php
namespace Oxbow\Http\Controllers;
namespace BookStack\Http\Controllers;
use Illuminate\Http\Request;
use Oxbow\Http\Requests;
use Oxbow\Http\Controllers\Controller;
use BookStack\Http\Requests;
use BookStack\Http\Controllers\Controller;
use Setting;
class SettingController extends Controller

10
app/Http/Controllers/UserController.php
View File

@@ -1,14 +1,14 @@
<?php
namespace Oxbow\Http\Controllers;
namespace BookStack\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
use Oxbow\Http\Requests;
use Oxbow\Repos\UserRepo;
use Oxbow\Services\SocialAuthService;
use Oxbow\User;
use BookStack\Http\Requests;
use BookStack\Repos\UserRepo;
use BookStack\Services\SocialAuthService;
use BookStack\User;
class UserController extends Controller
{

12
app/Http/Kernel.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow\Http;
namespace BookStack\Http;
use Illuminate\Foundation\Http\Kernel as HttpKernel;
@@ -13,11 +13,11 @@ class Kernel extends HttpKernel
*/
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
\Oxbow\Http\Middleware\EncryptCookies::class,
\BookStack\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\Oxbow\Http\Middleware\VerifyCsrfToken::class,
\BookStack\Http\Middleware\VerifyCsrfToken::class,
];
/**
@@ -26,9 +26,9 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'auth' => \Oxbow\Http\Middleware\Authenticate::class,
'auth' => \BookStack\Http\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'guest' => \Oxbow\Http\Middleware\RedirectIfAuthenticated::class,
'perm' => \Oxbow\Http\Middleware\PermissionMiddleware::class
'guest' => \BookStack\Http\Middleware\RedirectIfAuthenticated::class,
'perm' => \BookStack\Http\Middleware\PermissionMiddleware::class
];
}

4
app/Http/Middleware/Authenticate.php
View File

@@ -1,10 +1,10 @@
<?php
namespace Oxbow\Http\Middleware;
namespace BookStack\Http\Middleware;
use Closure;
use Illuminate\Contracts\Auth\Guard;
use Oxbow\Exceptions\UserRegistrationException;
use BookStack\Exceptions\UserRegistrationException;
use Setting;
class Authenticate

2
app/Http/Middleware/EncryptCookies.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow\Http\Middleware;
namespace BookStack\Http\Middleware;
use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;

2
app/Http/Middleware/PermissionMiddleware.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow\Http\Middleware;
namespace BookStack\Http\Middleware;
use Closure;
use Illuminate\Support\Facades\Session;

2
app/Http/Middleware/RedirectIfAuthenticated.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow\Http\Middleware;
namespace BookStack\Http\Middleware;
use Closure;
use Illuminate\Contracts\Auth\Guard;

2
app/Http/Middleware/VerifyCsrfToken.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow\Http\Middleware;
namespace BookStack\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;

2
app/Http/Requests/Request.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow\Http\Requests;
namespace BookStack\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;

2
app/Image.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow;
namespace BookStack;
class Image extends Entity

2
app/Jobs/Job.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow\Jobs;
namespace BookStack\Jobs;
use Illuminate\Bus\Queueable;

8
app/Page.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow;
namespace BookStack;
use Illuminate\Database\Eloquent\Model;
@@ -19,12 +19,12 @@ class Page extends Entity
public function book()
{
return $this->belongsTo('Oxbow\Book');
return $this->belongsTo('BookStack\Book');
}
public function chapter()
{
return $this->belongsTo('Oxbow\Chapter');
return $this->belongsTo('BookStack\Chapter');
}
public function hasChapter()
@@ -35,7 +35,7 @@ class Page extends Entity
public function revisions()
{
return $this->hasMany('Oxbow\PageRevision')->orderBy('created_at', 'desc');
return $this->hasMany('BookStack\PageRevision')->orderBy('created_at', 'desc');
}
public function getUrl()

6
app/PageRevision.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow;
namespace BookStack;
use Illuminate\Database\Eloquent\Model;
@@ -10,12 +10,12 @@ class PageRevision extends Model
public function createdBy()
{
return $this->belongsTo('Oxbow\User', 'created_by');
return $this->belongsTo('BookStack\User', 'created_by');
}
public function page()
{
return $this->belongsTo('Oxbow\Page');
return $this->belongsTo('BookStack\Page');
}
public function getUrl()

4
app/Permission.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow;
namespace BookStack;
use Illuminate\Database\Eloquent\Model;
@@ -11,6 +11,6 @@ class Permission extends Model
*/
public function roles()
{
return $this->belongsToMany('Oxbow\Permissions');
return $this->belongsToMany('BookStack\Permissions');
}
}

4
app/Providers/AppServiceProvider.php
View File

@@ -1,10 +1,10 @@
<?php
namespace Oxbow\Providers;
namespace BookStack\Providers;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\ServiceProvider;
use Oxbow\User;
use BookStack\User;
class AppServiceProvider extends ServiceProvider
{

10
app/Providers/CustomFacadeProvider.php
View File

@@ -1,10 +1,10 @@
<?php
namespace Oxbow\Providers;
namespace BookStack\Providers;
use Illuminate\Support\ServiceProvider;
use Oxbow\Services\ActivityService;
use Oxbow\Services\SettingService;
use BookStack\Services\ActivityService;
use BookStack\Services\SettingService;
class CustomFacadeProvider extends ServiceProvider
{
@@ -26,12 +26,12 @@ class CustomFacadeProvider extends ServiceProvider
public function register()
{
$this->app->bind('activity', function() {
return new ActivityService($this->app->make('Oxbow\Activity'));
return new ActivityService($this->app->make('BookStack\Activity'));
});
$this->app->bind('setting', function() {
return new SettingService(
$this->app->make('Oxbow\Setting'),
$this->app->make('BookStack\Setting'),
$this->app->make('Illuminate\Contracts\Cache\Repository')
);
});

6
app/Providers/EventServiceProvider.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow\Providers;
namespace BookStack\Providers;
use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
@@ -13,8 +13,8 @@ class EventServiceProvider extends ServiceProvider
* @var array
*/
protected $listen = [
'Oxbow\Events\SomeEvent' => [
'Oxbow\Listeners\EventListener',
'BookStack\Events\SomeEvent' => [
'BookStack\Listeners\EventListener',
],
];

4
app/Providers/RouteServiceProvider.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow\Providers;
namespace BookStack\Providers;
use Illuminate\Routing\Router;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
@@ -14,7 +14,7 @@ class RouteServiceProvider extends ServiceProvider
*
* @var string
*/
protected $namespace = 'Oxbow\Http\Controllers';
protected $namespace = 'BookStack\Http\Controllers';
/**
* Define your route model bindings, pattern filters, etc.

2
app/Providers/SocialiteServiceProvider.php
View File

@@ -1,4 +1,4 @@
<?php namespace Oxbow\Providers;
<?php namespace BookStack\Providers;
use Illuminate\Support\ServiceProvider;

4
app/Repos/BookRepo.php
View File

@@ -1,7 +1,7 @@
<?php namespace Oxbow\Repos;
<?php namespace BookStack\Repos;
use Illuminate\Support\Str;
use Oxbow\Book;
use BookStack\Book;
class BookRepo
{

4
app/Repos/ChapterRepo.php
View File

@@ -1,8 +1,8 @@
<?php namespace Oxbow\Repos;
<?php namespace BookStack\Repos;
use Illuminate\Support\Str;
use Oxbow\Chapter;
use BookStack\Chapter;
class ChapterRepo
{

6
app/Repos/PageRepo.php
View File

@@ -1,10 +1,10 @@
<?php namespace Oxbow\Repos;
<?php namespace BookStack\Repos;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Str;
use Oxbow\Page;
use Oxbow\PageRevision;
use BookStack\Page;
use BookStack\PageRevision;
class PageRepo
{

6
app/Repos/UserRepo.php
View File

@@ -1,8 +1,8 @@
<?php namespace Oxbow\Repos;
<?php namespace BookStack\Repos;
use Oxbow\Role;
use Oxbow\User;
use BookStack\Role;
use BookStack\User;
class UserRepo
{

6
app/Role.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow;
namespace BookStack;
use Illuminate\Database\Eloquent\Model;
@@ -17,7 +17,7 @@ class Role extends Model
*/
public function users()
{
return $this->belongsToMany('Oxbow\User');
return $this->belongsToMany('BookStack\User');
}
/**
@@ -25,7 +25,7 @@ class Role extends Model
*/
public function permissions()
{
return $this->belongsToMany('Oxbow\Permission');
return $this->belongsToMany('BookStack\Permission');
}
/**

8
app/Services/ActivityService.php
View File

@@ -1,8 +1,8 @@
<?php namespace Oxbow\Services;
<?php namespace BookStack\Services;
use Illuminate\Support\Facades\Auth;
use Oxbow\Activity;
use Oxbow\Entity;
use BookStack\Activity;
use BookStack\Entity;
use Session;
class ActivityService
@@ -100,7 +100,7 @@ class ActivityService
*/
function entityActivity($entity, $count = 20, $page = 0)
{
$activity = $entity->hasMany('Oxbow\Activity')->orderBy('created_at', 'desc')
$activity = $entity->hasMany('BookStack\Activity')->orderBy('created_at', 'desc')
->skip($count * $page)->take($count)->get();
return $this->filterSimilar($activity);

14
app/Services/EmailConfirmationService.php
View File

@@ -1,15 +1,15 @@
<?php namespace Oxbow\Services;
<?php namespace BookStack\Services;
use Carbon\Carbon;
use Illuminate\Contracts\Mail\Mailer;
use Illuminate\Mail\Message;
use Oxbow\EmailConfirmation;
use Oxbow\Exceptions\ConfirmationEmailException;
use Oxbow\Exceptions\UserRegistrationException;
use Oxbow\Repos\UserRepo;
use Oxbow\Setting;
use Oxbow\User;
use BookStack\EmailConfirmation;
use BookStack\Exceptions\ConfirmationEmailException;
use BookStack\Exceptions\UserRegistrationException;
use BookStack\Repos\UserRepo;
use BookStack\Setting;
use BookStack\User;
class EmailConfirmationService
{

2
app/Services/Facades/Activity.php
View File

@@ -1,4 +1,4 @@
<?php namespace Oxbow\Services\Facades;
<?php namespace BookStack\Services\Facades;
use Illuminate\Support\Facades\Facade;

2
app/Services/Facades/Setting.php
View File

@@ -1,4 +1,4 @@
<?php namespace Oxbow\Services\Facades;
<?php namespace BookStack\Services\Facades;
use Illuminate\Support\Facades\Facade;

6
app/Services/SettingService.php
View File

@@ -1,6 +1,6 @@
<?php namespace Oxbow\Services;
<?php namespace BookStack\Services;
use Oxbow\Setting;
use BookStack\Setting;
use Illuminate\Contracts\Cache\Repository as Cache;
/**
@@ -8,7 +8,7 @@ use Illuminate\Contracts\Cache\Repository as Cache;
*
* The settings are a simple key-value database store.
*
* @package Oxbow\Services
* @package BookStack\Services
*/
class SettingService
{

16
app/Services/SocialAuthService.php
View File

@@ -1,14 +1,14 @@
<?php namespace Oxbow\Services;
<?php namespace BookStack\Services;
use GuzzleHttp\Exception\ClientException;
use Laravel\Socialite\Contracts\Factory as Socialite;
use Oxbow\Exceptions\SocialDriverNotConfigured;
use Oxbow\Exceptions\SocialSignInException;
use Oxbow\Exceptions\UserRegistrationException;
use Oxbow\Http\Controllers\Auth\AuthController;
use Oxbow\Repos\UserRepo;
use Oxbow\SocialAccount;
use Oxbow\User;
use BookStack\Exceptions\SocialDriverNotConfigured;
use BookStack\Exceptions\SocialSignInException;
use BookStack\Exceptions\UserRegistrationException;
use BookStack\Http\Controllers\Auth\AuthController;
use BookStack\Repos\UserRepo;
use BookStack\SocialAccount;
use BookStack\User;
class SocialAuthService
{

2
app/Setting.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow;
namespace BookStack;
use Illuminate\Database\Eloquent\Model;

4
app/SocialAccount.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow;
namespace BookStack;
use Illuminate\Database\Eloquent\Model;
@@ -11,6 +11,6 @@ class SocialAccount extends Model
public function user()
{
return $this->belongsTo('Oxbow\User');
return $this->belongsTo('BookStack\User');
}
}

6
app/User.php
View File

@@ -1,6 +1,6 @@
<?php
namespace Oxbow;
namespace BookStack;
use Illuminate\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Model;
@@ -53,7 +53,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
*/
public function roles()
{
return $this->belongsToMany('Oxbow\Role');
return $this->belongsToMany('BookStack\Role');
}
public function getRoleAttribute()
@@ -103,7 +103,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
*/
public function socialAccounts()
{
return $this->hasMany('Oxbow\SocialAccount');
return $this->hasMany('BookStack\SocialAccount');
}
/**