From 9af731545c04df7df1d7e76b2bb136231b7648f4 Mon Sep 17 00:00:00 2001 From: Jeramy Simpson Date: Tue, 17 Mar 2015 11:30:56 +1000 Subject: [PATCH] Update Namespaces & Syntax --- .../Commands/SendRecurringInvoices.php | 2 +- app/Handlers/InvoiceEventHandler.php | 6 +- app/Handlers/UserEventHandler.php | 2 +- app/Http/Controllers/AccountController.php | 10 +- .../Controllers/AccountGatewayController.php | 4 +- app/Http/Controllers/ActivityController.php | 7 +- app/Http/Controllers/AppController.php | 18 +- app/Http/Controllers/ClientApiController.php | 4 +- app/Http/Controllers/ClientController.php | 2 +- app/Http/Controllers/CreditController.php | 4 +- app/Http/Controllers/DashboardController.php | 4 +- app/Http/Controllers/HomeController.php | 5 +- .../Controllers/IntegrationController.php | 4 +- app/Http/Controllers/InvoiceApiController.php | 7 +- app/Http/Controllers/InvoiceController.php | 11 +- app/Http/Controllers/PaymentApiController.php | 5 +- app/Http/Controllers/PaymentController.php | 10 +- app/Http/Controllers/ProductController.php | 5 +- app/Http/Controllers/QuoteApiController.php | 5 +- app/Http/Controllers/QuoteController.php | 11 +- app/Http/Controllers/ReportController.php | 6 +- app/Http/Controllers/TimesheetController.php | 4 +- app/Http/Controllers/TokenController.php | 4 +- app/Http/Controllers/UserController.php | 8 +- app/Http/Kernel.php | 2 + app/Http/Middleware/StartupCheck.php | 73 +++ app/Http/routes.php | 2 +- app/{includes => Includes}/parsecsv.lib.php | 0 app/Libraries/Utils.php | 4 +- .../Mailers}/ContactMailer.php | 2 +- .../mailers => Ninja/Mailers}/Mailer.php | 2 +- .../mailers => Ninja/Mailers}/UserMailer.php | 2 +- .../Repositories}/AccountRepository.php | 0 .../Repositories}/ClientRepository.php | 0 .../Repositories}/CreditRepository.php | 0 .../Repositories}/InvoiceRepository.php | 0 .../Repositories}/PaymentRepository.php | 0 .../Repositories}/TaxRateRepository.php | 0 app/libraries/Utils.php | 604 ------------------ bootstrap/environment.php | 1 + composer.json | 4 +- config/app.php | 47 +- resources/views/setup.blade.php | 48 +- storage/debugbar/.gitignore | 2 + 44 files changed, 225 insertions(+), 716 deletions(-) create mode 100644 app/Http/Middleware/StartupCheck.php rename app/{includes => Includes}/parsecsv.lib.php (100%) rename app/{ninja/mailers => Ninja/Mailers}/ContactMailer.php (99%) rename app/{ninja/mailers => Ninja/Mailers}/Mailer.php (96%) rename app/{ninja/mailers => Ninja/Mailers}/UserMailer.php (98%) rename app/{ninja/repositories => Ninja/Repositories}/AccountRepository.php (100%) rename app/{ninja/repositories => Ninja/Repositories}/ClientRepository.php (100%) rename app/{ninja/repositories => Ninja/Repositories}/CreditRepository.php (100%) rename app/{ninja/repositories => Ninja/Repositories}/InvoiceRepository.php (100%) rename app/{ninja/repositories => Ninja/Repositories}/PaymentRepository.php (100%) rename app/{ninja/repositories => Ninja/Repositories}/TaxRateRepository.php (100%) delete mode 100644 app/libraries/Utils.php create mode 100644 bootstrap/environment.php create mode 100644 storage/debugbar/.gitignore diff --git a/app/Console/Commands/SendRecurringInvoices.php b/app/Console/Commands/SendRecurringInvoices.php index 389950c8291a..31f6f5be8c86 100644 --- a/app/Console/Commands/SendRecurringInvoices.php +++ b/app/Console/Commands/SendRecurringInvoices.php @@ -3,7 +3,7 @@ use Illuminate\Console\Command; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputArgument; -use ninja\mailers\ContactMailer as Mailer; +use Ninja\Mailers\ContactMailer as Mailer; class SendRecurringInvoices extends Command { diff --git a/app/Handlers/InvoiceEventHandler.php b/app/Handlers/InvoiceEventHandler.php index 7b6f4e9cc52b..0296e7818518 100644 --- a/app/Handlers/InvoiceEventHandler.php +++ b/app/Handlers/InvoiceEventHandler.php @@ -1,7 +1,7 @@ -getRealPath(); - require_once app_path().'/includes/parsecsv.lib.php'; + require_once app_path().'/Includes/parsecsv.lib.php'; $csv = new parseCSV(); $csv->heading = false; $csv->auto($name); diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php index e6f646e4e70a..eb18642c1959 100644 --- a/app/Http/Controllers/AccountGatewayController.php +++ b/app/Http/Controllers/AccountGatewayController.php @@ -1,4 +1,4 @@ - $app, 'database' => $database, 'mail' => $mail] as $key => $config) { $content = ' 'App\Http\Middleware\Authenticate', 'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth', 'guest' => 'App\Http\Middleware\RedirectIfAuthenticated', + 'absurd' => 'App\Http\Middleware\StartupCheck', ]; } diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php new file mode 100644 index 000000000000..1bf247dfa177 --- /dev/null +++ b/app/Http/Middleware/StartupCheck.php @@ -0,0 +1,73 @@ +version != NINJA_VERSION) { + $params = [ + 'user_version' => NINJA_VERSION, + 'latest_version'=> $data->version, + 'releases_link' => link_to(RELEASES_URL, 'Invoice Ninja', ['target' => '_blank']) + ]; + Session::put('news_feed_id', NEW_VERSION_AVAILABLE); + Session::put('news_feed_message', trans('texts.new_version_available', $params)); + } else { + Session::put('news_feed_id', $data->id); + if ($data->message && $data->id > Auth::user()->news_feed_id) { + Session::put('news_feed_message', $data->message); + } + } + } else { + Session::put('news_feed_id', true); + } + } + } + + return $next($request); + } + +} diff --git a/app/Http/routes.php b/app/Http/routes.php index 9fbaa5ad9c25..89c0cf916758 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -64,7 +64,7 @@ Route::get('user/reset/{token?}', 'UserController@reset_password'); Route::post('user/reset', 'UserController@do_reset_password'); Route::get('logout', 'UserController@logout'); -if (\App\libraries\Utils::isNinja()) { +if (\App\Libraries\Utils::isNinja()) { Route::post('/signup/register', 'AccountController@doRegister'); Route::get('/news_feed/{user_type}/{version}/', 'HomeController@newsFeed'); Route::get('/demo', 'AccountController@demo'); diff --git a/app/includes/parsecsv.lib.php b/app/Includes/parsecsv.lib.php similarity index 100% rename from app/includes/parsecsv.lib.php rename to app/Includes/parsecsv.lib.php diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php index 609ae864cd35..0982f18af80c 100644 --- a/app/Libraries/Utils.php +++ b/app/Libraries/Utils.php @@ -1,5 +1,7 @@ registered; - } - - public static function isConfirmed() - { - return Auth::check() && Auth::user()->confirmed; - } - - public static function isDatabaseSetup() - { - try { - if (Schema::hasTable('accounts')) { - return true; - } - } catch (Exception $e) { - return false; - } - } - - public static function isProd() - { - return App::environment() == ENV_PRODUCTION; - } - - public static function isNinja() - { - return self::isNinjaProd() || self::isNinjaDev(); - } - - public static function isNinjaProd() - { - return isset($_ENV['NINJA_PROD']) && $_ENV['NINJA_PROD']; - } - - public static function isNinjaDev() - { - return isset($_ENV['NINJA_DEV']) && $_ENV['NINJA_DEV']; - } - - public static function isPro() - { - return Auth::check() && Auth::user()->isPro(); - } - - public static function getUserType() - { - if (Utils::isNinja()) { - return USER_TYPE_CLOUD_HOST; - } else { - return USER_TYPE_SELF_HOST; - } - } - - public static function getDemoAccountId() - { - return isset($_ENV[DEMO_ACCOUNT_ID]) ? $_ENV[DEMO_ACCOUNT_ID] : false; - } - - public static function isDemo() - { - return Auth::check() && Auth::user()->isDemo(); - } - - public static function getNewsFeedResponse($userType = false) - { - if (!$userType) { - $userType = Utils::getUserType(); - } - - $response = new stdClass(); - $response->message = isset($_ENV["{$userType}_MESSAGE"]) ? $_ENV["{$userType}_MESSAGE"] : ''; - $response->id = isset($_ENV["{$userType}_ID"]) ? $_ENV["{$userType}_ID"] : ''; - $response->version = NINJA_VERSION; - - return $response; - } - - public static function getProLabel($feature) - { - if (Auth::check() - && !Auth::user()->isPro() - && $feature == ACCOUNT_ADVANCED_SETTINGS) { - return ' PRO'; - } else { - return ''; - } - } - - public static function basePath() - { - return substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/') + 1); - } - - public static function trans($input) - { - $data = []; - - foreach ($input as $field) { - if ($field == "checkbox") { - $data[] = $field; - } else { - $data[] = trans("texts.$field"); - } - } - - return $data; - } - - public static function fatalError($message = false, $exception = false) - { - if (!$message) { - $message = "An error occurred, please try again later."; - } - - static::logError($message.' '.$exception); - - $data = [ - 'showBreadcrumbs' => false, - 'hideHeader' => true, - ]; - - return View::make('error', $data)->with('error', $message); - } - - public static function getErrorString($exception) - { - return "{$exception->getFile()} [Line {$exception->getLine()}] => {$exception->getMessage()}"; - } - - public static function logError($error, $context = 'PHP') - { - $count = Session::get('error_count', 0); - Session::put('error_count', ++$count); - if ($count > 100) { - return 'logged'; - } - - $data = [ - 'context' => $context, - 'user_id' => Auth::check() ? Auth::user()->id : 0, - 'user_name' => Auth::check() ? Auth::user()->getDisplayName() : '', - 'url' => Input::get('url', Request::url()), - 'user_agent' => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '', - 'ip' => Request::getClientIp(), - 'count' => Session::get('error_count', 0), - ]; - - Log::error($error."\n", $data); - - /* - Mail::queue('emails.error', ['message'=>$error.' '.json_encode($data)], function($message) - { - $message->to($email)->subject($subject); - }); - */ - } - - public static function parseFloat($value) - { - $value = preg_replace('/[^0-9\.\-]/', '', $value); - - return floatval($value); - } - - public static function formatPhoneNumber($phoneNumber) - { - $phoneNumber = preg_replace('/[^0-9a-zA-Z]/', '', $phoneNumber); - - if (!$phoneNumber) { - return ''; - } - - if (strlen($phoneNumber) > 10) { - $countryCode = substr($phoneNumber, 0, strlen($phoneNumber)-10); - $areaCode = substr($phoneNumber, -10, 3); - $nextThree = substr($phoneNumber, -7, 3); - $lastFour = substr($phoneNumber, -4, 4); - - $phoneNumber = '+'.$countryCode.' ('.$areaCode.') '.$nextThree.'-'.$lastFour; - } elseif (strlen($phoneNumber) == 10 && in_array(substr($phoneNumber, 0, 3), array(653, 656, 658, 659))) { - /** - * SG country code are 653, 656, 658, 659 - * US area code consist of 650, 651 and 657 - * @see http://en.wikipedia.org/wiki/Telephone_numbers_in_Singapore#Numbering_plan - * @see http://www.bennetyee.org/ucsd-pages/area.html - */ - $countryCode = substr($phoneNumber, 0, 2); - $nextFour = substr($phoneNumber, 2, 4); - $lastFour = substr($phoneNumber, 6, 4); - - $phoneNumber = '+'.$countryCode.' '.$nextFour.' '.$lastFour; - } elseif (strlen($phoneNumber) == 10) { - $areaCode = substr($phoneNumber, 0, 3); - $nextThree = substr($phoneNumber, 3, 3); - $lastFour = substr($phoneNumber, 6, 4); - - $phoneNumber = '('.$areaCode.') '.$nextThree.'-'.$lastFour; - } elseif (strlen($phoneNumber) == 7) { - $nextThree = substr($phoneNumber, 0, 3); - $lastFour = substr($phoneNumber, 3, 4); - - $phoneNumber = $nextThree.'-'.$lastFour; - } - - return $phoneNumber; - } - - public static function formatMoney($value, $currencyId = false) - { - if (!$currencyId) { - $currencyId = Session::get(SESSION_CURRENCY); - } - - $currency = Currency::remember(DEFAULT_QUERY_CACHE)->find($currencyId); - - if (!$currency) { - $currency = Currency::remember(DEFAULT_QUERY_CACHE)->find(1); - } - - return $currency->symbol.number_format($value, $currency->precision, $currency->decimal_separator, $currency->thousand_separator); - } - - public static function pluralize($string, $count) - { - $field = $count == 1 ? $string : $string.'s'; - $string = trans("texts.$field", ['count' => $count]); - - return $string; - } - - public static function toArray($data) - { - return json_decode(json_encode((array) $data), true); - } - - public static function toSpaceCase($camelStr) - { - return preg_replace('/([a-z])([A-Z])/s', '$1 $2', $camelStr); - } - - public static function timestampToDateTimeString($timestamp) - { - $timezone = Session::get(SESSION_TIMEZONE, DEFAULT_TIMEZONE); - $format = Session::get(SESSION_DATETIME_FORMAT, DEFAULT_DATETIME_FORMAT); - - return Utils::timestampToString($timestamp, $timezone, $format); - } - - public static function timestampToDateString($timestamp) - { - $timezone = Session::get(SESSION_TIMEZONE, DEFAULT_TIMEZONE); - $format = Session::get(SESSION_DATE_FORMAT, DEFAULT_DATE_FORMAT); - - return Utils::timestampToString($timestamp, $timezone, $format); - } - - public static function dateToString($date) - { - $dateTime = new DateTime($date); - $timestamp = $dateTime->getTimestamp(); - $format = Session::get(SESSION_DATE_FORMAT, DEFAULT_DATE_FORMAT); - - return Utils::timestampToString($timestamp, false, $format); - } - - public static function timestampToString($timestamp, $timezone = false, $format) - { - if (!$timestamp) { - return ''; - } - $date = Carbon::createFromTimeStamp($timestamp); - if ($timezone) { - $date->tz = $timezone; - } - if ($date->year < 1900) { - return ''; - } - - return $date->format($format); - } - - public static function toSqlDate($date, $formatResult = true) - { - if (!$date) { - return; - } - - $timezone = Session::get(SESSION_TIMEZONE); - $format = Session::get(SESSION_DATE_FORMAT); - - $dateTime = DateTime::createFromFormat($format, $date, new DateTimeZone($timezone)); - - return $formatResult ? $dateTime->format('Y-m-d') : $dateTime; - } - - public static function fromSqlDate($date, $formatResult = true) - { - if (!$date || $date == '0000-00-00') { - return ''; - } - - $timezone = Session::get(SESSION_TIMEZONE); - $format = Session::get(SESSION_DATE_FORMAT); - - $dateTime = DateTime::createFromFormat('Y-m-d', $date, new DateTimeZone($timezone)); - - return $formatResult ? $dateTime->format($format) : $dateTime; - } - - public static function today($formatResult = true) - { - $timezone = Session::get(SESSION_TIMEZONE); - $format = Session::get(SESSION_DATE_FORMAT); - $date = date_create(null, new DateTimeZone($timezone)); - - if ($formatResult) { - return $date->format($format); - } else { - return $date; - } - } - - public static function trackViewed($name, $type, $url = false) - { - if (!$url) { - $url = Request::url(); - } - - $viewed = Session::get(RECENTLY_VIEWED); - - if (!$viewed) { - $viewed = []; - } - - $object = new stdClass(); - $object->url = $url; - $object->name = ucwords($type).': '.$name; - - $data = []; - - for ($i = 0; $iurl == $item->url || $object->name == $item->name) { - continue; - } - - array_unshift($data, $item); - } - - array_unshift($data, $object); - - if (count($data) > RECENTLY_VIEWED_LIMIT) { - array_pop($data); - } - - Session::put(RECENTLY_VIEWED, $data); - } - - public static function processVariables($str) - { - if (!$str) { - return ''; - } - - $variables = ['MONTH', 'QUARTER', 'YEAR']; - for ($i = 0; $i 1) { - $offset = intval($addArray[1]); - } elseif (count($minArray) > 1) { - $offset = intval($minArray[1]) * -1; - } - - $val = Utils::getDatePart($variable, $offset); - $str = str_replace($match, $val, $str); - } - } - - return $str; - } - - private static function getDatePart($part, $offset) - { - $offset = intval($offset); - if ($part == 'MONTH') { - return Utils::getMonth($offset); - } elseif ($part == 'QUARTER') { - return Utils::getQuarter($offset); - } elseif ($part == 'YEAR') { - return Utils::getYear($offset); - } - } - - private static function getMonth($offset) - { - $months = [ "January", "February", "March", "April", "May", "June", - "July", "August", "September", "October", "November", "December", ]; - - $month = intval(date('n')) - 1; - - $month += $offset; - $month = $month % 12; - - if ($month < 0) { - $month += 12; - } - - return $months[$month]; - } - - private static function getQuarter($offset) - { - $month = intval(date('n')) - 1; - $quarter = floor(($month + 3) / 3); - $quarter += $offset; - $quarter = $quarter % 4; - if ($quarter == 0) { - $quarter = 4; - } - - return 'Q'.$quarter; - } - - private static function getYear($offset) - { - $year = intval(date('Y')); - - return $year + $offset; - } - - public static function getEntityName($entityType) - { - return ucwords(str_replace('_', ' ', $entityType)); - } - - public static function getClientDisplayName($model) - { - if ($model->client_name) { - return $model->client_name; - } elseif ($model->first_name || $model->last_name) { - return $model->first_name.' '.$model->last_name; - } else { - return $model->email; - } - } - - public static function encodeActivity($person = null, $action, $entity = null, $otherPerson = null) - { - $person = $person ? $person->getDisplayName() : 'System'; - $entity = $entity ? '['.$entity->getActivityKey().']' : ''; - $otherPerson = $otherPerson ? 'to '.$otherPerson->getDisplayName() : ''; - $token = Session::get('token_id') ? ' ('.trans('texts.token').')' : ''; - - return trim("$person $token $action $entity $otherPerson"); - } - - public static function decodeActivity($message) - { - $pattern = '/\[([\w]*):([\d]*):(.*)\]/i'; - preg_match($pattern, $message, $matches); - - if (count($matches) > 0) { - $match = $matches[0]; - $type = $matches[1]; - $publicId = $matches[2]; - $name = $matches[3]; - - $link = link_to($type.'s/'.$publicId, $name); - $message = str_replace($match, "$type $link", $message); - } - - return $message; - } - - public static function generateLicense() - { - $parts = []; - for ($i = 0; $i<5; $i++) { - $parts[] = strtoupper(str_random(4)); - } - - return implode('-', $parts); - } - - public static function lookupEventId($eventName) - { - if ($eventName == 'create_client') { - return EVENT_CREATE_CLIENT; - } elseif ($eventName == 'create_invoice') { - return EVENT_CREATE_INVOICE; - } elseif ($eventName == 'create_quote') { - return EVENT_CREATE_QUOTE; - } elseif ($eventName == 'create_payment') { - return EVENT_CREATE_PAYMENT; - } else { - return false; - } - } - - public static function notifyZapier($subscription, $data) - { - $curl = curl_init(); - - $jsonEncodedData = json_encode($data->toJson()); - $opts = [ - CURLOPT_URL => $subscription->target_url, - CURLOPT_RETURNTRANSFER => true, - CURLOPT_CUSTOMREQUEST => 'POST', - CURLOPT_POST => 1, - CURLOPT_POSTFIELDS => $jsonEncodedData, - CURLOPT_HTTPHEADER => ['Content-Type: application/json', 'Content-Length: '.strlen($jsonEncodedData)], - ]; - - curl_setopt_array($curl, $opts); - - $result = curl_exec($curl); - $status = curl_getinfo($curl, CURLINFO_HTTP_CODE); - - curl_close($curl); - - if ($status == 410) { - $subscription->delete(); - } - } - - - public static function remapPublicIds(array $data) - { - $return = []; - - foreach ($data as $key => $val) { - if ($key === 'public_id') { - $key = 'id'; - } elseif (strpos($key, '_id')) { - continue; - } - - if (is_array($val)) { - $val = Utils::remapPublicIds($val); - } - - $return[$key] = $val; - } - - return $return; - } - - public static function getApiHeaders($count = 0) - { - return [ - 'Content-Type' => 'application/json', - //'Access-Control-Allow-Origin' => '*', - //'Access-Control-Allow-Methods' => 'GET', - //'Access-Control-Allow-Headers' => 'Origin, Content-Type, Accept, Authorization, X-Requested-With', - //'Access-Control-Allow-Credentials' => 'true', - 'X-Total-Count' => $count, - //'X-Rate-Limit-Limit' - The number of allowed requests in the current period - //'X-Rate-Limit-Remaining' - The number of remaining requests in the current period - //'X-Rate-Limit-Reset' - The number of seconds left in the current period, - ]; - } - - public static function startsWith($haystack, $needle) - { - return $needle === "" || strpos($haystack, $needle) === 0; - } - - public static function endsWith($haystack, $needle) - { - return $needle === "" || substr($haystack, -strlen($needle)) === $needle; - } - - public static function getEntityRowClass($model) - { - $str = $model->is_deleted || ($model->deleted_at && $model->deleted_at != '0000-00-00') ? 'DISABLED ' : ''; - - if ($model->is_deleted) { - $str .= 'ENTITY_DELETED '; - } - - if ($model->deleted_at && $model->deleted_at != '0000-00-00') { - $str .= 'ENTITY_ARCHIVED '; - } - - return $str; - } -} diff --git a/bootstrap/environment.php b/bootstrap/environment.php new file mode 100644 index 000000000000..d206619103de --- /dev/null +++ b/bootstrap/environment.php @@ -0,0 +1 @@ + 'App\Libraries\Utils', 'Form' => 'Illuminate\Html\FormFacade', 'HTML' => 'Illuminate\Html\HtmlFacade', 'SSH' => 'Illuminate\Support\Facades\SSH', - 'Alert' => 'Bootstrapper\Alert', - 'Badge' => 'Bootstrapper\Badge', - 'Breadcrumb' => 'Bootstrapper\Breadcrumb', - 'Button' => 'Bootstrapper\Button', - 'ButtonGroup' => 'Bootstrapper\ButtonGroup', - 'ButtonToolbar' => 'Bootstrapper\ButtonToolbar', - 'Carousel' => 'Bootstrapper\Carousel', - 'DropdownButton' => 'Bootstrapper\DropdownButton', - 'Form' => 'Bootstrapper\Form', - 'Helpers' => 'Bootstrapper\Helpers', - 'Icon' => 'Bootstrapper\Icon', - //'Image' => 'Bootstrapper\Image', - 'Label' => 'Bootstrapper\Label', - 'MediaObject' => 'Bootstrapper\MediaObject', - 'Navbar' => 'Bootstrapper\Navbar', - 'Navigation' => 'Bootstrapper\Navigation', - 'Paginator' => 'Bootstrapper\Paginator', - 'Progress' => 'Bootstrapper\Progress', - 'Tabbable' => 'Bootstrapper\Tabbable', - 'Table' => 'Bootstrapper\Table', - 'Thumbnail' => 'Bootstrapper\Thumbnail', - 'Typeahead' => 'Bootstrapper\Typeahead', - 'Typography' => 'Bootstrapper\Typography', + 'Alert' => 'Bootstrapper\Facades\Alert', + 'Badge' => 'Bootstrapper\Facades\Badge', + 'Breadcrumb' => 'Bootstrapper\Facades\Breadcrumb', + 'Button' => 'Bootstrapper\Facades\Button', + 'ButtonGroup' => 'Bootstrapper\Facades\ButtonGroup', + 'ButtonToolbar' => 'Bootstrapper\Facades\ButtonToolbar', + 'Carousel' => 'Bootstrapper\Facades\Carousel', + 'DropdownButton' => 'Bootstrapper\Facades\DropdownButton', + 'Form' => 'Bootstrapper\Facades\Form', + 'Helpers' => 'Bootstrapper\Facades\Helpers', + 'Icon' => 'Bootstrapper\Facades\Icon', + //'Image' => 'Bootstrapper\Facades\Image', + 'Label' => 'Bootstrapper\Facades\Label', + 'MediaObject' => 'Bootstrapper\Facades\MediaObject', + 'Navbar' => 'Bootstrapper\Facades\Navbar', + 'Navigation' => 'Bootstrapper\Facades\Navigation', + 'Paginator' => 'Bootstrapper\Facades\Paginator', + 'Progress' => 'Bootstrapper\Facades\Progress', + 'Tabbable' => 'Bootstrapper\Facades\Tabbable', + 'Table' => 'Bootstrapper\Facades\Table', + 'Thumbnail' => 'Bootstrapper\Facades\Thumbnail', + 'Typeahead' => 'Bootstrapper\Facades\Typeahead', + 'Typography' => 'Bootstrapper\Facades\Typography', 'Former' => 'Former\Facades\Former', 'Datatable' => 'Chumper\Datatable\Facades\DatatableFacade', 'Omnipay' => 'Omnipay\Omnipay', diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php index 4a0ffa52ea6e..3dd433d90267 100644 --- a/resources/views/setup.blade.php +++ b/resources/views/setup.blade.php @@ -34,7 +34,7 @@ FLUSH PRIVILEGES;

- {{ Former::open()->rules([ + {!! Former::open()->rules([ 'app[url]' => 'required', 'database[type][host]' => 'required', 'database[type][database]' => 'required', @@ -45,14 +45,14 @@ FLUSH PRIVILEGES; 'email' => 'required|email', 'password' => 'required', 'terms_checkbox' => 'required' - ]) }} + ]) !!}

Application Settings

- {{ Former::text('app[url]')->label('URL')->value(Request::root()) }} + {!! Former::text('app[url]')->label('URL')->value(Request::root()) !!}
@@ -61,12 +61,12 @@ FLUSH PRIVILEGES;

Database Connection

- {{ Former::select('database[default]')->label('Driver')->options(['mysql' => 'MySQL', 'pgsql' => 'PostgreSQL', 'sqlite' => 'SQLite']) }} - {{ Former::text('database[type][host]')->label('Host')->value('localhost') }} - {{ Former::text('database[type][database]')->label('Database')->value('ninja') }} - {{ Former::text('database[type][username]')->label('Username')->value('ninja') }} - {{ Former::password('database[type][password]')->label('Password')->value('ninja') }} - {{ Former::actions( Button::normal('Test connection', ['onclick' => 'testDatabase()']), '  ' ) }} + {!! Former::select('database[default]')->label('Driver')->options(['mysql' => 'MySQL', 'pgsql' => 'PostgreSQL', 'sqlite' => 'SQLite']) !!} + {!! Former::text('database[type][host]')->label('Host')->value('localhost') !!} + {!! Former::text('database[type][database]')->label('Database')->value('ninja') !!} + {!! Former::text('database[type][username]')->label('Username')->value('ninja') !!} + {!! Former::password('database[type][password]')->label('Password')->value('ninja') !!} + {!! Former::actions( Button::normal('Test connection', ['onclick' => 'testDatabase()']), '  ' ) !!}
@@ -76,14 +76,14 @@ FLUSH PRIVILEGES;

Email Settings

- {{ Former::select('mail[driver]')->label('Driver')->options(['smtp' => 'SMTP', 'mail' => 'Mail', 'sendmail' => 'Sendmail']) }} - {{ Former::text('mail[host]')->label('Host')->value('localhost') }} - {{ Former::text('mail[port]')->label('Port')->value('587') }} - {{ Former::select('mail[encryption]')->label('Encryption')->options(['tls' => 'TLS', 'ssl' => 'SSL']) }} - {{ Former::text('mail[from][name]')->label('From Name') }} - {{ Former::text('mail[username]')->label('Email') }} - {{ Former::password('mail[password]')->label('Password') }} - {{ Former::actions( Button::normal('Send test email', ['onclick' => 'testMail()']), '  ' ) }} + {!! Former::select('mail[driver]')->label('Driver')->options(['smtp' => 'SMTP', 'mail' => 'Mail', 'sendmail' => 'Sendmail']) !!} + {!! Former::text('mail[host]')->label('Host')->value('localhost') !!} + {!! Former::text('mail[port]')->label('Port')->value('587') !!} + {!! Former::select('mail[encryption]')->label('Encryption')->options(['tls' => 'TLS', 'ssl' => 'SSL']) !!} + {!! Former::text('mail[from][name]')->label('From Name') !!} + {!! Former::text('mail[username]')->label('Email') !!} + {!! Former::password('mail[password]')->label('Password') !!} + {!! Former::actions( Button::normal('Send test email', ['onclick' => 'testMail()']), '  ' ) !!}
@@ -93,16 +93,16 @@ FLUSH PRIVILEGES;

User Details

- {{ Former::text('first_name') }} - {{ Former::text('last_name') }} - {{ Former::text('email') }} - {{ Former::password('password') }} + {!! Former::text('first_name') !!} + {!! Former::text('last_name') !!} + {!! Former::text('email') !!} + {!! Former::password('password') !!}
- {{ Former::checkbox('terms_checkbox')->label(' ')->text(trans('texts.agree_to_terms', ['terms' => ''.trans('texts.terms_of_service').''])) }} - {{ Former::actions( Button::submit_lg('Submit') ) }} - {{ Former::close() }} + {!! Former::checkbox('terms_checkbox')->label(' ')->text(trans('texts.agree_to_terms', ['terms' => ''.trans('texts.terms_of_service').''])) !!} + {!! Former::actions( Button::primary('Submit')->submit() ) !!} + {!! Former::close() !!} diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore new file mode 100644 index 000000000000..c96a04f008ee --- /dev/null +++ b/storage/debugbar/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file