";
+ else if ($this->state["formtables"])
+ {
+ $this->state["insiderow"] = true;
+?>
+ ">
+state["firstitem"] = false;
+ }
+ }
+ else if ($field == "endrow" && $this->state["formtables"])
+ {
+?>
+
";
+?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+state["insiderow"]) echo " | ";
+ }
+ }
+
+ protected function CleanupFields()
+ {
+ if ($this->state["insiderow"])
+ {
+?>
+
+state));
+ }
+ }
+
+ protected function ProcessSubmit(&$options)
+ {
+ if (is_string($options["submit"]))
+ {
+ $name = (isset($options["submitname"]) ? $options["submitname"] : "");
+ $options["submit"] = array($name => $options["submit"]);
+ }
+?>
+
+ $val)
+ {
+ if (is_int($name) && isset($options["submitname"])) $name = $options["submitname"];
+?>
+ GetHashedFieldName($name) : $name) . "\""; ?> value="" />
+
+
+
+
+OutputJQuery(true);
+
+ if ($this->state["jqueryuiused"]) $this->OutputJQueryUI(true);
+
+ // Output CSS.
+ $output = $this->state["cssoutput"];
+ foreach ($output as $name => $val) unset($this->state["css"][$name]);
+ if ($this->state["ajax"]) echo "\n";
+ foreach ($this->state["css"] as $name => $info)
+ {
+ if ($info["mode"] === "inline") echo $info["src"];
+ }
+ $this->state["css"] = array();
+ $this->state["cssoutput"] = $output;
+
+ // Output Javascript.
+ $output = $this->state["jsoutput"];
+ foreach ($output as $name => $val) unset($this->state["js"][$name]);
+ do
+ {
+ $found = false;
+
+ foreach ($this->state["js"] as $name => $info)
+ {
+ if ($info["dependency"] === false || !isset($this->state["js"][$info["dependency"]]))
+ {
+ if ($info["mode"] === "src")
+ {
+ if ($this->state["ajax"]) echo "FlexForms.jsqueue['" . self::JSSafe($name) . "'] = " . json_encode($info, JSON_UNESCAPED_SLASHES) . ";\n";
+ else echo "\n";
+ }
+ else if ($info["mode"] === "inline")
+ {
+ if (!$this->state["ajax"]) echo "\n";
+ else
+ {
+ $src = $info["src"];
+ unset($info["src"]);
+ echo "FlexForms.jsqueue['" . self::JSSafe($name) . "'] = " . json_encode($info, JSON_UNESCAPED_SLASHES) . ";\n";
+ echo "FlexForms.jsqueue['" . self::JSSafe($name) . "'].src = function() {\n" . $src . "};\n";
+ }
+ }
+
+ unset($this->state["js"][$name]);
+ $output[$name] = true;
+
+ $found = true;
+ }
+ }
+ } while ($found);
+ $this->state["js"] = array();
+ $this->state["jsoutput"] = $output;
+
+ // Let form handlers finalize other field types.
+ foreach (self::$formhandlers["finalize"] as $callback)
+ {
+ if (is_callable($callback)) call_user_func_array($callback, array(&$this->state));
+ }
+
+ // Initialize FlexForms (only needed for any AJAX bits).
+?>
+
+
\ No newline at end of file
diff --git a/support/page_basics.php b/support/page_basics.php
index 9764e48..b188663 100644
--- a/support/page_basics.php
+++ b/support/page_basics.php
@@ -2,96 +2,50 @@
// Admin Pack server-side page manipulation functions.
// (C) 2017 CubicleSoft. All Rights Reserved.
+ // Most functionality has been moved into FlexForms. Much of this is legacy interface code for convenience and to avoid breaking things badly.
+ require_once "flex_forms.php";
+ if (file_exists(str_replace("\\", "/", dirname(__FILE__)) . "/flex_forms_extras.php")) require_once str_replace("\\", "/", dirname(__FILE__)) . "/flex_forms_extras.php";
+
+ class BB_FlexForms extends FlexForms
+ {
+ public function CreateSecurityToken($action, $extra = "")
+ {
+ global $bb_randpage, $bb_usertoken;
+
+ $this->SetSecretKey($bb_randpage . ":" . $bb_usertoken);
+
+ return parent::CreateSecurityToken($action, $extra);
+ }
+ }
+
+ // Can be used to override default functionality with an extended class. However, form handlers are generally a better solution.
+ $bb_flexforms = new BB_FlexForms();
+
// Code swiped from Barebones CMS support functions.
function BB_JSSafe($data)
{
- return str_replace(array("'", "\r", "\n"), array("\\'", "\\r", "\\n"), $data);
+ return FlexForms::JSSafe($data);
}
function BB_IsSSLRequest()
{
- return ((isset($_SERVER["HTTPS"]) && ($_SERVER["HTTPS"] == "on" || $_SERVER["HTTPS"] == "1")) || (isset($_SERVER["SERVER_PORT"]) && $_SERVER["SERVER_PORT"] == "443") || (str_replace("\\", "/", strtolower(substr($_SERVER["REQUEST_URI"], 0, 8))) == "https://"));
+ return FlexForms::IsSSLRequest();
}
// Returns 'http[s]://www.something.com[:port]' based on the current page request.
function BB_GetRequestHost($protocol = "")
{
- global $bb_getrequesthost_cache;
-
- $protocol = strtolower($protocol);
- $ssl = ($protocol == "https" || ($protocol == "" && BB_IsSSLRequest()));
- if ($protocol == "") $type = "def";
- else if ($ssl) $type = "https";
- else $type = "http";
-
- if (!isset($bb_getrequesthost_cache)) $bb_getrequesthost_cache = array();
- if (isset($bb_getrequesthost_cache[$type])) return $bb_getrequesthost_cache[$type];
-
- $url = "http" . ($ssl ? "s" : "") . "://";
- if ($ssl && defined("HTTPS_SERVER") && HTTPS_SERVER != "") $url .= HTTPS_SERVER;
- else if (!$ssl && defined("HTTP_SERVER") && HTTP_SERVER != "") $url .= HTTP_SERVER;
- else
- {
- $str = str_replace("\\", "/", $_SERVER["REQUEST_URI"]);
- $pos = strpos($str, "?");
- if ($pos !== false) $str = substr($str, 0, $pos);
- $str2 = strtolower($str);
- if (substr($str2, 0, 7) == "http://")
- {
- $pos = strpos($str, "/", 7);
- if ($pos === false) $str = "";
- else $str = substr($str, 7, $pos);
- }
- else if (substr($str2, 0, 8) == "https://")
- {
- $pos = strpos($str, "/", 8);
- if ($pos === false) $str = "";
- else $str = substr($str, 8, $pos);
- }
- else $str = "";
-
- if ($str != "") $host = $str;
- else if (isset($_SERVER["HTTP_HOST"])) $host = $_SERVER["HTTP_HOST"];
- else $host = $_SERVER["SERVER_NAME"] . ":" . (int)$_SERVER["SERVER_PORT"];
-
- $pos = strpos($host, ":");
- if ($pos === false) $port = 0;
- else
- {
- $port = (int)substr($host, $pos + 1);
- $host = substr($host, 0, $pos);
- }
- if ($port < 1 || $port > 65535) $port = ($ssl ? 443 : 80);
- $url .= preg_replace('/[^a-z0-9.\-]/', "", strtolower($host));
- if ($protocol == "" && ((!$ssl && $port != 80) || ($ssl && $port != 443))) $url .= ":" . $port;
- else if ($protocol == "http" && !$ssl && $port != 80) $url .= ":" . $port;
- else if ($protocol == "https" && $ssl && $port != 443) $url .= ":" . $port;
- }
-
- $bb_getrequesthost_cache[$type] = $url;
-
- return $url;
+ return FlexForms::GetRequestHost($protocol);
}
function BB_GetRequestURLBase()
{
- $str = str_replace("\\", "/", $_SERVER["REQUEST_URI"]);
- $pos = strpos($str, "?");
- if ($pos !== false) $str = substr($str, 0, $pos);
- $str2 = strtolower($str);
- if (substr($str2, 0, 7) == "http://" || substr($str2, 0, 8) == "https://")
- {
- $pos = strpos($str, "/", 8);
- if ($pos === false) $str = "/";
- else $str = substr($str, $pos);
- }
-
- return $str;
+ return FlexForms::GetRequestURLBase();
}
function BB_GetFullRequestURLBase($protocol = "")
{
- return BB_GetRequestHost($protocol) . BB_GetRequestURLBase();
+ return FlexForms::GetFullRequestURLBase($protocol);
}
// Multilingual admin functions.
@@ -198,6 +152,9 @@ function BB_InitLangmap($path, $default = "")
}
}
+ // Route all translation requests through BB_Translate().
+ if (!defined("CS_TRANSLATE_FUNC")) define("CS_TRANSLATE_FUNC", "BB_Translate");
+
// Code swiped from CubicleSoft browser cookie support functions.
function SetCookieFixDomain($name, $value = "", $expires = 0, $path = "", $domain = "", $secure = false, $httponly = false)
@@ -228,31 +185,18 @@ function SetCookieFixDomain($name, $value = "", $expires = 0, $path = "", $domai
}
- function BB_OutputJQueryUI($rooturl, $supportpath)
- {
-?>
-