Merge 7ae57f2 into 11c0eb0

GrupaZero · Mar 24, 2016 · f7706ca · f7706ca
2 parents 11c0eb0 + 7ae57f2
commit f7706ca
Show file tree

Hide file tree

Showing 377 changed files with 12,640 additions and 13,640 deletions.
diff --git a/.env.example b/.env.example
@@ -33,3 +33,7 @@ OAUTH_TWITTER_CLIENT_SECRET=
 VANILLA_FORUM_DOMAIN=
 VANILLA_FORUM_CLIENT_ID=
 VANILLA_FORUM_SECRET=
+
+DISQUS_API_KEY=
+DISQUS_API_SECRET=
+DISQUS_DOMAIN=
diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
@@ -26,7 +26,7 @@ public function __construct()
         /** @TODO We need better way to access langs */
         $langRepository = App::make('Gzero\Repository\LangRepository');
         $this->lang     = $langRepository->getCurrent();
-        $this->langs    = $langRepository->getAll();
+        $this->langs    = $langRepository->getAllEnabled();
         $this->viewShareLangs();
     }
 

diff --git a/app/Http/Controllers/DevController.php b/app/Http/Controllers/DevController.php
@@ -1,6 +1,7 @@
 <?php namespace App\Http\Controllers;
 
 use Gzero\Repository\ContentRepository;
+use Illuminate\Support\Facades\App;
 
 /**
  * This file is part of the GZERO CMS package.
@@ -17,6 +18,11 @@ class DevController extends BaseController {
 
     public function __construct(ContentRepository $repository)
     {
+        // show dev page only for logged users
+        if (!app('auth')->check() || !app('auth')->user()->isAdmin) {
+            App::abort(404);
+        }
+
         parent::__construct();
         $this->repository = $repository;
     }

diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -43,7 +43,8 @@ public function index(Request $request)
             ],
             [
                 ['isPromoted', 'DESC'],
-                ['isSticky', 'DESC']
+                ['isSticky', 'DESC'],
+                ['publishedAt', 'DESC']
             ],
             $request->get('page', 1),
             option('general', 'defaultPageSize', 20)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
@@ -11,6 +11,7 @@
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Password;
 
 
 /**
@@ -86,6 +87,9 @@ public function postLogin()
 
     public function register()
     {
+        if (Auth::check()) {
+            return redirect()->to('home');
+        }
         return view('auth.register');
     }
 
@@ -145,7 +149,7 @@ function ($message) use ($input, $subject) {
     public function remind()
     {
         if (Auth::check()) {
-            return redirect()->to('/');
+            return redirect()->to('home');
         }
         return view('auth.password');
     }
@@ -159,7 +163,7 @@ public function postRemind()
     {
         try {
             $input    = $this->validator->validate('remind');
-            $response = Password::remind(
+            $response = Password::sendResetLink(
                 $input,
                 function ($message) {
                     $message->subject(Lang::get('emails.passwordReminder.title'));
@@ -177,7 +181,7 @@ function ($message) {
                         ]
                     );
                     return redirect()->back()->withInput();
-                case Password::REMINDER_SENT:
+                case Password::RESET_LINK_SENT:
                     Session::flash(
                         'messages',
                         [

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -30,7 +30,49 @@ class AppServiceProvider extends AbstractServiceProvider {
      */
     public function boot()
     {
-        //
+        view()->composer(
+            'includes.disqus.disqus',
+            function ($view) {
+                $data = [];
+                $user = auth()->user();
+                if ($user) {
+                    $data = [
+                        "id"       => $user["id"],
+                        "username" => $user["firstName"] . ' ' . $user["lastName"],
+                        "email"    => $user["email"],
+                        //"avatar"    => $user["avatar"],
+                    ];
+                }
+
+                function dsq_hmacsha1($data, $key)
+                {
+                    $blockSize = 64;
+                    if (strlen($key) > $blockSize) {
+                        $key = pack('H*', sha1($key));
+                    }
+                    $key  = str_pad($key, $blockSize, chr(0x00));
+                    $ipad = str_repeat(chr(0x36), $blockSize);
+                    $opad = str_repeat(chr(0x5c), $blockSize);
+                    $hmac = pack(
+                        'H*',
+                        sha1(
+                            ($key ^ $opad) . pack(
+                                'H*',
+                                sha1(
+                                    ($key ^ $ipad) . $data
+                                )
+                            )
+                        )
+                    );
+                    return bin2hex($hmac);
+                }
+
+                $message   = base64_encode(json_encode($data));
+                $timestamp = time();
+                $hmac      = dsq_hmacsha1($message . ' ' . $timestamp, config('disqus.api_secret'));
+                $view->with('remoteAuthS3', "$message $hmac $timestamp");
+            }
+        );
     }
 
     /**

diff --git a/composer.json b/composer.json
@@ -15,10 +15,10 @@
         }
     ],
     "require": {
-        "gzero/cms": "0.*",
-        "gzero/api": "0.*",
-        "gzero/admin": "0.*",
-        "gzero/social": "^1.0",
+        "gzero/cms": "dev-master as 0.0.5",
+        "gzero/api": "dev-master as 0.0.5",
+        "gzero/admin": "dev-master as 0.0.5",
+        "gzero/social": "dev-master as 1.0",
         "gzero/vanilla-integration": "^1.0",
         "thomaswelton/laravel-gravatar": "~1.0",
         "predis/predis": "1.0.*"