+
+HTML;
+ return $sHtml;
+ }
+}
\ No newline at end of file
diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/Settings.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/Settings.php
index ecb842f..d588b7b 100644
--- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/Settings.php
+++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/Settings.php
@@ -27,11 +27,28 @@
namespace BaikalAdmin\Controller;
class Settings extends \Flake\Core\Controller {
-
+
+ public function __construct() {
+ parent::__construct();
+ $this->oModel = new \Baikal\Model\Config(BAIKAL_PATH_SPECIFIC . "config.php");
+
+ # Assert that config file is writable
+ if(!$this->oModel->writable()) {
+ throw new \Exception("Config file is not writable;" . __FILE__ . " > " . __LINE__);
+ }
+
+ $this->oForm = $this->oModel->formForThisModelInstance(array(
+ "close" => FALSE
+ ));
+ }
+
public function execute() {
+ if($this->oForm->submitted()) {
+ $this->oForm->execute();
+ }
}
public function render() {
- return "
Settings
";
+ return $this->oForm->render();
}
}
\ No newline at end of file
diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php
new file mode 100644
index 0000000..3d46bb2
--- /dev/null
+++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php
@@ -0,0 +1,243 @@
+
+* All rights reserved
+*
+* http://baikal.codr.fr
+*
+* This script is part of the Baïkal Server project. The Baïkal
+* Server project is free software; you can redistribute it
+* and/or modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* The GNU General Public License can be found at
+* http://www.gnu.org/copyleft/gpl.html.
+*
+* This script is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* This copyright notice MUST APPEAR in all copies of the script!
+***************************************************************/
+
+namespace BaikalAdmin\Controller\User;
+
+class AddressBooks extends \Flake\Core\Controller {
+
+ protected $aMessages = array();
+ protected $oModel; # \Baikal\Model\Contact
+ protected $oUser; # \Baikal\Model\User
+ protected $oForm; # \Formal\Form
+
+ public function __construct() {
+ parent::__construct();
+
+ if(($iUser = $this->currentUserId()) === FALSE) {
+ throw new \Exception("BaikalAdmin\Controller\User\Contacts::render(): User get-parameter not found.");
+ }
+
+ $this->oUser = new \Baikal\Model\User($iUser);
+
+ if(($iModel = self::editRequested()) !== FALSE) {
+ $this->oModel = new \Baikal\Model\AddressBook($iModel);
+ $this->initForm();
+ }
+
+ if(self::newRequested()) {
+ # building floating object
+ $this->oModel = new \Baikal\Model\AddressBook();
+ $this->oModel->set(
+ "principaluri",
+ $this->oUser->get("uri")
+ );
+
+ $this->oModel->set(
+ "ctag",
+ "1"
+ );
+
+ $this->initForm();
+ }
+ }
+
+ public function execute() {
+ if(self::editRequested()) {
+ if($this->oForm->submitted()) {
+ $this->oForm->execute();
+ }
+ }
+
+ if(self::newRequested()) {
+ if($this->oForm->submitted()) {
+ $this->oForm->execute();
+
+ if($this->oForm->persisted()) {
+ $this->oForm->setOption(
+ "action",
+ $this->linkEdit(
+ $this->oForm->modelInstance()
+ )
+ );
+ }
+ }
+ }
+
+ if(($iModel = self::deleteRequested()) !== FALSE) {
+
+ if(self::deleteConfirmed() !== FALSE) {
+
+ # catching Exception thrown when model already destroyed
+ # happens when user refreshes page on delete-URL, for instance
+
+ try {
+ $oModel = new \Baikal\Model\AddressBook($iModel);
+ $oModel->destroy();
+ } catch(\Exception $e) {
+ # already deleted; silently discarding
+ }
+
+ # Redirecting to admin home
+ \Flake\Util\Tools::redirectUsingMeta(self::linkHome());
+ } else {
+
+ $oModel = new \Baikal\Model\AddressBook($iModel);
+ $this->aMessages[] = \Formal\Core\Message::warningConfirmMessage(
+ "Check twice, you're about to delete " . $oModel->label() . " from the database !",
+ "
You are about to delete a contact book and all it's visiting cards. This operation cannot be undone.
So, now that you know all that, what shall we do ?
",
+ self::linkDeleteConfirm($oModel),
+ "Delete " . $oModel->label() . "",
+ self::linkHome()
+ );
+ }
+ }
+ }
+
+ public function render() {
+
+ $sHtml = "";
+
+ # Render list of users
+ $oAddressBooks = $this->oUser->getAddressBooksBaseRequester()->execute();
+
+ $oView = new \BaikalAdmin\View\AddressBooks\Listing();
+ $oView->setData("user", $this->oUser);
+ $oView->setData("addressbooks", $oAddressBooks);
+ $sHtml .= $oView->render();
+
+ # Render form
+ $sHtml .= "";
+ $sMessages = implode("\n", $this->aMessages);
+
+ if(self::newRequested() || self::editRequested()) {
+ # We have to display the User form
+ $sHtml .= $this->oForm->render();
+ } else {
+ # No form is displayed; simply display messages, if any
+ $sHtml .= $sMessages;
+ }
+
+ return $sHtml;
+ }
+
+ protected function initForm() {
+ if($this->editRequested() || $this->newRequested()) {
+ $aOptions = array(
+ "closeurl" => $this->linkHome()
+ );
+
+ $this->oForm = $this->oModel->formForThisModelInstance($aOptions);
+ }
+ }
+
+ protected static function currentUserId() {
+ $aParams = $GLOBALS["ROUTER"]::getURLParams();
+ if(($iUser = intval($aParams[0])) === 0) {
+ return FALSE;
+ }
+
+ return $iUser;
+ }
+
+ protected static function newRequested() {
+ $aParams = $GLOBALS["ROUTER"]::getURLParams();
+ return $aParams[1] === "new";
+ }
+
+ protected static function editRequested() {
+ $aParams = $GLOBALS["ROUTER"]::getURLParams();
+ if(($aParams[1] === "edit") && intval($aParams[2]) > 0) {
+ return intval($aParams[2]);
+ }
+
+ return FALSE;
+ }
+
+ protected static function deleteRequested() {
+ $aParams = $GLOBALS["ROUTER"]::getURLParams();
+ if(($aParams[1] === "delete") && intval($aParams[2]) > 0) {
+ return intval($aParams[2]);
+ }
+
+ return FALSE;
+ }
+
+ protected static function deleteConfirmed() {
+ if(($iPrimary = self::deleteRequested()) === FALSE) {
+ return FALSE;
+ }
+
+ $aParams = $GLOBALS["ROUTER"]::getURLParams();
+ if($aParams[3] === "confirm") {
+ return $iPrimary;
+ }
+
+ return FALSE;
+ }
+
+ public static function linkNew() {
+ return $GLOBALS["ROUTER"]::buildRouteForController(
+ get_called_class(),
+ self::currentUserId(),
+ "new"
+ ) . "#form";
+ }
+
+ public static function linkEdit(\Baikal\Model\AddressBook $oModel) {
+ return $GLOBALS["ROUTER"]::buildRouteForController(
+ get_called_class(),
+ self::currentUserId(),
+ "edit",
+ $oModel->get("id")
+ ) . "#form";
+ }
+
+ public static function linkDelete(\Baikal\Model\AddressBook $oModel) {
+ return $GLOBALS["ROUTER"]::buildRouteForController(
+ get_called_class(),
+ self::currentUserId(),
+ "delete",
+ $oModel->get("id")
+ ) . "#message";
+ }
+
+ public static function linkDeleteConfirm(\Baikal\Model\AddressBook $oModel) {
+ return $GLOBALS["ROUTER"]::buildRouteForController(
+ get_called_class(),
+ self::currentUserId(),
+ "delete",
+ $oModel->get("id"),
+ "confirm"
+ ) . "#message";
+ }
+
+ public static function linkHome() {
+ return $GLOBALS["ROUTER"]::buildRouteForController(
+ get_called_class(),
+ self::currentUserId()
+ );
+ }
+}
\ No newline at end of file
diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/User/Calendars.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/User/Calendars.php
index 6c213dc..890a307 100644
--- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/User/Calendars.php
+++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/User/Calendars.php
@@ -37,17 +37,17 @@ class Calendars extends \Flake\Core\Controller {
parent::__construct();
if(($iUser = $this->currentUserId()) === FALSE) {
- throw new \Exception("BaikalAdmin\Controller\Details::render(): User get-parameter not found.");
+ throw new \Exception("BaikalAdmin\Controller\User\Calendars::render(): User get-parameter not found.");
}
$this->oUser = new \Baikal\Model\User($iUser);
- if(($iCalendar = self::editRequested()) !== FALSE) {
- $this->oModel = new \Baikal\Model\Calendar($iCalendar);
+ if(($iModel = self::editRequested()) !== FALSE) {
+ $this->oModel = new \Baikal\Model\Calendar($iModel);
$this->initForm();
}
- if(($iUser = self::newRequested()) !== FALSE) {
+ if(self::newRequested()) {
# building floating object
$this->oModel = new \Baikal\Model\Calendar();
$this->oModel->set(
diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/Users.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/Users.php
index a58012a..28cf632 100644
--- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/Users.php
+++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Controller/Users.php
@@ -196,4 +196,8 @@ class Users extends \Flake\Core\Controller {
public static function linkCalendars(\Baikal\Model\User $user) {
return $GLOBALS["ROUTER"]::buildRouteForController('\BaikalAdmin\Controller\User\Calendars', $user->get("id"));
}
+
+ public static function linkAddressBooks(\Baikal\Model\User $user) {
+ return $GLOBALS["ROUTER"]::buildRouteForController('\BaikalAdmin\Controller\User\AddressBooks', $user->get("id"));
+ }
}
\ No newline at end of file
diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/AddressBooks/Listing.html b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/AddressBooks/Listing.html
new file mode 100644
index 0000000..66eba68
--- /dev/null
+++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/AddressBooks/Listing.html
@@ -0,0 +1,47 @@
+
+
+
+
\ No newline at end of file
diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/Calendars/Listing.html b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/Calendars/Listing.html
index 13f473f..15617dc 100644
--- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/Calendars/Listing.html
+++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Resources/Templates/Calendars/Listing.html
@@ -10,7 +10,7 @@
-
diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/User/AddressBooks.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/User/AddressBooks.php
new file mode 100644
index 0000000..60a5a8a
--- /dev/null
+++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/Route/User/AddressBooks.php
@@ -0,0 +1,34 @@
+
+* All rights reserved
+*
+* http://baikal.codr.fr
+*
+* This script is part of the Baïkal Server project. The Baïkal
+* Server project is free software; you can redistribute it
+* and/or modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* The GNU General Public License can be found at
+* http://www.gnu.org/copyleft/gpl.html.
+*
+* This script is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* This copyright notice MUST APPEAR in all copies of the script!
+***************************************************************/
+
+namespace BaikalAdmin\Route\User;
+
+class AddressBooks {
+
+ public static function execute(\Flake\Core\Render\Container &$oRenderContainer) {
+ $oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\User\AddressBooks());
+ }
+}
\ No newline at end of file
diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/View/AddressBooks/Listing.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/View/AddressBooks/Listing.php
new file mode 100644
index 0000000..efb2f80
--- /dev/null
+++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/View/AddressBooks/Listing.php
@@ -0,0 +1,30 @@
+
+* All rights reserved
+*
+* http://baikal.codr.fr
+*
+* This script is part of the Baïkal Server project. The Baïkal
+* Server project is free software; you can redistribute it
+* and/or modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* The GNU General Public License can be found at
+* http://www.gnu.org/copyleft/gpl.html.
+*
+* This script is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* This copyright notice MUST APPEAR in all copies of the script!
+***************************************************************/
+
+namespace BaikalAdmin\View\AddressBooks;
+
+class Listing extends \BaikalAdmin\Core\View {
+}
\ No newline at end of file
diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/config.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/config.php
index 88b2b90..70c481a 100644
--- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/config.php
+++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/config.php
@@ -30,6 +30,7 @@ $GLOBALS["ROUTES"] = array(
"default" => "\BaikalAdmin\Route\Dashboard",
"users" => "\BaikalAdmin\Route\Users",
"users/calendars" => "\BaikalAdmin\Route\User\Calendars",
+ "users/addressbooks" => "\BaikalAdmin\Route\User\AddressBooks",
"install" => "\BaikalAdmin\Route\Install",
"settings" => "\BaikalAdmin\Route\Settings"
);
\ No newline at end of file
diff --git a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/index.php b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/index.php
index 9f79786..91fe0e3 100644
--- a/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/index.php
+++ b/CoreVersions/Baikal_0.1/Frameworks/BaikalAdmin/index.php
@@ -43,18 +43,7 @@ $oPage->injectHTTPHeaders();
$oPage->setTitle("Baïkal Web Admin");
$oPage->setBaseUrl(BAIKAL_URI);
-$sControllerForDefaultRoute = $GLOBALS["ROUTER"]::getControllerForRoute("default");
-$oPage->zone("homelink")->addBlock(new \Flake\Controller\HtmlBlock(
- $sControllerForDefaultRoute::link()
-));
-
-$oPage->zone("userslink")->addBlock(new \Flake\Controller\HtmlBlock(
- \BaikalAdmin\Controller\Users::link()
-));
-
-$oPage->zone("settingslink")->addBlock(new \Flake\Controller\HtmlBlock(
- \BaikalAdmin\Controller\Settings::link()
-));
+$oPage->zone("navbar")->addBlock(new \BaikalAdmin\Controller\Navigation\Bar());
# Route the request
$GLOBALS["ROUTER"]::route($oPage);
diff --git a/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Bootstrap.php b/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Bootstrap.php
index 10956cd..f6efb39 100755
--- a/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Bootstrap.php
+++ b/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Bootstrap.php
@@ -24,6 +24,14 @@
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+if(!defined('LF')) {
+ define('LF', chr(10));
+}
+
+if(!defined('CR')) {
+ define('CR', chr(13));
+}
+
if(array_key_exists("SERVER_NAME", $_SERVER) && $_SERVER["SERVER_NAME"] === "mongoose") {
define("MONGOOSE_SERVER", TRUE);
} else {
diff --git a/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Model.php b/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Model.php
index cb0f258..36b3dc6 100755
--- a/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Model.php
+++ b/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Model.php
@@ -72,6 +72,10 @@ abstract class Model extends \Flake\Core\FLObject {
return array_pop($aRes);
}
+ public function floating() {
+ return TRUE;
+ }
+
public function formForThisModelInstance($options = array()) {
$sClass = get_class($this);
$oForm = new \Formal\Form($sClass, $options);
@@ -83,4 +87,8 @@ abstract class Model extends \Flake\Core\FLObject {
public function formMorphologyForThisModelInstance() {
throw new \Exception(get_class($this) . ": No form morphology provided for Model.");
}
+
+ public abstract function persist();
+
+ public abstract function destroy();
}
\ No newline at end of file
diff --git a/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Model/NoDb.php b/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Model/NoDb.php
index 1183687..1a1008f 100755
--- a/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Model/NoDb.php
+++ b/CoreVersions/Baikal_0.1/Frameworks/Flake/Core/Model/NoDb.php
@@ -31,5 +31,4 @@ abstract class NoDb extends \Flake\Core\Model {
public function __construct($aData = array()) {
$this->aData = $aData;
}
-
}
\ No newline at end of file
diff --git a/CoreVersions/Baikal_0.1/Frameworks/Flake/Util/Tools.php b/CoreVersions/Baikal_0.1/Frameworks/Flake/Util/Tools.php
index 3bc2219..8c428eb 100755
--- a/CoreVersions/Baikal_0.1/Frameworks/Flake/Util/Tools.php
+++ b/CoreVersions/Baikal_0.1/Frameworks/Flake/Util/Tools.php
@@ -604,4 +604,18 @@ TEST;
public static function router() {
return "\Flake\Util\Router\QuestionMarkRewrite";
}
+
+ public static function arrayIsAssoc($aArray) {
+ if(!is_array($aArray)) {
+ throw new \Exception("\Flake\Util\Tools::arrayIsAssoc(): parameter has to be an array.");
+ }
+
+ # Taken from http://stackoverflow.com/questions/173400/php-arrays-a-good-way-to-check-if-an-array-is-associative-or-sequential#answer-4254008
+ # count() will return 0 if numeric, and > 0 if assoc, even partially
+ return (bool)count(array_filter(array_keys($aArray), 'is_string'));
+ }
+
+ public static function arrayIsSeq($aArray) {
+ return !self::arrayIsAssoc($aArray);
+ }
}
\ No newline at end of file
diff --git a/CoreVersions/Baikal_0.1/Frameworks/Formal/Element.php b/CoreVersions/Baikal_0.1/Frameworks/Formal/Element.php
index 0fb362a..1904e05 100644
--- a/CoreVersions/Baikal_0.1/Frameworks/Formal/Element.php
+++ b/CoreVersions/Baikal_0.1/Frameworks/Formal/Element.php
@@ -26,7 +26,7 @@
namespace Formal;
-class Element {
+abstract class Element {
protected $aOptions = array(
"readonly" => FALSE,
@@ -76,4 +76,6 @@ class Element {
public function __toString() {
return get_class($this) . "<" . $this->option("label") . ">";
}
+
+ public abstract function render();
}
\ No newline at end of file
diff --git a/CoreVersions/Baikal_0.1/Frameworks/Formal/Element/Checkbox.php b/CoreVersions/Baikal_0.1/Frameworks/Formal/Element/Checkbox.php
index c1c1349..ea29cf1 100644
--- a/CoreVersions/Baikal_0.1/Frameworks/Formal/Element/Checkbox.php
+++ b/CoreVersions/Baikal_0.1/Frameworks/Formal/Element/Checkbox.php
@@ -56,7 +56,7 @@ class Checkbox extends \Formal\Element {
$sHtml =<<
-
+
diff --git a/CoreVersions/Baikal_0.1/Frameworks/Formal/Element/Listbox.php b/CoreVersions/Baikal_0.1/Frameworks/Formal/Element/Listbox.php
new file mode 100644
index 0000000..1e4abb0
--- /dev/null
+++ b/CoreVersions/Baikal_0.1/Frameworks/Formal/Element/Listbox.php
@@ -0,0 +1,91 @@
+
+* All rights reserved
+*
+* http://baikal.codr.fr
+*
+* This script is part of the Baïkal Server project. The Baïkal
+* Server project is free software; you can redistribute it
+* and/or modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* The GNU General Public License can be found at
+* http://www.gnu.org/copyleft/gpl.html.
+*
+* This script is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* This copyright notice MUST APPEAR in all copies of the script!
+***************************************************************/
+
+namespace Formal\Element;
+
+class Listbox extends \Formal\Element {
+ public function render() {
+
+ $disabled = "";
+ $inputclass = "";
+ $groupclass = "";
+ $placeholder = "";
+
+ $value = $this->value();
+ $label = $this->option("label");
+ $prop = $this->option("prop");
+
+ if($this->option("readonly") === TRUE) {
+ $inputclass .= " disabled";
+ $disabled = " disabled";
+ }
+
+ if($this->option("error") === TRUE) {
+ $groupclass .= " error";
+ }
+
+ $aOptions = $this->option("options");
+ if(!is_array($aOptions)) {
+ throw new \Exception("\Formal\Element\Listbox->render(): 'options' has to be an array.");
+ }
+
+ $clientvalue = htmlspecialchars($value);
+
+ $aRenderedOptions = array();
+
+ if(\Flake\Util\Tools::arrayIsSeq($aOptions)) {
+ # Array is sequential
+ reset($aOptions);
+ foreach($aOptions as $sOptionValue) {
+ $selected = ($sOptionValue === $value) ? " selected=\"selected\"" : "";
+ $aRenderedOptions[] = "" . htmlspecialchars($sOptionValue) . "";
+ }
+ } else {
+ # Array is associative
+ reset($aOptions);
+ foreach($aOptions as $sOptionValue => $sOptionCaption) {
+ $selected = ($sOptionValue === $value) ? " selected=\"selected\"" : "";
+ $aRenderedOptions[] = "";
+ }
+ }
+
+ reset($aRenderedOptions);
+ $sRenderedOptions = implode("\n", $aRenderedOptions);
+ unset($aRenderedOptions);
+
+ $sHtml =<<
+
+
+
+
+
+HTML;
+ return $sHtml;
+ }
+}
\ No newline at end of file
diff --git a/CoreVersions/Baikal_0.1/Frameworks/Formal/Element/Text.php b/CoreVersions/Baikal_0.1/Frameworks/Formal/Element/Text.php
index a7665a9..cc3dc36 100644
--- a/CoreVersions/Baikal_0.1/Frameworks/Formal/Element/Text.php
+++ b/CoreVersions/Baikal_0.1/Frameworks/Formal/Element/Text.php
@@ -38,7 +38,7 @@ class Text extends \Formal\Element {
$groupclass = "";
$placeholder = "";
- $value = htmlspecialchars($this->value());
+ $value = $this->value();
$label = $this->option("label");
$prop = $this->option("prop");
$placeholder = $this->option("placeholder");
@@ -56,13 +56,15 @@ class Text extends \Formal\Element {
$placeholder = " placeholder=\"" . htmlspecialchars($sPlaceHolder) . "\" ";
}
+ $clientvalue = htmlspecialchars($value);
+
$sInputType = $this->inputtype();
$sHtml =<<
-
+