Merge branch 'laravel' of https://github.com/visuddhinanda/mint into laravel

app/Console/Commands/ImportArticleMap.php

@@ -95,7 +95,12 @@ class ImportArticleMap extends Command
                 $dir = $data[1];
                 $title = $data[2];
                 $realTitle = "[{$id}]{$title}";
+                $realTitle = mb_substr($realTitle,0,128,'UTF-8');
                 $reference = $data[5];
+
+                $percent = (int)($inputRow*100/6984);
+                $this->info("[{$percent}%] doing ".$realTitle);
+
                 if($this->option('size')){
                     $currDir = 'tipitaka-sarupa-'.$currBlock;
                     if($currSize > $this->option('size')){

app/Http/Controllers/CollectionController.php

@@ -12,9 +12,6 @@ use App\Http\Api\ShareApi;
 use App\Http\Resources\CollectionResource;
 use Illuminate\Support\Facades\DB;
 
-require_once __DIR__.'/../../../public/app/ucenter/function.php';
-
-
 class CollectionController extends Controller
 {
     /**
@@ -24,9 +21,7 @@ class CollectionController extends Controller
      */
     public function index(Request $request)
     {
-        //
-                //
-        $userinfo = new \UserInfo();
+
 		$result=false;
 		$indexCol = ['uid','title','subtitle','summary',
                       'article_list','owner','status',