From 5ecd127960654865716742282e1c5db66ca398af Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 23 Feb 2013 11:29:13 -0500 Subject: Fixes #4971 serving languages from ajax page handler rather than simplecache (which cannot handle languages) --- js/lib/languages.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'js') diff --git a/js/lib/languages.js b/js/lib/languages.js index 99a1ba0ee..44ea56d2b 100644 --- a/js/lib/languages.js +++ b/js/lib/languages.js @@ -28,13 +28,8 @@ elgg.reload_all_translations = function(language) { var lang = language || elgg.get_language(); var url, options; - if (elgg.config.simplecache_enabled) { - url = 'cache/js/default/languages/' + lang + '.' + elgg.config.lastcache + '.js'; - options = {}; - } else { - url = 'ajax/view/js/languages'; - options = {data: {language: lang}}; - } + url = 'ajax/view/js/languages'; + options = {data: {language: lang}}; options['success'] = function(json) { elgg.add_translation(lang, json); -- cgit v1.2.3 From 06c3b6e3c41c629e510c55199bd19914273b0e64 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 23 Feb 2013 14:16:29 -0500 Subject: Fixes #4997 stop requesting a token after a failed request --- engine/lib/actions.php | 14 ++++++++++++-- js/lib/security.js | 33 ++++++++++----------------------- languages/en.php | 4 ++-- 3 files changed, 24 insertions(+), 27 deletions(-) (limited to 'js') diff --git a/engine/lib/actions.php b/engine/lib/actions.php index 53b185dea..ac6325813 100644 --- a/engine/lib/actions.php +++ b/engine/lib/actions.php @@ -252,10 +252,20 @@ function validate_action_token($visibleerrors = TRUE, $token = NULL, $ts = NULL) register_error(elgg_echo('actiongatekeeper:pluginprevents')); } } else if ($visibleerrors) { - register_error(elgg_echo('actiongatekeeper:timeerror')); + // this is necessary because of #5133 + if (elgg_is_xhr()) { + register_error(elgg_echo('js:security:token_refresh_failed', array(elgg_get_site_url()))); + } else { + register_error(elgg_echo('actiongatekeeper:timeerror')); + } } } else if ($visibleerrors) { - register_error(elgg_echo('actiongatekeeper:tokeninvalid')); + // this is necessary because of #5133 + if (elgg_is_xhr()) { + register_error(elgg_echo('js:security:token_refresh_failed', array(elgg_get_site_url()))); + } else { + register_error(elgg_echo('actiongatekeeper:tokeninvalid')); + } } } else { if (! empty($_SERVER['CONTENT_LENGTH']) && empty($_POST)) { diff --git a/js/lib/security.js b/js/lib/security.js index 61aa1cfcd..af02824a6 100644 --- a/js/lib/security.js +++ b/js/lib/security.js @@ -7,6 +7,8 @@ elgg.security.token = {}; elgg.security.tokenRefreshFailed = false; +elgg.security.tokenRefreshTimer = null; + /** * Sets the currently active security token and updates all forms and links on the current page. * @@ -30,31 +32,17 @@ elgg.security.setToken = function(json) { }; /** - * Security tokens time out, so lets refresh those every so often. + * Security tokens time out so we refresh those every so often. * - * @todo handle error and bad return data + * @private */ elgg.security.refreshToken = function() { elgg.action('security/refreshtoken', function(data) { - - // @todo might want to move this to setToken() once http://trac.elgg.org/ticket/3127 - // is implemented. It's here right now to avoid soggy code. - if (!data || !(data.output.__elgg_ts && data.output.__elgg_token)) { - elgg.register_error(elgg.echo('js:security:token_refresh_failed', [elgg.get_site_url()])); - elgg.security.tokenRefreshFailed = true; - - // don't setToken because we refresh every 5 minutes and tokens are good for 1 - // hour by default - return; - } - - // if had problems last time, let them know it's working now - if (elgg.security.tokenRefreshFailed) { - elgg.system_message(elgg.echo('js:security:token_refreshed', [elgg.get_site_url()])); - elgg.security.tokenRefreshFailed = false; + if (data && data.output.__elgg_ts && data.output.__elgg_token) { + elgg.security.setToken(data.output); + } else { + clearInterval(elgg.security.tokenRefreshTimer); } - - elgg.security.setToken(data.output); }); }; @@ -112,9 +100,8 @@ elgg.security.addToken = function(data) { }; elgg.security.init = function() { - //refresh security token every 5 minutes - //this is set in the js/elgg PHP view. - setInterval(elgg.security.refreshToken, elgg.security.interval); + // elgg.security.interval is set in the js/elgg PHP view. + elgg.security.tokenRefreshTimer = setInterval(elgg.security.refreshToken, 60 * 1000); }; elgg.register_hook_handler('boot', 'system', elgg.security.init); \ No newline at end of file diff --git a/languages/en.php b/languages/en.php index 353896047..fe450b8a2 100644 --- a/languages/en.php +++ b/languages/en.php @@ -1189,7 +1189,7 @@ You cannot reply to this email.", * Action gatekeeper */ 'actiongatekeeper:missingfields' => 'Form is missing __token or __ts fields', - 'actiongatekeeper:tokeninvalid' => "We encountered an error (token mismatch). This probably means that the page you were using expired.", + 'actiongatekeeper:tokeninvalid' => "The page you were using had expired. Please try again.", 'actiongatekeeper:timeerror' => 'The page you were using has expired. Please refresh and try again.', 'actiongatekeeper:pluginprevents' => 'A extension has prevented this form from being submitted.', 'actiongatekeeper:uploadexceeded' => 'The size of file(s) uploaded exceeded the limit set by your site administrator', @@ -1211,7 +1211,7 @@ You cannot reply to this email.", * Javascript */ - 'js:security:token_refresh_failed' => 'Cannot contact %s. You may experience problems saving content.', + 'js:security:token_refresh_failed' => 'Failed to contact %s. You may experience problems saving content. Please refresh this page.', 'js:security:token_refreshed' => 'Connection to %s restored!', /** -- cgit v1.2.3 From 8a76e62accd81a68724b424a77421dac7a9d9a12 Mon Sep 17 00:00:00 2001 From: cash Date: Tue, 5 Mar 2013 17:21:04 -0500 Subject: fixed token refresh interval - introduced during development for this release --- js/lib/security.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/lib/security.js b/js/lib/security.js index af02824a6..9c12f8586 100644 --- a/js/lib/security.js +++ b/js/lib/security.js @@ -101,7 +101,7 @@ elgg.security.addToken = function(data) { elgg.security.init = function() { // elgg.security.interval is set in the js/elgg PHP view. - elgg.security.tokenRefreshTimer = setInterval(elgg.security.refreshToken, 60 * 1000); + elgg.security.tokenRefreshTimer = setInterval(elgg.security.refreshToken, elgg.security.interval); }; elgg.register_hook_handler('boot', 'system', elgg.security.init); \ No newline at end of file -- cgit v1.2.3 From 42c52d51ea0e9047134441b31c8a9c7eac7922ef Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 10 Mar 2013 17:52:38 -0400 Subject: fixing line endings --- js/lib/ui.river.js | 26 ++--- .../theme_preview/components/image_block.php | 12 +-- .../default/theme_preview/components/list.php | 38 +++---- .../default/theme_preview/components/messages.php | 10 +- .../default/theme_preview/components/table.php | 22 ++-- .../views/default/theme_preview/icons/avatars.php | 72 ++++++------- .../views/default/theme_preview/icons/sprites.php | 120 ++++++++++----------- .../default/theme_preview/modules/modules.php | 44 ++++---- .../theme_preview/navigation/breadcrumbs.php | 20 ++-- .../default/theme_preview/navigation/default.php | 22 ++-- .../default/theme_preview/navigation/extras.php | 34 +++--- .../default/theme_preview/navigation/filter.php | 26 ++--- .../theme_preview/navigation/horizontal.php | 24 ++--- .../theme_preview/navigation/owner_block.php | 26 ++--- .../default/theme_preview/navigation/page.php | 38 +++---- .../theme_preview/navigation/pagination.php | 14 +-- .../default/theme_preview/navigation/site.php | 36 +++---- .../default/theme_preview/navigation/tabs.php | 18 ++-- .../default/theme_preview/typography/headings.php | 10 +- .../default/theme_preview/typography/misc.php | 32 +++--- .../default/theme_preview/typography/paragraph.php | 36 +++---- 21 files changed, 340 insertions(+), 340 deletions(-) (limited to 'js') diff --git a/js/lib/ui.river.js b/js/lib/ui.river.js index a56a664a4..c103fabb3 100644 --- a/js/lib/ui.river.js +++ b/js/lib/ui.river.js @@ -1,14 +1,14 @@ -elgg.provide('elgg.ui.river'); - -elgg.ui.river.init = function() { - $('#elgg-river-selector').change(function() { - var url = window.location.href; - if (window.location.search.length) { - url = url.substring(0, url.indexOf('?')); - } - url += '?' + $(this).val(); - elgg.forward(url); - }); -}; - +elgg.provide('elgg.ui.river'); + +elgg.ui.river.init = function() { + $('#elgg-river-selector').change(function() { + var url = window.location.href; + if (window.location.search.length) { + url = url.substring(0, url.indexOf('?')); + } + url += '?' + $(this).val(); + elgg.forward(url); + }); +}; + elgg.register_hook_handler('init', 'system', elgg.ui.river.init); \ No newline at end of file diff --git a/mod/developers/views/default/theme_preview/components/image_block.php b/mod/developers/views/default/theme_preview/components/image_block.php index 0bb16428b..ecd35ac65 100644 --- a/mod/developers/views/default/theme_preview/components/image_block.php +++ b/mod/developers/views/default/theme_preview/components/image_block.php @@ -1,6 +1,6 @@ -title = "Object 1"; -$obj1->description = $ipsum; - -$obj2 = new ElggObject(); -$obj2->title = "Object 2"; -$obj2->description = $ipsum; - -$obj3 = new ElggObject(); -$obj3->title = "Object 3"; -$obj3->description = $ipsum; - -$obj4 = new ElggObject(); -$obj4->title = "Object 4"; -$obj4->description = $ipsum; - -echo elgg_view('page/components/list', array('items' => array($obj1, $obj2, $obj3, $obj4))); +title = "Object 1"; +$obj1->description = $ipsum; + +$obj2 = new ElggObject(); +$obj2->title = "Object 2"; +$obj2->description = $ipsum; + +$obj3 = new ElggObject(); +$obj3->title = "Object 3"; +$obj3->description = $ipsum; + +$obj4 = new ElggObject(); +$obj4->title = "Object 4"; +$obj4->description = $ipsum; + +echo elgg_view('page/components/list', array('items' => array($obj1, $obj2, $obj3, $obj4))); diff --git a/mod/developers/views/default/theme_preview/components/messages.php b/mod/developers/views/default/theme_preview/components/messages.php index ac4d2bfd7..a53255291 100644 --- a/mod/developers/views/default/theme_preview/components/messages.php +++ b/mod/developers/views/default/theme_preview/components/messages.php @@ -1,5 +1,5 @@ -
    -
  • Success message (.elgg-state-success)
    • -
  • Error message (.elgg-state-error)
    • -
  • Notice message (.elgg-state-notice)
    • -
