aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-19 19:29:43 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-19 19:29:43 +0000
commit8ead3001aca12fa920ef616002a75c00dc28d851 (patch)
treeb1fc8628e36dea774f324dcc78402f64a1936ba0
parent83891172afe30f9ea7e51c1956d873b8e4f3ced3 (diff)
downloadelgg-8ead3001aca12fa920ef616002a75c00dc28d851.tar.gz
elgg-8ead3001aca12fa920ef616002a75c00dc28d851.tar.bz2
Namespaces sticky forms. Requires more testing.
git-svn-id: http://code.elgg.org/elgg/trunk@5446 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/elgglib.php56
1 files changed, 43 insertions, 13 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 5a7fca837..258bf0be6 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -2724,14 +2724,20 @@ function elgg_get_breadcrumbs() {
* Call this from an action when you want all your submitted variables
* available if the submission fails validation and is sent back to the form
*/
-function elgg_make_sticky_form() {
- elgg_clear_sticky_form();
+function elgg_make_sticky_form($form_name) {
+ global $CONFIG;
+
+ $CONFIG->active_sticky_form = $form_name;
+ elgg_clear_sticky_form($form_name);
- $_SESSION['sticky_form'] = array();
+ if (!isset($_SESSION['sticky_forms'])) {
+ $_SESSION['sticky_forms'] = array();
+ }
+ $_SESSION['sticky_forms'][$form_name] = array();
foreach($_REQUEST as $key => $var) {
// will go through XSS filtering on the get function
- $_SESSION['sticky_form'][$key] = $var;
+ $_SESSION['sticky_forms'][$form_name][$key] = $var;
}
}
@@ -2742,18 +2748,21 @@ function elgg_make_sticky_form() {
* Call this if validation is successful in the action handler or
* when they sticky values have been used to repopulate the form
* after a validation error.
+ *
+ * @param string $name Form namespace
*/
-function elgg_clear_sticky_form() {
- unset($_SESSION['sticky_form']);
+function elgg_clear_sticky_form($form_name) {
+ unset($_SESSION['sticky_forms'][$form_name]);
}
/**
* Has this form been made sticky
*
+ * @param string $name Form namespace
* @return boolean
*/
-function elgg_is_sticky_form() {
- return isset($_SESSION['sticky_form']);
+function elgg_is_sticky_form($form_name) {
+ return isset($_SESSION['sticky_forms'][$form_name]);
}
/**
@@ -2766,9 +2775,9 @@ function elgg_is_sticky_form() {
*
* @todo should this filter the default value?
*/
-function elgg_get_sticky_value($variable, $default = "", $filter_result = true) {
- if (isset($_SESSION['sticky_form'][$variable])) {
- $value = $_SESSION['sticky_form'][$variable];
+function elgg_get_sticky_value($form_name, $variable, $default = NULL, $filter_result = true) {
+ if (isset($_SESSION['sticky_forms'][$form_name][$variable])) {
+ $value = $_SESSION['sticky_forms'][$form_name][$variable];
if ($filter_result) {
// XSS filter result
$value = filter_tags($value);
@@ -2783,11 +2792,31 @@ function elgg_get_sticky_value($variable, $default = "", $filter_result = true)
*
* @param string $variable The name of the variable to clear
*/
-function elgg_clear_sticky_value($variable) {
- unset($_SESSION['sticky_form'][$variable]);
+function elgg_clear_sticky_value($form_name, $variable) {
+ unset($_SESSION['sticky_forms'][$form_name][$variable]);
}
+/**
+ * Returns the current active sticky form.
+ * @return mixed Str | FALSE
+ */
+function elgg_get_active_sticky_form() {
+ global $CONFIG;
+ if (isset($CONFIG->active_sticky_form)) {
+ $form_name = $CONFIG->active_sticky_form;
+ } else {
+ return FALSE;
+ }
+
+ return (elgg_is_sticky_form($form_name)) ? $form_name : FALSE;
+}
+
+function elgg_set_active_sticky_form($form_name) {
+ global $CONFIG;
+
+ $CONFIG->active_sticky_form = $form_name;
+}
/**
* Returns the PHP INI setting in bytes
*
@@ -2900,6 +2929,7 @@ function ui_page_setup() {
$hide_toolbar_dupes = get_config('menu_items_hide_toolbar_entries') == 'yes' ? TRUE : FALSE;
$menu_items = get_register('menu');
$featured_urls_info = get_config('menu_items_featured_urls');
+
$toolbar = array();
$featured_urls = array();
$featured_urls_sanitised = array();