Permalink
Browse files

Added line end characters and basic character updates

  • Loading branch information...
sergeychernyshev committed May 7, 2016
1 parent 1d7b5dd commit 683a2ad4f2d763e337bf0a3771ca65a62a137f90
Showing with 151 additions and 158 deletions.
  1. +1 −1 admin/account.php
  2. +1 −1 admin/badge.php
  3. +1 −1 admin/badges.php
  4. +0 −1 admin/cohorts.php
  5. +1 −1 admin/edit_account.php
  6. +0 −1 admin/index.php
  7. +0 −1 admin/invitations.php
  8. +1 −1 admin/new_account.php
  9. +1 −1 admin/plan.php
  10. +1 −1 admin/templates/account.html.twig
  11. +1 −1 admin/templates/choose_engine.html.twig
  12. +1 −1 admin/templates/outstanding.html.twig
  13. +1 −1 admin/templates/transaction_log.html.twig
  14. +1 −1 badges.php
  15. +1 −1 bootstrap2/js/bootstrap.js
  16. +1 −1 bootstrap2/js/bootstrap.min.js
  17. +1 −1 bootstrap3/css/bootstrap-theme.css.map
  18. +1 −1 bootstrap3/css/bootstrap-theme.min.css
  19. +1 −1 bootstrap3/css/bootstrap.css.map
  20. +1 −1 bootstrap3/css/bootstrap.min.css
  21. +1 −1 bootstrap3/js/bootstrap.min.js
  22. +1 −1 bootstrap3/js/npm.js
  23. +0 −1 classes/Clock.php
  24. +17 −18 classes/CookieStorage.php
  25. +1 −1 controller/account/account.php
  26. +1 −1 edit_account.php
  27. +1 −1 invitations.php
  28. +1 −1 login.php
  29. +1 −1 maillist.php
  30. +1 −1 manage_account.php
  31. +1 −1 modules/amazon/index.php
  32. +1 −1 modules/etsy/index.php
  33. +1 −1 modules/external_payment/callback.php
  34. +1 −1 modules/external_payment/external_page.php
  35. +1 −1 modules/facebook/index.php
  36. +1 −1 modules/facebook/json2-min.js
  37. +2 −2 modules/github/index.php
  38. +2 −2 modules/google/index.php
  39. +3 −3 modules/instagram/index.php
  40. +1 −1 modules/usernamepass/passwordreset.php
  41. +1 −1 plans.php
  42. +1 −1 register.php
  43. +1 −1 sample.php
  44. +1 −1 send_email_verification_code.php
  45. +1 −1 startupapi.js
  46. +1 −1 subscription_details.php
  47. +1 −1 tests/TestUser.php
  48. +1 −1 tests/test.js
  49. +1 −1 themes/awesome/templates/account/edit_account.html.twig
  50. +1 −1 themes/awesome/templates/account/manage_account.html.twig
  51. +3 −3 themes/awesome/templates/account/subscription_details.html.twig
  52. +1 −1 themes/awesome/templates/account/transaction_log.html.twig
  53. +1 −1 themes/awesome/templates/badges.html.twig
  54. +1 −1 themes/awesome/templates/edit.html.twig
  55. +1 −1 themes/awesome/templates/error_messages.html.twig
  56. +1 −1 themes/awesome/templates/head_tag.html.twig
  57. +1 −1 themes/awesome/templates/invitations.html.twig
  58. +1 −1 themes/awesome/templates/login.html.twig
  59. +1 −1 themes/awesome/templates/maillist.html.twig
  60. +1 −1 themes/awesome/templates/modules/email/edit_user_form.html.twig
  61. +1 −1 themes/awesome/templates/modules/email/login.html.twig
  62. +1 −1 themes/awesome/templates/modules/email/registration_form.html.twig
  63. +1 −1 themes/awesome/templates/modules/etsy/user_info.html.twig
  64. +1 −1 themes/awesome/templates/modules/external_payment/external_page.html.twig
  65. +1 −1 themes/awesome/templates/modules/facebook/auto_logout_form.html.twig
  66. +1 −1 themes/awesome/templates/modules/facebook/forms.html.twig
  67. +1 −1 themes/awesome/templates/modules/foursquare/credentials.html.twig
  68. +1 −1 themes/awesome/templates/modules/foursquare/user_info.html.twig
  69. +1 −1 themes/awesome/templates/modules/github/credentials.html.twig
  70. +0 −1 themes/awesome/templates/modules/github/user_info.html.twig
  71. +1 −1 themes/awesome/templates/modules/linkedin/credentials.html.twig
  72. +1 −1 themes/awesome/templates/modules/meetup/credentials.html.twig
  73. +1 −1 themes/awesome/templates/modules/ohloh/credentials.html.twig
  74. +1 −1 themes/awesome/templates/modules/ohloh/user_info.html.twig
  75. +1 −1 themes/awesome/templates/modules/twitter/credentials.html.twig
  76. +1 −1 themes/awesome/templates/modules/twitter/user_info.html.twig
  77. +1 −1 themes/awesome/templates/modules/usernamepass/edit_user_form.html.twig
  78. +1 −1 themes/awesome/templates/modules/usernamepass/forgotpassword.html.twig
  79. +1 −1 themes/awesome/templates/modules/usernamepass/login_form.html.twig
  80. +1 −1 themes/awesome/templates/modules/usernamepass/passwordreset.html.twig
  81. +1 −1 themes/awesome/templates/oauth_login_form.html.twig
  82. +1 −1 themes/awesome/templates/oauth_registration_form.html.twig
  83. +1 −1 themes/awesome/templates/page_with_sidebar.html.twig
  84. +1 −1 themes/awesome/templates/plan/plans.html.twig
  85. +1 −1 themes/awesome/templates/plan/select_payment_method.html.twig
  86. +1 −1 themes/awesome/templates/send_email_verification_code.html.twig
  87. +1 −1 themes/awesome/templates/show_badge.html.twig
  88. +1 −1 themes/awesome/templates/verify_email.html.twig
  89. +1 −1 themes/classic/startupapi.css
  90. +1 −1 themes/classic/templates/badges.html.twig
  91. +1 −1 themes/classic/templates/edit.html.twig
  92. +1 −1 themes/classic/templates/head_tag.html.twig
  93. +1 −1 themes/classic/templates/invitations.html.twig
  94. +1 −1 themes/classic/templates/login.html.twig
  95. +1 −1 themes/classic/templates/maillist.html.twig
  96. +1 −1 themes/classic/templates/modules/email/edit_user_form.html.twig
  97. +2 −2 themes/classic/templates/modules/email/login.html.twig
  98. +1 −1 themes/classic/templates/modules/email/login_form.html.twig
  99. +1 −1 themes/classic/templates/modules/email/registration_form.html.twig
  100. +1 −1 themes/classic/templates/modules/etsy/user_info.html.twig
  101. +1 −1 themes/classic/templates/modules/external_payment/external_page.html.twig
  102. +1 −1 themes/classic/templates/modules/facebook/auto_logout_form.html.twig
  103. +1 −1 themes/classic/templates/modules/facebook/edit_user_form.html.twig
  104. +1 −1 themes/classic/templates/modules/facebook/forms.html.twig
  105. +1 −1 themes/classic/templates/modules/foursquare/credentials.html.twig
  106. +1 −1 themes/classic/templates/modules/foursquare/user_info.html.twig
  107. +1 −1 themes/classic/templates/modules/github/credentials.html.twig
  108. +0 −1 themes/classic/templates/modules/github/user_info.html.twig
  109. +1 −1 themes/classic/templates/modules/linkedin/credentials.html.twig
  110. +1 −1 themes/classic/templates/modules/meetup/credentials.html.twig
  111. +1 −1 themes/classic/templates/modules/meetup/user_info.html.twig
  112. +1 −1 themes/classic/templates/modules/ohloh/credentials.html.twig
  113. +1 −1 themes/classic/templates/modules/ohloh/user_info.html.twig
  114. +1 −1 themes/classic/templates/modules/twitter/credentials.html.twig
  115. +1 −1 themes/classic/templates/modules/twitter/user_info.html.twig
  116. +1 −1 themes/classic/templates/modules/usernamepass/edit_user_form.html.twig
  117. +1 −1 themes/classic/templates/modules/usernamepass/forgotpassword.html.twig
  118. +1 −1 themes/classic/templates/modules/usernamepass/login_form.html.twig
  119. +1 −1 themes/classic/templates/modules/usernamepass/passwordreset.html.twig
  120. +1 −1 themes/classic/templates/oauth2_edit_user_form.html.twig
  121. +1 −1 themes/classic/templates/oauth_edit_user_form.html.twig
  122. +1 −1 themes/classic/templates/oauth_login_form.html.twig
  123. +1 −1 themes/classic/templates/oauth_registration_form.html.twig
  124. +2 −2 themes/classic/templates/page_with_sidebar.html.twig
  125. +1 −1 themes/classic/templates/plan/plans.html.twig
  126. +1 −1 themes/classic/templates/plan/select_payment_method.html.twig
  127. +1 −1 themes/classic/templates/power_strip.html.twig
  128. +1 −1 themes/classic/templates/register.html.twig
  129. +1 −1 themes/classic/templates/send_email_verification_code.html.twig
  130. +1 −1 themes/classic/templates/show_badge.html.twig
  131. +1 −1 themes/classic/templates/verify_email.html.twig
  132. +1 −1 transaction_log.php
  133. +1 −1 verify_email.php