+
    +
  • Success message (.elgg-state-success)
    • +
  • Error message (.elgg-state-error)
    • +
  • Notice message (.elgg-state-notice)
    • +
diff --git a/mod/developers/views/default/theme_preview/components/table.php b/mod/developers/views/default/theme_preview/components/table.php index 8b8b13e76..7d619dcea 100644 --- a/mod/developers/views/default/theme_preview/components/table.php +++ b/mod/developers/views/default/theme_preview/components/table.php @@ -1,12 +1,12 @@ - -"; - for ($i = 1; $i < 5; $i++) { - echo ''; - for ($j = 1; $j < 3; $j++) { - echo ""; - } - echo ''; - } -?> +
column 1column 2
value $j
+"; + for ($i = 1; $i < 5; $i++) { + echo ''; + for ($j = 1; $j < 3; $j++) { + echo ""; + } + echo ''; + } +?>
column 1column 2
value $j
\ No newline at end of file diff --git a/mod/developers/views/default/theme_preview/icons/avatars.php b/mod/developers/views/default/theme_preview/icons/avatars.php index f50a6b70d..3aa1eda26 100644 --- a/mod/developers/views/default/theme_preview/icons/avatars.php +++ b/mod/developers/views/default/theme_preview/icons/avatars.php @@ -1,36 +1,36 @@ - - - - - $size"; - } - ?> - - - - '; - echo elgg_view_entity_icon($user, $size, array('use_hover' => false)); - echo ''; - } - ?> - - - - '; - echo elgg_view_entity_icon($group, $size, array('use_hover' => false)); - echo ''; - } - ?> - -
User
Group
+ + + + + $size"; + } + ?> + + + + '; + echo elgg_view_entity_icon($user, $size, array('use_hover' => false)); + echo ''; + } + ?> + + + + '; + echo elgg_view_entity_icon($group, $size, array('use_hover' => false)); + echo ''; + } + ?> + +
User
Group
diff --git a/mod/developers/views/default/theme_preview/icons/sprites.php b/mod/developers/views/default/theme_preview/icons/sprites.php index 134dd9aca..3edb0bd7c 100644 --- a/mod/developers/views/default/theme_preview/icons/sprites.php +++ b/mod/developers/views/default/theme_preview/icons/sprites.php @@ -1,61 +1,61 @@ - - -
    -" . elgg_view_icon($icon) . ""; - } -?> + + +
      +" . elgg_view_icon($icon) . ""; + } +?>
    \ No newline at end of file diff --git a/mod/developers/views/default/theme_preview/modules/modules.php b/mod/developers/views/default/theme_preview/modules/modules.php index e0d39c0da..04f5917b4 100644 --- a/mod/developers/views/default/theme_preview/modules/modules.php +++ b/mod/developers/views/default/theme_preview/modules/modules.php @@ -1,23 +1,23 @@ - -
    -
    -
    - -
    -
    -
    -
    - -
    -
    + +
    +
    +
    + +
    +
    +
    +
    + +
    +
    \ No newline at end of file diff --git a/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php b/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php index c910b2aa4..0439bd577 100644 --- a/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php +++ b/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php @@ -1,10 +1,10 @@ - mts)); - -elgg_pop_breadcrumb(); -elgg_pop_breadcrumb(); -elgg_pop_breadcrumb(); + mts)); + +elgg_pop_breadcrumb(); +elgg_pop_breadcrumb(); +elgg_pop_breadcrumb(); diff --git a/mod/developers/views/default/theme_preview/navigation/default.php b/mod/developers/views/default/theme_preview/navigation/default.php index bfd26162f..6efcd8890 100644 --- a/mod/developers/views/default/theme_preview/navigation/default.php +++ b/mod/developers/views/default/theme_preview/navigation/default.php @@ -1,11 +1,11 @@ -setSelected(true); - -echo elgg_view('navigation/menu/default', $params); +setSelected(true); + +echo elgg_view('navigation/menu/default', $params); diff --git a/mod/developers/views/default/theme_preview/navigation/extras.php b/mod/developers/views/default/theme_preview/navigation/extras.php index 43b19f8e3..01bc6d434 100644 --- a/mod/developers/views/default/theme_preview/navigation/extras.php +++ b/mod/developers/views/default/theme_preview/navigation/extras.php @@ -1,18 +1,18 @@ - - -
    - + + +
    +
    \ No newline at end of file diff --git a/mod/developers/views/default/theme_preview/navigation/filter.php b/mod/developers/views/default/theme_preview/navigation/filter.php index ea1c8b033..70cd31d2a 100644 --- a/mod/developers/views/default/theme_preview/navigation/filter.php +++ b/mod/developers/views/default/theme_preview/navigation/filter.php @@ -1,13 +1,13 @@ -setSelected(true); - -$params['name'] = 'filter'; - -echo elgg_view('navigation/menu/default', $params); +setSelected(true); + +$params['name'] = 'filter'; + +echo elgg_view('navigation/menu/default', $params); diff --git a/mod/developers/views/default/theme_preview/navigation/horizontal.php b/mod/developers/views/default/theme_preview/navigation/horizontal.php index f404f42c0..44e04cd7c 100644 --- a/mod/developers/views/default/theme_preview/navigation/horizontal.php +++ b/mod/developers/views/default/theme_preview/navigation/horizontal.php @@ -1,12 +1,12 @@ -setSelected(true); -$params['class'] = 'elgg-menu-hz'; - -echo elgg_view('navigation/menu/default', $params); +setSelected(true); +$params['class'] = 'elgg-menu-hz'; + +echo elgg_view('navigation/menu/default', $params); diff --git a/mod/developers/views/default/theme_preview/navigation/owner_block.php b/mod/developers/views/default/theme_preview/navigation/owner_block.php index 20b93d166..f5f203947 100644 --- a/mod/developers/views/default/theme_preview/navigation/owner_block.php +++ b/mod/developers/views/default/theme_preview/navigation/owner_block.php @@ -1,13 +1,13 @@ -setSelected(true); -$params['name'] = 'owner-block'; - -echo '
    '; -echo elgg_view('navigation/menu/default', $params); -echo '
    '; +setSelected(true); +$params['name'] = 'owner-block'; + +echo '
    '; +echo elgg_view('navigation/menu/default', $params); +echo '
    '; diff --git a/mod/developers/views/default/theme_preview/navigation/page.php b/mod/developers/views/default/theme_preview/navigation/page.php index a57edc2e2..1da6a1fd9 100644 --- a/mod/developers/views/default/theme_preview/navigation/page.php +++ b/mod/developers/views/default/theme_preview/navigation/page.php @@ -1,20 +1,20 @@ -setSelected(true); - -$m = new ElggMenuItem(10, "Child", "#"); -$m->setParent($params['menu']['default'][1]); -$params['menu']['default'][1]->addChild($m); -?> - -
    - +setSelected(true); + +$m = new ElggMenuItem(10, "Child", "#"); +$m->setParent($params['menu']['default'][1]); +$params['menu']['default'][1]->addChild($m); +?> + +
    +
    \ No newline at end of file diff --git a/mod/developers/views/default/theme_preview/navigation/pagination.php b/mod/developers/views/default/theme_preview/navigation/pagination.php index 90ae48edf..f5e1b632d 100644 --- a/mod/developers/views/default/theme_preview/navigation/pagination.php +++ b/mod/developers/views/default/theme_preview/navigation/pagination.php @@ -1,8 +1,8 @@ - 1000, - 'limit' => 10, - 'offset' => 230, -); - + 1000, + 'limit' => 10, + 'offset' => 230, +); + echo elgg_view('navigation/pagination', $params); \ No newline at end of file diff --git a/mod/developers/views/default/theme_preview/navigation/site.php b/mod/developers/views/default/theme_preview/navigation/site.php index 329036b80..90bb8ff46 100644 --- a/mod/developers/views/default/theme_preview/navigation/site.php +++ b/mod/developers/views/default/theme_preview/navigation/site.php @@ -1,18 +1,18 @@ -setSelected(true); -?> - -
    -
    - -
    -
    +setSelected(true); +?> + +
    +
    + +
    +
    diff --git a/mod/developers/views/default/theme_preview/navigation/tabs.php b/mod/developers/views/default/theme_preview/navigation/tabs.php index 81fe4e669..dd282dc83 100644 --- a/mod/developers/views/default/theme_preview/navigation/tabs.php +++ b/mod/developers/views/default/theme_preview/navigation/tabs.php @@ -1,10 +1,10 @@ - array( - array('title' => 'First', 'url' => "#"), - array('title' => 'Second', 'url' => "#", 'selected' => true), - array('title' => 'Third', 'url' => "#"), - ) -); - + array( + array('title' => 'First', 'url' => "#"), + array('title' => 'Second', 'url' => "#", 'selected' => true), + array('title' => 'Third', 'url' => "#"), + ) +); + echo elgg_view('navigation/tabs', $params); \ No newline at end of file diff --git a/mod/developers/views/default/theme_preview/typography/headings.php b/mod/developers/views/default/theme_preview/typography/headings.php index 1eb96c75c..d843853e3 100644 --- a/mod/developers/views/default/theme_preview/typography/headings.php +++ b/mod/developers/views/default/theme_preview/typography/headings.php @@ -1,6 +1,6 @@ -

    Level 1 heading

    -

    Level 2 heading

    -

    Level 3 heading

    -

    Level 4 heading

    -
    Level 5 heading
    +

    Level 1 heading

    +

    Level 2 heading

    +

    Level 3 heading

    +

    Level 4 heading

    +
    Level 5 heading
    Level 6 heading
    \ No newline at end of file diff --git a/mod/developers/views/default/theme_preview/typography/misc.php b/mod/developers/views/default/theme_preview/typography/misc.php index 93a279c36..0b9fd9db7 100644 --- a/mod/developers/views/default/theme_preview/typography/misc.php +++ b/mod/developers/views/default/theme_preview/typography/misc.php @@ -1,16 +1,16 @@ -
      -
    • I am the a tag example
      • -
    • I am the abbr tag example
      • -
    • I am the acronym tag example
      • -
    • I am the b tag example
      • -
    • I am the code tag example
      • -
    • I am the del tag example
      • -
    • I am the em tag example
      • -
    • I am the i tag example
      • -
    • I am the strong tag example
      • -
    -

    Paragraph inside Blockquote:

    -
    -	Preformated:Testing one row
