diff --git a/src/api/url.php b/src/api/url.php index 3d8d86ab..aa70f854 100644 --- a/src/api/url.php +++ b/src/api/url.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\URL; +namespace wishthis; $api = true; $response = array(); diff --git a/src/api/wishes.php b/src/api/wishes.php index cd2352c6..1890eb97 100644 --- a/src/api/wishes.php +++ b/src/api/wishes.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\{User, Wish, EmbedCache}; +namespace wishthis; $api = true; $response = array(); diff --git a/src/api/wishlists.php b/src/api/wishlists.php index 32f49b37..8468ce97 100644 --- a/src/api/wishlists.php +++ b/src/api/wishlists.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\{User, Wishlist}; +namespace wishthis; $api = true; $response = array(); diff --git a/src/classes/page.php b/src/classes/page.php index 2b635cc4..3d21c5b6 100644 --- a/src/classes/page.php +++ b/src/classes/page.php @@ -6,8 +6,6 @@ namespace wishthis; -use wishthis\{User, URL, Wish}; - enum Navigation: int { case Wishlists = 1; @@ -122,10 +120,10 @@ class Page $ignorePower = array( 'home', - 'login', - 'register', 'install', + 'login', 'maintenance', + 'register', ); if ( !isset($_SESSION['user']) diff --git a/src/pages/home.php b/src/pages/home.php index 979271c4..84f5908c 100644 --- a/src/pages/home.php +++ b/src/pages/home.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\Page; +namespace wishthis; $page = new Page(__FILE__, __('Home')); $page->header(); diff --git a/src/pages/install.php b/src/pages/install.php index 8dda922c..f99d0b4c 100644 --- a/src/pages/install.php +++ b/src/pages/install.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\{Page, Database}; +namespace wishthis; if ($options && $options->getOption('isInstalled')) { redirect('/?page=home'); diff --git a/src/pages/login-as.php b/src/pages/login-as.php index 67fea9aa..81435e7a 100644 --- a/src/pages/login-as.php +++ b/src/pages/login-as.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\Page; +namespace wishthis; $page = new Page(__FILE__, __('Login as'), 100); diff --git a/src/pages/login.php b/src/pages/login.php index 74ab8dbf..7a67efd6 100644 --- a/src/pages/login.php +++ b/src/pages/login.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\{Page, Email, User}; +namespace wishthis; $page = new Page(__FILE__, __('Login')); diff --git a/src/pages/logout.php b/src/pages/logout.php index 0c828cce..132f2215 100644 --- a/src/pages/logout.php +++ b/src/pages/logout.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\Page; +namespace wishthis; $page = new Page(__FILE__, __('Logout')); diff --git a/src/pages/maintenance.php b/src/pages/maintenance.php index 036dde4c..9b97b83a 100644 --- a/src/pages/maintenance.php +++ b/src/pages/maintenance.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\Page; +namespace wishthis; $page = new Page(__FILE__, __('Maintenance')); $page->header(); diff --git a/src/pages/parts/wish-add.php b/src/pages/parts/wish-add.php index 41e5df7e..ed41a547 100644 --- a/src/pages/parts/wish-add.php +++ b/src/pages/parts/wish-add.php @@ -4,7 +4,7 @@ * @author Jay Trees */ -use wishthis\Wish; +namespace wishthis; $scriptPart = '/src/assets/js/parts/wish-add.js'; ?> diff --git a/src/pages/parts/wishlist-filter.php b/src/pages/parts/wishlist-filter.php index 7c5e6460..fa51570c 100644 --- a/src/pages/parts/wishlist-filter.php +++ b/src/pages/parts/wishlist-filter.php @@ -4,7 +4,7 @@ * @author Jay Trees */ -use wishthis\Wish; +namespace wishthis; $scriptPart = '/src/assets/js/parts/wishlist-filter.js'; ?> diff --git a/src/pages/power.php b/src/pages/power.php index 5e602959..067a0208 100644 --- a/src/pages/power.php +++ b/src/pages/power.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\Page; +namespace wishthis; $page = new Page(__FILE__, __('Insufficient power')); $page->header(); diff --git a/src/pages/profile.php b/src/pages/profile.php index fe9146fb..5ef15584 100644 --- a/src/pages/profile.php +++ b/src/pages/profile.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\{Page, User}; +namespace wishthis; $page = new Page(__FILE__, __('Profile')); diff --git a/src/pages/register.php b/src/pages/register.php index a19df5f7..2c617097 100644 --- a/src/pages/register.php +++ b/src/pages/register.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\{Page, User}; +namespace wishthis; $passwordReset = isset($_SESSION['_GET']['password-reset'], $_SESSION['_GET']['token']); diff --git a/src/pages/settings.php b/src/pages/settings.php index a004dcb4..012da97b 100644 --- a/src/pages/settings.php +++ b/src/pages/settings.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\Page; +namespace wishthis; $page = new Page(__FILE__, __('Settings')); $page->header(); diff --git a/src/pages/update.php b/src/pages/update.php index 7c5aa7c1..aceb7dfd 100644 --- a/src/pages/update.php +++ b/src/pages/update.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\{Page, User}; +namespace wishthis; $page = new Page(__FILE__, __('Update'), 100); diff --git a/src/pages/wish.php b/src/pages/wish.php index 13fbea25..af0f2155 100644 --- a/src/pages/wish.php +++ b/src/pages/wish.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\{Page, Wish}; +namespace wishthis; $userIsAuthenticated = false; diff --git a/src/pages/wishlist.php b/src/pages/wishlist.php index 6bf62f7c..5fd31d91 100644 --- a/src/pages/wishlist.php +++ b/src/pages/wishlist.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\{Page, User, Wishlist, Wish}; +namespace wishthis; $wishlist = new Wishlist($_SESSION['_GET']['wishlist']); $page = new Page(__FILE__, $wishlist->getTitle()); diff --git a/src/pages/wishlists-saved.php b/src/pages/wishlists-saved.php index 65b201a6..f4cda7a1 100644 --- a/src/pages/wishlists-saved.php +++ b/src/pages/wishlists-saved.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\{Page, User, Wishlist}; +namespace wishthis; $page = new Page(__FILE__, __('Saved lists')); $page->header(); diff --git a/src/pages/wishlists.php b/src/pages/wishlists.php index 4fa2973c..9c4b33a3 100644 --- a/src/pages/wishlists.php +++ b/src/pages/wishlists.php @@ -6,7 +6,7 @@ * @author Jay Trees */ -use wishthis\{Page, User, Wishlist}; +namespace wishthis; $page = new Page(__FILE__, __('My lists')); $page->header();