Merge pull request #715 from LearningLocker/develop

v1.9.0

Author: daniel-abbey

.env.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-  'LOCAL_FILESTORE' => __DIR__.'/uploads',
-  'SESSION_FILESTORE' => __DIR__.'/app/storage/sessions',
+  'FS_REPO' => 'Local',
+  'FS_LOCAL_ENDPOINT' => __DIR__.'/uploads',
   'LOG_FILESTORE' => __DIR__.'/app/storage/logs/laravel.log',
 ];

.gitignore

@@ -3,6 +3,8 @@
 composer.phar
 .DS_Store
 Thumbs.db
+.phpintel
+.env.*.php
 
 /app/config/ht2
 /app/config/production

VERSION

@@ -1 +1 @@
-1.8.0
+1.9.0

app/commands/FileRepositoryCommand.php

@@ -0,0 +1,43 @@
+<?php
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+use Locker\Repository\File\Factory as FileFactory;
+
+class FileRepositoryCommand extends Command {
+	protected $name = 'll:file-repo';
+	protected $description = 'Migrates files from one file repository (i.e. Local) to another (i.e. Rackspace).';
+
+	public function fire() {
+    $from_var = $this->option('from');
+    $to_var = $this->argument('to');
+		$from_repo = FileFactory::createRepo($from_var);
+    $to_repo = FileFactory::createRepo($to_var);
+    $files = $from_repo->index([]);
+
+    $count = 0;
+    foreach ($files as $file) {
+      $path = $file['path'];
+      if ($file['type'] === 'file' && !$to_repo->has($path, [])) {
+        $count += 1;
+        $to_repo->update($path, ['content' => $from_repo->show($path, [])], []);
+        echo "Migrated '{$path}' from '{$from_var}' to '{$to_var}'.".PHP_EOL;
+      } 
+    }
+
+    echo "Migrated $count files and ignored ".(count($files) - $count).".".PHP_EOL;
+	}
+
+	protected function getArguments() {
+		return [
+      ['to', InputArgument::REQUIRED, 'The repository to migrate to.']
+    ];
+	}
+
+	protected function getOptions() {
+		return [
+			['from', 'f', InputOption::VALUE_OPTIONAL, 'The repository to migrate from.', 'Local'],
+		];
+	}
+
+}

app/config/app.php

@@ -108,17 +108,18 @@
     'Illuminate\Validation\ValidationServiceProvider',
     'Illuminate\View\ViewServiceProvider',
     'Illuminate\Workbench\WorkbenchServiceProvider',
+    'Jenssegers\Mongodb\MongodbServiceProvider',
+    'Jenssegers\Mongodb\Auth\ReminderServiceProvider',
+    'Jenssegers\Mongodb\Session\SessionServiceProvider',
     'Locker\Repository\RepositoryServiceProvider',
     'Locker\Data\DataServiceProvider',
     'Locker\Graphing\GraphServiceProvider',
-    'Jenssegers\Mongodb\MongodbServiceProvider',
     'DaveJamesMiller\Breadcrumbs\ServiceProvider',
     'Way\Generators\GeneratorsServiceProvider',
     'Barryvdh\Cors\CorsServiceProvider',
     'JsLocalization\JsLocalizationServiceProvider',
     'locker\RequestServiceProvider',
     'Philo\Translate\TranslateServiceProvider',
-    'Jenssegers\Mongodb\Auth\ReminderServiceProvider',
   ),
 
   /*

app/config/session.php

@@ -18,7 +18,7 @@
 	|
 	*/
 
-	'driver' => 'file',
+	'driver' => 'mongodb',
 
 	/*
 	|--------------------------------------------------------------------------
@@ -46,7 +46,7 @@
 	|
 	*/
 
-	'files' => Helpers::getEnvVar('SESSION_FILESTORE'),
+	'files' => null,
 
 	/*
 	|--------------------------------------------------------------------------

app/controllers/LoginController.php

@@ -20,7 +20,7 @@ public function login(){
     $remember_me = Input::get('remember', 0);
 
     if( Auth::attempt($creds, $remember_me) ){
-      return Redirect::to('/');
+      return Redirect::intended('/');
     } 
 
     return Redirect::route('login.create')

app/controllers/LrsController.php

@@ -192,9 +192,9 @@ public function destroy($lrs_id){
   public function statements($lrs_id){
     $site = \Site::first();
     $statements = (new StatementIndexer)->index(new IndexOptions([
-      'lrs_id' => $lrs_id,
+      'lrs_id' => new \MongoId($lrs_id),
       'limit' => $this->statement->count([
-        'lrs_id' => $lrs_id,
+        'lrs_id' => new \MongoId($lrs_id),
         'scopes' => ['all']
       ]),
       'scopes' => ['all']

app/controllers/ReportingController.php

@@ -91,10 +91,10 @@ public function statements($lrs_id, $report_id) {
     return View::make("{$this->views}.statements", array_merge($this->getLrs($lrs_id), [
       'reporting_nav' => true,
       'statements' => $this->report->statements($report_id, [
-        'lrs_id' => $lrs_id
+        'lrs_id' => new \MongoId($lrs_id)
       ])->select('statement')->paginate(20),
       'report' => $this->report->show($report_id, [
-        'lrs_id' => $lrs_id
+        'lrs_id' => new \MongoId($lrs_id)
       ]),
       'lang' => $site->lang
     ]));

app/controllers/api/Analytics.php

@@ -17,7 +17,7 @@ public function __construct(AnalyticsData $analytics) {
 
   // http://docs.learninglocker.net/analytics_api/
   public function index() {
-    $data = $this->analytics->timedGrouping($this->lrs->_id, LockerRequest::getParams());
+    $data = $this->analytics->timedGrouping($this->getOptions()['lrs_id'], LockerRequest::getParams());
     return $this->returnJson($data);
   }
 }