mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Update Confide Config Setting for L5
Also adds other package config settings however they have not yet been called in ConfigServiceProvider
This commit is contained in:
parent
427d8ddc3f
commit
651e06fdb9
@ -15,9 +15,15 @@ class ConfigServiceProvider extends ServiceProvider {
|
|||||||
*/
|
*/
|
||||||
public function register()
|
public function register()
|
||||||
{
|
{
|
||||||
|
// Surely there has to be a better way than this?
|
||||||
|
|
||||||
|
app('config')->set('confide', require $this->app->basePath() . '/config/packages/zizaco/confide/config.php');
|
||||||
|
|
||||||
|
/*
|
||||||
|
This doesn't work:
|
||||||
config([
|
config([
|
||||||
//
|
'config/packages/zizaco/confide/config.php'
|
||||||
]);
|
]);*/
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -26,7 +26,7 @@ return [
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'url' => 'http://ninja5.boldplatform.com',
|
'url' => '',
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
@ -39,7 +39,7 @@ return [
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'timezone' => 'Australia/Brisbane',
|
'timezone' => 'UTC',
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
@ -78,7 +78,7 @@ return [
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'key' => env('APP_KEY', 'p118gfK&rlbAb22CB&8!5SKiPkcZpzGG'),
|
'key' => env('APP_KEY', ''),
|
||||||
|
|
||||||
'cipher' => MCRYPT_RIJNDAEL_128,
|
'cipher' => MCRYPT_RIJNDAEL_128,
|
||||||
|
|
||||||
@ -136,18 +136,11 @@ return [
|
|||||||
'Illuminate\Validation\ValidationServiceProvider',
|
'Illuminate\Validation\ValidationServiceProvider',
|
||||||
'Illuminate\View\ViewServiceProvider',
|
'Illuminate\View\ViewServiceProvider',
|
||||||
|
|
||||||
/*
|
|
||||||
* Application Service Providers...
|
|
||||||
*/
|
|
||||||
'App\Providers\AppServiceProvider',
|
|
||||||
'App\Providers\BusServiceProvider',
|
|
||||||
'App\Providers\ConfigServiceProvider',
|
|
||||||
'App\Providers\EventServiceProvider',
|
|
||||||
'App\Providers\RouteServiceProvider',
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Additional Providers
|
* Additional Providers
|
||||||
*/
|
*/
|
||||||
|
'Zizaco\Confide\ServiceProvider', // Confide to be replaced
|
||||||
|
|
||||||
'Bootstrapper\BootstrapperL5ServiceProvider',
|
'Bootstrapper\BootstrapperL5ServiceProvider',
|
||||||
'Former\FormerServiceProvider',
|
'Former\FormerServiceProvider',
|
||||||
'Barryvdh\Debugbar\ServiceProvider',
|
'Barryvdh\Debugbar\ServiceProvider',
|
||||||
@ -156,6 +149,15 @@ return [
|
|||||||
'Webpatser\Countries\CountriesServiceProvider',
|
'Webpatser\Countries\CountriesServiceProvider',
|
||||||
'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider',
|
'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider',
|
||||||
'Illuminate\Html\HtmlServiceProvider',
|
'Illuminate\Html\HtmlServiceProvider',
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Application Service Providers...
|
||||||
|
*/
|
||||||
|
'App\Providers\AppServiceProvider',
|
||||||
|
'App\Providers\BusServiceProvider',
|
||||||
|
'App\Providers\ConfigServiceProvider',
|
||||||
|
'App\Providers\EventServiceProvider',
|
||||||
|
'App\Providers\RouteServiceProvider',
|
||||||
],
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -278,6 +280,8 @@ return [
|
|||||||
'Countries' => 'Webpatser\Countries\CountriesFacade',
|
'Countries' => 'Webpatser\Countries\CountriesFacade',
|
||||||
'Carbon' => 'Carbon\Carbon',
|
'Carbon' => 'Carbon\Carbon',
|
||||||
'Rocketeer' => 'Rocketeer\Facades\Rocketeer',
|
'Rocketeer' => 'Rocketeer\Facades\Rocketeer',
|
||||||
|
'Confide' => 'Zizaco\Confide\Facade',// Confide to be replaced
|
||||||
|
|
||||||
],
|
],
|
||||||
|
|
||||||
];
|
];
|
||||||
|
0
config/packages/.gitkeep
Normal file
0
config/packages/.gitkeep
Normal file
14
config/packages/anahkiasen/former/Nude.php
Normal file
14
config/packages/anahkiasen/former/Nude.php
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
return array(
|
||||||
|
|
||||||
|
// HTML markup and classes used by the "Nude" framework for icons
|
||||||
|
'icon' => array(
|
||||||
|
|
||||||
|
'tag' => 'i',
|
||||||
|
'set' => null,
|
||||||
|
'prefix' => 'icon',
|
||||||
|
|
||||||
|
),
|
||||||
|
|
||||||
|
);
|
14
config/packages/anahkiasen/former/TwitterBootstrap.php
Normal file
14
config/packages/anahkiasen/former/TwitterBootstrap.php
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
return array(
|
||||||
|
|
||||||
|
// HTML markup and classes used by Bootstrap for icons
|
||||||
|
'icon' => array(
|
||||||
|
|
||||||
|
'tag' => 'i',
|
||||||
|
'set' => null,
|
||||||
|
'prefix' => 'icon',
|
||||||
|
|
||||||
|
),
|
||||||
|
|
||||||
|
);
|
26
config/packages/anahkiasen/former/TwitterBootstrap3.php
Normal file
26
config/packages/anahkiasen/former/TwitterBootstrap3.php
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
return array(
|
||||||
|
|
||||||
|
// Map Former-supported viewports to Bootstrap 3 equivalents
|
||||||
|
'viewports' => array(
|
||||||
|
'large' => 'lg',
|
||||||
|
'medium' => 'md',
|
||||||
|
'small' => 'sm',
|
||||||
|
'mini' => 'xs',
|
||||||
|
),
|
||||||
|
|
||||||
|
// Width of labels for horizontal forms expressed as viewport => grid columns
|
||||||
|
'labelWidths' => array(
|
||||||
|
'large' => 4,
|
||||||
|
'small' => 4,
|
||||||
|
),
|
||||||
|
|
||||||
|
// HTML markup and classes used by Bootstrap 3 for icons
|
||||||
|
'icon' => array(
|
||||||
|
'tag' => 'span',
|
||||||
|
'set' => 'glyphicon',
|
||||||
|
'prefix' => 'glyphicon',
|
||||||
|
),
|
||||||
|
|
||||||
|
);
|
35
config/packages/anahkiasen/former/ZurbFoundation.php
Normal file
35
config/packages/anahkiasen/former/ZurbFoundation.php
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
return array(
|
||||||
|
|
||||||
|
// Map Former-supported viewports to Foundation 3 equivalents
|
||||||
|
'viewports' => array(
|
||||||
|
|
||||||
|
'large' => '',
|
||||||
|
'medium' => null,
|
||||||
|
'small' => 'mobile-',
|
||||||
|
'mini' => null,
|
||||||
|
|
||||||
|
),
|
||||||
|
|
||||||
|
// Width of labels for horizontal forms expressed as viewport => grid columns
|
||||||
|
'labelWidths' => array(
|
||||||
|
|
||||||
|
'large' => 2,
|
||||||
|
'small' => 4,
|
||||||
|
|
||||||
|
),
|
||||||
|
|
||||||
|
// Classes to be applied to wrapped labels in horizontal forms
|
||||||
|
'wrappedLabelClasses' => array('right','inline'),
|
||||||
|
|
||||||
|
// HTML markup and classes used by Foundation 3 for icons
|
||||||
|
'icon' => array(
|
||||||
|
|
||||||
|
'tag' => 'i',
|
||||||
|
'set' => null,
|
||||||
|
'prefix' => 'fi',
|
||||||
|
|
||||||
|
),
|
||||||
|
|
||||||
|
);
|
36
config/packages/anahkiasen/former/ZurbFoundation4.php
Normal file
36
config/packages/anahkiasen/former/ZurbFoundation4.php
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
return array(
|
||||||
|
|
||||||
|
// Map Former-supported viewports to Foundation 4 equivalents
|
||||||
|
// Foundation 4 also has an experimental "medium" breakpoint
|
||||||
|
// explained at http://foundation.zurb.com/docs/components/grid.html
|
||||||
|
'viewports' => array(
|
||||||
|
|
||||||
|
'large' => 'large',
|
||||||
|
'medium' => null,
|
||||||
|
'small' => 'small',
|
||||||
|
'mini' => null,
|
||||||
|
|
||||||
|
),
|
||||||
|
|
||||||
|
// Width of labels for horizontal forms expressed as viewport => grid columns
|
||||||
|
'labelWidths' => array(
|
||||||
|
|
||||||
|
'small' => 3,
|
||||||
|
|
||||||
|
),
|
||||||
|
|
||||||
|
// Classes to be applied to wrapped labels in horizontal forms
|
||||||
|
'wrappedLabelClasses' => array('right','inline'),
|
||||||
|
|
||||||
|
// HTML markup and classes used by Foundation 4 for icons
|
||||||
|
'icon' => array(
|
||||||
|
|
||||||
|
'tag' => 'i',
|
||||||
|
'set' => 'general',
|
||||||
|
'prefix' => 'foundicon',
|
||||||
|
|
||||||
|
),
|
||||||
|
|
||||||
|
);
|
59
config/packages/anahkiasen/former/config.php
Normal file
59
config/packages/anahkiasen/former/config.php
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
<?php return array(
|
||||||
|
|
||||||
|
// Markup
|
||||||
|
////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
// Whether labels should be automatically computed from name
|
||||||
|
'automatic_label' => true,
|
||||||
|
|
||||||
|
// The default form type
|
||||||
|
'default_form_type' => 'horizontal',
|
||||||
|
|
||||||
|
// The framework to be used by Former
|
||||||
|
'framework' => 'TwitterBootstrap3',
|
||||||
|
|
||||||
|
// Validation
|
||||||
|
////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
// Whether Former should fetch errors from Session
|
||||||
|
'fetch_errors' => true,
|
||||||
|
|
||||||
|
// Whether Former should try to apply Validator rules as attributes
|
||||||
|
'live_validation' => true,
|
||||||
|
|
||||||
|
// Whether Former should automatically fetch error messages and
|
||||||
|
// display them next to the matching fields
|
||||||
|
'error_messages' => true,
|
||||||
|
|
||||||
|
// Checkables
|
||||||
|
////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
// Whether checkboxes should always be present in the POST data,
|
||||||
|
// no matter if you checked them or not
|
||||||
|
'push_checkboxes' => false,
|
||||||
|
|
||||||
|
// The value a checkbox will have in the POST array if unchecked
|
||||||
|
'unchecked_value' => 0,
|
||||||
|
|
||||||
|
// Required fields
|
||||||
|
////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
// The class to be added to required fields
|
||||||
|
'required_class' => 'required',
|
||||||
|
|
||||||
|
// A facultative text to append to the labels of required fields
|
||||||
|
'required_text' => '', //'<sup>*</sup>',
|
||||||
|
|
||||||
|
// Translations
|
||||||
|
////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
// Where Former should look for translations
|
||||||
|
'translate_from' => 'texts',
|
||||||
|
|
||||||
|
// An array of attributes to automatically translate
|
||||||
|
'translatable' => array(
|
||||||
|
'help', 'inlineHelp', 'blockHelp',
|
||||||
|
'placeholder', 'data_placeholder',
|
||||||
|
'label'
|
||||||
|
),
|
||||||
|
);
|
19
config/packages/ignited/laravel-omnipay/config.php
Normal file
19
config/packages/ignited/laravel-omnipay/config.php
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
return array(
|
||||||
|
|
||||||
|
// The default gateway to use
|
||||||
|
'default' => 'paypal',
|
||||||
|
|
||||||
|
// Add in each gateway here
|
||||||
|
'gateways' => array(
|
||||||
|
'paypal' => array(
|
||||||
|
'driver' => 'Paypal_Express',
|
||||||
|
'options' => array(
|
||||||
|
'solutionType' => '',
|
||||||
|
'landingPage' => '',
|
||||||
|
'headerImageUrl' => ''
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
0
config/packages/zizaco/confide/.gitkeep
Normal file
0
config/packages/zizaco/confide/.gitkeep
Normal file
117
config/packages/zizaco/confide/config.php
Normal file
117
config/packages/zizaco/confide/config.php
Normal file
@ -0,0 +1,117 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
return array(
|
||||||
|
|
||||||
|
/*
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
| Login Throttle
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
| Defines how many login failed tries may be done within
|
||||||
|
| the 'throttle_time_period', which is in minutes.
|
||||||
|
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
'throttle_limit' => 9,
|
||||||
|
'throttle_time_period' => 2,
|
||||||
|
|
||||||
|
/*
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
| Login Throttle Field
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
| Login throttle is done using the remote ip address
|
||||||
|
| and a provided credential. Email and username are likely values.
|
||||||
|
|
|
||||||
|
| Default: email
|
||||||
|
|
|
||||||
|
*/
|
||||||
|
'login_cache_field' => 'email',
|
||||||
|
|
||||||
|
/*
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
| Form Views
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
| The VIEWS used to render forms with Confide methods:
|
||||||
|
| makeLoginForm, makeSignupForm, makeForgotPasswordForm
|
||||||
|
| and makeResetPasswordForm.
|
||||||
|
|
|
||||||
|
| By default, the out of the box confide views are used
|
||||||
|
| but you can create your own forms and replace the view
|
||||||
|
| names here. For example
|
||||||
|
|
|
||||||
|
| // To use app/views/user/signup.blade.php:
|
||||||
|
|
|
||||||
|
| 'signup_form' => 'user.signup'
|
||||||
|
|
|
||||||
|
|
|
||||||
|
*/
|
||||||
|
'login_form' => 'users.login',
|
||||||
|
'signup_form' => 'confide::signup',
|
||||||
|
'forgot_password_form' => 'users.forgot_password',
|
||||||
|
'reset_password_form' => 'users.reset_password',
|
||||||
|
|
||||||
|
/*
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
| Email Views
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
| The VIEWS used to email messages for some Confide events:
|
||||||
|
|
|
||||||
|
| By default, the out of the box confide views are used
|
||||||
|
| but you can create your own forms and replace the view
|
||||||
|
| names here. For example
|
||||||
|
|
|
||||||
|
| // To use app/views/email/confirmation.blade.php:
|
||||||
|
|
|
||||||
|
| 'email_account_confirmation' => 'email.confirmation'
|
||||||
|
|
|
||||||
|
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
'email_reset_password' => 'emails.passwordreset_html', // with $user and $token.
|
||||||
|
'email_account_confirmation' => 'emails.confirm_html', // with $user
|
||||||
|
|
||||||
|
/*
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
| Signup (create) Cache
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
| By default you will only can only register once every 2 hours
|
||||||
|
| (120 minutes) because you are not able to receive a registration
|
||||||
|
| email more often then that.
|
||||||
|
|
|
||||||
|
| You can adjust that limitation here, set to 0 for no caching.
|
||||||
|
| Time is in minutes.
|
||||||
|
|
|
||||||
|
|
|
||||||
|
*/
|
||||||
|
'signup_cache' => 0,
|
||||||
|
|
||||||
|
/*
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
| Signup E-mail and confirmation (true or false)
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
| By default a signup e-mail will be send by the system, however if you
|
||||||
|
| do not want this to happen, change the line below in false and handle
|
||||||
|
| the confirmation using another technique, for example by using the IPN
|
||||||
|
| from a payment-processor. Very usefull for websites offering products.
|
||||||
|
|
|
||||||
|
| signup_email:
|
||||||
|
| is for the transport of the email, true or false
|
||||||
|
| If you want to use an IPN to trigger the email, then set it to false
|
||||||
|
|
|
||||||
|
| signup_confirm:
|
||||||
|
| is to decide of a member needs to be confirmed before he is able to login
|
||||||
|
| so when you set this to true, then a member has to be confirmed before
|
||||||
|
| he is able to login, so if you want to use an IPN for confirmation, be
|
||||||
|
| sure that the ipn process also changes the confirmed flag in the member
|
||||||
|
| table, otherwise they will not be able to login after the payment.
|
||||||
|
|
|
||||||
|
*/
|
||||||
|
'signup_email' => false,
|
||||||
|
'signup_confirm' => false,
|
||||||
|
|
||||||
|
);
|
Loading…
x
Reference in New Issue
Block a user