View
@@ -228,4 +228,4 @@
StartupAPI::$template->display('@startupapi-admin/account.html.twig', $template_data);
require_once(__DIR__ . '/footer.php');
require_once(__DIR__ . '/footer.php');
View
@@ -58,4 +58,4 @@
?>
</div>
<?php
require_once(__DIR__ . '/footer.php');
require_once(__DIR__ . '/footer.php');
View
@@ -32,4 +32,4 @@
?>
</div>
<?php
require_once(__DIR__ . '/footer.php');
require_once(__DIR__ . '/footer.php');
View
@@ -301,4 +301,3 @@
</div>
<?php
require_once(__DIR__ . '/footer.php');
View
@@ -151,4 +151,4 @@
</form>
</div>
<?php
require_once(__DIR__ . '/footer.php');
require_once(__DIR__ . '/footer.php');
View
@@ -114,4 +114,3 @@
<?php
require_once(__DIR__ . '/footer.php');
View
@@ -346,4 +346,3 @@
</div>
<?php
require_once(__DIR__ . '/footer.php');
View
@@ -76,4 +76,4 @@
</form>
</div>
<?php
require_once(__DIR__ . '/footer.php');
require_once(__DIR__ . '/footer.php');
View
@@ -75,4 +75,4 @@
</div>
<?php
require_once(__DIR__ . '/footer.php');
require_once(__DIR__ . '/footer.php');
@@ -248,4 +248,4 @@
</form>
{% endif %}
{% endif %}
</div>
</div>
@@ -24,4 +24,4 @@
</form>
</div>
{%endif%}
</div>
</div>
@@ -24,4 +24,4 @@
</div>
{%endif%}
{%endif%}
</div>
</div>
@@ -100,4 +100,4 @@
</ul>
{%endif%}
{%endif%}
</div>
</div>
View
@@ -40,4 +40,4 @@
$template_info['badges'][] = $badge_info;
}
StartupAPI::$template->display('@startupapi/badges.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/badges.html.twig', $template_info);
@@ -2277,4 +2277,4 @@
})
}(window.jQuery);
}(window.jQuery);

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -10,4 +10,4 @@ require('../../js/tooltip.js')
require('../../js/popover.js')
require('../../js/scrollspy.js')
require('../../js/tab.js')
require('../../js/affix.js')
require('../../js/affix.js')
View
@@ -60,4 +60,3 @@ function _addTime( $date_interval )
$this -> datetime -> add( new DateInterval ( $date_interval ));
}
}
View
@@ -13,7 +13,7 @@
* } else {
* // check $storage->errors
* }
*
*
* // later request
* $user = $storage->fetch('user');
* if (is_string($user)) {
@@ -26,7 +26,7 @@
* // cookie not present
* }
* }
*
*
* // encrypt cookie contents
* $storage = new MrClay_CookieStorage(array(
* 'secret' => '67676kmcuiekihbfyhbtfitfytrdo=op-p-=[hH8'
@@ -40,7 +40,7 @@ class MrClay_CookieStorage {
const LENGTH_LIMIT = 3896;
const MODE_VISIBLE = 0;
const MODE_ENCRYPT = 1;
/**
* @var array errors that occured
*/
@@ -51,12 +51,12 @@ public function __construct($options = array())
{
$this->_o = array_merge(self::getDefaults(), $options);
}
public static function hash($input)
{
return str_replace('=', '', base64_encode(hash('ripemd160', $input, true)));
}
public static function padkey($key, $bits = 256)
{
$keylen = round($bits / 8);
@@ -67,20 +67,20 @@ public static function padkey($key, $bits = 256)
public static function encrypt($key, $str)
{
$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
$data = mcrypt_encrypt(MCRYPT_RIJNDAEL_256, self::padkey($key, 256), $str, MCRYPT_MODE_ECB, $iv);
return base64_encode($data);
}
public static function decrypt($key, $data)
{
if (false === ($data = base64_decode($data))) {
return false;
}
$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
$iv_size = mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB);
$iv = mcrypt_create_iv($iv_size, MCRYPT_RAND);
return mcrypt_decrypt(MCRYPT_RIJNDAEL_256, self::padkey($key, 256), $data, MCRYPT_MODE_ECB, $iv);
}
@@ -118,7 +118,7 @@ public function store($name, $str)
? $this->_storeEncrypted($name, $str)
: $this->_store($name, $str);
}
private function _store($name, $str)
{
if (! is_callable($this->_o['hashFunc'])) {
@@ -134,7 +134,7 @@ private function _store($name, $str)
$this->errors[] = 'Cookie is likely too large to store.';
return false;
}
$res = setcookie($name, $raw, $this->_o['expire'], $this->_o['path'],
$res = setcookie($name, $raw, $this->_o['expire'], $this->_o['path'],
$this->_o['domain'], $this->_o['secure'], $this->_o['httponly']);
if ($res) {
return true;
@@ -143,7 +143,7 @@ private function _store($name, $str)
return false;
}
}
private function _storeEncrypted($name, $str)
{
if (! is_callable($this->_o['encryptFunc'])) {
@@ -157,7 +157,7 @@ private function _storeEncrypted($name, $str)
$this->errors[] = 'Cookie is likely too large to store.';
return false;
}
$res = setcookie($name, $raw, $this->_o['expire'], $this->_o['path'],
$res = setcookie($name, $raw, $this->_o['expire'], $this->_o['path'],
$this->_o['domain'], $this->_o['secure'], $this->_o['httponly']);
if ($res) {
return true;
@@ -179,7 +179,7 @@ public function fetch($name)
? $this->_fetchEncrypted($name)
: $this->_fetch($name);
}
private function _fetch($name)
{
if (isset($this->_returns[self::MODE_VISIBLE][$name])) {
@@ -203,7 +203,7 @@ private function _fetch($name)
$this->_returns[self::MODE_VISIBLE][$name] = array($str, $time);
return $str;
}
private function _fetchEncrypted($name)
{
if (isset($this->_returns[self::MODE_ENCRYPT][$name])) {
@@ -247,12 +247,11 @@ public function delete($name)
{
setcookie($name, '', time() - 3600, $this->_o['path'], $this->_o['domain'], $this->_o['secure'], $this->_o['httponly']);
}
/**
* @var array options
*/
private $_o;
private $_returns = array();
}
@@ -42,4 +42,4 @@
}
}
header('Location: ' . UserConfig::$USERSROOTURL . '/manage_account.php');
header('Location: ' . UserConfig::$USERSROOTURL . '/manage_account.php');
View
@@ -36,4 +36,4 @@
$template_info['PAGE']['SECTION'] = 'account';
$template_info['account_name'] = $account->getName();
StartupAPI::$template->display('@startupapi/account/edit_account.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/account/edit_account.html.twig', $template_info);
View
@@ -107,4 +107,4 @@
);
}
StartupAPI::$template->display('@startupapi/invitations.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/invitations.html.twig', $template_info);
View
@@ -68,4 +68,4 @@
$template_info['login_failed'][$id] = TRUE;
}
StartupAPI::$template->display('@startupapi/login.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/login.html.twig', $template_info);
View
@@ -15,4 +15,4 @@
$template_info['maillist_html'] = file_get_contents(UserConfig::$maillist);
}
StartupAPI::$template->display('@startupapi/maillist.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/maillist.html.twig', $template_info);
View
@@ -95,4 +95,4 @@
$template_info['PAGE']['SECTION'] = 'account';
StartupAPI::$template->display('@startupapi/account/manage_account.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/account/manage_account.html.twig', $template_info);
View
@@ -4,7 +4,7 @@
/**
* First register an app here: https://sellercentral.amazon.com/gp/homepage.html
* Amazon OAuth(2) docs: https://login.amazon.com/documentation
*
*
* @package StartupAPI
* @subpackage Authentication\Amazon
*/
View
@@ -152,7 +152,7 @@ public function getIdentity($oauth_user_id) {
* Displays user's login name with the link to their Etsy store
*
* @param string $serialized_userinfo Serialized user information array
*
*
* @return string Rendered user information HTML
*/
protected function renderUserInfo($serialized_userinfo) {
@@ -42,4 +42,4 @@
exit;
}
header('Location: ' . UserConfig::$USERSROOTURL . '/plans.php?notpaid');
header('Location: ' . UserConfig::$USERSROOTURL . '/plans.php?notpaid');
@@ -26,4 +26,4 @@
$template_info['engine']['logo'] = $engine->getLogo();
}
StartupAPI::$template->display('@startupapi/modules/external_payment/external_page.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/modules/external_payment/external_page.html.twig', $template_info);
@@ -257,7 +257,7 @@ public function renderEditUserForm($template_info, $action, $errors, $user, $dat
$template_info['action'] = $action;
$template_info['errors'] = $errors;
$template_info['data'] = $data;
$template_info['me'] = $me;
$template_info['fb_id'] = $fb_id;

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -4,7 +4,7 @@
/**
* First register an app here: https://github.com/settings/applications/new
* GitHub OAuth(2) docs: http://developer.github.com/v3/oauth/
*
*
* @package StartupAPI
* @subpackage Authentication\Githib
*/
@@ -67,7 +67,7 @@ public static function getModulesLogo($size = 100) {
}
public function getIdentity($oauth2_client_id) {
$credentials = $this->getOAuth2Credentials($oauth2_client_id);
$credentials = $this->getOAuth2Credentials($oauth2_client_id);
try {
$result = $credentials->makeOAuth2Request('https://api.github.com/user', 'GET', null, array(
View
@@ -4,7 +4,7 @@
/**
* First register an app here: https://console.developers.google.com/project
* Google OAuth2 docs: https://developers.google.com/identity/protocols/OAuth2
*
*
* @package StartupAPI
* @subpackage Authentication\Google
*/
@@ -70,7 +70,7 @@ public static function getModulesLogo($size = 100) {
}
public function getIdentity($oauth2_client_id) {
$credentials = $this->getOAuth2Credentials($oauth2_client_id);
$credentials = $this->getOAuth2Credentials($oauth2_client_id);
try {
$result = $credentials->makeOAuth2Request('https://www.googleapis.com/plus/v1/people/me');
@@ -3,8 +3,8 @@
/**
* First register an app here: https://instagram.com/developer/clients/register/
* Instagram OAuth2 docs: https://instagram.com/developer/authentication/
*
* Instagram OAuth2 docs: https://instagram.com/developer/authentication/
*
* @package StartupAPI
* @subpackage Authentication\Instagram
*/
@@ -68,7 +68,7 @@ public static function getModulesLogo($size = 100) {
}
public function getIdentity($oauth2_client_id) {
$credentials = $this->getOAuth2Credentials($oauth2_client_id);
$credentials = $this->getOAuth2Credentials($oauth2_client_id);
try {
$result = $credentials->makeOAuth2Request('https://api.instagram.com/v1/users/self');
@@ -38,4 +38,4 @@
$template_info['slug'] = 'usernamepass';
StartupAPI::$template->display('@startupapi/modules/usernamepass/passwordreset.html.twig', $template_info);
StartupAPI::$template->display('@startupapi/modules/usernamepass/passwordreset.html.twig', $template_info);
Oops, something went wrong.

0 comments on commit 683a2ad

Please sign in to comment.