Permalink
Browse files

updates from other forks

per @snopoke for $this->config->item('third_party_auth_providers')
  • Loading branch information...
1 parent a24a07a commit 70fc506f749d274c3500f8215671ebcf2ff2d4d0 @donjakobo donjakobo committed Jul 27, 2012
View
@@ -0,0 +1,3 @@
+#Ignore log files of any kind
+log-*.php
+
@@ -1,66 +1,66 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
-
-/*
-|--------------------------------------------------------------------------
-| Global
-|--------------------------------------------------------------------------
-*/
-$config['ssl_enabled'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Sign In
-|--------------------------------------------------------------------------
-*/
-$config['sign_in_recaptcha_enabled'] = FALSE;
-$config['sign_in_recaptcha_offset'] = 3;
-
-/*
-|--------------------------------------------------------------------------
-| Sign Up
-|--------------------------------------------------------------------------
-*/
-$config['sign_up_recaptcha_enabled'] = FALSE;
-$config['sign_up_auto_sign_in'] = TRUE;
-
-/*
-|--------------------------------------------------------------------------
-| Sign Out
-|--------------------------------------------------------------------------
-*/
-$config['sign_out_view_enabled'] = TRUE;
-
-/*
-|--------------------------------------------------------------------------
-| OpenID
-|--------------------------------------------------------------------------
-*/
-$config['openid_file_store_path'] = 'system/cache';
-$config['openid_google_discovery_endpoint'] = 'http://www.google.com/accounts/o8/id';
-$config['openid_yahoo_discovery_endpoint'] = 'http://www.yahoo.com/';
-
-/*
-|--------------------------------------------------------------------------
-| Third Party Auth
-|--------------------------------------------------------------------------
-*/
-$config['third_party_auth_providers'] = array('facebook', 'twitter', 'google', 'yahoo', 'openid');
-$config['openid_what_is_url'] = 'http://openidexplained.com/';
-
-/*
-|--------------------------------------------------------------------------
-| Password Reset
-|--------------------------------------------------------------------------
-|
-| password_reset_expiration Reset password form will be valid for 30 mins (default)
-| password_reset_secret Reset password token salt. See https://www.grc.com/passwords.htm
-| * IMPORTANT * Do not reuse the password reset salt else where!
-| password_reset_email Reset password sender email
-*/
-$config['password_reset_expiration'] = 1800;
-$config['password_reset_secret'] = '';
-$config['password_reset_email'] = 'no-reply@a3m.mushmellow.com';
-
-
-/* End of file account.php */
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+/*
+|--------------------------------------------------------------------------
+| Global
+|--------------------------------------------------------------------------
+*/
+$config['ssl_enabled'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Sign In
+|--------------------------------------------------------------------------
+*/
+$config['sign_in_recaptcha_enabled'] = FALSE;
+$config['sign_in_recaptcha_offset'] = 3;
+
+/*
+|--------------------------------------------------------------------------
+| Sign Up
+|--------------------------------------------------------------------------
+*/
+$config['sign_up_recaptcha_enabled'] = FALSE;
+$config['sign_up_auto_sign_in'] = TRUE;
+
+/*
+|--------------------------------------------------------------------------
+| Sign Out
+|--------------------------------------------------------------------------
+*/
+$config['sign_out_view_enabled'] = TRUE;
+
+/*
+|--------------------------------------------------------------------------
+| OpenID
+|--------------------------------------------------------------------------
+*/
+$config['openid_file_store_path'] = 'application/cache';
+$config['openid_google_discovery_endpoint'] = 'http://www.google.com/accounts/o8/id';
+$config['openid_yahoo_discovery_endpoint'] = 'http://www.yahoo.com/';
+
+/*
+|--------------------------------------------------------------------------
+| Third Party Auth
+|--------------------------------------------------------------------------
+*/
+$config['third_party_auth_providers'] = array('facebook', 'twitter', 'google', 'yahoo', 'openid');
+$config['openid_what_is_url'] = 'http://openidexplained.com/';
+
+/*
+|--------------------------------------------------------------------------
+| Password Reset
+|--------------------------------------------------------------------------
+|
+| password_reset_expiration Reset password form will be valid for 30 mins (default)
+| password_reset_secret Reset password token salt. See https://www.grc.com/passwords.htm
+| * IMPORTANT * Do not reuse the password reset salt else where!
+| password_reset_email Reset password sender email
+*/
+$config['password_reset_expiration'] = 1800;
+$config['password_reset_secret'] = '';
+$config['password_reset_email'] = 'no-reply@a3m.com';
+
+
+/* End of file account.php */
/* Location: ./application/modules/account/config/account.php */
@@ -1,18 +1,18 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
-
-/*
-|--------------------------------------------------------------------------
-| reCAPTCHA
-|--------------------------------------------------------------------------
-|
-| reCAPTCHA PHP Library - http://recaptcha.net/plugins/php/
-|
-| recaptcha_theme 'red' | 'white' | 'blackglass' | 'clean' | 'custom'
-*/
-$config['recaptcha_public_key'] = "";
-$config['recaptcha_private_key'] = "";
-$config['recaptcha_theme'] = "white";
-
-
-/* End of file recaptcha.php */
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+/*
+|--------------------------------------------------------------------------
+| reCAPTCHA
+|--------------------------------------------------------------------------
+|
+| reCAPTCHA PHP Library - http://recaptcha.net/plugins/php/
+|
+| recaptcha_theme 'red' | 'white' | 'blackglass' | 'clean' | 'custom'
+*/
+$config['recaptcha_public_key'] = "";
+$config['recaptcha_private_key'] = "";
+$config['recaptcha_theme'] = "white";
+
+
+/* End of file recaptcha.php */
/* Location: ./application/modules/account/config/recaptcha.php */
@@ -7,8 +7,7 @@
<li<?php if ($current == 'account_password') echo ' class="active"'; ?>><?php echo anchor('account/account_password', lang('website_password')); ?></li>
<?php endif; ?>
<li<?php if ($current == 'account_profile') echo ' class="active"'; ?>><?php echo anchor('account/account_profile', lang('website_profile')); ?></li>
-
- <?php if (count($this->config->item('third_party_auth_providers')) > 0) : ?>
+ <?php if ($this->config->item('third_party_auth_providers')) : ?>
<li<?php if ($current == 'account_linked') echo ' class="active"'; ?>><?php echo anchor('account/account_linked', lang('website_linked')); ?></li>
<?php endif; ?>
Oops, something went wrong.

0 comments on commit 70fc506

Please sign in to comment.