gitmedia/mein-sterntours
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FileManager

Browse source
This commit is contained in:
Kevin Adametz 2020-03-07 19:45:39 +01:00
parent c8948338bb
commit f1e0900a7a
131 changed files with 5844 additions and 3081 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/API/CMSContentController.php
View file

@ -141,7 +141,6 @@ class CMSContentController extends Controller
public function makeNaviTree(IQContentTree $iq_content_tree, $urlArray = [], $url = "", $lvl = 0, $parent_id = false)
{
$link = false;
if (!empty($urlArray[$lvl])) {
$link = ($urlArray[$lvl]);

3
app/Http/Controllers/API/DraftController.php
View file

@ -8,6 +8,7 @@ use App\Models\Draft;
use App\Models\TravelProgram;
use Carbon\Carbon;
use HTMLHelper;
use Request;
class DraftController extends Controller
@ -49,7 +50,7 @@ class DraftController extends Controller
}
if ($action === "create_drafts_from_fewo") {
$data = \Input::all();
$data = Request::all();
$start_date = Carbon::parse($data['startDateStr']);
$end_date = Carbon::parse($data['endDateStr']);
$pos = 0;

6
app/Http/Controllers/API/FewoController.php
View file

@ -7,7 +7,7 @@ use App\Mail\MailSendFeWoService;
use App\Models\TravelUser;
use App\Models\TravelUserBookingFewo;
use Illuminate\Support\Facades\Mail;
use Input;
use Request;
use Validator;
class FewoController extends Controller
@ -24,7 +24,7 @@ class FewoController extends Controller
{
if ($action == "create_travel_users") {
$data = \Input::all();
$data = Request::all();
if(!isset($data['travel_user']) && !is_array($data['travel_user'])) {
return response()->json(['error' => 'travel_user not exist, but need'], $this->errorStatus);
}
@ -77,7 +77,7 @@ class FewoController extends Controller
if ($action == "create_fewo_booking") {
$data = \Input::all();
$data = Request::all();
if(!isset($data['travel_user_booking_fewo']) && !is_array($data['travel_user_booking_fewo'])) {
return response()->json(['error' => 'travel_user_booking_fewo not exist, but need'], $this->errorStatus);
}

2
app/Http/Controllers/API/UserController.php
View file

@ -2,7 +2,7 @@
namespace App\Http\Controllers\API;
use Illuminate\Http\Request;
use Request;
use App\Http\Controllers\Controller;
use App\User;
use Illuminate\Support\Facades\Auth;

37
app/Http/Controllers/Admin/ReportController.php
View file

@ -13,7 +13,6 @@ use App\Services\Util;
use Carbon\Carbon;
use HTMLHelper;
use Illuminate\Validation\Rules\In;
use Input;
use Maatwebsite\Excel\Facades\Excel;
use Request;
use Response;
@ -45,21 +44,21 @@ class ReportController extends Controller
public function providersExport(){
$query = ServiceProviderEntry::with('booking', 'service_provider', 'booking.customer');
if(Input::get('filter_is_cleared') != ""){
$query->where('is_cleared', '=', Input::get('filter_is_cleared'));
if(Request::get('filter_is_cleared') != ""){
$query->where('is_cleared', '=', Request::get('filter_is_cleared'));
}
if(Input::get('filter_service_provider_id') != ""){
$query->where('service_provider_id', '=', Input::get('filter_service_provider_id'));
if(Request::get('filter_service_provider_id') != ""){
$query->where('service_provider_id', '=', Request::get('filter_service_provider_id'));
}
if(Input::get('filter_travel_date_from') != ""){
if(Request::get('filter_travel_date_from') != ""){
$query->whereHas('booking', function ($q) {
$travel_date_from = Carbon::parse(Input::get('filter_travel_date_from'))->format("Y-m-d");
$travel_date_from = Carbon::parse(Request::get('filter_travel_date_from'))->format("Y-m-d");
$q->where("start_date", '>=', $travel_date_from);
});
}
if(Input::get('filter_travel_date_to') != ""){
if(Request::get('filter_travel_date_to') != ""){
$query->whereHas('booking', function ($q) {
$travel_date_to = Carbon::parse(Input::get('filter_travel_date_to'))->format("Y-m-d");
$travel_date_to = Carbon::parse(Request::get('filter_travel_date_to'))->format("Y-m-d");
$q->where("start_date", '<=', $travel_date_to);
});
}
@ -71,7 +70,7 @@ class ReportController extends Controller
$filename = "file-".date('Y-m-d-H-i-s');
$exports = $query->get();
$columns = [];
if(Input::get('export') === "export"){
if(Request::get('export') === "export"){
$filename = "Export_".date('Y-m-d-H-i-s');
$headers = array(
@ -114,7 +113,7 @@ class ReportController extends Controller
$isset[] = $export->booking->lead_id;
}
}
if(Input::get('export') === "export_lt"){
if(Request::get('export') === "export_lt"){
$filename = "Export_LT_".date('Y-m-d-H-i-s');
$headers = array(
@ -162,21 +161,21 @@ class ReportController extends Controller
$query = ServiceProviderEntry::with('booking', 'service_provider', 'booking.customer');
if(Input::get('filter_is_cleared') != ""){
$query->where('is_cleared', '=', Input::get('filter_is_cleared'));
if(Request::get('filter_is_cleared') != ""){
$query->where('is_cleared', '=', Request::get('filter_is_cleared'));
}
if(Input::get('filter_service_provider_id') != ""){
$query->where('service_provider_id', '=', Input::get('filter_service_provider_id'));
if(Request::get('filter_service_provider_id') != ""){
$query->where('service_provider_id', '=', Request::get('filter_service_provider_id'));
}
if(Input::get('filter_travel_date_from') != ""){
if(Request::get('filter_travel_date_from') != ""){
$query->whereHas('booking', function ($q) {
$travel_date_from = Carbon::parse(Input::get('filter_travel_date_from'))->format("Y-m-d");
$travel_date_from = Carbon::parse(Request::get('filter_travel_date_from'))->format("Y-m-d");
$q->where("start_date", '>=', $travel_date_from);
});
}
if(Input::get('filter_travel_date_to') != ""){
if(Request::get('filter_travel_date_to') != ""){
$query->whereHas('booking', function ($q) {
$travel_date_to = Carbon::parse(Input::get('filter_travel_date_to'))->format("Y-m-d");
$travel_date_to = Carbon::parse(Request::get('filter_travel_date_to'))->format("Y-m-d");
$q->where("start_date", '<=', $travel_date_to);
});
}

11
app/Http/Controllers/AdminUserController.php
View file

@ -10,13 +10,10 @@ use App\Repositories\UserRepository;
use App\Services\HTMLHelper;
use App\User;
use Illuminate\Support\Facades\Mail;
use Input;
use Request;
use Validator;
use DataTables;
class AdminUserController extends Controller
{
protected $userRepo;
@ -63,7 +60,7 @@ class AdminUserController extends Controller
public function store()
{
$data = Input::all();
$data = Request::all();
if($data['user_id'] === "new"){
$rules = array(
@ -76,9 +73,9 @@ class AdminUserController extends Controller
'name' => 'required'
);
}
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
return back()->withInput(Input::all())->withErrors($validator);
return back()->withRequest(Request::all())->withErrors($validator);
}
if($data['user_id'] === "new"){
@ -140,7 +137,7 @@ class AdminUserController extends Controller
public function updateModal($step = false){
if($step == 'user'){
$data = Input::all();
$data = Request::all();
$user = User::findOrFail($data['id']);
$user->permissions = isset($data['permissions']) ? $data['permissions'] : [];

2
app/Http/Controllers/Auth/LoginController.php
View file

@ -5,7 +5,7 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Http\Request;
use Illuminate\Http\Request;;
class LoginController extends Controller

2
app/Http/Controllers/Auth/RegisterController.php
View file

@ -4,7 +4,7 @@ namespace App\Http\Controllers\Auth;
use App\User;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Request;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
use Illuminate\Foundation\Auth\RegistersUsers;

4
app/Http/Controllers/BookingController.php
View file

@ -5,7 +5,7 @@ namespace App\Http\Controllers;
use App\Models\Booking;
use App\Models\BookingDraftItem;
use App\Repositories\BookingRepository;
use Input;
use Request;
class BookingController extends Controller
{
@ -50,7 +50,7 @@ class BookingController extends Controller
// \Session()->flash('alert-save', '1');
$data = Input::all();
$data = Request::all();
if($id == "new") {
$booking = new Booking();
}else{

91
app/Http/Controllers/CMS/CMSContentAuthorController.php Executable file
View file

@ -0,0 +1,91 @@
<?php
namespace App\Http\Controllers\CMS;
use App\Http\Controllers\Controller;
use App\Models\CMSAuthor;
use Request;
use Validator;
class CMSContentAuthorController extends Controller
{
/*
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
}
public function index()
{
$data = [
'contents' => CMSAuthor::all()->sortByDesc('id')
];
return view('cms.content.author.index', $data);
}
public function store()
{
$data = Request::all();
$rules = array(
'name' => 'required',
);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
return back()->withErrors($validator);
}
if($data['id'] === "new"){
CMSAuthor::create($data);
}else{
$model = CMSAuthor::find($data['id']);
$model->fill($data);
$model->save();
}
\Session()->flash('alert-save', '1');
return redirect(route('cms_content_author'));
}
public function loadModal()
{
if(Request::ajax()){
$data = Request::all();
$returnHTML = "";
if(isset($data['model']) && isset($data['id']) ){
if($data['model'] === 'content'){
if($data['id'] === "new"){
$value = new CMSAuthor();
}else {
$value = CMSAuthor::find($data['id']);
}
$returnHTML = view("cms.content.author.modal", compact('data','value') )->render();
}
}
return response()->json(['response' => $data, 'html'=>$returnHTML]);
}
}
public function delete($id){
$content = CMSAuthor::findOrFail($id);
$content->delete();
\Session()->flash('alert-success', __('Autor gelöscht'));
return redirect(route('cms_content_author'));
}
}

7
app/Http/Controllers/CMS/CMSContentController.php
View file

@ -5,7 +5,6 @@ namespace App\Http\Controllers\CMS;
use App\Http\Controllers\Controller;
use App\Models\CMSContent;
use Input;
use Request;
use Validator;
@ -35,12 +34,12 @@ class CMSContentController extends Controller
public function store()
{
$data = Input::all();
$data = Request::all();
$rules = array(
'name' => 'required',
'field' => 'required',
);
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
return back()->withErrors($validator);
@ -69,7 +68,7 @@ class CMSContentController extends Controller
public function loadModal()
{
if(Request::ajax()){
$data = Input::all();
$data = Request::all();
$returnHTML = "";
if(isset($data['model']) && isset($data['id']) ){
if($data['model'] == 'content'){

3
app/Http/Controllers/CMS/CMSContentCountryController.php
View file

@ -7,7 +7,6 @@ use App\Http\Controllers\Controller;
use App\Models\CMSContent;
use App\Models\TravelCountry;
use App\Models\TravelNationality;
use Input;
use Request;
use Validator;
@ -53,7 +52,7 @@ class CMSContentCountryController extends Controller
public function store($id)
{
$data = Input::all();
$data = Request::all();
if(!isset($data['contact_lands'])){
$data['contact_lands'] = null;
}

3
app/Http/Controllers/CMS/CMSContentInfoController.php
View file

@ -9,7 +9,6 @@ use App\Models\CMSInfo;
use App\Models\CMSInfoAvailable;
use App\Models\CMSInfoHoliday;
use App\Services\HTMLHelper;
use Input;
use Request;
use Validator;
@ -40,7 +39,7 @@ class CMSContentInfoController extends Controller
public function store()
{
$data = Input::all();
$data = Request::all();
if($data['action'] === "saveAll"){

4
app/Http/Controllers/CMS/CMSFeedbackController.php
View file

@ -6,7 +6,7 @@ namespace App\Http\Controllers\CMS;
use App\Http\Controllers\Controller;
use App\Models\Feedback;
use Carbon\Carbon;
use Input;
use Request;
class CMSFeedbackController extends Controller
{
@ -56,7 +56,7 @@ class CMSFeedbackController extends Controller
public function store($id)
{
$data = Input::all();
$data = Request::all();
if($id == "new") {
if(!isset($data['feedback_parent']) && !$data['feedback_parent']) {

4
app/Http/Controllers/CMS/CMSSidebarController.php
View file

@ -5,7 +5,7 @@ namespace App\Http\Controllers\CMS;
use App\Http\Controllers\Controller;
use App\Models\SidebarWidget;
use Input;
use Request;
class CMSSidebarController extends Controller
@ -57,7 +57,7 @@ class CMSSidebarController extends Controller
public function store($id)
{
$data = Input::all();
$data = Request::all();
if($id == "new") {
$widget = new SidebarWidget();
}else{

35
app/Http/Controllers/CMS/CMSTravelGuideController.php
View file

@ -8,10 +8,10 @@ use App\Models\IQContentTree;
use App\Models\IQContentTreeNode;
use App\Models\TravelGuide;
use App\Models\TravelPageGuide;
use AppBundle\Util;
use Gregwar\Image\Image;
use Illuminate\Http\Request;
use Input;
#use AppBundle\Util;
#use Gregwar\Image\Image;
use IqContent\LaravelFilemanager\Lfm;
use Request;
use Validator;
class CMSTravelGuideController extends Controller
@ -44,7 +44,6 @@ class CMSTravelGuideController extends Controller
public function page()
{
//make tree
$data = [
'travel_guide_pages' => TravelPageGuide::getPageGuides(),
@ -56,7 +55,7 @@ class CMSTravelGuideController extends Controller
public function detail($id)
{
if($id == "new") {
if($id === "new") {
$model = new TravelGuide();
$id = 'new';
$model->active = 1;
@ -65,15 +64,15 @@ class CMSTravelGuideController extends Controller
$model = TravelGuide::findOrFail($id);
$id = $model->id;
}
if(Input::get('clean') == "true"){
if(Request::get('clean') === "true"){
$model->full_text = \App\Services\Util::cleanHTML($model->full_text);
}
$data = [
'response_clean' => Request::get('clean'),
'travel_guide' => $model,
'id' => $id,
'lfm_helper' => app(Lfm::class),
];
return view('cms.travel_guide.detail', $data);
@ -83,7 +82,7 @@ class CMSTravelGuideController extends Controller
public function pageDetail($id)
{
if($id == "new") {
if($id === "new") {
/* $model = new TravelGuide();
$id = 'new';
$model->active = 1;
@ -104,13 +103,13 @@ class CMSTravelGuideController extends Controller
public function store($id)
{
$data = Input::all();
$data = Request::all();
$data['active'] = isset($data['active']) ? true : false;
$data['scope'] = isset($data['scope']) ? true : false;
$rules = array(
'name' => 'required',
);
if($id != "new") {
if($id !== "new") {
$model = TravelGuide::findOrFail($id);
$rules = array(
@ -121,12 +120,12 @@ class CMSTravelGuideController extends Controller
}
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
return back()->withErrors($validator);
}
if($id == "new") {
if($id === "new") {
$model = TravelGuide::create($data);
}else{
$model = TravelGuide::findOrFail($id);
@ -141,14 +140,14 @@ class CMSTravelGuideController extends Controller
public function pageStore($id)
{
$data = Input::all();
$data = Request::all();
$data['status'] = isset($data['status']) ? 1 : 0;
$data['show_in_navi'] = isset($data['show_in_navi']) ? 1 : 0;
$rules = array(
'title' => 'required',
);
if($id != "new") {
if($id !== "new") {
$model = TravelPageGuide::findOrFail($id);
$rules = array(
@ -158,12 +157,12 @@ class CMSTravelGuideController extends Controller
}
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
return back()->withErrors($validator);
}
if($id == "new") {
if($id === "new") {
$model = TravelPageGuide::create($data);
}else{
$model = TravelPageGuide::findOrFail($id);

1
app/Http/Controllers/DataTableController.php
View file

@ -8,7 +8,6 @@ use Carbon\Carbon;
use Composer\DependencyResolver\Request;
use DataTables;
use App\User;
use Input;
class DataTableController extends Controller
{

9
app/Http/Controllers/DraftController.php
View file

@ -5,7 +5,6 @@ namespace App\Http\Controllers;
use App\Models\Draft;
use App\Models\DraftItem;
use App\Models\DraftType;
use Input;
class DraftController extends Controller
{
@ -48,7 +47,7 @@ class DraftController extends Controller
public function store($id)
{
$data = Input::all();
$data = Request::all();
if($id == "new") {
$draft = new Draft();
}else{
@ -145,7 +144,7 @@ class DraftController extends Controller
*/
public function typeUpdate(){
$data = Input::all();
$data = Request::all();
if($data['id'] == "new"){
$draft_type = DraftType::create([
'name' => $data['name'],
@ -184,7 +183,7 @@ class DraftController extends Controller
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function loadOldAction(){
$data = Input::all();
$data = Request::all();
$template = \App\Models\Sym\ArrangementTemplate::findOrFail($data['load_old']);
$draft = new Draft();
@ -259,7 +258,7 @@ class DraftController extends Controller
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function loadNewAction(){
$data = Input::all();
$data = Request::all();
$d = Draft::findOrFail($data['load_new']);
$draft = new Draft();
$draft->active = true;

5
app/Http/Controllers/HomeController.php
View file

@ -8,7 +8,6 @@ use Auth;
use Carbon\Carbon;
use Config;
use Request;
use Input;
class HomeController extends Controller
{
@ -50,8 +49,8 @@ class HomeController extends Controller
public function loadingModal(){
$data = Input::get('data');
$target = Input::get('target');
$data = Request::get('data');
$target = Request::get('target');
$response = "";
if($data == "data_protection"){

15
app/Http/Controllers/IQ/ContentAssetController.php
View file

@ -3,7 +3,7 @@
namespace App\Http\Controllers\IQ;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Request;
use IqContent\LaravelFilemanager\Controllers\LfmController;
class ContentAssetController extends LfmController
@ -14,7 +14,18 @@ class ContentAssetController extends LfmController
{
$data = [
'models' => [],
'lfm_helper' => $this->helper,
'modal' => false,
];
return view('iq.content.assets.index', $data)->withHelper($this->helper);
return view('iq.content.assets.index', $data);
}
public function modal(){
$data = [
'models' => [],
'lfm_helper' => $this->helper,
'modal' => true,
];
return view('iq.content.assets.body', $data);
}
}

5
app/Http/Controllers/IQ/ContentModalController.php
View file

@ -12,7 +12,6 @@ use App\Models\IQContentTree;
use App\Models\IQContentTreeNode;
use Illuminate\Database\Eloquent\Collection;
use Request;
use Input;
class ContentModalController extends Controller
{
@ -32,8 +31,8 @@ class ContentModalController extends Controller
*/
public function load()
{
if(\Request::ajax()){
$data = Input::all();
if(Request::ajax()){
$data = Request::all();
$ret = "";
if(isset($data['model']) && isset($data['id']) ){
switch ($data['model']){

43
app/Http/Controllers/IQ/ContentTreeController.php
View file

@ -10,9 +10,8 @@ use App\Models\IQContentTreeNode;
use App\Models\TravelGuide;
use App\Models\TravelPageGuide;
use App\Repositories\IQ\ContentSiteRepository;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use Input;
use Request;
use Validator;
class ContentTreeController extends Controller
@ -147,7 +146,7 @@ class ContentTreeController extends Controller
public function store($id, $node_id = false, $area_section_id = false)
{
$data = Input::all();
$data = Request::all();
//from ajax
if(isset($data['action'])){
@ -193,7 +192,7 @@ class ContentTreeController extends Controller
$rules = array(
'name' => 'required',
);
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
return back()->withErrors($validator);
}
@ -278,6 +277,42 @@ class ContentTreeController extends Controller
}
public function delete($id, $node_id = false, $section_id = false){
//TODO delete Node not the tree....
$model = IQContentTree::findOrFail($id);
$tree_node = IQContentTreeNode::find($node_id);
if($tree_node){
$this->recrusiveDelete($id, $tree_node->id);
$tree_node->delete();
\Session()->flash('alert-success', __('Tree Node gelöscht'));
}
return redirect(route('iq_content_tree_detail', [$id]));
}
public function recrusiveDelete($id, $node_id = false, $section_id = false){
$model = IQContentTree::findOrFail($id);
$tree_node = IQContentTreeNode::find($node_id);
if($tree_node){
if($tree_node->iq_content_tree_node_childs->count()){
foreach ($tree_node->iq_content_tree_node_childs as $child){
$this->recrusiveDelete($id, $child->id);
$child->delete();
}
}
if($tree_node->iq_content_sites->count()){
foreach ($tree_node->iq_content_sites as $site){
$site->delete();
}
}
}
}
public function removeSite($id, $node_id, $travel_guide_id, $r=false){
$model = IQContentTree::findOrFail($id);
$tree_node = IQContentTreeNode::findOrFail($node_id);

7
app/Http/Controllers/IQ/Tools/ContentLinkController.php
View file

@ -4,11 +4,10 @@ namespace App\Http\Controllers\IQ\Tools;
use App\Http\Controllers\Controller;
use App\Models\IQContentSite;
use App\Models\IQContentSiteField;
use App\Models\IQContentTree;
use App\Models\IQContentTreeNode;
use App\Models\TravelGuide;
use Input;
use Request;
use Validator;
class ContentLinkController extends Controller
@ -96,7 +95,7 @@ class ContentLinkController extends Controller
public function readNodeAndSaveToTree(){
$input = Input::all();
$input = Request::all();
$ret = [];
if(isset($input['text'])){
$out = $this->ul_to_array($input['text']);
@ -226,7 +225,7 @@ class ContentLinkController extends Controller
$iqContentTree = IQContentTree::find(2);
$this->makeTree($iqContentTree);
$input = Input::all();
$input = Request::all();
$ret = [];
if(isset($input['text'])){

64
app/Http/Controllers/RequestController.php
View file

@ -6,7 +6,7 @@ use App\Models\Booking;
use App\Models\Sym\TravelCountry;
use App\Models\TravelAgenda;
use Carbon\Carbon;
use Input;
use Request;
use DataTables;
class RequestController extends Controller
@ -49,32 +49,32 @@ class RequestController extends Controller
$query = Booking::where('lead_id', '!=', NULL);
if(Input::get('full_firstname_search') != ""){
$query->where('participant_firstname', 'LIKE', '%'.Input::get('full_firstname_search').'%');
if(Request::get('full_firstname_search') != ""){
$query->where('participant_firstname', 'LIKE', '%'.Request::get('full_firstname_search').'%');
}
if(Input::get('full_lastname_search') != ""){
$query->where('participant_name', 'LIKE', '%'.Input::get('full_lastname_search').'%');
if(Request::get('full_lastname_search') != ""){
$query->where('participant_name', 'LIKE', '%'.Request::get('full_lastname_search').'%');
}
if(Input::get('travel_option_country_id') != ""){
$country_ids = TravelCountry::where('contact_lands', 'LIKE', '%"'.Input::get('travel_option_country_id').'"%')->get()->pluck('id');
$country_ids[] = Input::get('travel_option_country_id');
if(Request::get('travel_option_country_id') != ""){
$country_ids = TravelCountry::where('contact_lands', 'LIKE', '%"'.Request::get('travel_option_country_id').'"%')->get()->pluck('id');
$country_ids[] = Request::get('travel_option_country_id');
$query->whereIn('travel_country_id', $country_ids);
}
if(Input::get('travel_option_agenda_id') != ""){
$query->where('travelagenda_id', '=', Input::get('travel_option_agenda_id'));
if(Request::get('travel_option_agenda_id') != ""){
$query->where('travelagenda_id', '=', Request::get('travel_option_agenda_id'));
}
// $query->where('end_date', '<=', $now);
if(Input::get('travel_option_search')){
if(Request::get('travel_option_search')){
$now = Carbon::now();
switch (Input::get('travel_option_search')){
switch (Request::get('travel_option_search')){
case 'before_2':
$query->whereBetween('start_date', [Carbon::now()->modify('-2 month'), $now]);
@ -99,14 +99,14 @@ class RequestController extends Controller
}else{
$start = null;
$end = null;
if(Input::get('arrival_start_date') != ""){
$arrStart = explode(".", Input::get('arrival_start_date'));
if(Request::get('arrival_start_date') != ""){
$arrStart = explode(".", Request::get('arrival_start_date'));
if(count($arrStart) == 3){
$start = Carbon::create($arrStart[2], $arrStart[1], $arrStart[0], 0, 0, 0);
}
}
if(Input::get('arrival_end_date') != ""){
$arrEnd = explode(".", Input::get('arrival_end_date'));
if(Request::get('arrival_end_date') != ""){
$arrEnd = explode(".", Request::get('arrival_end_date'));
if(count($arrEnd) == 3){
$end = Carbon::create($arrEnd[2], $arrEnd[1], $arrEnd[0], 23, 59, 59);
}
@ -123,14 +123,14 @@ class RequestController extends Controller
$start = null;
$end = null;
if(Input::get('departure_start_date') != ""){
$arrStart = explode(".", Input::get('departure_start_date'));
if(Request::get('departure_start_date') != ""){
$arrStart = explode(".", Request::get('departure_start_date'));
if(count($arrStart) == 3){
$start = Carbon::create($arrStart[2], $arrStart[1], $arrStart[0], 0, 0, 0);
}
}
if(Input::get('departure_end_date') != ""){
$arrEnd = explode(".", Input::get('departure_end_date'));
if(Request::get('departure_end_date') != ""){
$arrEnd = explode(".", Request::get('departure_end_date'));
if(count($arrEnd) == 3){
$end = Carbon::create($arrEnd[2], $arrEnd[1], $arrEnd[0], 23, 59, 59);
}
@ -148,27 +148,27 @@ class RequestController extends Controller
if(Input::get('sort_travel_country_id') != ""){
$query->where('travel_country_id', '=', Input::get('sort_travel_country_id'));
if(Request::get('sort_travel_country_id') != ""){
$query->where('travel_country_id', '=', Request::get('sort_travel_country_id'));
}
if(Input::get('sort_travelagenda_id') != ""){
$query->where('travelagenda_id', '=', Input::get('sort_travelagenda_id'));
if(Request::get('sort_travelagenda_id') != ""){
$query->where('travelagenda_id', '=', Request::get('sort_travelagenda_id'));
}
if(Input::get('sort_sf_guard_user_id') != ""){
$query->where('sf_guard_user_id', '=', Input::get('sort_sf_guard_user_id'));
if(Request::get('sort_sf_guard_user_id') != ""){
$query->where('sf_guard_user_id', '=', Request::get('sort_sf_guard_user_id'));
}
if(Input::get('sort_travel_documents') != ""){
$query->where('travel_documents', '=', Input::get('sort_travel_documents'));
if(Request::get('sort_travel_documents') != ""){
$query->where('travel_documents', '=', Request::get('sort_travel_documents'));
}
if(Input::get('full_lead_id_search') != ""){
$query->where('lead_id', 'LIKE', '%'.Input::get('full_lead_id_search'). '%');
if(Request::get('full_lead_id_search') != ""){
$query->where('lead_id', 'LIKE', '%'.Request::get('full_lead_id_search'). '%');
}
if(Input::get('full_booking_id_search') != ""){
$query->where('id', 'LIKE', '%'.Input::get('full_booking_id_search').'%');
if(Request::get('full_booking_id_search') != ""){
$query->where('id', 'LIKE', '%'.Request::get('full_booking_id_search').'%');
}
return $query;
}

60
app/Http/Controllers/Settings/KeywordController.php Executable file
View file

@ -0,0 +1,60 @@
<?php
namespace App\Http\Controllers\Settings;
use App\Http\Controllers\Controller;
use App\Models\Booking;
use App\Models\Keyword;
use App\Models\TravelAgenda;
use Request;
class KeywordController extends Controller
{
public function __construct()
{
$this->middleware('admin');
}
public function index($step = false)
{
$data = [
'keywords' => Keyword::all(),
];
return view('settings.keywords.index', $data);
}
public function update(){
$data = Request::all();
if($data['id'] === "new"){
$model = Keyword::create([
'name' => $data['name'],
]);
}else{
$model = Keyword::find($data['id']);
$model->name = $data['name'];
$model->save();
}
\Session()->flash('alert-save', '1');
return redirect(route('admin_settings_keyword'));
}
public function delete($id){
//TODO check ist linked
/*if(Booking::where('travelagenda_id', $id)->count()){
\Session()->flash('alert-error', 'Eintrag wird verwendet');
return redirect()->back();
}*/
$model = Keyword::findOrFail($id);
$model->delete();
\Session()->flash('alert-success', 'Eintrag gelöscht');
return redirect()->back();
}
}

9
app/Http/Controllers/Settings/TravelAgendaController.php
View file

@ -6,12 +6,7 @@ use App\Http\Controllers\Controller;
use App\Models\Booking;
use App\Models\TravelAgenda;
use App\Models\TravelCountry;
use App\Models\TravelNationality;
use App\Models\TravelNationalityRequirement;
use Carbon\Carbon;
use HTMLHelper;
use Input;
use Request;
class TravelAgendaController extends Controller
{
@ -32,7 +27,7 @@ class TravelAgendaController extends Controller
public function update(){
$data = Input::all();
$data = Request::all();
if($data['id'] == "new"){
$model = TravelAgenda::create([
'name' => $data['name'],

7
app/Http/Controllers/Settings/TravelCountryController.php
View file

@ -6,10 +6,7 @@ use App\Http\Controllers\Controller;
use App\Models\TravelCountry;
use App\Models\TravelNationality;
use App\Models\TravelNationalityRequirement;
use Carbon\Carbon;
use HTMLHelper;
use Input;
use Request;
class TravelCountryController extends Controller
{
@ -49,7 +46,7 @@ class TravelCountryController extends Controller
public function store(){
$data = Input::all();
$data = Request::all();
$data['is_customer_country'] = isset($data['is_customer_country']) ? true : false;
$data['active_frontend'] = isset($data['active_frontend']) ? true : false;
$data['active_backend'] = isset($data['active_backend']) ? true : false;

7
app/Http/Controllers/Settings/TravelNationalityController.php
View file

@ -4,12 +4,9 @@ namespace App\Http\Controllers\Settings;
use App\Http\Controllers\Controller;
use App\Models\TravelCountry;
use App\Models\TravelNationality;
use App\Models\TravelNationalityRequirement;
use Carbon\Carbon;
use HTMLHelper;
use Input;
use Request;
class TravelNationalityController extends Controller
{
@ -30,7 +27,7 @@ class TravelNationalityController extends Controller
public function update(){
$data = Input::all();
$data = Request::all();
if($data['id'] == "new"){
$model = TravelNationality::create([
'name' => $data['name'],

6
app/Http/Controllers/SyS/Tools/ContentLinkController.php
View file

@ -8,7 +8,7 @@ use App\Models\IQContentSiteField;
use App\Models\IQContentTree;
use App\Models\IQContentTreeNode;
use App\Models\TravelGuide;
use Input;
use Request;
use Validator;
class ContentLinkController extends Controller
@ -192,7 +192,7 @@ class ContentLinkController extends Controller
public function readNodeAndSaveToTree(){
$input = Input::all();
$input = Request::all();
$ret = [];
if(isset($input['text'])){
$out = $this->ul_to_array($input['text']);
@ -322,7 +322,7 @@ class ContentLinkController extends Controller
$iqContentTree = IQContentTree::find(2);
$this->makeTree($iqContentTree);
$input = Input::all();
$input = Request::all();
$ret = [];
if(isset($input['text'])){

4
app/Http/Controllers/TranslationController.php
View file

@ -4,7 +4,7 @@ namespace App\Http\Controllers;
use App;
use File;
use Input;
use Request;
class TranslationController extends Controller
{
@ -63,7 +63,7 @@ class TranslationController extends Controller
$path = $this->resourcePath($this->languagesPath);
$file = $path.$language.".json";
$data = Input::all();
$data = Request::all();
$this->backup($path, $language.".json");
unset($data['_token']);

4
app/Http/Controllers/TranslationFileController.php
View file

@ -1,9 +1,5 @@
<?php
//use Input;
//use Request;
namespace App\Http\Controllers;
use App;

8
app/Http/Controllers/TravelProgramController.php
View file

@ -6,7 +6,7 @@ use App\Models\TravelClass;
use App\Models\TravelProgram;
use App\Models\TravelProgramDraft;
use App\Repositories\TravelProgramRepository;
use Input;
use Request;
class TravelProgramController extends Controller
{
@ -48,7 +48,7 @@ class TravelProgramController extends Controller
public function store($id)
{
$data = Input::all();
$data = Request::all();
$program = $this->travelProgramRepo->update($data);
\Session()->flash('alert-save', '1');
return redirect(route('travel_program_detail', [$program->id]));
@ -63,7 +63,7 @@ class TravelProgramController extends Controller
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function classUpdate(){
$data = Input::all();
$data = Request::all();
$this->travelProgramRepo->updateClass($data);
\Session()->flash('alert-save', '1');
return redirect(route('travel_program_detail', [$data['program_id']]));
@ -89,7 +89,7 @@ class TravelProgramController extends Controller
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function draftUpdate(){
$data = Input::all();
$data = Request::all();
$this->travelProgramRepo->updateDraft($data);
\Session()->flash('alert-save', '1');
return redirect(route('travel_program_detail', [$data['travel_program_id']]));

34
app/Http/Controllers/TravelUserBookingFewoController.php
View file

@ -12,7 +12,7 @@ use App\Models\TravelUserBookingFewo;
use App\Repositories\TravelUserBookingFewoRepository;
use App\Services\Util;
use Illuminate\Support\Facades\Mail;
use Input;
use Request;
class TravelUserBookingFewoController extends Controller
{
@ -69,18 +69,18 @@ class TravelUserBookingFewoController extends Controller
public function store($id)
{
$data = Input::all();
$data = Request::all();
if($data['action'] == 'saveAll'){
return $this->userBookingFewoRepo->update($id, $data);
}
if($data['action'] == 'createInvoice'){
if(!TravelUserBookingFewo::find($id)){
\Session()->flash('alert-error', __('Buchung nicht gefunden.'));
return back()->withInput(Input::all());
return back()->withRequest(Request::all());
}
$ret = $this->userBookingFewoRepo->check($id, $data);
if($ret['success'] == false){
return back()->withInput(Input::all())->withErrors($ret['error']);
return back()->withRequest(Request::all())->withErrors($ret['error']);
}
if($ret['success'] == true){
$this->userBookingFewoRepo->createInvoicePDF($id);
@ -92,11 +92,11 @@ class TravelUserBookingFewoController extends Controller
if($data['action'] == 'createTravelInfo'){
if(!TravelUserBookingFewo::find($id)){
\Session()->flash('alert-error', __('Buchung nicht gefunden.'));
return back()->withInput(Input::all());
return back()->withRequest(Request::all());
}
$ret = $this->userBookingFewoRepo->check($id, $data);
if($ret['success'] == false){
return back()->withInput(Input::all())->withErrors($ret['error']);
return back()->withRequest(Request::all())->withErrors($ret['error']);
}
if($ret['success'] == true){
$this->userBookingFewoRepo->createTravelInfoPDF($id, $data['info_mail_text']);
@ -110,9 +110,9 @@ class TravelUserBookingFewoController extends Controller
$travel_user_booking_fewo = TravelUserBookingFewo::findOrFail($id);
if($travel_user_booking_fewo->travel_user_id && $travel_user_booking_fewo->travel_user->email){
$mail_bbc = config('mail.mail_bbc');
Mail::to($travel_user_booking_fewo->travel_user->email)->bcc($mail_bbc)->send(new MailSendFeWoInvoice($travel_user_booking_fewo, Input::get('send_mail_user_notice')));
Mail::to($travel_user_booking_fewo->travel_user->email)->bcc($mail_bbc)->send(new MailSendFeWoInvoice($travel_user_booking_fewo, Request::get('send_mail_user_notice')));
$send_user_mail = $travel_user_booking_fewo->send_user_mail;
$send_user_mail[] = [date('H:i d.m.Y') => $travel_user_booking_fewo->travel_user->email." ".Input::get('send_mail_user_notice')];
$send_user_mail[] = [date('H:i d.m.Y') => $travel_user_booking_fewo->travel_user->email." ".Request::get('send_mail_user_notice')];
$travel_user_booking_fewo->send_user_mail = $send_user_mail;
$travel_user_booking_fewo->save();
\Session()->flash('alert-success', __('E-Mail wurde an den Mieter versendet.'));
@ -138,12 +138,12 @@ class TravelUserBookingFewoController extends Controller
$travel_user_booking_fewo = TravelUserBookingFewo::findOrFail($id);
if($travel_user_booking_fewo){
$mail_bbc = config('mail.mail_bbc');
Mail::to(Input::get('send_mail_service_mail'))->bcc($mail_bbc)->send(new MailSendFeWoService($travel_user_booking_fewo, Input::get('send_mail_service_subject'), Input::get('send_mail_service_content')));
Mail::to(Request::get('send_mail_service_mail'))->bcc($mail_bbc)->send(new MailSendFeWoService($travel_user_booking_fewo, Request::get('send_mail_service_subject'), Request::get('send_mail_service_content')));
$send_service_mail = $travel_user_booking_fewo->send_service_mail;
$send_service_mail[] = ['d' => date('H:i d.m.Y'),
'm'=>Input::get('send_mail_service_mail'),
's'=>Input::get('send_mail_service_subject'),
'c'=>Input::get('send_mail_service_content')];
'm'=>Request::get('send_mail_service_mail'),
's'=>Request::get('send_mail_service_subject'),
'c'=>Request::get('send_mail_service_content')];
$travel_user_booking_fewo->send_service_mail = $send_service_mail;
$travel_user_booking_fewo->save();
@ -155,13 +155,13 @@ class TravelUserBookingFewoController extends Controller
if($data['action'] == 'sendMailtoEmployee') {
$travel_user_booking_fewo = TravelUserBookingFewo::findOrFail($id);
if($travel_user_booking_fewo){
$mails = explode(",", Input::get('send_mail_employee_mail'));
Mail::to($mails)->send(new MailSendFeWoService($travel_user_booking_fewo, Input::get('send_mail_employee_subject'), Input::get('send_mail_employee_content')));
$mails = explode(",", Request::get('send_mail_employee_mail'));
Mail::to($mails)->send(new MailSendFeWoService($travel_user_booking_fewo, Request::get('send_mail_employee_subject'), Request::get('send_mail_employee_content')));
$send_employee_mail = $travel_user_booking_fewo->send_employee_mail;
$send_employee_mail[] = ['d' => date('H:i d.m.Y'),
'm'=>Input::get('send_mail_employee_mail'),
's'=>Input::get('send_mail_employee_subject'),
'c'=>Input::get('send_mail_employee_content')];
'm'=>Request::get('send_mail_employee_mail'),
's'=>Request::get('send_mail_employee_subject'),
'c'=>Request::get('send_mail_employee_content')];
$travel_user_booking_fewo->send_employee_mail = $send_employee_mail;
$travel_user_booking_fewo->save();

8
app/Http/Controllers/TravelUserController.php
View file

@ -4,7 +4,7 @@ namespace App\Http\Controllers;
use App\Models\TravelUser;
use Input;
use Request;
use Validator;
class TravelUserController extends Controller
@ -43,7 +43,7 @@ class TravelUserController extends Controller
public function store($id)
{
$data = Input::all();
$data = Request::all();
$rules = array(
'salutation_id' => 'required',
@ -58,10 +58,10 @@ class TravelUserController extends Controller
$rules['email'] = 'required|string|email|max:255|unique:mysql_stern.travel_users,email,'.$model->id;
}
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
return back()->withInput(Input::all())->withErrors($validator);
return back()->withRequest(Request::all())->withErrors($validator);
}
if($id == "new") {

10
app/Http/Controllers/UserDataController.php
View file

@ -4,7 +4,7 @@
namespace App\Http\Controllers;
use App\Repositories\UserRepository;
use Auth;
use Input;
use Request;
use Validator;
@ -41,12 +41,12 @@ class UserDataController extends Controller
$rules = array(
'name' => 'required'
);
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
return back()->withInput(Input::all())->withErrors($validator);
return back()->withRequest(Request::all())->withErrors($validator);
} else {
$data = Input::all();
$data = Request::all();
$user->name = $data['name'];
$user->save();
\Session()->flash('alert-save', true);
@ -60,7 +60,7 @@ class UserDataController extends Controller
public function userDataAcceptedForm(){
$user = Auth::user();
if(Input::get('sender_accepted_infos') == "on"){
if(Request::get('sender_accepted_infos') == "on"){
$user->agreement = now();
}else {
$user->agreement = null;

5
app/Http/Controllers/UserDeleteController.php
View file

@ -5,8 +5,7 @@ namespace App\Http\Controllers;
use Auth;
use Validator;
use Input;
use Illuminate\Http\Request;
use Request;
use Illuminate\Support\Facades\Hash;
use App\Repositories\UserRepository;
@ -53,7 +52,7 @@ class UserDeleteController extends Controller
});
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {

8
app/Http/Controllers/UserUpdateEmailController.php
View file

@ -6,11 +6,9 @@ namespace App\Http\Controllers;
use App\User;
use Auth;
use Validator;
use Input;
use Request;
use Carbon\Carbon;
use Illuminate\Database\Connection;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Mail\ReportExport;
use Illuminate\Support\Facades\Mail;
@ -52,7 +50,7 @@ class UserUpdateEmailController extends Controller
return true;
});
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
// redirect our user back to the form with the errors from the validator
$messages = $validator->messages();
@ -104,7 +102,7 @@ class UserUpdateEmailController extends Controller
return true;
});
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
// redirect our user back to the form with the errors from the validator
$messages = $validator->messages();

7
app/Http/Controllers/UserUpdatePasswordController.php
View file

@ -6,8 +6,7 @@ namespace App\Http\Controllers;
use Auth;
use Illuminate\Support\Facades\Hash;
use Validator;
use Input;
use Illuminate\Http\Request;
use Request;
class UserUpdatePasswordController extends Controller
@ -45,7 +44,7 @@ class UserUpdatePasswordController extends Controller
});
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {
@ -91,7 +90,7 @@ class UserUpdatePasswordController extends Controller
);
$validator = Validator::make(Input::all(), $rules);
$validator = Validator::make(Request::all(), $rules);
if ($validator->fails()) {