cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied fixes from StyleCI

Browse Source
This commit is contained in:
Bhanu
2016-06-13 11:30:41 -04:00
committed by StyleCI Bot
parent 4c25919b65
commit 1b77330dde
38 changed files with 1302 additions and 1185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
app/Http/Controllers/Agent/kb/ArticleController.php
View File

@@ -29,8 +29,8 @@ use Redirect;
*
* @author Ladybird <info@ladybirdweb.com>
*/
class ArticleController extends Controller {
class ArticleController extends Controller
{
/**
* Create a new controller instance.
* constructor to check
@@ -40,7 +40,8 @@ class ArticleController extends Controller {
*
* @return void
*/
public function __construct() {
public function __construct()
{
// checking authentication
$this->middleware('auth');
// checking roles
@@ -48,7 +49,8 @@ class ArticleController extends Controller {
SettingsController::language();
}
public function test() {
public function test()
{
//$table = $this->setDatatable();
return view('themes.default1.agent.kb.article.test');
}
@@ -58,7 +60,8 @@ class ArticleController extends Controller {
*
* @return type void
*/
public function getData() {
public function getData()
{
$article = new Article();
// returns chumper datatable
return Datatable::query($article)
@@ -68,7 +71,6 @@ class ArticleController extends Controller {
->orderColumns('name', 'description')
/* add column name */
->addColumn('name', function ($model) {
$string = strip_tags($model->name);
if (strlen($string) > 40) {
// truncate string
@@ -76,7 +78,8 @@ class ArticleController extends Controller {
} else {
$stringCut = $model->name;
}
return $stringCut . '...';
return $stringCut.'...';
})
/* add column Created */
->addColumn('publish_time', function ($model) {
@@ -87,8 +90,8 @@ class ArticleController extends Controller {
/* add column action */
->addColumn('Actions', function ($model) {
/* here are all the action buttons and modal popup to delete articles with confirmations */
return '<span data-toggle="modal" data-target="#deletearticle' . $model->id . '"><a href="#" ><button class="btn btn-danger btn-xs"></a> ' . \Lang::get('lang.delete') . ' </button></span>&nbsp;<a href=article/' . $model->id . '/edit class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a>&nbsp;<a href=show/' . $model->slug . ' class="btn btn-primary btn-xs">' . \Lang::get('lang.view') . '</a>
<div class="modal fade" id="deletearticle' . $model->id . '">
return '<span data-toggle="modal" data-target="#deletearticle'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').' </button></span>&nbsp;<a href=article/'.$model->id.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href=show/'.$model->slug.' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
<div class="modal fade" id="deletearticle'.$model->id.'">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
@@ -96,11 +99,11 @@ class ArticleController extends Controller {
<h4 class="modal-title">Are You Sure ?</h4>
</div>
<div class="modal-body">
' . $model->name . '
'.$model->name.'
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">Close</button>
<a href="article/delete/' . $model->slug . '"><button class="btn btn-danger">delete</button></a>
<a href="article/delete/'.$model->slug.'"><button class="btn btn-danger">delete</button></a>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
@@ -114,7 +117,8 @@ class ArticleController extends Controller {
*
* @return type view
*/
public function index() {
public function index()
{
/* show article list */
try {
return view('themes.default1.agent.kb.article.index');
@@ -130,7 +134,8 @@ class ArticleController extends Controller {
*
* @return type view
*/
public function create(Category $category) {
public function create(Category $category)
{
/* get the attributes of the category */
$category = $category->lists('id', 'name');
/* get the create page */
@@ -149,9 +154,10 @@ class ArticleController extends Controller {
*
* @return type redirect
*/
public function store(Article $article, ArticleRequest $request) {
public function store(Article $article, ArticleRequest $request)
{
// requesting the values to store article data
$publishTime = $request->input('year') . '-' . $request->input('month') . '-' . $request->input('day') . ' ' . $request->input('hour') . ':' . $request->input('minute') . ':00';
$publishTime = $request->input('year').'-'.$request->input('month').'-'.$request->input('day').' '.$request->input('hour').':'.$request->input('minute').':00';
$sl = $request->input('name');
$slug = str_slug($sl, '-');
@@ -171,7 +177,7 @@ class ArticleController extends Controller {
return redirect('article')->with('success', Lang::get('lang.article_inserted_successfully'));
} catch (Exception $e) {
return redirect('article')->with('fails', Lang::get('lang.article_not_inserted') . '<li>' . $e->getMessage() . '</li>');
return redirect('article')->with('fails', Lang::get('lang.article_not_inserted').'<li>'.$e->getMessage().'</li>');
}
}
@@ -185,7 +191,8 @@ class ArticleController extends Controller {
*
* @return view
*/
public function edit($slug) {
public function edit($slug)
{
$article = new Article();
$relation = new Relationship();
$category = new Category();
@@ -216,11 +223,12 @@ class ArticleController extends Controller {
*
* @return Response
*/
public function update($slug, ArticleUpdate $request) {
public function update($slug, ArticleUpdate $request)
{
$article = new Article();
$relation = new Relationship();
$aid = $article->where('id', $slug)->first();
$publishTime = $request->input('year') . '-' . $request->input('month') . '-' . $request->input('day') . ' ' . $request->input('hour') . ':' . $request->input('minute') . ':00';
$publishTime = $request->input('year').'-'.$request->input('month').'-'.$request->input('day').' '.$request->input('hour').':'.$request->input('minute').':00';
$id = $aid->id;
$sl = $request->input('slug');
@@ -247,7 +255,7 @@ class ArticleController extends Controller {
return redirect('article')->with('success', Lang::get('lang.article_updated_successfully'));
} catch (Exception $e) {
return redirect('article')->with('fails', Lang::get('lang.article_not_updated') . '<li>' . $e->getMessage() . '</li>');
return redirect('article')->with('fails', Lang::get('lang.article_not_updated').'<li>'.$e->getMessage().'</li>');
}
}
@@ -259,7 +267,8 @@ class ArticleController extends Controller {
*
* @return Response
*/
public function destroy($slug, Article $article, Relationship $relation, Comment $comment) {
public function destroy($slug, Article $article, Relationship $relation, Comment $comment)
{
/* delete the selected article from the table */
$article = $article->where('slug', $slug)->first(); //get the selected article via id
$id = $article->id;
@@ -293,7 +302,8 @@ class ArticleController extends Controller {
*
* @return type
*/
public static function usertimezone($utc) {
public static function usertimezone($utc)
{
$user = Auth::user();
$tz = $user->timezone;
$set = Settings::whereId('1')->first();
@@ -304,5 +314,4 @@ class ArticleController extends Controller {
$date = date($format, strtotime($utc) + $offset);
echo $date;
}
}

50
app/Http/Controllers/Agent/kb/CategoryController.php
View File

@@ -23,8 +23,8 @@ use Redirect;
*
* @author Ladybird <info@ladybirdweb.com>
*/
class CategoryController extends Controller {
class CategoryController extends Controller
{
/**
* Create a new controller instance.
* constructor to check
@@ -34,7 +34,8 @@ class CategoryController extends Controller {
*
* @return void
*/
public function __construct() {
public function __construct()
{
// checking authentication
$this->middleware('auth');
// checking roles
@@ -49,7 +50,8 @@ class CategoryController extends Controller {
*
* @return Response
*/
public function index() {
public function index()
{
/* get the view of index of the catogorys with all attributes
of category model */
try {
@@ -64,7 +66,8 @@ class CategoryController extends Controller {
*
* @return type chumper datatable
*/
public function getData() {
public function getData()
{
/* fetching chumper datatables */
return Datatable::collection(Category::All())
/* search column name */
@@ -73,7 +76,6 @@ class CategoryController extends Controller {
->orderColumns('name', 'description')
/* add column name */
->addColumn('name', function ($model) {
$string = strip_tags($model->name);
if (strlen($string) > 40) {
// truncate string
@@ -81,6 +83,7 @@ class CategoryController extends Controller {
} else {
$stringCut = $model->name;
}
return $stringCut.'...';
})
/* add column Created */
@@ -92,20 +95,20 @@ class CategoryController extends Controller {
/* add column Actions */
/* there are action buttons and modal popup to delete a data column */
->addColumn('Actions', function ($model) {
return '<span data-toggle="modal" data-target="#deletecategory' . $model->slug . '"><a href="#" ><button class="btn btn-danger btn-xs"></a>' . \Lang::get('lang.delete') . '</button></span>&nbsp;<a href=category/' . $model->id . '/edit class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a>&nbsp;<a href=article-list class="btn btn-primary btn-xs">' . \Lang::get('lang.view') . '</a>
<div class="modal fade" id="deletecategory' . $model->slug . '">
return '<span data-toggle="modal" data-target="#deletecategory'.$model->slug.'"><a href="#" ><button class="btn btn-danger btn-xs"></a>'.\Lang::get('lang.delete').'</button></span>&nbsp;<a href=category/'.$model->id.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href=article-list class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
<div class="modal fade" id="deletecategory'.$model->slug.'">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">' . Lang::get('lang.are_you_sure_you_want_to_delete') . '</h4>
<h4 class="modal-title">'.Lang::get('lang.are_you_sure_you_want_to_delete').'</h4>
</div>
<div class="modal-body">
' . $model->name . '
'.$model->name.'
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">' . Lang::get('lang.close') . '</button>
<a href="category/delete/' . $model->id . '"><button class="btn btn-danger">' . Lang::get('lang.delete') . '</button></a>
<button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">'.Lang::get('lang.close').'</button>
<a href="category/delete/'.$model->id.'"><button class="btn btn-danger">'.Lang::get('lang.delete').'</button></a>
</div>
</div>
</div>
@@ -121,7 +124,8 @@ class CategoryController extends Controller {
*
* @return type view
*/
public function create(Category $category) {
public function create(Category $category)
{
/* Get the all attributes in the category model */
$category = $category->get();
/* get the view page to create new category with all attributes
@@ -141,7 +145,8 @@ class CategoryController extends Controller {
*
* @return type Redirect
*/
public function store(Category $category, CategoryRequest $request) {
public function store(Category $category, CategoryRequest $request)
{
/* Get the whole request from the form and insert into table via model */
$sl = $request->input('slug');
$slug = str_slug($sl, '-');
@@ -152,7 +157,7 @@ class CategoryController extends Controller {
return Redirect::back()->with('success', Lang::get('lang.category_inserted_successfully'));
} catch (Exception $e) {
return Redirect::back()->with('fails', Lang::get('lang.category_not_inserted') . '<li>' . $e->getMessage() . '</li>');
return Redirect::back()->with('fails', Lang::get('lang.category_not_inserted').'<li>'.$e->getMessage().'</li>');
}
}
@@ -164,7 +169,8 @@ class CategoryController extends Controller {
*
* @return type view
*/
public function edit($slug) {
public function edit($slug)
{
// fetch the category
$cid = Category::where('id', $slug)->first();
$id = $cid->id;
@@ -183,7 +189,8 @@ class CategoryController extends Controller {
*
* @return type redirect
*/
public function update($slug, CategoryUpdate $request) {
public function update($slug, CategoryUpdate $request)
{
/* Edit the selected category via id */
$category = Category::where('id', $slug)->first();
@@ -197,10 +204,11 @@ class CategoryController extends Controller {
$category->fill($request->all())->save();
$category->slug = $slug;
$category->save();
return redirect('category')->with('success', Lang::get('lang.category_updated_successfully'));
} catch (Exception $e) {
//redirect to index with fails message
return redirect('category')->with('fails', Lang::get('lang.category_not_updated') . '<li>' . $e->getMessage() . '</li>');
return redirect('category')->with('fails', Lang::get('lang.category_not_updated').'<li>'.$e->getMessage().'</li>');
}
}
@@ -213,7 +221,8 @@ class CategoryController extends Controller {
*
* @return type Redirect
*/
public function destroy($id, Category $category, Relationship $relation) {
public function destroy($id, Category $category, Relationship $relation)
{
$relation = $relation->where('category_id', $id)->first();
if ($relation != null) {
return Redirect::back()->with('fails', Lang::get('lang.category_not_deleted'));
@@ -226,9 +235,8 @@ class CategoryController extends Controller {
return Redirect::back()->with('success', Lang::get('lang.category_deleted_successfully'));
} catch (Exception $e) {
return Redirect::back()->with('fails', Lang::get('lang.category_not_deleted') . '<li>' . $e->getMessage() . '</li>');
return Redirect::back()->with('fails', Lang::get('lang.category_not_deleted').'<li>'.$e->getMessage().'</li>');
}
}
}
}

37
app/Http/Controllers/Agent/kb/PageController.php
View File

@@ -21,8 +21,8 @@ use Lang;
*
* @author Ladybird <info@ladybirdweb.com>
*/
class PageController extends Controller {
class PageController extends Controller
{
/**
* Create a new controller instance.
* constructor to check
@@ -32,7 +32,8 @@ class PageController extends Controller {
*
* @return void
*/
public function __construct(Page $page) {
public function __construct(Page $page)
{
// checking authentication
$this->middleware('auth');
// checking roles
@@ -46,7 +47,8 @@ class PageController extends Controller {
*
* @return type
*/
public function index() {
public function index()
{
$pages = $this->page->paginate(3);
$pages->setPath('page');
try {
@@ -61,7 +63,8 @@ class PageController extends Controller {
*
* @return type
*/
public function getData() {
public function getData()
{
/* fetching chumper datatables */
return Datatable::collection(Page::All())
/* search column name */
@@ -81,8 +84,8 @@ class PageController extends Controller {
/* add column Actions */
/* there are action buttons and modal popup to delete a data column */
->addColumn('Actions', function ($model) {
return '<span data-toggle="modal" data-target="#deletepage' . $model->id . '"><a href="#" ><button class="btn btn-danger btn-xs"></a> ' . \Lang::get('lang.delete') . '</button></span>&nbsp;<a href=page/' . $model->slug . '/edit class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . '</a>&nbsp;<a href=pages/' . $model->slug . ' class="btn btn-primary btn-xs">' . \Lang::get('lang.view') . '</a>
<div class="modal fade" id="deletepage' . $model->id . '">
return '<span data-toggle="modal" data-target="#deletepage'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').'</button></span>&nbsp;<a href=page/'.$model->slug.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href=pages/'.$model->slug.' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
<div class="modal fade" id="deletepage'.$model->id.'">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
@@ -90,11 +93,11 @@ class PageController extends Controller {
<h4 class="modal-title">Are You Sure ?</h4>
</div>
<div class="modal-body">
' . $model->name . '
'.$model->name.'
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left" data-dismiss="modal" id="dismis2">Close</button>
<a href="page/delete/' . $model->id . '"><button class="btn btn-danger">delete</button></a>
<a href="page/delete/'.$model->id.'"><button class="btn btn-danger">delete</button></a>
</div>
</div>
</div>
@@ -108,7 +111,8 @@ class PageController extends Controller {
*
* @return type view
*/
public function create() {
public function create()
{
return view('themes.default1.agent.kb.pages.create');
}
@@ -119,7 +123,8 @@ class PageController extends Controller {
*
* @return type
*/
public function store(PageRequest $request) {
public function store(PageRequest $request)
{
$sl = $request->input('slug');
$slug = str_slug($sl, '-');
$this->page->slug = $slug;
@@ -139,7 +144,8 @@ class PageController extends Controller {
*
* @return type view
*/
public function edit($slug) {
public function edit($slug)
{
try {
$page = $this->page->where('slug', $slug)->first();
@@ -157,7 +163,8 @@ class PageController extends Controller {
*
* @return type redirect
*/
public function update($slug, PageUpdate $request) {
public function update($slug, PageUpdate $request)
{
// get pages with respect to slug
$pages = $this->page->where('slug', $slug)->first();
$sl = $request->input('slug');
@@ -181,7 +188,8 @@ class PageController extends Controller {
*
* @return type redirect
*/
public function destroy($id) {
public function destroy($id)
{
try {
// get the page to be deleted
$page = $this->page->whereId($id)->first();
@@ -192,5 +200,4 @@ class PageController extends Controller {
return redirect('page')->with('fails', $e->getMessage());
}
}
}