-	and another
-
    +
      +
    • I am the a tag example
      • +
    • I am the abbr tag example
      • +
    • I am the acronym tag example
      • +
    • I am the b tag example
      • +
    • I am the code tag example
      • +
    • I am the del tag example
      • +
    • I am the em tag example
      • +
    • I am the i tag example
      • +
    • I am the strong tag example
      • +
    +

    Paragraph inside Blockquote:

    +
    +	Preformated:Testing one row
+	and another
+
    diff --git a/mod/developers/views/default/theme_preview/typography/paragraph.php b/mod/developers/views/default/theme_preview/typography/paragraph.php index 54d548f46..a3a7b2cfa 100644 --- a/mod/developers/views/default/theme_preview/typography/paragraph.php +++ b/mod/developers/views/default/theme_preview/typography/paragraph.php @@ -1,19 +1,19 @@ -

    Lorem ipsum dolor sit amet, test link -adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec -faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero -nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent -mattis, massa quis luctus strong, turpis mi volutpat justo, eu -volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus -eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem, -consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue -quis tellus.

    - -

    Lorem ipsum dolor sit amet, emphasis consectetuer -adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec -faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero -nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent -mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu -volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus -eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem, -consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue +

    Lorem ipsum dolor sit amet, test link +adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec +faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero +nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent +mattis, massa quis luctus strong, turpis mi volutpat justo, eu +volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus +eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem, +consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue +quis tellus.

    + +

    Lorem ipsum dolor sit amet, emphasis consectetuer +adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec +faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero +nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent +mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu +volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus +eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem, +consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue quis tellus.

    \ No newline at end of file -- cgit v1.2.3 From 31f5e27f60f3d9e5fcb3b6b9ab01b9d64a244b87 Mon Sep 17 00:00:00 2001 From: Steve Clay Date: Sun, 31 Mar 2013 18:18:33 -0400 Subject: Fixes #3754: Language JS views send cache headers and support conditional get --- js/lib/languages.js | 3 +++ views/default/js/languages.php | 24 +++++++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) (limited to 'js') diff --git a/js/lib/languages.js b/js/lib/languages.js index 44ea56d2b..d218cbc4f 100644 --- a/js/lib/languages.js +++ b/js/lib/languages.js @@ -30,6 +30,9 @@ elgg.reload_all_translations = function(language) { var url, options; url = 'ajax/view/js/languages'; options = {data: {language: lang}}; + if (elgg.config.simplecache_enabled) { + options.data.lc = elgg.config.lastcache; + } options['success'] = function(json) { elgg.add_translation(lang, json); diff --git a/views/default/js/languages.php b/views/default/js/languages.php index c51d7bcb2..fcf903d4b 100644 --- a/views/default/js/languages.php +++ b/views/default/js/languages.php @@ -1,15 +1,33 @@ translations['en']; +// @todo add server-side caching +if ($lastcache) { + // we're relying on lastcache changes to predict language changes + $etag = '"' . md5("$language|$lastcache") . '"'; + + header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', strtotime("+6 months")), true); + header("Pragma: public", true); + header("Cache-Control: public", true); + header("ETag: $etag"); + + if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && trim($_SERVER['HTTP_IF_NONE_MATCH']) === $etag) { + header("HTTP/1.1 304 Not Modified"); + exit; + } +} + +$all_translations = elgg_get_config('translations'); +$translations = $all_translations['en']; if ($language != 'en') { - $translations = array_merge($translations, $CONFIG->translations[$language]); + $translations = array_merge($translations, $all_translations[$language]); } echo json_encode($translations); \ No newline at end of file -- cgit v1.2.3 From 999f23c13e8c34f4cbae4af409446d037043d798 Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 14 Apr 2013 19:32:03 -0400 Subject: Refs #5335 added unit test for underscore in relative path for JS url normalization --- js/tests/ElggLibTest.js | 1 + 1 file changed, 1 insertion(+) (limited to 'js') diff --git a/js/tests/ElggLibTest.js b/js/tests/ElggLibTest.js index 2a676e22a..31b561923 100644 --- a/js/tests/ElggLibTest.js +++ b/js/tests/ElggLibTest.js @@ -78,6 +78,7 @@ ElggLibTest.prototype.testNormalizeUrl = function() { ['https://example.com', 'https://example.com'], ['http://example-time.com', 'http://example-time.com'], ['//example.com', '//example.com'], + ['mod/my_plugin/graphics/image.jpg', elgg.config.wwwroot + 'mod/my_plugin/graphics/image.jpg'], ['ftp://example.com/file', 'ftp://example.com/file'], ['mailto:brett@elgg.org', 'mailto:brett@elgg.org'], -- cgit v1.2.3 From 42726251455e87b5ee4d368c0e743057506ad60d Mon Sep 17 00:00:00 2001 From: Steve Clay Date: Sat, 8 Jun 2013 23:29:52 -0400 Subject: Fixes elgg.session.cookie() support of Date() for expires --- js/lib/session.js | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'js') diff --git a/js/lib/session.js b/js/lib/session.js index fa3d60aa9..0fc7f5c87 100644 --- a/js/lib/session.js +++ b/js/lib/session.js @@ -47,21 +47,18 @@ elgg.session.cookie = function (name, value, options) { } cookies.push(name + '=' + value); - - if (elgg.isNumber(options.expires)) { - if (elgg.isNumber(options.expires)) { - date = new Date(); - date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000)); - } else if (options.expires.toUTCString) { - date = options.expires; - } else { - valid = false; - } - - if (valid) { - cookies.push('expires=' + date.toUTCString()); - } - } + + if (elgg.isNumber(options.expires)) { + date = new Date(); + date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000)); + } else if (options.expires.toUTCString) { + date = options.expires; + } + + if (date) { + cookies.push('expires=' + date.toUTCString()); + } + // CAUTION: Needed to parenthesize options.path and options.domain // in the following expressions, otherwise they evaluate to undefined -- cgit v1.2.3 From afb0cef118a59c86e649e0717748c299a05f2427 Mon Sep 17 00:00:00 2001 From: Steve Clay Date: Fri, 14 Jun 2013 11:28:54 -0400 Subject: elgg.session.cookie() again handles missing options.expires --- js/lib/session.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'js') diff --git a/js/lib/session.js b/js/lib/session.js index 0fc7f5c87..a8d52733c 100644 --- a/js/lib/session.js +++ b/js/lib/session.js @@ -14,9 +14,9 @@ elgg.provide('elgg.session'); * {string} options[domain] * {boolean} options[secure] * - * @return {string} The value of the cookie, if only name is specified + * @return {string|undefined} The value of the cookie, if only name is specified. Undefined if no value set */ -elgg.session.cookie = function (name, value, options) { +elgg.session.cookie = function(name, value, options) { var cookies = [], cookie = [], i = 0, date, valid = true; //elgg.session.cookie() @@ -48,17 +48,18 @@ elgg.session.cookie = function (name, value, options) { cookies.push(name + '=' + value); - if (elgg.isNumber(options.expires)) { - date = new Date(); - date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000)); - } else if (options.expires.toUTCString) { - date = options.expires; - } + if (options.expires) { + if (elgg.isNumber(options.expires)) { + date = new Date(); + date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000)); + } else if (options.expires.toUTCString) { + date = options.expires; + } - if (date) { - cookies.push('expires=' + date.toUTCString()); + if (date) { + cookies.push('expires=' + date.toUTCString()); + } } - // CAUTION: Needed to parenthesize options.path and options.domain // in the following expressions, otherwise they evaluate to undefined -- cgit v1.2.3 From ccdf769513fa0268c5ef6880f54dfa1a25f71da6 Mon Sep 17 00:00:00 2001 From: Paweł Sroka Date: Wed, 19 Jun 2013 19:37:10 +0200 Subject: Fixes #5647 - Corrects handling of plus sign in elgg.parse_str --- js/lib/elgglib.js | 4 ++-- js/tests/ElggLibTest.js | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/lib/elgglib.js b/js/lib/elgglib.js index af2c94000..cea2d0cdb 100644 --- a/js/lib/elgglib.js +++ b/js/lib/elgglib.js @@ -474,8 +474,8 @@ elgg.parse_str = function(string) { re = /([^&=]+)=?([^&]*)/g; while (result = re.exec(string)) { - key = decodeURIComponent(result[1]) - value = decodeURIComponent(result[2]) + key = decodeURIComponent(result[1].replace(/\+/g,' ')) + value = decodeURIComponent(result[2].replace(/\+/g,' ')) params[key] = value; } diff --git a/js/tests/ElggLibTest.js b/js/tests/ElggLibTest.js index 31b561923..21c6cb214 100644 --- a/js/tests/ElggLibTest.js +++ b/js/tests/ElggLibTest.js @@ -128,3 +128,13 @@ ElggLibTest.prototype.testParseUrl = function() { }); }; +ElggLibTest.prototype.testParseStr = function() { + + [ + ["A+%2B+B", "A + B"] + + ].forEach(function(args) { + assertEquals(args[1], elgg.parse_str(args[0])); + }); +}; + -- cgit v1.2.3 From 77773f0cf081dbb7321075f625cc4ef3d07bbe3b Mon Sep 17 00:00:00 2001 From: Steve Clay Date: Wed, 19 Jun 2013 15:29:18 -0400 Subject: style fixes --- js/lib/elgglib.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/lib/elgglib.js b/js/lib/elgglib.js index cea2d0cdb..a8e187f1d 100644 --- a/js/lib/elgglib.js +++ b/js/lib/elgglib.js @@ -474,8 +474,8 @@ elgg.parse_str = function(string) { re = /([^&=]+)=?([^&]*)/g; while (result = re.exec(string)) { - key = decodeURIComponent(result[1].replace(/\+/g,' ')) - value = decodeURIComponent(result[2].replace(/\+/g,' ')) + key = decodeURIComponent(result[1].replace(/\+/g, ' ')); + value = decodeURIComponent(result[2].replace(/\+/g, ' ')); params[key] = value; } -- cgit v1.2.3 From 8464276af251c8938ecdeb558de4ccaece4f628a Mon Sep 17 00:00:00 2001 From: Steve Clay Date: Wed, 19 Jun 2013 15:40:30 -0400 Subject: Fix ElggLibTest.prototype.testParseStr --- js/tests/ElggLibTest.js | 2 +- js/tests/README | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'js') diff --git a/js/tests/ElggLibTest.js b/js/tests/ElggLibTest.js index 21c6cb214..bd39e7fb3 100644 --- a/js/tests/ElggLibTest.js +++ b/js/tests/ElggLibTest.js @@ -131,7 +131,7 @@ ElggLibTest.prototype.testParseUrl = function() { ElggLibTest.prototype.testParseStr = function() { [ - ["A+%2B+B", "A + B"] + ["A+%2B+B=A+%2B+B", {"A + B": "A + B"}] ].forEach(function(args) { assertEquals(args[1], elgg.parse_str(args[0])); diff --git a/js/tests/README b/js/tests/README index 4f86b27c6..f43c0c89d 100644 --- a/js/tests/README +++ b/js/tests/README @@ -12,9 +12,10 @@ based debuggers. Visit its wiki at the Google Code site for more information. Sample Usage ============ 1. Put jar file in the base directory of Elgg - 2. Run the server: java -jar JsTestDriver-1.3.3d.jar --port 4224 + 2. Run the server: java -jar JsTestDriver-1.3.5.jar --port 4224 3. Point a web browser at http://localhost:4224 - 4. Run the tests: java -jar JsTestDriver-1.3.3d.jar --config js/tests/jsTestDriver.conf --basePath . --tests all + 4. Click "Capture this browser" + 5. Run the tests: java -jar JsTestDriver-1.3.5.jar --config js/tests/jsTestDriver.conf --basePath . --tests all Configuration Hints -- cgit v1.2.3 From 392e8e691066c7a7ca9ef82c24f30ef235e1df93 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Fri, 9 Aug 2013 18:10:11 -0400 Subject: Fixes #5898. Fixed selector for finding the only friends checkbox. --- js/lib/ui.userpicker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/lib/ui.userpicker.js b/js/lib/ui.userpicker.js index 7298da114..669b84cdb 100644 --- a/js/lib/ui.userpicker.js +++ b/js/lib/ui.userpicker.js @@ -107,11 +107,11 @@ elgg.userpicker.viewUser = function(info) { * @return Object */ elgg.userpicker.getSearchParams = function(obj) { - if (obj.element.siblings('[name=match_on]').attr('checked')) { + if (obj.element.parent('.elgg-user-picker').find('input[name=match_on]').attr('checked')) { return {'match_on[]': 'friends', 'term' : obj.term}; } else { return {'match_on[]': 'users', 'term' : obj.term}; } }; -elgg.register_hook_handler('init', 'system', elgg.userpicker.init); \ No newline at end of file +elgg.register_hook_handler('init', 'system', elgg.userpicker.init); -- cgit v1.2.3