diff --git a/README.md b/README.md index 0277da1..6eaeecc 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,36 @@ Baïkal for YunoHost ----------------------- -Lightweight CalDAV+CardDAV server +------------------- -http://baikal-server.com/ +*This is a work-in-progress package review to update Baikal to 0.4.x +and make use of new YunoHost facilities - e.g. helpers - coming with 2.3.x.* + +[Baikal](http://baikal-server.com/) is a Cal and CardDAV server, based on +sabre/dav, that includes an administrative interface for easy management. + +**Shipped version:** 0.4.4 + +## Installation + +While it's merged to the official application list, you can install it in order +to try - or use it with caution! - either from the command line: + + $ sudo yunohost app install https://github.com/YunoHost-Apps/baikal_ynh/tree/testing + +or from the Web administration: + + * Go to *Applications* + * Click on *Install* + * Scroll to the bottom of the page and put `https://github.com/YunoHost-Apps/baikal_ynh/tree/testing` + under **Install custom app**. + +## TODO + + * Update the `upgrade` script and test the upgrade from the current + official package + * Add `backup` and `remove` scripts + +## Links ## + +**Baikal**: http://baikal-server.com/ + +**YunoHost**: https://yunohost.org/ diff --git a/conf/config.php b/conf/config.php index 4c73ff0..5b71d3a 100644 --- a/conf/config.php +++ b/conf/config.php @@ -3,7 +3,7 @@ # # Copyright notice # -# (c) 2014 Jérôme Schneider +# (c) 2016 Jérôme Schneider # All rights reserved # # http://baikal-server.com @@ -32,7 +32,7 @@ # # Timezone of your users, if unsure, check http://en.wikipedia.org/wiki/List_of_tz_database_time_zones -define("PROJECT_TIMEZONE", 'YNH_TIMEZONE'); +define("PROJECT_TIMEZONE", '#TIMEZONE#'); # CardDAV ON/OFF switch; default TRUE define("BAIKAL_CARD_ENABLED", TRUE); @@ -48,8 +48,8 @@ define("BAIKAL_DAV_LDAP_URI", 'ldap://127.0.0.1/'); # Auth Backend LDAP-UserBind; Template for userbind # %n => username -# %u => user part of username when it is an email -# %u => domain part of username when it is an email +# %u => user part of username when it is an email +# %u => domain part of username when it is an email define("BAIKAL_DAV_LDAP_DN_TEMPLATE", 'uid=%n,ou=users,dc=yunohost,dc=org'); # Auth Backend LDAP-UserBind; attribute for displayname @@ -58,23 +58,5 @@ define("BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR", 'cn'); # Auth Backend LDAP-UserBind; attribute for email define("BAIKAL_DAV_LDAP_EMAIL_ATTR", 'mail'); -# Auth Backend Mail; protocol of service -define("BAIKAL_DAV_MAIL_PROTOCOL", 'imap'); - -# Auth Backend Mail; server host:port -define("BAIKAL_DAV_MAIL_SERVER", 'localhost:143'); - -# Auth Backend Mail; validate the ssl-certificate -define("BAIKAL_DAV_MAIL_CHECK_CERT", TRUE); - -# Auth Backends: automatic creation of users; default yes" -define("BAIKAL_DAV_AUTO_CREATE_USER", TRUE); - -# Baïkal Web Admin ON/OFF switch; default TRUE -define("BAIKAL_ADMIN_ENABLED", TRUE); - -# Baïkal Web Admin autolock ON/OFF switch; default FALSE -define("BAIKAL_ADMIN_AUTOLOCKENABLED", FALSE); - # Baïkal Web admin password hash; Set via Baïkal Web Admin -define("BAIKAL_ADMIN_PASSWORDHASH", 'YNH_ADMIN_PASSWORDHASH'); +define("BAIKAL_ADMIN_PASSWORDHASH", '#PASSWORDHASH#'); diff --git a/conf/config.system.php b/conf/config.system.php index 6ec79ec..72af22d 100644 --- a/conf/config.system.php +++ b/conf/config.system.php @@ -3,7 +3,7 @@ # # Copyright notice # -# (c) 2014 Jérôme Schneider +# (c) 2016 Jérôme Schneider # All rights reserved # # http://baikal-server.com @@ -35,17 +35,17 @@ # 1. All URIs *must* be suffixed by "/" if pointing to a folder # -# PATH to SabreDAV -define("BAIKAL_PATH_SABREDAV", PROJECT_PATH_FRAMEWORKS . "SabreDAV/lib/Sabre/"); - # If you change this value, you'll have to re-generate passwords for all your users define("BAIKAL_AUTH_REALM", 'BaikalDAV'); # Should begin and end with a "/" -define("BAIKAL_CARD_BASEURI", "YNH_LOCATION/card.php/"); +define("BAIKAL_CARD_BASEURI", "#PATH#/card.php/"); # Should begin and end with a "/" -define("BAIKAL_CAL_BASEURI", "YNH_LOCATION/cal.php/"); +define("BAIKAL_CAL_BASEURI", "#PATH#/cal.php/"); + +# Should begin and end with a "/" +define("BAIKAL_DAV_BASEURI", "#PATH#/dav.php/"); # Define path to Baïkal Database SQLite file define("PROJECT_SQLITE_FILE", PROJECT_PATH_SPECIFIC . "db/db.sqlite"); @@ -57,16 +57,16 @@ define("PROJECT_DB_MYSQL", TRUE); define("PROJECT_DB_MYSQL_HOST", 'localhost'); # MySQL > Database name -define("PROJECT_DB_MYSQL_DBNAME", 'YNH_DBNAME'); +define("PROJECT_DB_MYSQL_DBNAME", '#DBNAME#'); # MySQL > Username -define("PROJECT_DB_MYSQL_USERNAME", 'YNH_DBUSER'); +define("PROJECT_DB_MYSQL_USERNAME", '#DBUSER#'); # MySQL > Password -define("PROJECT_DB_MYSQL_PASSWORD", 'YNH_DBPWD'); +define("PROJECT_DB_MYSQL_PASSWORD", '#DBPASS#'); # A random 32 bytes key that will be used to encrypt data -define("BAIKAL_ENCRYPTION_KEY", 'YNH_ENCRYPTKEY'); +define("BAIKAL_ENCRYPTION_KEY", '#DESKEY#'); # The currently configured Baïkal version -define("BAIKAL_CONFIGURED_VERSION", '0.2.7'); +define("BAIKAL_CONFIGURED_VERSION", '0.4.4'); diff --git a/conf/nginx.conf b/conf/nginx.conf index 92f6ae2..d7b75ab 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,5 @@ -location PATHTOCHANGE { - alias ALIASTOCHANGE/; +location #LOCATION# { + alias #DESTDIR#/html; if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; } @@ -15,13 +15,13 @@ location PATHTOCHANGE { } } -location /.well-known/carddav { - rewrite ^(.*)$ PATHTOCHANGE/card.php redirect; - } - location /.well-known/caldav { - rewrite ^(.*)$ PATHTOCHANGE/cal.php redirect; - } - -location ~ ^PATHTOCHANGE/(\.ht|Core|Specific) { - deny all; +location ~ ^#PATH#/(\.|Core|Specific) { + deny all; +} + +location /.well-known/carddav { + rewrite ^(.*)$ #PATH#/card.php redirect; +} +location /.well-known/caldav { + rewrite ^(.*)$ #PATH#/cal.php redirect; } diff --git a/patches/add-ldap-auth.patch b/patches/add-ldap-auth.patch new file mode 100644 index 0000000..b4cb6ed --- /dev/null +++ b/patches/add-ldap-auth.patch @@ -0,0 +1,317 @@ +--- /dev/null ++++ b/Core/Frameworks/Baikal/Core/AbstractExternalAuth.php +@@ -0,0 +1,130 @@ ++ ++ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License ++ */ ++abstract class AbstractExternalAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic { ++ ++ /** ++ * enable autocreation of user ++ * ++ * @var PDO ++ */ ++ protected $enableAutoCreation; ++ ++ /** ++ * Reference to PDO connection ++ * ++ * @var PDO ++ */ ++ private $pdo; ++ ++ /** ++ * PDO table name we'll be using ++ * ++ * @var string ++ */ ++ private $tableName; ++ ++ /** ++ * Creates the backend object. ++ * ++ * If the filename argument is passed in, it will parse out the specified file fist. ++ * ++ * @param PDO $pdo ++ * @param string $realm ++ * @param string $tableName The PDO table name to use ++ */ ++ public function __construct(\PDO $pdo, $realm = 'BaikalDAV', $tableName = 'users') { ++ ++ $this->pdo = $pdo; ++ $this->tableName = $tableName; ++ $this->enableAutoCreation = true; ++ } ++ ++ /** ++ * Validates a username and password ++ * ++ * This method should return true or false depending on if login ++ * succeeded. ++ * ++ * @param string $username ++ * @param string $password ++ * @return bool ++ */ ++ public function validateUserPass($username, $password) { ++ ++ if (!$this->validateUserPassExternal($username, $password)) ++ return false; ++ ++ $this->currentUser = $username; ++ if ($this->enableAutoCreation) ++ $this->autoUserCreation($username); ++ ++ return true; ++ } ++ ++ /** ++ * Validates a username and password agains external backend ++ * ++ * This method should return true or false depending on if login ++ * succeeded. ++ * ++ * @param string $username ++ * @param string $password ++ * @return bool ++ */ ++ public abstract function validateUserPassExternal($username, $password); ++ ++ /** ++ * return the displayname and email from the external Backend ++ * ++ * @param string $username ++ * @return array ('displayname' => string, 'email' => string) ++ */ ++ public function getAccountValues($username) { ++ ++ return array(); ++ } ++ ++ /** ++ * create an internal user, when user not exists ++ * ++ * @param string $username ++ */ ++ private function autoUserCreation($username) { ++ ++ /* search user in DB and do nothing, when user exists */ ++ $stmt = $this->pdo->prepare('SELECT username FROM '.$this->tableName.' WHERE username = ?'); ++ $stmt->execute(array($username)); ++ $result = $stmt->fetchAll(); ++ if (count($result) != 0) ++ return; ++ ++ /* get account values from backend */ ++ $values = $this->getAccountValues($username); ++ if (!isset($values['displayname']) OR strlen($values['displayname']) === 0) ++ $values['displayname'] = $username; ++ if (!isset($values['email']) OR strlen($values['email']) === 0) { ++ if(filter_var($username, FILTER_VALIDATE_EMAIL)) ++ $values['email'] = $username; ++ else ++ $values['email'] = 'unset-mail'; ++ } ++ ++ /* create user */ ++ $user = new \Baikal\Model\User(); ++ $user->set('username', $username); ++ $user->set('displayname', $values['displayname']); ++ $user->set('email', $values['email']); ++ $user->persist(); ++ } ++ ++} +--- /dev/null ++++ b/Core/Frameworks/Baikal/Core/LDAPUserBindAuth.php +@@ -0,0 +1,75 @@ ++ ++ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License ++ */ ++class LDAPUserBindAuth extends AbstractExternalAuth { ++ ++ /** ++ * AccountValues for getAccountValues ++ * ++ * @var array ('displayname' => string, 'email' => string) ++ */ ++ private $accountValues; ++ ++ /** ++ * Validates a username and password over ldap ++ * ++ * @param string $username ++ * @param string $password ++ * @return bool ++ */ ++ public function validateUserPassExternal($username, $password) { ++ ++ /* create ldap connection */ ++ $conn = ldap_connect(BAIKAL_DAV_LDAP_URI); ++ if (!$conn) ++ return false; ++ if (!ldap_set_option($conn, LDAP_OPT_PROTOCOL_VERSION, 3)) ++ return false; ++ ++ /* bind with user ++ * error_handler have to change, because a failed bind raises an error ++ * this raise a secuity issue because in the stack trace is the password of user readable ++ */ ++ $arr = explode('@', $username, 2); ++ $dn = str_replace('%n', $username, BAIKAL_DAV_LDAP_DN_TEMPLATE); ++ $dn = str_replace('%u', $arr[0], $dn); ++ if(isset($arr[1])) $dn = str_replace('%d', $arr[1], $dn); ++ ++ set_error_handler("\Baikal\Core\LDAPUserBindAuth::exception_error_handler"); ++ $bind = ldap_bind($conn, $dn, $password); ++ restore_error_handler(); ++ if (!$bind) { ++ ldap_close($conn); ++ return false; ++ } ++ ++ /* read displayname and email from user */ ++ $this->accountValues = array(); ++ $sr = ldap_read($conn, $dn, '(objectclass=*)', array(BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR, BAIKAL_DAV_LDAP_EMAIL_ATTR)); ++ $entry = ldap_get_entries($conn, $sr); ++ if (isset($entry[0][BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR][0])) ++ $this->accountValues['displayname'] = $entry[0][BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR][0]; ++ if (isset($entry[0][BAIKAL_DAV_LDAP_EMAIL_ATTR][0])) ++ $this->accountValues['email'] = $entry[0][BAIKAL_DAV_LDAP_EMAIL_ATTR][0]; ++ ++ /* close */ ++ ldap_close($conn); ++ return true; ++ } ++ ++ public function getAccountValues($username) { ++ ++ return $this->accountValues; ++ } ++ ++ # WorkAround error_handler in failed bind of LDAP ++ public static function exception_error_handler($errno, $errstr, $errfile, $errline) { ++ } ++} +diff --git a/Core/Frameworks/Baikal/Core/Server.php b/Core/Frameworks/Baikal/Core/Server.php +index 8026854..8d306fe 100644 +--- a/Core/Frameworks/Baikal/Core/Server.php ++++ b/Core/Frameworks/Baikal/Core/Server.php +@@ -133,6 +133,8 @@ class Server { + + if ($this->authType === 'Basic') { + $authBackend = new \Baikal\Core\PDOBasicAuth($this->pdo, $this->authRealm); ++ } elseif ($this->authType === 'LDAP-UserBind') { ++ $authBackend = new \Baikal\Core\LDAPUserBindAuth($this->pdo, $this->authRealm); + } else { + $authBackend = new \Sabre\DAV\Auth\Backend\PDO($this->pdo); + $authBackend->setRealm($this->authRealm); +diff --git a/Core/Frameworks/Baikal/Model/Config/Standard.php b/Core/Frameworks/Baikal/Model/Config/Standard.php +index 6107377..39f90bd 100644 +--- a/Core/Frameworks/Baikal/Model/Config/Standard.php ++++ b/Core/Frameworks/Baikal/Model/Config/Standard.php +@@ -46,6 +46,22 @@ class Standard extends \Baikal\Model\Config { + "type" => "string", + "comment" => "HTTP authentication type for WebDAV; default Digest" + ], ++ "BAIKAL_DAV_LDAP_URI" => [ ++ "type" => "string", ++ "comment" => "URI to LDAP Server (for ldap-userbind auth); default ldapi:///" ++ ], ++ "BAIKAL_DAV_LDAP_DN_TEMPLATE" => [ ++ "type" => "string", ++ "comment" => "User DN for bind; with replacments %n => username, %u => user part, %d => domain part of username" ++ ], ++ "BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR" => [ ++ "type" => "string", ++ "comment" => "LDAP-attribute for displayname; default cn" ++ ], ++ "BAIKAL_DAV_LDAP_EMAIL_ATTR" => [ ++ "type" => "string", ++ "comment" => "LDAP-attribute for email; default mail" ++ ], + "BAIKAL_ADMIN_PASSWORDHASH" => [ + "type" => "string", + "comment" => "Baïkal Web admin password hash; Set via Baïkal Web Admin", +@@ -58,6 +74,10 @@ class Standard extends \Baikal\Model\Config { + "BAIKAL_CARD_ENABLED" => true, + "BAIKAL_CAL_ENABLED" => true, + "BAIKAL_DAV_AUTH_TYPE" => "Digest", ++ "BAIKAL_DAV_LDAP_URI" => "ldapi:///", ++ "BAIKAL_DAV_LDAP_DN_TEMPLATE" => "uid=%n,dc=example,dc=com", ++ "BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR" => "cn", ++ "BAIKAL_DAV_LDAP_EMAIL_ATTR" => "mail", + "BAIKAL_ADMIN_PASSWORDHASH" => "" + ]; + +@@ -85,7 +105,31 @@ class Standard extends \Baikal\Model\Config { + $oMorpho->add(new \Formal\Element\Listbox([ + "prop" => "BAIKAL_DAV_AUTH_TYPE", + "label" => "WebDAV authentication type", +- "options" => [ "Digest", "Basic" ] ++ "options" => [ "Digest", "Basic", "LDAP-UserBind" ] ++ ])); ++ ++ $oMorpho->add(new \Formal\Element\Text([ ++ "prop" => "BAIKAL_DAV_LDAP_URI", ++ "label" => "LDAP URI" ++ ])); ++ ++ $oMorpho->add(new \Formal\Element\Text([ ++ "prop" => "BAIKAL_DAV_LDAP_DN_TEMPLATE", ++ "label" => "LDAP DN template", ++ "popover" => [ ++ "title" => "posible placeholder", ++ "content" => "%n - username
%u - user part of username , when it is an email address)
%d - domain part", ++ ] ++ ])); ++ ++ $oMorpho->add(new \Formal\Element\Text([ ++ "prop" => "BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR", ++ "label" => "LDAP attribute for DisplayName" ++ ])); ++ ++ $oMorpho->add(new \Formal\Element\Text([ ++ "prop" => "BAIKAL_DAV_LDAP_EMAIL_ATTR", ++ "label" => "LDAP attribute for eMail" + ])); + + $oMorpho->add(new \Formal\Element\Password([ +@@ -180,6 +224,21 @@ define("BAIKAL_CAL_ENABLED", TRUE); + # WebDAV authentication type; default Digest + define("BAIKAL_DAV_AUTH_TYPE", "Digest"); + ++# Auth Backend LDAP-UserBind; LDAP URI ++define("BAIKAL_DAV_LDAP_URI", 'ldapi:///'); ++ ++# Auth Backend LDAP-UserBind; Template for userbind ++# %n => username ++# %u => user part of username when it is an email ++# %u => domain part of username when it is an email ++define("BAIKAL_DAV_LDAP_DN_TEMPLATE", 'cn=%u,dc=%d,ou=domains,o=server'); ++ ++# Auth Backend LDAP-UserBind; attribute for displayname ++define("BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR", 'cn'); ++ ++# Auth Backend LDAP-UserBind; attribute for email ++define("BAIKAL_DAV_LDAP_EMAIL_ATTR", 'mail'); ++ + # Baïkal Web admin password hash; Set via Baïkal Web Admin + define("BAIKAL_ADMIN_PASSWORDHASH", ""); + CODE; diff --git a/scripts/_common.sh b/scripts/_common.sh new file mode 100644 index 0000000..0b61d64 --- /dev/null +++ b/scripts/_common.sh @@ -0,0 +1,44 @@ +# +# Common variables +# + +# Baikal version +VERSION=0.4.4 + +# Baikal source archive checksum +BAIKAL_SOURCE_SHA256="cced612353862bce532ed458eda0675b5e1e5790f92969bf13992c6567943efc" + +# Remote URL to fetch Baikal source archive +BAIKAL_SOURCE_URL="https://github.com/fruux/Baikal/releases/download/${VERSION}/baikal-${VERSION}.zip" + +# App package root directory should be the parent folder +PKGDIR=$(cd ../; pwd) + +# +# Common helpers +# + +# Source app helpers +source /usr/share/yunohost/helpers + +# Download and extract Baikal sources to the given directory +# usage: extract_baikal DESTDIR +extract_baikal() { + local DESTDIR=$1 + local bk_archive="${DESTDIR}/baikal.zip" + +# wget -q -O "$bk_archive" "$BAIKAL_SOURCE_URL" \ + cp /home/admin/baikal.zip "$bk_archive" \ + || ynh_die "Unable to download Baikal archive" + echo "$BAIKAL_SOURCE_SHA256 $bk_archive" | sha256sum -c >/dev/null \ + || ynh_die "Invalid checksum of downloaded archive" + unzip -q "$bk_archive" -d "$DESTDIR" \ + || ynh_die "Unable to extract Baikal archive" + mv "${DESTDIR}/baikal/"* "$DESTDIR" + rm -rf "$bk_archive" "${DESTDIR}/baikal" + + # apply patches + (cd "$DESTDIR" \ + && for p in ${PKGDIR}/patches/*.patch; do patch -p1 < $p; done) \ + || die "Unable to apply patches to Baikal" +} diff --git a/scripts/install b/scripts/install index af79cfc..0b76731 100644 --- a/scripts/install +++ b/scripts/install @@ -1,65 +1,91 @@ #!/bin/bash +set -e + # Retrieve arguments domain=$1 -path=$2 +path=${2%/} password=$3 +app=${!#} + +# Load common variables and helpers +source ./_common.sh + +# Set app specific variables +dbname=$app +dbuser=$app # Check domain/path availability -sudo yunohost app checkurl $domain$path -a baikal -if [[ ! $? -eq 0 ]]; then - exit 1 -fi +sudo yunohost app checkurl "${domain}${path}" -a "$app" \ + || exit 1 -# Install PHP dependency -sudo apt-get update -sudo apt-get install -y php5-cli +# Check destination directory +DESTDIR="/var/www/${app}" +[[ -d "$DESTDIR" ]] && die \ +"The destination directory '${DESTDIR}' already exists.\ + You should safely delete it before installing this app." -# Copy files to the right place -final_path=/var/www/baikal +# Create tmp directory and fetch app inside +TMPDIR=$(ynh_mkdir_tmp) +extract_baikal "$TMPDIR" -sudo mkdir -p $final_path -sudo cp -a ../sources/* $final_path -sudo chown -R www-data: $final_path -sudo su -c "curl -sS https://getcomposer.org/installer | php -- --install-dir=$final_path" -s /bin/sh www-data -sudo su -c "cd $final_path && php composer.phar install" -s /bin/sh www-data -sudo rm $final_path/composer* +# Generate random DES key & password +deskey=$(ynh_string_random 24) +dbpass=$(ynh_string_random) -db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]' | sed -n 's/\(.\{24\}\).*/\1/p') -db_user=baikal -sudo yunohost app initdb $db_user -p $db_pwd -s $(readlink -e ../sources/Core/Resources/Db/MySQL/db.sql) -sudo yunohost app setting baikal mysqlpwd -v $db_pwd -sed -i "s@YNH_TIMEZONE@$(cat /etc/timezone)@g" ../conf/config.php -sed -i "s@YNH_ADMIN_PASSWORDHASH@$(echo -n admin:BaikalDAV:$password | md5sum | cut -d ' ' -f 1)@g" ../conf/config.php -sudo yunohost app setting baikal password -v "$password" +# Initialize database +ynh_mysql_create_db "$dbname" "$dbuser" "$dbpass" +ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" \ + < "${TMPDIR}/Core/Resources/Db/MySQL/db.sql" -sed -i "s@YNH_LOCATION@$path@g" ../conf/config.system.php -sed -i "s@YNH_DBNAME@$db_user@g" ../conf/config.system.php -sed -i "s@YNH_DBUSER@$db_user@g" ../conf/config.system.php -sed -i "s@YNH_DBPWD@$db_pwd@g" ../conf/config.system.php -encrypt_key=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{32\}\).*/\1/p') -sudo yunohost app setting baikal encrypt_key -v $encrypt_key -sed -i "s@YNH_ENCRYPTKEY@$encrypt_key@g" ../conf/config.system.php +# Create admin password hash +password_hash=$(echo -n admin:BaikalDAV:$password | md5sum | cut -d ' ' -f 1) -sudo cp ../conf/config.php $final_path/Specific -sudo cp ../conf/config.system.php $final_path/Specific +# Copy and set Baikal configuration +bk_conf="${TMPDIR}/Specific/config.php" +cp ../conf/config.php "$bk_conf" +sed -i "s@#TIMEZONE#@$(cat /etc/timezone)@g" "$bk_conf" +sed -i "s@#PASSWORDHASH#@${password_hash}@g" "$bk_conf" -sudo chown -R root: $final_path -sudo chown -R www-data: $final_path/Specific -sudo find $final_path -type f | xargs sudo chmod 644 -sudo find $final_path -type d | xargs sudo chmod 755 +bk_conf="${TMPDIR}/Specific/config.system.php" +cp ../conf/config.system.php "$bk_conf" +sed -i "s@#PATH#@${path}@g" "$bk_conf" +sed -i "s@#DBNAME#@${dbname}@g" "$bk_conf" +sed -i "s@#DBUSER#@${dbuser}@g" "$bk_conf" +sed -i "s@#DBPASS#@${dbpass}@g" "$bk_conf" +sed -i "s@#DESKEY#@${deskey}@g" "$bk_conf" -# Change variables in Baikal configuration -sed -i "s@PATHTOCHANGE@$path@g" ../conf/nginx.conf -sed -i "s@ALIASTOCHANGE@$final_path/html@g" ../conf/nginx.conf -sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/baikal.conf -sudo chown root: /etc/nginx/conf.d/$domain.d/baikal.conf -sudo chmod 600 /etc/nginx/conf.d/$domain.d/baikal.conf +# Disable installation +touch "${TMPDIR}/Specific/INSTALL_DISABLED" -# Reload Nginx and regenerate SSOwat conf -sudo service nginx reload -sudo yunohost app setting baikal skipped_uris -v "/" -sudo yunohost app ssowatconf +# Install files and set permissions +sudo mv "$TMPDIR" "$DESTDIR" +sudo chown -R www-data: "$DESTDIR" -# Remove ENABLE_INSTALL for more Security -sudo rm $final_path/Specific/ENABLE_INSTALL +# Copy and set nginx configuration +nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf" +sed -i "s@#PATH#@${path}@g" ../conf/nginx.conf +sed -i "s@#LOCATION#@${path:-/}@g" ../conf/nginx.conf +sed -i "s@#DESTDIR#@${DESTDIR}@g" ../conf/nginx.conf +sudo cp ../conf/nginx.conf "$nginx_conf" + +# Copy and set php-fpm configuration +#phpfpm_conf="/etc/php5/fpm/pool.d/${app}.conf" +#sed -i "s@#POOLNAME#@${app}@g" ../conf/php-fpm.conf +#sed -i "s@#DESTDIR#@${DESTDIR}/@g" ../conf/php-fpm.conf +#sudo cp ../conf/php-fpm.conf "$phpfpm_conf" +#sudo chown root: $phpfpm_conf +#sudo chmod 644 $phpfpm_conf + +# Save app settings +ynh_app_setting_set "$app" password "$password" +ynh_app_setting_set "$app" encrypt_key "$deskey" +ynh_app_setting_set "$app" mysqlpwd "$dbpass" + +# Set SSOwat rules +ynh_app_setting_set "$app" skipped_uris "/" +ynh_app_setting_set "$app" protected_uris "/admin/" + +# Reload services +#sudo service php5-fpm restart || true +sudo service nginx reload || true diff --git a/scripts/remove b/scripts/remove index ec897b3..c83ac19 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,14 +1,27 @@ #!/bin/bash -db_user=baikal -db_name=baikal -root_pwd=$(sudo cat /etc/yunohost/mysql) -mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;" +# Retrieve arguments +app=${!#} -# Removing executable files -sudo rm -rf /var/www/baikal -domain=$(sudo yunohost app setting baikal domain) -sudo rm -f /etc/nginx/conf.d/$domain.d/baikal.conf +# Load common variables and helpers +source ./_common.sh -# Restarting services -sudo service nginx reload +# Set app specific variables +dbname=$app +dbuser=$app + +# Drop MySQL database and user +ynh_mysql_drop_db $dbname || true +ynh_mysql_drop_user $dbuser || true + +# Retrieve domain from app settings +domain=$(ynh_app_setting_get $app domain) + +# Delete app directory and configurations +sudo rm -rf "/var/www/${app}" +#sudo rm -f "/etc/php5/fpm/pool.d/${app}.conf" +[[ -n $domain ]] && sudo rm -f "/etc/nginx/conf.d/${domain}.d/${app}.conf" + +# Reload services +#sudo service php5-fpm restart || true +sudo service nginx reload || true diff --git a/sources/ChangeLog.md b/sources/ChangeLog.md deleted file mode 100644 index 7b45a73..0000000 --- a/sources/ChangeLog.md +++ /dev/null @@ -1,4 +0,0 @@ -# 0.2.5 - -Upgraded SabreDAV from 1.8.0 to 1.8.6 -Baïkal releases are now based on composer thanks to @evert \ No newline at end of file diff --git a/sources/Core/Distrib.php b/sources/Core/Distrib.php deleted file mode 100644 index 01b17f9..0000000 --- a/sources/Core/Distrib.php +++ /dev/null @@ -1,29 +0,0 @@ - -# All rights reserved -# -# http://baikal-server.com -# -# 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! -################################################################# - -define("BAIKAL_VERSION", "0.2.7"); -define("BAIKAL_HOMEPAGE", "http://baikal-server.com"); -define("PROJECT_PACKAGE", "regular"); diff --git a/sources/Core/Frameworks/Baikal/Core/AbstractExternalAuth.php b/sources/Core/Frameworks/Baikal/Core/AbstractExternalAuth.php deleted file mode 100644 index 726dfa5..0000000 --- a/sources/Core/Frameworks/Baikal/Core/AbstractExternalAuth.php +++ /dev/null @@ -1,136 +0,0 @@ - - * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License - */ -abstract class AbstractExternalAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic { - - /** - * enable autocreation of user - * - * @var PDO - */ - protected $enableAutoCreation; - - /** - * Reference to PDO connection - * - * @var PDO - */ - private $pdo; - - /** - * PDO table name we'll be using - * - * @var string - */ - private $tableName; - - /** - * Creates the backend object. - * - * If the filename argument is passed in, it will parse out the specified file fist. - * - * @param PDO $pdo - * @param string $realm - * @param string $tableName The PDO table name to use - */ - public function __construct(\PDO $pdo, $realm = 'BaikalDAV', $tableName = 'users') { - - $this->pdo = $pdo; - $this->tableName = $tableName; - $this->enableAutoCreation = true; - } - - /** - * Validates a username and password - * - * This method should return true or false depending on if login - * succeeded. - * - * @param string $username - * @param string $password - * @return bool - */ - public function validateUserPass($username, $password) { - - /* auth user agains backend */ - if (!$this->validateUserPassExternal($username, $password)) - return false; - - /* check user exists already */ - $stmt = $this->pdo->prepare('SELECT username FROM '.$this->tableName.' WHERE username = ?'); - $stmt->execute(array($username)); - $result = $stmt->fetchAll(); - if( count($result) == 1) { - $this->currentUser = $username; - return true; - } - - /* failed login, when new user should not create */ - if( !BAIKAL_DAV_AUTO_CREATE_USER || !$this->enableAutoCreation) - return false; - - /* create user */ - $this->autoUserCreation($username); - $this->currentUser = $username; - return true; - } - - /** - * Validates a username and password agains external backend - * - * This method should return true or false depending on if login - * succeeded. - * - * @param string $username - * @param string $password - * @return bool - */ - public abstract function validateUserPassExternal($username, $password); - - /** - * return the displayname and email from the external Backend - * - * @param string $username - * @return array ('displayname' => string, 'email' => string) - */ - public function getAccountValues($username) { - - return array(); - } - - /** - * create an internal user, when user not exists - * - * @param string $username - */ - private function autoUserCreation($username) { - - /* get account values from backend */ - $values = $this->getAccountValues($username); - if (!isset($values['displayname']) OR strlen($values['displayname']) === 0) - $values['displayname'] = $username; - if (!isset($values['email']) OR strlen($values['email']) === 0) { - if(filter_var($username, FILTER_VALIDATE_EMAIL)) - $values['email'] = $username; - else - $values['email'] = 'unset-mail'; - } - - /* create user */ - $user = new \Baikal\Model\User(); - $user->set('username', $username); - $user->set('displayname', $values['displayname']); - $user->set('email', $values['email']); - $user->persist(); - } - -} diff --git a/sources/Core/Frameworks/Baikal/Core/LDAPUserBindAuth.php b/sources/Core/Frameworks/Baikal/Core/LDAPUserBindAuth.php deleted file mode 100644 index c83fa29..0000000 --- a/sources/Core/Frameworks/Baikal/Core/LDAPUserBindAuth.php +++ /dev/null @@ -1,75 +0,0 @@ - - * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License - */ -class LDAPUserBindAuth extends AbstractExternalAuth { - - /** - * AccountValues for getAccountValues - * - * @var array ('displayname' => string, 'email' => string) - */ - private $accountValues; - - /** - * Validates a username and password over ldap - * - * @param string $username - * @param string $password - * @return bool - */ - public function validateUserPassExternal($username, $password) { - - /* create ldap connection */ - $conn = ldap_connect(BAIKAL_DAV_LDAP_URI); - if (!$conn) - return false; - if (!ldap_set_option($conn,LDAP_OPT_PROTOCOL_VERSION,3)) - return false; - - /* bind with user - * error_handler have to change, because a failed bind raises an error - * this raise a secuity issue because in the stack trace is the password of user readable - */ - $arr = explode('@', $username, 2); - $dn = str_replace('%n', $username, BAIKAL_DAV_LDAP_DN_TEMPLATE); - $dn = str_replace('%u', $arr[0], $dn); - if(isset($arr[1])) $dn = str_replace('%d', $arr[1], $dn); - - set_error_handler("\Baikal\Core\LDAPUserBindAuth::exception_error_handler"); - $bind = ldap_bind($conn, $dn, $password); - restore_error_handler(); - if (!$bind) { - ldap_close($conn); - return false; - } - - /* read displayname and email from user */ - $this->accountValues = array(); - $sr = ldap_read($conn, $dn, '(objectclass=*)', array(BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR,BAIKAL_DAV_LDAP_EMAIL_ATTR)); - $entry = ldap_get_entries($conn, $sr); - if (isset($entry[0][BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR][0])) - $this->accountValues['displayname'] = $entry[0][BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR][0]; - if (isset($entry[0][BAIKAL_DAV_LDAP_EMAIL_ATTR][0])) - $this->accountValues['email'] = $entry[0][BAIKAL_DAV_LDAP_EMAIL_ATTR][0]; - - /* close */ - ldap_close($conn); - return true; - } - - public function getAccountValues($username) { - - return $this->accountValues; - } - - # WorkAround error_handler in failed bind of LDAP - public static function exception_error_handler($errno, $errstr, $errfile, $errline) { - } -} diff --git a/sources/Core/Frameworks/Baikal/Core/MailAuth.php b/sources/Core/Frameworks/Baikal/Core/MailAuth.php deleted file mode 100644 index 63a93c2..0000000 --- a/sources/Core/Frameworks/Baikal/Core/MailAuth.php +++ /dev/null @@ -1,56 +0,0 @@ - - * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License - */ -class MailAuth extends AbstractExternalAuth { - - /** - * Validates a username and password over ldap - * - * @param string $username - * @param string $password - * @return bool - */ - public function validateUserPassExternal($username, $password) { - - /* build connection string */ - $cert = BAIKAL_DAV_MAIL_CHECK_CERT ? "/validate-cert" : "/novalidate-cert"; - $url = ""; - switch(BAIKAL_DAV_MAIL_PROTOCOL) { - case "imap": $url = "{".BAIKAL_DAV_MAIL_SERVER."/imap/notls}INBOX"; break; - case "imaps": $url = "{".BAIKAL_DAV_MAIL_SERVER."/imap/ssl${cert}}INBOX"; break; - case "imaptls": $url = "{".BAIKAL_DAV_MAIL_SERVER."/imap/tls${cert}}INBOX"; break; - case "pop3": $url = "{".BAIKAL_DAV_MAIL_SERVER."/pop3/notls}"; break; - case "pop3s": $url = "{".BAIKAL_DAV_MAIL_SERVER."/pop3/ssl${cert}}"; break; - case "pop3tls": $url = "{".BAIKAL_DAV_MAIL_SERVER."/pop3/tls${cert}}"; break; - case "smtp": $url = "{".BAIKAL_DAV_MAIL_SERVER."/smtp/notls}"; break; - case "smtps": $url = "{".BAIKAL_DAV_MAIL_SERVER."/smtp/ssl${cert}}"; break; - case "smtptls": $url = "{".BAIKAL_DAV_MAIL_SERVER."/smtp/tls${cert}}"; break; - } - - /* connect to mail server (only one try) */ - set_error_handler("\Baikal\Core\MailAuth::exception_error_handler"); - $conn = imap_open($url, $username, $password, NULL, 0); - restore_error_handler(); - if (!$conn) - return false; - - /* skip notices, warnings and errors */ - imap_errors(); - - /* close */ - imap_close($conn); - return true; - } - - # WorkAround error_handler in failed login in imap_open - public static function exception_error_handler($errno, $errstr, $errfile, $errline) { - } -} - diff --git a/sources/Core/Frameworks/Baikal/Core/PDOBasicAuth.php b/sources/Core/Frameworks/Baikal/Core/PDOBasicAuth.php deleted file mode 100644 index 433eade..0000000 --- a/sources/Core/Frameworks/Baikal/Core/PDOBasicAuth.php +++ /dev/null @@ -1,81 +0,0 @@ - - * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License - */ -class PDOBasicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic { - - /** - * Reference to PDO connection - * - * @var PDO - */ - protected $pdo; - - /** - * PDO table name we'll be using - * - * @var string - */ - protected $tableName; - - /** - * Authentication realm - * - * @var string - */ - protected $authRealm; - - /** - * Creates the backend object. - * - * If the filename argument is passed in, it will parse out the specified file fist. - * - * @param PDO $pdo - * @param string $tableName The PDO table name to use - */ - public function __construct(\PDO $pdo, $authRealm, $tableName = 'users') { - - $this->pdo = $pdo; - $this->tableName = $tableName; - $this->authRealm = $authRealm; - } - - /** - * Validates a username and password - * - * This method should return true or false depending on if login - * succeeded. - * - * @param string $username - * @param string $password - * @return bool - */ - public function validateUserPass($username, $password) { - - $stmt = $this->pdo->prepare('SELECT username, digesta1 FROM '.$this->tableName.' WHERE username = ?'); - $stmt->execute(array($username)); - $result = $stmt->fetchAll(); - - - if (!count($result)) return false; - - $hash = md5( $username . ':' . $this->authRealm . ':' . $password ); - if( $result[0]['digesta1'] == $hash ) - { - $this->currentUser = $username; - return true; - } - return false; - - } - -} diff --git a/sources/Core/Frameworks/Baikal/Core/Tools.php b/sources/Core/Frameworks/Baikal/Core/Tools.php deleted file mode 100644 index 416df32..0000000 --- a/sources/Core/Frameworks/Baikal/Core/Tools.php +++ /dev/null @@ -1,215 +0,0 @@ - -# All rights reserved -# -# http://baikal-server.com -# -# 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 Baikal\Core; - -class Tools { - public static function &db() { - return $GLOBALS["pdo"]; - } - - public static function assertEnvironmentIsOk() { - # Asserting Baikal Context - if(!defined("BAIKAL_CONTEXT") || BAIKAL_CONTEXT !== TRUE) { - die("Bootstrap.php may not be included outside the Baikal context"); - } - - # Asserting PDO - if(!defined('PDO::ATTR_DRIVER_NAME')) { - die('Baikal Fatal Error: PDO is unavailable. It\'s required by Baikal.'); - } - - # Asserting PDO::SQLite or PDO::MySQL - $aPDODrivers = \PDO::getAvailableDrivers(); - if(!in_array('sqlite', $aPDODrivers) && !in_array('mysql', $aPDODrivers)) { - die('Baikal Fatal Error: Both PDO::sqlite and PDO::mysql are unavailable. One of them at least is required by Baikal.'); - } - } - - public static function configureEnvironment() { - set_exception_handler('\Baikal\Core\Tools::handleException'); - ini_set("error_reporting", E_ALL); - } - - public static function handleException($exception) { - echo "
" . $exception . "
";
-	}
-	
-	public static function assertBaikalIsOk() {
-		
-		# DB connexion has not been asserted earlier by Flake, to give us a chance to trigger the install tool
-		# We assert it right now
-		if(!\Flake\Framework::isDBInitialized() && (!defined("BAIKAL_CONTEXT_INSTALL") || BAIKAL_CONTEXT_INSTALL === FALSE)) {
-			throw new \Exception("Fatal error: no connection to a database is available.");
-		}
-		
-		# Asserting that the database is structurally complete
-		#if(($aMissingTables = self::isDBStructurallyComplete($GLOBALS["DB"])) !== TRUE) {
-		#	throw new \Exception("Fatal error: Database is not structurally complete; missing tables are: " . implode(", ", $aMissingTables) . "");
-		#}
-		
-		# Asserting config file exists
-		if(!file_exists(PROJECT_PATH_SPECIFIC . "config.php")) {
-			throw new \Exception("Specific/config.php does not exist. Please use the Install tool to create it.");
-		}
-		
-		# Asserting config file is readable
-		if(!is_readable(PROJECT_PATH_SPECIFIC . "config.php")) {
-			throw new \Exception("Specific/config.php is not readable. Please give read permissions to httpd user on file 'Specific/config.php'.");
-		}
-		
-		# Asserting config file is writable
-		if(!is_writable(PROJECT_PATH_SPECIFIC . "config.php")) {
-			throw new \Exception("Specific/config.php is not writable. Please give write permissions to httpd user on file 'Specific/config.php'.");
-		}
-		
-		# Asserting system config file exists
-		if(!file_exists(PROJECT_PATH_SPECIFIC . "config.system.php")) {
-			throw new \Exception("Specific/config.system.php does not exist. Please use the Install tool to create it.");
-		}
-		
-		# Asserting system config file is readable
-		if(!is_readable(PROJECT_PATH_SPECIFIC . "config.system.php")) {
-			throw new \Exception("Specific/config.system.php is not readable. Please give read permissions to httpd user on file 'Specific/config.system.php'.");
-		}
-		
-		# Asserting system config file is writable
-		if(!is_writable(PROJECT_PATH_SPECIFIC . "config.system.php")) {
-			throw new \Exception("Specific/config.system.php is not writable. Please give write permissions to httpd user on file 'Specific/config.system.php'.");
-		}
-	}
-
-	public static function getRequiredTablesList() {
-		return array(
-			"addressbooks",
-			"calendarobjects",
-			"calendars",
-			"cards",
-			"groupmembers",
-			"locks",
-			"principals",
-			"users",
-		);
-	}
-	
-	public static function isDBStructurallyComplete(\Flake\Core\Database $oDB) {
-		
-		$aRequiredTables = self::getRequiredTablesList();
-		$aPresentTables = $oDB->tables();
-
-		$aIntersect = array_intersect($aRequiredTables, $aPresentTables);
-		if(count($aIntersect) !== count($aRequiredTables)) {
-			return array_diff($aRequiredTables, $aIntersect);
-		}
-		
-		return TRUE;
-	}
-	
-	public static function bashPrompt($prompt) {
-		print $prompt;
-		@flush();
-		@ob_flush();
-		$confirmation = @trim(fgets(STDIN));
-		return $confirmation;
-	}
-	
-	public static function bashPromptSilent($prompt = "Enter Password:") {
-		$command = "/usr/bin/env bash -c 'echo OK'";
-
-		if(rtrim(shell_exec($command)) !== 'OK') {
-			trigger_error("Can't invoke bash");
-			return;
-		}
-
-		$command = "/usr/bin/env bash -c 'read -s -p \""
-		. addslashes($prompt)
-		. "\" mypassword && echo \$mypassword'";
-
-		$password = rtrim(shell_exec($command));
-		echo "\n";
-		return $password;
-	}
-	
-	public static function getCopyrightNotice($sLinePrefixChar = "#", $sLineSuffixChar = "", $sOpening = FALSE, $sClosing = FALSE) {
-		
-		if($sOpening === FALSE) {
-			$sOpening = str_repeat("#", 78);
-		}
-		
-		if($sClosing === FALSE) {
-			$sClosing = str_repeat("#", 78);
-		}
-		
-		$iYear = date("Y");
-		
-		$sCode =<<
-All rights reserved
-
-http://baikal-server.com
-
-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!
-CODE;
-		$sCode = "\n" . trim($sCode) . "\n";
-		$aCode = explode("\n", $sCode);
-		foreach(array_keys($aCode) as $iLineNum) {
-			$aCode[$iLineNum] = trim($sLinePrefixChar . "\t" . $aCode[$iLineNum]);
-		}
-		
-		if(trim($sOpening) !== "") {
-			array_unshift($aCode, $sOpening);
-		}
-		
-		if(trim($sClosing) !== "") {
-			$aCode[] = $sClosing;
-		}
-		
-		return implode("\n", $aCode);
-	}
-	
-	public static function timezones() {
-		$aZones = \DateTimeZone::listIdentifiers();
-		
-		reset($aZones);
-		return $aZones;
-	}
-}
diff --git a/sources/Core/Frameworks/Baikal/Framework.php b/sources/Core/Frameworks/Baikal/Framework.php
deleted file mode 100644
index 0e57017..0000000
--- a/sources/Core/Frameworks/Baikal/Framework.php
+++ /dev/null
@@ -1,93 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 Baikal;
-
-class Framework extends \Flake\Core\Framework {
-	
-	public static function installTool() {	
-		if(defined("BAIKAL_CONTEXT_INSTALL") && BAIKAL_CONTEXT_INSTALL === TRUE) {
-			# Install tool has been launched and we're already on the install page
-			return;
-		} else {
-			# Install tool has been launched; redirecting user
-			$sInstallToolUrl = PROJECT_URI . "admin/install/";
-			header("Location: " . $sInstallToolUrl);
-			exit(0);
-		}
-	}
-	
-	public static function bootstrap() {
-		
-		# Registering Baikal classloader
-		define("BAIKAL_PATH_FRAMEWORKROOT", dirname(__FILE__) . "/");
-
-		\Baikal\Core\Tools::assertEnvironmentIsOk();
-		\Baikal\Core\Tools::configureEnvironment();
-
-		# Check that a config file exists
-		if(
-			!file_exists(PROJECT_PATH_SPECIFIC . "config.php") ||
-			!file_exists(PROJECT_PATH_SPECIFIC . "config.system.php")
-		) {
-			self::installTool();
-		} else {
-			require_once(PROJECT_PATH_SPECIFIC . "config.php");
-			require_once(PROJECT_PATH_SPECIFIC . "config.system.php");
-			date_default_timezone_set(PROJECT_TIMEZONE);
-
-			# Check that Baïkal is already configured
-			if(!defined("BAIKAL_CONFIGURED_VERSION")) {
-				self::installTool();
-
-			} else {
-
-				# Check that running version matches configured version
-				if(version_compare(BAIKAL_VERSION, BAIKAL_CONFIGURED_VERSION) > 0) {
-					self::installTool();
-
-				} else {
-
-					# Check that admin password is set
-					if(!defined("BAIKAL_ADMIN_PASSWORDHASH")) {
-						self::installTool();
-					}
-
-					\Baikal\Core\Tools::assertBaikalIsOk();
-
-					set_error_handler("\Baikal\Framework::exception_error_handler");
-					
-				}
-			}
-		}
-		
-	}
-	
-	# Mapping PHP errors to exceptions; needed by SabreDAV
-	public static function exception_error_handler($errno, $errstr, $errfile, $errline) {
-		throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
-	}
-}
diff --git a/sources/Core/Frameworks/Baikal/Model/AddressBook.php b/sources/Core/Frameworks/Baikal/Model/AddressBook.php
deleted file mode 100644
index e07acbd..0000000
--- a/sources/Core/Frameworks/Baikal/Model/AddressBook.php
+++ /dev/null
@@ -1,118 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 Baikal\Model;
-
-class AddressBook extends \Flake\Core\Model\Db {
-	const DATATABLE = "addressbooks";
-	const PRIMARYKEY = "id";
-	const LABELFIELD = "displayname";
-	
-	protected $aData = array(
-		"principaluri" => "",
-		"displayname" => "",
-		"uri" => "",
-		"description" => "",
-		"ctag" => 1,
-	);
-	
-	public static function humanName() {
-		return "Address Book";
-	}
-	
-	public static function icon() {
-		return "icon-book";
-	}
-	
-	public static function mediumicon() {
-		return "glyph-adress-book";
-	}
-	
-	public static function bigicon() {
-		return "glyph2x-adress-book";
-	}
-	
-	public function getContactsBaseRequester() {
-		$oBaseRequester = \Baikal\Model\AddressBook\Contact::getBaseRequester();
-		$oBaseRequester->addClauseEquals(
-			"addressbookid",
-			$this->get("id")
-		);
-
-		return $oBaseRequester;
-	}
-	
-	public function formMorphologyForThisModelInstance() {
-		$oMorpho = new \Formal\Form\Morphology();
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "uri",
-			"label" => "Address Book token ID",
-			"validation" => "required,tokenid",
-			"popover" => array(
-				"title" => "Address Book token ID",
-				"content" => "The unique identifier for this address book.",
-			)
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "displayname",
-			"label" => "Display name",
-			"validation" => "required",
-			"popover" => array(
-				"title" => "Display name",
-				"content" => "This is the name that will be displayed in your CardDAV client.",
-			)
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "description",
-			"label" => "Description",
-			"validation" => "required"
-		)));
-		
-		if($this->floating()) {
-			$oMorpho->element("uri")->setOption(
-				"help",
-				"Allowed characters are digits, lowercase letters and the dash symbol '-'."
-			);
-		} else {
-			$oMorpho->element("uri")->setOption("readonly", TRUE);
-		}
-		
-		return $oMorpho;
-	}
-		
-	public function destroy() {
-				
-		$oContacts = $this->getContactsBaseRequester()->execute();
-		foreach($oContacts as $contact) {
-			$contact->destroy();
-		}
-		
-		parent::destroy();
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Baikal/Model/AddressBook/Contact.php b/sources/Core/Frameworks/Baikal/Model/AddressBook/Contact.php
deleted file mode 100644
index 6fddc57..0000000
--- a/sources/Core/Frameworks/Baikal/Model/AddressBook/Contact.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 Baikal\Model\AddressBook;
-
-class Contact extends \Flake\Core\Model\Db {
-	const DATATABLE = "cards";
-	const PRIMARYKEY = "id";
-	const LABELFIELD = "uri";
-	
-	protected $aData = array(
-		"carddata" => "",
-		"uri" => "",
-		"addressbookid" => "",
-		"lastmodified" => "",
-	);
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Baikal/Model/Calendar.php b/sources/Core/Frameworks/Baikal/Model/Calendar.php
deleted file mode 100644
index dfd0b02..0000000
--- a/sources/Core/Frameworks/Baikal/Model/Calendar.php
+++ /dev/null
@@ -1,207 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 Baikal\Model;
-
-class Calendar extends \Flake\Core\Model\Db {
-	const DATATABLE = "calendars";
-	const PRIMARYKEY = "id";
-	const LABELFIELD = "displayname";
-
-	protected $aData = array(
-		"principaluri" => "",
-		"displayname" => "",
-		"uri" => "",
-		"ctag" => 0,
-		"description" => "",
-		"calendarorder" => 0,
-		"calendarcolor" => "",
-		"timezone" => "",
-		"components" => "",
-	);
-
-	public static function icon() {
-		return "icon-calendar";
-	}
-
-	public static function mediumicon() {
-		return "glyph-calendar";
-	}
-
-	public static function bigicon() {
-		return "glyph2x-calendar";
-	}
-
-	public function getEventsBaseRequester() {
-		$oBaseRequester = \Baikal\Model\Calendar\Event::getBaseRequester();
-		$oBaseRequester->addClauseEquals(
-			"calendarid",
-			$this->get("id")
-		);
-
-		return $oBaseRequester;
-	}
-
-	public function get($sPropName) {
-
-		if($sPropName === "todos") {
-			# TRUE if components contains VTODO, FALSE otherwise
-			if(($sComponents = $this->get("components")) !== "") {
-				$aComponents = explode(",", $sComponents);
-			} else {
-				$aComponents = array();
-			}
-
-			return in_array("VTODO", $aComponents);
-		}
-
-		if($sPropName === "notes") {
-			# TRUE if components contains VJOURNAL, FALSE otherwise
-			if(($sComponents = $this->get("components")) !== "") {
-				$aComponents = explode(",", $sComponents);
-			} else {
-				$aComponents = array();
-			}
-
-			return in_array("VJOURNAL", $aComponents);
-		}
-
-		return parent::get($sPropName);
-	}
-
-	public function set($sPropName, $sValue) {
-
-		if($sPropName === "todos") {
-
-			if(($sComponents = $this->get("components")) !== "") {
-				$aComponents = explode(",", $sComponents);
-			} else {
-				$aComponents = array();
-			}
-
-			if($sValue === TRUE) {
-				if(!in_array("VTODO", $aComponents)) {
-					$aComponents[] = "VTODO";
-				}
-			} else {
-				if(in_array("VTODO", $aComponents)) {
-					unset($aComponents[array_search("VTODO", $aComponents)]);
-				}
-			}
-
-			return parent::set("components", implode(",", $aComponents));
-		}
-
-		if($sPropName === "notes") {
-
-			if(($sComponents = $this->get("components")) !== "") {
-				$aComponents = explode(",", $sComponents);
-			} else {
-				$aComponents = array();
-			}
-
-			if($sValue === TRUE) {
-				if(!in_array("VJOURNAL", $aComponents)) {
-					$aComponents[] = "VJOURNAL";
-				}
-			} else {
-				if(in_array("VJOURNAL", $aComponents)) {
-					unset($aComponents[array_search("VJOURNAL", $aComponents)]);
-				}
-			}
-
-			return parent::set("components", implode(",", $aComponents));
-		}
-
-		return parent::set($sPropName, $sValue);
-	}
-
-	public function formMorphologyForThisModelInstance() {
-		$oMorpho = new \Formal\Form\Morphology();
-
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "uri",
-			"label" => "Calendar token ID",
-			"validation" => "required,tokenid",
-			"popover" => array(
-				"title" => "Calendar token ID",
-				"content" => "The unique identifier for this calendar.",
-			)
-		)));
-
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "displayname",
-			"label" => "Display name",
-			"validation" => "required",
-			"popover" => array(
-				"title" => "Display name",
-				"content" => "This is the name that will be displayed in your CalDAV client.",
-			)
-		)));
-
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "description",
-			"label" => "Description"
-		)));
-
-		$oMorpho->add(new \Formal\Element\Checkbox(array(
-			"prop" => "todos",
-			"label" => "Todos",
-			"help" => "If checked, todos will be enabled on this calendar.",
-		)));
-
-		$oMorpho->add(new \Formal\Element\Checkbox(array(
-			"prop" => "notes",
-			"label" => "Notes",
-			"help" => "If checked, notes will be enabled on this calendar.",
-		)));
-
-
-		if($this->floating()) {
-			$oMorpho->element("uri")->setOption(
-				"help",
-				"Allowed characters are digits, lowercase letters and the dash symbol '-'."
-			);
-		} else {
-			$oMorpho->element("uri")->setOption("readonly", TRUE);
-		}
-
-		return $oMorpho;
-	}
-
-	public function isDefault() {
-		return $this->get("uri") === "default";
-	}
-
-	public function destroy() {
-		$oEvents = $this->getEventsBaseRequester()->execute();
-		foreach($oEvents as $event) {
-			$event->destroy();
-		}
-
-		parent::destroy();
-	}
-}
diff --git a/sources/Core/Frameworks/Baikal/Model/Calendar/Event.php b/sources/Core/Frameworks/Baikal/Model/Calendar/Event.php
deleted file mode 100644
index f09cfbf..0000000
--- a/sources/Core/Frameworks/Baikal/Model/Calendar/Event.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 Baikal\Model\Calendar;
-
-class Event extends \Flake\Core\Model\Db {
-	const DATATABLE = "calendarobjects";
-	const PRIMARYKEY = "id";
-	const LABELFIELD = "uri";
-	
-	protected $aData = array(
-		"calendardata" => "",
-		"uri" => "",
-		"calendarid" => "",
-		"lastmodified" => "",
-	);
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Baikal/Model/Config.php b/sources/Core/Frameworks/Baikal/Model/Config.php
deleted file mode 100644
index 01f1fa6..0000000
--- a/sources/Core/Frameworks/Baikal/Model/Config.php
+++ /dev/null
@@ -1,240 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 Baikal\Model;
-
-abstract class Config extends \Flake\Core\Model\NoDb {
-
-	protected $sConfigFilePath = "";
-	protected $aConstants = array();
-	protected $aData = array();
-
-	public function __construct($sConfigFilePath) {
-		# Note: no call to parent::__construct() to avoid erasing $this->aData
-		$this->sConfigFilePath = $sConfigFilePath;
-		$aConfig = $this->parseConfig(
-			$this->getConfigAsString()
-		);
-
-		foreach(array_keys($this->aData) as $sProp) {
-			if(array_key_exists($sProp, $aConfig)) {
-				$this->aData[$sProp] = $aConfig[$sProp];
-			}
-		}
-	}
-
-	protected function getConfigAsString() {
-		if(file_exists($this->sConfigFilePath)) {
-			$sContent = file_get_contents($this->sConfigFilePath);
-			return str_replace(LF . CR, LF, $sContent);
-		} else {
-
-			$sConfig = "aConstants) as $sConstant) {
-			$aConstant = $this->aConstants[$sConstant];
-
-			$aMatches = array();
-			$sPattern = '/\s*define\(\s*["|\']' . $sConstant . '["|\']\s*\,\s*(.*?)\s*\);\s*/ix';
-
-			$iNbRes = preg_match_all(
-				$sPattern,
-				$sString,
-				$aMatches
-			);
-
-			if($iNbRes === 1) {
-				# Exactly one match
-				# O would be not enough, and > 1, to much to handle properly
-
-				$sValue = $aMatches[1][0];	# first capture (.*?), first occurence (anyway, we asserted that there's only one)
-				switch($aConstant["type"]) {
-					case "string": {
-						$sValue = substr($sValue, 1, -1);	# Strip quotes
-						break;
-					}
-					case "integer": {
-						$sValue = intval($sValue);	# Integer
-						break;
-					}
-					case "boolean": {
-						if(in_array(strtoupper(trim($sValue)), array("1", "TRUE"))) {
-							$sValue = TRUE;
-						} else {
-							$sValue = FALSE;
-						}
-						break;
-					}
-					case "litteral": {
-						$sValue = trim($sValue);
-						break;
-					}
-					default: {
-						# nothing
-						break;
-					}
-				}
-				
-				$aRes[$sConstant] = $sValue;
-				
-			} elseif($iNbRes > 1) {
-				throw new \Exception("Baikal\Model\Config->parseConfig(): constant '" . $sConstant . "' has been found multiple times in the config file; stopping execution");
-			} else {
-				# $iNbRes === 0
-				# We do nothing, to keep the default value (the one already set in $aData)
-			}
-		}
-
-		reset($aRes);
-		return $aRes;
-	}
-
-	public function writable() {
-		return (
-			@file_exists($this->sConfigFilePath) &&
-			@is_file($this->sConfigFilePath) &&
-			@is_writable($this->sConfigFilePath)
-		);
-	}
-
-	public static function icon() {
-		return "icon-cog";
-	}
-
-	public static function mediumicon() {
-		return "glyph-cogwheel";
-	}
-
-	public static function bigicon() {
-		return "glyph2x-cogwheel";
-	}
-	
-	public function floating() {
-		return FALSE;
-	}
-
-	public function persist() {
-		$aLines = explode(LF, $this->getConfigAsString());
-		$iLines = count($aLines);
-		
-		foreach(array_keys($this->aData) as $prop) {
-			$sPattern = '/\s*define\(\s*["|\']' . $prop . '["|\']\s*\,\s*(.*?)\s*\);\s*/ix';
-			$sValue = $this->aData[$prop];
-			
-			
-			# We replace value by it's native PHP notation
-			switch($this->aConstants[$prop]["type"]) {
-				case "string": {
-					$sValue = var_export($sValue, TRUE);	# Add quotes, and escape " and all string-termination chars
-					break;
-				}
-				case "integer": {
-					$sValue = intval($sValue);	# Cast as integer
-					break;
-				}
-				case "boolean": {
-
-					if(intval($sValue) === 1) {	# Note as a BOOLEAN PHP constant
-						$sValue = "TRUE";
-					} else {
-						$sValue = "FALSE";
-					}
-
-					break;
-				}
-				case "litteral": {
-					$sValue = trim($sValue);
-					break;
-				}
-				default: {
-					$sValue = "''";
-					break;
-				}
-			}
-			
-			$mFound = FALSE;
-			for($k = ($iLines - 1); $k >= 0; $k--) {
-				if(preg_match($sPattern, $aLines[$k])) {
-					
-					# Found the last matching line
-					$mFound = $k;
-					break;
-				}
-			}
-			
-			if($mFound === FALSE) {
-				# Adding line at the end of the file
-				$aLines[] = "\n" . "# " . $this->aConstants[$prop]["comment"] . "\ndefine(\"" . $prop . "\", " . $sValue . ");";
-			} else {
-				$aLines[$mFound] = "define(\"" . $prop . "\", " . $sValue . ");";
-			}
-		}
-
-		$sLines = implode("\n", $aLines);
-		$sSandboxedCode = str_replace(array(""), "", $sLines);
-		$sRand = (string)rand();
-		$sCode = "if(0) {" . $sSandboxedCode . "}; echo '" . $sRand . "';";
-		ob_start();
-		eval($sCode);
-		$sRes = ob_get_contents();
-		ob_end_clean();
-
-		if($sRes !== $sRand) {
-			echo "
" . htmlspecialchars($sLines) . "
";
-			throw new \Exception("Parse error in new config file. Aborting, nothing has been changed.");
-		}
-		
-		# We asserted that the syntax is OK;
-		# We now check that all the constants are present, and with the right value
-		$aNewConfig = $this->parseConfig($sLines);
-		$aWrittenConfig = $this->aData;
-
-		asort($aNewConfig);
-		asort($aWrittenConfig);
-		
-		if($aNewConfig != $aWrittenConfig) {
-			throw new \Exception("New config does not correspond to expected config. Aborting, nothing has been changed.");
-		}
-
-		file_put_contents($this->sConfigFilePath, $sLines);
-	}
-
-	public function destroy() {
-
-	}
-
-	protected static function getDefaultConfig() {
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Baikal/Model/Config/Database.php b/sources/Core/Frameworks/Baikal/Model/Config/Database.php
deleted file mode 100644
index 4874f14..0000000
--- a/sources/Core/Frameworks/Baikal/Model/Config/Database.php
+++ /dev/null
@@ -1,117 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 Baikal\Model\Config;
-
-class Database extends \Baikal\Model\Config {
-	
-	protected $aConstants = array(
-		"PROJECT_SQLITE_FILE" => array(
-			"type" => "litteral",
-			"comment" => "Define path to Baïkal Database SQLite file",
-		),
-		"PROJECT_DB_MYSQL" => array(
-			"type" => "boolean",
-			"comment" => "MySQL > Use MySQL instead of SQLite ?",
-		),
-		"PROJECT_DB_MYSQL_HOST" => array(
-			"type" => "string",
-			"comment" => "MySQL > Host, including ':portnumber' if port is not the default one (3306)",
-		),
-		"PROJECT_DB_MYSQL_DBNAME" => array(
-			"type" => "string",
-			"comment" => "MySQL > Database name",
-		),
-		"PROJECT_DB_MYSQL_USERNAME" => array(
-			"type" => "string",
-			"comment" => "MySQL > Username",
-		),
-		"PROJECT_DB_MYSQL_PASSWORD" => array(
-			"type" => "string",
-			"comment" => "MySQL > Password",
-		),
-	);
-	
-	# Default values
-	protected $aData = array(
-		"PROJECT_SQLITE_FILE" => 'PROJECT_PATH_SPECIFIC . "db/db.sqlite"',
-		"PROJECT_DB_MYSQL" => FALSE,
-		"PROJECT_DB_MYSQL_HOST" => "",
-		"PROJECT_DB_MYSQL_DBNAME" => "",
-		"PROJECT_DB_MYSQL_USERNAME" => "",
-		"PROJECT_DB_MYSQL_PASSWORD" => "",
-	);
-	
-	public function formMorphologyForThisModelInstance() {
-		$oMorpho = new \Formal\Form\Morphology();
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "PROJECT_SQLITE_FILE",
-			"label" => "SQLite file path",
-			"validation" => "required",
-			"inputclass" => "input-xxlarge",
-			"help" => "The absolute server path to the SQLite file",
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Checkbox(array(
-			"prop" => "PROJECT_DB_MYSQL",
-			"label" => "Use MySQL",
-			"help" => "If checked, Baïkal will use MySQL instead of SQLite.",
-			"refreshonchange" => TRUE,
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "PROJECT_DB_MYSQL_HOST",
-			"label" => "MySQL host",
-			"help" => "Host ip or name, including ':portnumber' if port is not the default one (3306)"
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "PROJECT_DB_MYSQL_DBNAME",
-			"label" => "MySQL database name",
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "PROJECT_DB_MYSQL_USERNAME",
-			"label" => "MySQL username",
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Password(array(
-			"prop" => "PROJECT_DB_MYSQL_PASSWORD",
-			"label" => "MySQL password",
-		)));
-
-		return $oMorpho;
-	}
-		
-	public function label() {
-		return "Baïkal Database Settings";
-	}
-
-	protected static function getDefaultConfig() {
-		throw new \Exception("Should never reach getDefaultConfig() on \Baikal\Model\Config\Database");
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Baikal/Model/Config/Distrib.php b/sources/Core/Frameworks/Baikal/Model/Config/Distrib.php
deleted file mode 100644
index 7859546..0000000
--- a/sources/Core/Frameworks/Baikal/Model/Config/Distrib.php
+++ /dev/null
@@ -1,61 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 Baikal\Model\Config;
-
-class Distrib extends \Baikal\Model\Config {
-	
-	protected $aConstants = array(
-		"BAIKAL_VERSION" => array(
-			"type" => "string",
-			"comment" => "The version of the packaged system"
-		),
-		"BAIKAL_HOMEPAGE" => array(
-			"type" => "string",
-			"comment" => "The URL to the project homepage",
-		),
-		"PROJECT_PACKAGE" => array(
-			"type" => "string",
-			"comment" => "The type of the current package (one of 'flat', 'regular')"
-		),
-	);
-	
-	# Default values
-	protected $aData = array(
-		"BAIKAL_VERSION" => "",
-		"BAIKAL_HOMEPAGE" => "",
-		"PROJECT_PACKAGE" => "",
-	);
-	
-	public function formMorphologyForThisModelInstance() {
-		$oMorpho = new \Formal\Form\Morphology();
-		return $oMorpho;
-	}
-		
-	public function label() {
-		return "Baïkal distribution info";
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Baikal/Model/Config/Standard.php b/sources/Core/Frameworks/Baikal/Model/Config/Standard.php
deleted file mode 100644
index 50b869f..0000000
--- a/sources/Core/Frameworks/Baikal/Model/Config/Standard.php
+++ /dev/null
@@ -1,360 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 Baikal\Model\Config;
-
-class Standard extends \Baikal\Model\Config {
-	
-	protected $aConstants = array(
-		"PROJECT_TIMEZONE" => array(
-			"type" => "string",
-			"comment" => "Timezone of the server; if unsure, check http://en.wikipedia.org/wiki/List_of_tz_database_time_zones",
-		),
-		"BAIKAL_CARD_ENABLED" => array(
-			"type" => "boolean",
-			"comment" => "CardDAV ON/OFF switch; default TRUE",
-		),
-		"BAIKAL_CAL_ENABLED" => array(
-			"type" => "boolean",
-			"comment" => "CalDAV ON/OFF switch; default TRUE",
-		),
-		"BAIKAL_DAV_AUTH_TYPE" => array(
-			"type" => "string",
-			"comment" => "HTTP authentication type for WebDAV; default Digest"
-		),
-		"BAIKAL_DAV_LDAP_URI" => array(
-			"type" => "string",
-			"comment" => "URI to LDAP Server (for ldap-userbind auth); default ldapi:///"
-		),
-		"BAIKAL_DAV_LDAP_DN_TEMPLATE" => array(
-			"type" => "string",
-			"comment" => "User DN for bind; with replacments %n => username, %u => user part, %d => domain part of username"
-		),
-		"BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR" => array(
-			"type" => "string",
-			"comment" => "LDAP-attribute for displayname; default cn"
-		),
-		"BAIKAL_DAV_LDAP_EMAIL_ATTR" => array(
-			"type" => "string",
-			"comment" => "LDAP-attribute for email; default mail"
-		),
-		"BAIKAL_DAV_MAIL_PROTOCOL" => array(
-			"type" => "string",
-			"comment" => "used protocol; default 'imap (TLS/StartTLS)'"
-		),
-		"BAIKAL_DAV_MAIL_SERVER" => array(
-			"type" => "string",
-			"comment" => "host:port of mail server; default localhost:143"
-		),
-		"BAIKAL_DAV_MAIL_CHECK_CERT" => array(
-			"type" => "boolean",
-			"comment" => "validate ssl-certificate; default yes"
-		),
-		"BAIKAL_DAV_AUTO_CREATE_USER" => array(
-			"type" => "boolean",
-			"comment" => "automatic creation of users; default yes"
-		),
-		"BAIKAL_ADMIN_ENABLED" => array(
-			"type" => "boolean",
-			"comment" => "Baïkal Web Admin ON/OFF switch; default TRUE",
-		),
-		"BAIKAL_ADMIN_AUTOLOCKENABLED" => array(
-			"type" => "boolean",
-			"comment" => "Baïkal Web Admin autolock ON/OFF switch; default FALSE",
-		),
-		"BAIKAL_ADMIN_PASSWORDHASH" => array(
-			"type" => "string",
-			"comment" => "Baïkal Web admin password hash; Set via Baïkal Web Admin",
-		)
-	);
-	
-	# Default values
-	protected $aData = array(
-		"PROJECT_TIMEZONE" => "Europe/Paris",
-		"BAIKAL_CARD_ENABLED" => TRUE,
-		"BAIKAL_CAL_ENABLED" => TRUE,
-		"BAIKAL_DAV_AUTH_TYPE" => "Digest",
-		"BAIKAL_DAV_LDAP_URI" => "ldapi:///",
-		"BAIKAL_DAV_LDAP_DN_TEMPLATE" => "uid=%n,dc=example,dc=com",
-		"BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR" => "cn",
-		"BAIKAL_DAV_LDAP_EMAIL_ATTR" => "mail",
-		"BAIKAL_DAV_MAIL_PROTOCOL" => "imap (unencrypted)",
-		"BAIKAL_DAV_MAIL_SERVER" => "localhost:143",
-		"BAIKAL_DAV_MAIL_CHECK_CERT" => TRUE,
-		"BAIKAL_DAV_AUTO_CREATE_USER" => TRUE,
-		"BAIKAL_ADMIN_ENABLED" => TRUE,
-		"BAIKAL_ADMIN_AUTOLOCKENABLED" => FALSE,
-		"BAIKAL_ADMIN_PASSWORDHASH" => ""
-	);
-	
-	public function formMorphologyForThisModelInstance() {
-		$oMorpho = new \Formal\Form\Morphology();
-		
-		$oMorpho->add(new \Formal\Element\Listbox(array(
-			"prop" => "PROJECT_TIMEZONE",
-			"label" => "Server Time zone",
-			"validation" => "required",
-			"options" => \Baikal\Core\Tools::timezones(),
-		)));
-		
-		
-		$oMorpho->add(new \Formal\Element\Checkbox(array(
-			"prop" => "BAIKAL_CAL_ENABLED",
-			"label" => "Enable CalDAV"
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Checkbox(array(
-			"prop" => "BAIKAL_CARD_ENABLED",
-			"label" => "Enable CardDAV"
-		)));
-
-		$oMorpho->add(new \Formal\Element\Listbox(array(
-			"prop" => "BAIKAL_DAV_AUTH_TYPE",
-			"label" => "WebDAV authentication type",
-			"options" => array( "Digest", "Basic", "LDAP-UserBind", "Mail" )
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "BAIKAL_DAV_LDAP_URI",
-			"label" => "LDAP URI",
-			"class" => "auth_ldap-userbind"
-		)));
-
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "BAIKAL_DAV_LDAP_DN_TEMPLATE",
-			"label" => "LDAP DN template",
-			"class" => "auth_ldap-userbind",
-			"popover" => array(
-				"title" => "posible placeholder",
-				"content" => "%n - username
%u - user part of username , when it is an email address)
%d - domain part",
-			)
-		)));
-
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR",
-			"label" => "LDAP attribute for DisplayName",
-			"class" => "auth_ldap-userbind"
-		)));
-
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "BAIKAL_DAV_LDAP_EMAIL_ATTR",
-			"label" => "LDAP attribute for eMail",
-			"class" => "auth_ldap-userbind"
-		)));
-
-		$oMorpho->add(new \Formal\Element\Listbox(array(
-			"prop" => "BAIKAL_DAV_MAIL_PROTOCOL",
-			"label" => "MailAuth Protocol",
-			"class" => "auth_mail",
-			"options" => array(
-				"imap" => "imap (unencrypted)",
-				"imaps" => "imaps (SSL)",
-				"imaptls" => "imap (StartTLS)",
-				"pop3" => "pop3 (unencrypted)",
-				"pop3s" => "pop3s (SSL)",
-				"pop3tls" => "pop3 (StartTLS)",
-				"smtp" => "smtp (unencrypted)",
-				"smtps" => "smtps (SSL)",
-				"smtptls" => "smtp (StartTLS)"
-			)
-		)));
-
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "BAIKAL_DAV_MAIL_SERVER",
-			"label" => "MailAuth Server",
-			"class" => "auth_mail",
-			"popover" => array(
-				"title" => "Format",
-				"content" => "host:port"
-			)
-		)));
-
-		$oMorpho->add(new \Formal\Element\Checkbox(array(
-			"prop" => "BAIKAL_DAV_MAIL_CHECK_CERT",
-			"label" => "MailAuth Check SSL-Certificate",
-			"class" => "auth_mail auth_mail_ssl",
-			"popover" => array(
-				"title" => "Security",
-				"content" => "validate the server certificate"
-			)
-		)));
-
-		$oMorpho->add(new \Formal\Element\Checkbox(array(
-			"prop" => "BAIKAL_DAV_AUTO_CREATE_USER",
-			"label" => "Automatic create users",
-			"class" => "auth_mail auth_ldap-userbind"
-		)));
-
-		$oMorpho->add(new \Formal\Element\Password(array(
-			"prop" => "BAIKAL_ADMIN_PASSWORDHASH",
-			"label" => "Admin password",
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Password(array(
-			"prop" => "BAIKAL_ADMIN_PASSWORDHASH_CONFIRM",
-			"label" => "Admin password, confirmation",
-			"validation" => "sameas:BAIKAL_ADMIN_PASSWORDHASH",
-		)));
-		
-		if(!defined("BAIKAL_ADMIN_PASSWORDHASH") || trim(BAIKAL_ADMIN_PASSWORDHASH) === "") {
-
-			# No password set (Form is used in install tool), so password is required as it has to be defined
-			$oMorpho->element("BAIKAL_ADMIN_PASSWORDHASH")->setOption("validation", "required");
-		} else {
-			$sNotice = "-- Leave empty to keep current password --";
-			$oMorpho->element("BAIKAL_ADMIN_PASSWORDHASH")->setOption("placeholder", $sNotice);
-			$oMorpho->element("BAIKAL_ADMIN_PASSWORDHASH_CONFIRM")->setOption("placeholder", $sNotice);
-		}
-
-		$oMorpho->add(new \Formal\Element\Checkbox(array(
-			"prop" => "BAIKAL_ADMIN_ENABLED",
-			"label" => "Enable Web interface (recommended)",
-			"popover" => array(
-				"title" => "Warning !",
-				"content" => "If disabled, you'll lose access to this very admin interface !",
-			),
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Checkbox(array(
-			"prop" => "BAIKAL_ADMIN_AUTOLOCKENABLED",
-			"label" => "Web interface autolock",
-			"popover" => array(
-				"title" => "Web admin autolock",
-				"content" => "If enabled, you'll have to create a file named ENABLE_ADMIN in the folder Specific/ prior to every admin use.

This enforces security, but might be uncomfortable if you use the admin frequently."
-			)
-		)));
-		
-		return $oMorpho;
-	}
-		
-	public function label() {
-		return "Baïkal Settings";
-	}
-	
-	public function set($sProp, $sValue) {
-		if($sProp === "BAIKAL_ADMIN_PASSWORDHASH" || $sProp === "BAIKAL_ADMIN_PASSWORDHASH_CONFIRM") {
-			# Special handling for password and passwordconfirm
-			
-			if($sProp === "BAIKAL_ADMIN_PASSWORDHASH" && $sValue !== "") {
-				parent::set(
-					"BAIKAL_ADMIN_PASSWORDHASH",
-					\BaikalAdmin\Core\Auth::hashAdminPassword($sValue)
-				);
-			}
-			
-			return $this;
-		}
-		
-		parent::set($sProp, $sValue);
-	}
-	
-	public function get($sProp) {
-		if($sProp === "BAIKAL_ADMIN_PASSWORDHASH" || $sProp === "BAIKAL_ADMIN_PASSWORDHASH_CONFIRM") {
-			return "";
-		}
-		
-		return parent::get($sProp);
-	}
-
-	protected function createDefaultConfigFilesIfNeeded() {
-
-		# Create empty config.php if needed
-		if(!file_exists(PROJECT_PATH_SPECIFIC . "config.php")) {
-			@touch(PROJECT_PATH_SPECIFIC . "config.php");
-			$sContent = "getDefaultConfig();
-			file_put_contents(PROJECT_PATH_SPECIFIC . "config.php", $sContent);
-		}
-		
-		# Create empty config.system.php if needed
-		if(!file_exists(PROJECT_PATH_SPECIFIC . "config.system.php")) {
-			@touch(PROJECT_PATH_SPECIFIC . "config.system.php");
-			$sContent = "getDefaultSystemConfig();
-			file_put_contents(PROJECT_PATH_SPECIFIC . "config.system.php", $sContent);
-		}
-	}
-	
-	protected static function getDefaultConfig() {
-
-		$sCode =<< username
-# %u => user part of username when it is an email 
-# %u => domain part of username when it is an email 
-define("BAIKAL_DAV_LDAP_DN_TEMPLATE", 'cn=%u,dc=%d,ou=domains,o=server');
-
-# Auth Backend LDAP-UserBind; attribute for displayname
-define("BAIKAL_DAV_LDAP_DISPLAYNAME_ATTR", 'cn');
-
-# Auth Backend LDAP-UserBind; attribute for email
-define("BAIKAL_DAV_LDAP_EMAIL_ATTR", 'mail');
-
-# Auth Backend Mail; protocol of service
-define("BAIKAL_DAV_MAIL_PROTOCOL", 'imap');
-
-# Auth Backend Mail; server host:port
-define("BAIKAL_DAV_MAIL_SERVER", 'localhost:143');
-
-# Auth Backend Mail; validate the ssl-certificate
-define("BAIKAL_DAV_MAIL_CHECK_CERT", TRUE);
-
-# Auth Backends: automatic creation of users; default yes"
-define("BAIKAL_DAV_AUTO_CREATE_USER", TRUE);
-
-# Baïkal Web Admin ON/OFF switch; default TRUE
-define("BAIKAL_ADMIN_ENABLED", TRUE);
-
-# Baïkal Web Admin autolock ON/OFF switch; default FALSE
-define("BAIKAL_ADMIN_AUTOLOCKENABLED", FALSE);
-
-# Baïkal Web admin password hash; Set via Baïkal Web Admin
-define("BAIKAL_ADMIN_PASSWORDHASH", "");
-CODE;
-		$sCode = trim($sCode);
-		return $sCode;
-	}
-}
diff --git a/sources/Core/Frameworks/Baikal/Model/Config/System.php b/sources/Core/Frameworks/Baikal/Model/Config/System.php
deleted file mode 100644
index a17313c..0000000
--- a/sources/Core/Frameworks/Baikal/Model/Config/System.php
+++ /dev/null
@@ -1,244 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 Baikal\Model\Config;
-
-class System extends \Baikal\Model\Config {
-	
-	protected $aConstants = array(
-		"BAIKAL_PATH_SABREDAV" => array(
-			"type" => "litteral",
-			"comment" => "PATH to SabreDAV",
-		),
-		"BAIKAL_AUTH_REALM" => array(
-			"type" => "string",
-			"comment" => "If you change this value, you'll have to re-generate passwords for all your users",
-		),
-		"BAIKAL_CARD_BASEURI" => array(
-			"type" => "litteral",
-			"comment" => 'Should begin and end with a "/"',
-		),
-		"BAIKAL_CAL_BASEURI" => array(
-			"type" => "litteral",
-			"comment" => 'Should begin and end with a "/"',
-		),
-		"PROJECT_SQLITE_FILE" => array(
-			"type" => "litteral",
-			"comment" => "Define path to Baïkal Database SQLite file",
-		),
-		"PROJECT_DB_MYSQL" => array(
-			"type" => "boolean",
-			"comment" => "MySQL > Use MySQL instead of SQLite ?",
-		),
-		"PROJECT_DB_MYSQL_HOST" => array(
-			"type" => "string",
-			"comment" => "MySQL > Host, including ':portnumber' if port is not the default one (3306)",
-		),
-		"PROJECT_DB_MYSQL_DBNAME" => array(
-			"type" => "string",
-			"comment" => "MySQL > Database name",
-		),
-		"PROJECT_DB_MYSQL_USERNAME" => array(
-			"type" => "string",
-			"comment" => "MySQL > Username",
-		),
-		"PROJECT_DB_MYSQL_PASSWORD" => array(
-			"type" => "string",
-			"comment" => "MySQL > Password",
-		),
-		"BAIKAL_ENCRYPTION_KEY" => array(
-			"type" => "string",
-			"comment" => "A random 32 bytes key that will be used to encrypt data",
-		),
-		"BAIKAL_CONFIGURED_VERSION" => array(
-			"type" => "string",
-			"comment" => "The currently configured Baïkal version",
-		),
-	);
-	
-	# Default values
-	protected $aData = array(
-		"BAIKAL_PATH_SABREDAV" => 'PROJECT_PATH_FRAMEWORKS . "SabreDAV/lib/Sabre/"',
-		"BAIKAL_AUTH_REALM" => "BaikalDAV",
-		"BAIKAL_CARD_BASEURI" => 'PROJECT_BASEURI . "card.php/"',
-		"BAIKAL_CAL_BASEURI" => 'PROJECT_BASEURI . "cal.php/"',
-		"PROJECT_SQLITE_FILE" => 'PROJECT_PATH_SPECIFIC . "db/db.sqlite"',
-		"PROJECT_DB_MYSQL" => FALSE,
-		"PROJECT_DB_MYSQL_HOST" => "",
-		"PROJECT_DB_MYSQL_DBNAME" => "",
-		"PROJECT_DB_MYSQL_USERNAME" => "",
-		"PROJECT_DB_MYSQL_PASSWORD" => "",
-		"BAIKAL_ENCRYPTION_KEY" => "",
-		"BAIKAL_CONFIGURED_VERSION" => "",
-	);
-	
-	public function formMorphologyForThisModelInstance() {
-		$oMorpho = new \Formal\Form\Morphology();
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "BAIKAL_CAL_BASEURI",
-			"label" => "CalDAV base URI",
-			"validation" => "required",
-			"help" => "The absolute web path to cal.php",
-			"popover" => array(
-				"title" => "CalDAV base URI",
-				"content" => "If Baïkal is hosted in a subfolder, this path should reflect it.
Whatever happens, it should begin and end with a slash.",
-			)
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "BAIKAL_CARD_BASEURI",
-			"label" => "CardDAV base URI",
-			"validation" => "required",
-			"help" => "The absolute web path to card.php",
-			"popover" => array(
-				"title" => "CardDAV base URI",
-				"content" => "If Baïkal is hosted in a subfolder, this path should reflect it.
Whatever happens, it should begin and end with a slash."
-			)
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "BAIKAL_AUTH_REALM",
-			"label" => "Auth realm",
-			"validation" => "required",
-			"help" => "Token used in authentication process.
If you change this, you'll have to reset all your users passwords.
You'll also loose access to this admin interface.",
-			"popover" => array(
-				"title" => "Auth realm",
-				"content" => "If you change this, you'll loose your access to this interface.
In other words: you should not change this, unless YKWYD."
-			)
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "BAIKAL_PATH_SABREDAV",
-			"label" => "Path to SabreDAV",
-			"validation" => "required",
-			"inputclass" => "input-xxlarge",
-			"help" => "The absolute server path to SabreDAV API",
-			"popover" => array(
-				"title" => "Path to SabreDAV",
-				"content" => "If Baïkal is hosted in a subfolder, this path should reflect it.
Whatever happens, it should begin and end with a slash.",
-				"position" => "top"
-			)
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "PROJECT_SQLITE_FILE",
-			"label" => "SQLite file path",
-			"validation" => "required",
-			"inputclass" => "input-xxlarge",
-			"help" => "The absolute server path to the SQLite file",
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Checkbox(array(
-			"prop" => "PROJECT_DB_MYSQL",
-			"label" => "Use MySQL",
-			"help" => "If checked, Baïkal will use MySQL instead of SQLite.",
-			"refreshonchange" => TRUE,
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "PROJECT_DB_MYSQL_HOST",
-			"label" => "MySQL host",
-			"help" => "Host ip or name, including ':portnumber' if port is not the default one (3306)"
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "PROJECT_DB_MYSQL_DBNAME",
-			"label" => "MySQL database name",
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "PROJECT_DB_MYSQL_USERNAME",
-			"label" => "MySQL username",
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Password(array(
-			"prop" => "PROJECT_DB_MYSQL_PASSWORD",
-			"label" => "MySQL password",
-		)));
-		
-		return $oMorpho;
-	}
-		
-	public function label() {
-		return "Baïkal Settings";
-	}
-
-	protected static function getDefaultConfig() {
-
-		$sBaikalVersion = BAIKAL_VERSION;
-
-		$sCode =<< Use MySQL instead of SQLite ?
-define("PROJECT_DB_MYSQL", FALSE);
-
-# MySQL > Host, including ':portnumber' if port is not the default one (3306)
-define("PROJECT_DB_MYSQL_HOST", "");
-
-# MySQL > Database name
-define("PROJECT_DB_MYSQL_DBNAME", "");
-
-# MySQL > Username
-define("PROJECT_DB_MYSQL_USERNAME", "");
-
-# MySQL > Password
-define("PROJECT_DB_MYSQL_PASSWORD", "");
-
-# A random 32 bytes key that will be used to encrypt data
-define("BAIKAL_ENCRYPTION_KEY", "");
-
-# The currently configured Baïkal version
-define("BAIKAL_CONFIGURED_VERSION", "{$sBaikalVersion}");
-
-CODE;
-		$sCode = trim($sCode);
-		return $sCode;
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Baikal/Model/Principal.php b/sources/Core/Frameworks/Baikal/Model/Principal.php
deleted file mode 100644
index 31694de..0000000
--- a/sources/Core/Frameworks/Baikal/Model/Principal.php
+++ /dev/null
@@ -1,37 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 Baikal\Model;
-
-class Principal extends \Flake\Core\Model\Db {
-	const DATATABLE = "principals";
-	const PRIMARYKEY = "id";
-	protected $aData = array(
-		"uri" => "",
-		"displayname" => "",
-		"email" => "",
-	);
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Baikal/Model/User.php b/sources/Core/Frameworks/Baikal/Model/User.php
deleted file mode 100644
index 5c7bfa0..0000000
--- a/sources/Core/Frameworks/Baikal/Model/User.php
+++ /dev/null
@@ -1,286 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 Baikal\Model;
-
-class User extends \Flake\Core\Model\Db {
-	const DATATABLE = "users";
-	const PRIMARYKEY = "id";
-	const LABELFIELD = "username";
-	
-	protected $aData = array(
-		"username" => "",
-		"digesta1" => "",
-	);
-	
-	protected $oIdentityPrincipal = null;
-	
-	public function initByPrimary($sPrimary) {
-		parent::initByPrimary($sPrimary);
-		
-		# Initializing principals
-		$this->oIdentityPrincipal = \Baikal\Model\Principal::getBaseRequester()
-			->addClauseEquals("uri", "principals/" . $this->get("username"))
-			->execute()
-			->first();
-	}
-	
-	public function getAddressBooksBaseRequester() {
-		$oBaseRequester = \Baikal\Model\AddressBook::getBaseRequester();
-		$oBaseRequester->addClauseEquals(
-			"principaluri",
-			"principals/" . $this->get("username")
-		);
-		
-		return $oBaseRequester;
-	}
-	
-	public function getCalendarsBaseRequester() {
-		$oBaseRequester = \Baikal\Model\Calendar::getBaseRequester();
-		$oBaseRequester->addClauseEquals(
-			"principaluri",
-			"principals/" . $this->get("username")
-		);
-		
-		return $oBaseRequester;
-	}
-	
-	public function initFloating() {
-		parent::initFloating();
-		
-		# Initializing principals
-		$this->oIdentityPrincipal = new \Baikal\Model\Principal();
-	}
-	
-	public function get($sPropName) {
-		
-		if($sPropName === "password" || $sPropName === "passwordconfirm") {
-			# Special handling for password and passwordconfirm
-			return "";
-		}
-		
-		try {
-			# does the property exist on the model object ?
-			$sRes = parent::get($sPropName);
-		} catch(\Exception $e) {
-			# no, it may belong to the oIdentityPrincipal model object
-			$sRes = $this->oIdentityPrincipal->get($sPropName);
-		}
-		
-		return $sRes;
-	}
-	
-	public function set($sPropName, $sPropValue) {
-		
-		if($sPropName === "password" || $sPropName === "passwordconfirm") {
-			# Special handling for password and passwordconfirm
-			
-			if($sPropName === "password" && $sPropValue !== "") {
-				parent::set(
-					"digesta1",
-					$this->getPasswordHashForPassword($sPropValue)
-				);
-			}
-			
-			return $this;
-		}
-		
-		try {
-			# does the property exist on the model object ?
-			parent::set($sPropName, $sPropValue);
-		} catch(\Exception $e) {
-			# no, it may belong to the oIdentityPrincipal model object
-			$this->oIdentityPrincipal->set($sPropName, $sPropValue);
-		}
-		
-		return $this;
-	}
-	
-	public function persist() {
-		
-		$bFloating = $this->floating();
-		
-		# Persisted first, as Model users loads this data
-		$this->oIdentityPrincipal->set("uri", "principals/" . $this->get("username"));
-		$this->oIdentityPrincipal->persist();
-		
-		parent::persist();
-		
-		if($bFloating) {
-			
-			# Creating default calendar for user
-			$oDefaultCalendar = new \Baikal\Model\Calendar();
-			$oDefaultCalendar->set(
-				"principaluri",
-				"principals/" . $this->get("username")
-			)->set(
-				"displayname",
-				"Default calendar"
-			)->set(
-				"uri",
-				"default"
-			)->set(
-				"ctag",
-				1
-			)->set(
-				"description",
-				"Default calendar"
-			)->set(
-				"components",
-				"VEVENT,VTODO"
-			);
-			
-			$oDefaultCalendar->persist();
-			
-			# Creating default address book for user
-			$oDefaultAddressBook = new \Baikal\Model\AddressBook();
-			$oDefaultAddressBook->set(
-				"principaluri",
-				"principals/" . $this->get("username")
-			)->set(
-				"displayname",
-				"Default Address Book"
-			)->set(
-				"uri",
-				"default"
-			)->set(
-				"description",
-				"Default Address Book for " . $this->get("displayname")
-			);
-			
-			$oDefaultAddressBook->persist();
-		}
-	}
-	
-	public function destroy() {
-		# TODO: delete all related resources (principals, calendars, calendar events, contact books and contacts)
-		
-		# Destroying identity principal
-		$this->oIdentityPrincipal->destroy();
-		
-		$oCalendars = $this->getCalendarsBaseRequester()->execute();
-		foreach($oCalendars as $calendar) {
-			$calendar->destroy();
-		}
-		
-		$oAddressBooks = $this->getAddressBooksBaseRequester()->execute();
-		foreach($oAddressBooks as $addressbook) {
-			$addressbook->destroy();
-		}
-		
-		parent::destroy();
-	}
-	
-	public function getMailtoURI() {
-		return "mailto:" . rawurlencode($this->get("displayname") . " <" . $this->get("email") . ">");
-	}
-	
-	public function formMorphologyForThisModelInstance() {
-		$oMorpho = new \Formal\Form\Morphology();
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "username",
-			"label" => "Username",
-			"validation" => "required,unique",
-			"popover" => array(
-				"title" => "Username",
-				"content" => "The login for this user account.
It has to be unique.",
-			)
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "displayname",
-			"label" => "Display name",
-			"validation" => "required",
-			"popover" => array(
-				"title" => "Display name",
-				"content" => "This is the name that will be displayed in your CalDAV/CardDAV clients.",
-			)
-		)));
-		
-		$oMorpho->add(new \Formal\Element\Text(array(
-			"prop" => "email",
-			"label" => "Email",
-			"validation" => "required,email"
-		)));
-
-		if($this->floating()) {
-			$oMorpho->element("username")->setOption("help", "May be an email, but not forcibly.");
-		} else {
-			$oMorpho->element("username")->setOption("readonly", true);
-		}
-
-		if( BAIKAL_DAV_AUTH_TYPE == "Digest" || BAIKAL_DAV_AUTH_TYPE == "Basic") {
-			$oMorpho->add(new \Formal\Element\Password(array(
-				"prop" => "password",
-				"label" => "Password",
-			)));
-		
-			$oMorpho->add(new \Formal\Element\Password(array(
-				"prop" => "passwordconfirm",
-				"label" => "Confirm password",
-				"validation" => "sameas:password",
-			)));
-		
-			if($this->floating()) {
-				$oMorpho->element("password")->setOption("validation", "required");
-			} else {
-				$sNotice = "-- Leave empty to keep current password --";
-			
-				$oMorpho->element("password")->setOption("popover", array(
-					"title" => "Password",
-					"content" => "Write something here only if you want to change the user password."
-				));
-			
-				$oMorpho->element("passwordconfirm")->setOption("popover", array(
-					"title" => "Confirm password",
-					"content" => "Write something here only if you want to change the user password."
-				));
-			
-				$oMorpho->element("password")->setOption("placeholder", $sNotice);
-				$oMorpho->element("passwordconfirm")->setOption("placeholder", $sNotice);
-			}
-		}
-		
-		return $oMorpho;
-	}
-	
-	public static function icon() {
-		return "icon-user";
-	}
-	
-	public static function mediumicon() {
-		return "glyph-user";
-	}
-	
-	public static function bigicon() {
-		return "glyph2x-user";
-	}
-	
-	public function getPasswordHashForPassword($sPassword) {
-		return md5($this->get("username") . ':' . BAIKAL_AUTH_REALM . ':' . $sPassword);
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Baikal/Scripts/package-flat.sh b/sources/Core/Frameworks/Baikal/Scripts/package-flat.sh
deleted file mode 100755
index acf9649..0000000
--- a/sources/Core/Frameworks/Baikal/Scripts/package-flat.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env sh
-TEMPDATE="`date +%Y-%m-%d-%H-%M-%S`"
-TEMPDIR="/tmp/baikal-flat-$TEMPDATE-temp"
-TEMPARCHIVE="$TEMPDIR/temparchive.tgz"
-TEMPDIRDEREFERENCE="/tmp/baikal-flat-$TEMPDATE"
-
-echo "########################################################################"
-echo "#"
-echo "#     Baïkal Packaging script"
-echo "#"
-echo "#     Packaging project for flat distribution (replacing symlinks"
-echo "#     by their target). Useful for FTP deployment"
-echo "#"
-echo "#     TEMPDIR: $TEMPDIR"
-
-rm -rf /tmp/baikal-flat
-
-# Export Project
-# Requires the git-archive-all script by https://github.com/Kentzo (https://github.com/Kentzo/git-archive-all)
-
-mkdir $TEMPDIR && \
-git-archive-all --force-submodules $TEMPARCHIVE && \
-cd $TEMPDIR && tar -xzf $TEMPARCHIVE && rm $TEMPARCHIVE && \
-
-# Dereferencig symlinks
-cp -RfL $TEMPDIR $TEMPDIRDEREFERENCE && \
-rm -Rf $TEMPDIR && \
-
-TEMPDIR=$TEMPDIRDEREFERENCE/temparchive && \
-
-# Jump to tempdir
-cd $TEMPDIR && \
-
-# Cleaning Resources
-rm -f Core/Resources/Web/README.md && \
-rm -Rf Core/Resources/Web/TwitterBootstrap && \
-
-# Cleaning Scripts
-rm -Rf Core/Scripts && \
-rm -Rf Core/Frameworks/Baikal/Scripts && \
-
-# Cleaning WWWRoot
-rm -Rf Core/Frameworks/Baikal/WWWRoot && \
-rm -Rf Core/Frameworks/BaikalAdmin/WWWRoot && \
-
-# Cleaning Specific/Virtualhosts
-rm -Rf Specific/virtualhosts && \
-
-# Installing dependencies (composer)
-composer install && \
-
-# Removing composer stuff
-rm -f composer.* && \
-
-# Moving HTML roots
-mv html/* . && \
-mv html/.htaccess . && \
-rm -Rf html && \
-
-# Tagging Distrib
-cat Core/Distrib.php | sed -e "s/\"regular\"/\"flat\"/g" > Core/Distrib2.php && \
-rm -f Core/Distrib.php && \
-mv Core/Distrib2.php Core/Distrib.php && \
-
-# Deploy empty DB
-mkdir -p Specific/db && \
-cp Core/Resources/Db/SQLite/db.sqlite Specific/db && \
-
-# Add ENABLE_INSTALL
-
-touch Specific/ENABLE_INSTALL && \
-
-# Zipping package
-cd .. && \
-mv $TEMPDIR baikal-flat && \
-zip -r baikal-flat.zip baikal-flat && \
-mv baikal-flat.zip ~/Desktop/ && \
-
-# Displaying result
-echo "# Success: ~/Desktop/baikal-flat.zip"
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Baikal/Scripts/package-regular.sh b/sources/Core/Frameworks/Baikal/Scripts/package-regular.sh
deleted file mode 100755
index 36ac06b..0000000
--- a/sources/Core/Frameworks/Baikal/Scripts/package-regular.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env sh
-TEMPDATE="`date +%Y-%m-%d-%H-%M-%S`"
-TEMPDIR="/tmp/baikal-regular-$TEMPDATE"
-TEMPARCHIVE="$TEMPDIR/temparchive.tgz"
-
-echo "########################################################################"
-echo "#"
-echo "#     Baïkal Packaging script"
-echo "#"
-echo "#     Packaging project for regular distribution"
-echo "#"
-echo "#     TEMPDIR: $TEMPDIR"
-
-rm -rf /tmp/baikal-regular
-
-# Export Project
-# Requires the git-archive-all script by https://github.com/Kentzo (https://github.com/Kentzo/git-archive-all)
-
-mkdir -p $TEMPDIR && \
-git-archive-all --force-submodules $TEMPARCHIVE && \
-cd $TEMPDIR && tar -xzf $TEMPARCHIVE && rm $TEMPARCHIVE && \
-
-TEMPDIR=$TEMPDIR/temparchive && \
-
-# Jump to tempdir
-cd $TEMPDIR && \
-
-# Cleaning Scripts
-rm -Rf Core/Scripts && \
-rm -Rf Core/Frameworks/Baikal/Scripts && \
-
-# Deploy empty DB
-mkdir -p Specific/db && \
-cp Core/Resources/Db/SQLite/db.sqlite Specific/db && \
-
-# Add ENABLE_INSTALL
-
-touch Specific/ENABLE_INSTALL && \
-
-# Installing dependencies (composer)
-composer install && \
-
-# Removing composer stuff
-rm -f composer.* && \
-
-# GZipping package
-cd .. && \
-mv $TEMPDIR baikal-regular && \
-tar -cvzf baikal-regular.tgz baikal-regular && \
-mv baikal-regular.tgz ~/Desktop/ && \
-
-# Displaying result
-echo "# Success: ~/Desktop/baikal-regular.tgz"
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Baikal/WWWRoot/cal.php b/sources/Core/Frameworks/Baikal/WWWRoot/cal.php
deleted file mode 100644
index ab5c7ce..0000000
--- a/sources/Core/Frameworks/Baikal/WWWRoot/cal.php
+++ /dev/null
@@ -1,92 +0,0 @@
-
-*  All rights reserved
-*
-*  http://baikal-server.com
-*
-*  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!
-***************************************************************/
-
-ini_set("session.cookie_httponly", 1);
-ini_set("display_errors", 0);
-ini_set("log_errors", 1);
-
-define("BAIKAL_CONTEXT", TRUE);
-define("PROJECT_CONTEXT_BASEURI", "/");
-
-if(file_exists(getcwd() . "/Core")) {
-	# Flat FTP mode
-	define("PROJECT_PATH_ROOT", getcwd() . "/");	#./
-} else {
-	# Dedicated server mode
-	define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/");	#../
-}
-
-if(!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
-	die('
Incomplete installation
Baïkal dependencies have not been installed. Please, execute "composer install" in the folder where you installed Baïkal.');
-}
-
-require PROJECT_PATH_ROOT . 'vendor/autoload.php';
-
-# Bootstraping Flake
-\Flake\Framework::bootstrap();
-# Bootstrapping Baïkal
-\Baikal\Framework::bootstrap();
-
-if(!defined("BAIKAL_CAL_ENABLED") || BAIKAL_CAL_ENABLED !== TRUE) {
-	throw new ErrorException("Baikal CalDAV is disabled.", 0, 255, __FILE__, __LINE__);
-}
-
-# Backends
-if( BAIKAL_DAV_AUTH_TYPE == "Digest" && !preg_match('/Windows-Phone-WebDAV-Client/i', $_SERVER['HTTP_USER_AGENT']))
-    $authBackend = new \Sabre\DAV\Auth\Backend\PDO($GLOBALS["DB"]->getPDO());
-else {
-    switch (strtoupper(BAIKAL_DAV_AUTH_TYPE)) {
-         case "MAIL":
-              $authBackend = new \Baikal\Core\MailAuth($GLOBALS["DB"]->getPDO(), BAIKAL_AUTH_REALM);
-              break;
-         case "LDAP-USERBIND":
-              $authBackend = new \Baikal\Core\LDAPUserBindAuth($GLOBALS["DB"]->getPDO(), BAIKAL_AUTH_REALM); 
-              break;
-         default:
-              $authBackend = new \Baikal\Core\PDOBasicAuth($GLOBALS["DB"]->getPDO(), BAIKAL_AUTH_REALM);
-    }
-}
-
-$principalBackend = new \Sabre\DAVACL\PrincipalBackend\PDO($GLOBALS["DB"]->getPDO());
-$calendarBackend = new \Sabre\CalDAV\Backend\PDO($GLOBALS["DB"]->getPDO());
-
-# Directory structure
-$nodes = array(
-    new \Sabre\CalDAV\Principal\Collection($principalBackend),
-    new \Sabre\CalDAV\CalendarRootNode($principalBackend, $calendarBackend),
-);
-
-# Initializing server
-$server = new \Sabre\DAV\Server($nodes);
-$server->setBaseUri(BAIKAL_CAL_BASEURI);
-
-# Server Plugins
-$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, BAIKAL_AUTH_REALM));
-$server->addPlugin(new \Sabre\DAVACL\Plugin());
-$server->addPlugin(new \Sabre\CalDAV\Plugin());
-
-# And off we go!
-$server->exec();
diff --git a/sources/Core/Frameworks/Baikal/WWWRoot/card.php b/sources/Core/Frameworks/Baikal/WWWRoot/card.php
deleted file mode 100644
index ba5b7b3..0000000
--- a/sources/Core/Frameworks/Baikal/WWWRoot/card.php
+++ /dev/null
@@ -1,89 +0,0 @@
-
-*  All rights reserved
-*
-*  http://baikal-server.com
-*
-*  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!
-***************************************************************/
-
-define("BAIKAL_CONTEXT", TRUE);
-define("PROJECT_CONTEXT_BASEURI", "/");
-
-if(file_exists(getcwd() . "/Core")) {
-	# Flat FTP mode
-	define("PROJECT_PATH_ROOT", getcwd() . "/");	#./
-} else {
-	# Dedicated server mode
-	define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/");	#../
-}
-
-if(!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
-	die('
Incomplete installation
Baïkal dependencies have not been installed. Please, execute "composer install" in the folder where you installed Baïkal.');
-}
-
-require PROJECT_PATH_ROOT . 'vendor/autoload.php';
-
-# Bootstraping Flake
-\Flake\Framework::bootstrap();
-
-# Bootstrapping Baïkal
-\Baikal\Framework::bootstrap();
-
-if(!defined("BAIKAL_CARD_ENABLED") || BAIKAL_CARD_ENABLED !== TRUE) {
-	throw new ErrorException("Baikal CardDAV is disabled.", 0, 255, __FILE__, __LINE__);
-}
-
-# Backends
-if( BAIKAL_DAV_AUTH_TYPE == "Digest" && !preg_match('/Windows-Phone-WebDAV-Client/i', $_SERVER['HTTP_USER_AGENT']))
-    $authBackend = new \Sabre\DAV\Auth\Backend\PDO($GLOBALS["DB"]->getPDO());
-else {
-    switch (strtoupper(BAIKAL_DAV_AUTH_TYPE)) {
-         case "MAIL":
-              $authBackend = new \Baikal\Core\MailAuth($GLOBALS["DB"]->getPDO(), BAIKAL_AUTH_REALM);
-              break;
-         case "LDAP-USERBIND":
-              $authBackend = new \Baikal\Core\LDAPUserBindAuth($GLOBALS["DB"]->getPDO(), BAIKAL_AUTH_REALM); 
-              break;
-         default:
-              $authBackend = new \Baikal\Core\PDOBasicAuth($GLOBALS["DB"]->getPDO(), BAIKAL_AUTH_REALM);
-    }
-}
-
-$principalBackend = new \Sabre\DAVACL\PrincipalBackend\PDO($GLOBALS["DB"]->getPDO());
-$carddavBackend = new \Sabre\CardDAV\Backend\PDO($GLOBALS["DB"]->getPDO()); 
-
-# Setting up the directory tree
-$nodes = array(
-    new \Sabre\DAVACL\PrincipalCollection($principalBackend),
-    new \Sabre\CardDAV\AddressBookRoot($principalBackend, $carddavBackend),
-);
-
-# The object tree needs in turn to be passed to the server class
-$server = new \Sabre\DAV\Server($nodes);
-$server->setBaseUri(BAIKAL_CARD_BASEURI);
-
-# Plugins 
-$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, BAIKAL_AUTH_REALM));
-$server->addPlugin(new \Sabre\CardDAV\Plugin());
-$server->addPlugin(new \Sabre\DAVACL\Plugin());
-
-# And off we go!
-$server->exec();
diff --git a/sources/Core/Frameworks/Baikal/WWWRoot/index.php b/sources/Core/Frameworks/Baikal/WWWRoot/index.php
deleted file mode 100644
index fdc38ef..0000000
--- a/sources/Core/Frameworks/Baikal/WWWRoot/index.php
+++ /dev/null
@@ -1,64 +0,0 @@
-
-*  All rights reserved
-*
-*  http://baikal-server.com
-*
-*  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!
-***************************************************************/
-
-ini_set("session.cookie_httponly", 1);
-ini_set("display_errors", 0);
-ini_set("log_errors", 1);
-
-define("BAIKAL_CONTEXT", TRUE);
-define("PROJECT_CONTEXT_BASEURI", "/");
-
-if(file_exists(getcwd() . "/Core")) {
-	# Flat FTP mode
-	define("PROJECT_PATH_ROOT", getcwd() . "/");	#./
-} else {
-	# Dedicated server mode
-	define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/");	#../
-}
-
-if(!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
-	die('
Incomplete installation
Baïkal dependencies have not been installed. Please, execute "composer install" in the folder where you installed Baïkal.');
-}
-
-require PROJECT_PATH_ROOT . 'vendor/autoload.php';
-
-# Bootstraping Flake
-\Flake\Framework::bootstrap();
-
-# Bootstrapping Baïkal
-\Baikal\Framework::bootstrap();
-
-?>
-
-
-	Baïkal Server
-	
-
-
-	
Baïkal is running allright.

-
-
diff --git a/sources/Core/Frameworks/BaikalAdmin/Controller/Dashboard.php b/sources/Core/Frameworks/BaikalAdmin/Controller/Dashboard.php
deleted file mode 100644
index 08076bf..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Controller/Dashboard.php
+++ /dev/null
@@ -1,63 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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;
-
-class Dashboard extends \Flake\Core\Controller {
-	
-	public function execute() {
-	}
-	
-	public function render() {
-		$oView = new \BaikalAdmin\View\Dashboard();
-		$oView->setData("BAIKAL_VERSION", BAIKAL_VERSION);
-		$oView->setData("PROJECT_PACKAGE", PROJECT_PACKAGE);
-		
-		# Services status
-		$oView->setData("BAIKAL_CAL_ENABLED", BAIKAL_CAL_ENABLED);
-		$oView->setData("BAIKAL_CARD_ENABLED", BAIKAL_CARD_ENABLED);
-		
-		# Statistics: Users
-		$iNbUsers = \Baikal\Model\User::getBaseRequester()->count();
-		$oView->setData("nbusers", $iNbUsers);
-		
-		# Statistics: CalDAV
-		$iNbCalendars = \Baikal\Model\Calendar::getBaseRequester()->count();
-		$oView->setData("nbcalendars", $iNbCalendars);
-		
-		$iNbEvents = \Baikal\Model\Calendar\Event::getBaseRequester()->count();
-		$oView->setData("nbevents", $iNbEvents);
-		
-		# Statistics: CardDAV
-		$iNbBooks = \Baikal\Model\AddressBook::getBaseRequester()->count();
-		$oView->setData("nbbooks", $iNbBooks);
-		
-		$iNbContacts = \Baikal\Model\AddressBook\Contact::getBaseRequester()->count();
-		$oView->setData("nbcontacts", $iNbContacts);
-		
-		return $oView->render();
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php b/sources/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php
deleted file mode 100644
index 7ebcdea..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Controller/Install/Database.php
+++ /dev/null
@@ -1,165 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Install;
-
-class Database extends \Flake\Core\Controller {
-	
-	protected $aMessages = array();
-	protected $oModel;
-	protected $oForm;	# \Formal\Form
-	
-	public function execute() {
-		$this->oModel = new \Baikal\Model\Config\Database(PROJECT_PATH_SPECIFIC . "config.system.php");
-		
-		$this->oForm = $this->oModel->formForThisModelInstance(array(
-			"close" => FALSE,
-			"hook.validation" => array($this, "validateMySQLConnection"),
-			"hook.morphology" => array($this, "hideMySQLFieldWhenNeeded"),
-		));
-		
-		if($this->oForm->submitted()) {
-			$this->oForm->execute();
-			
-			if($this->oForm->persisted()) {
-
-				# nothing here
-			}
-		}
-	}
-
-	public function render() {
-		$sBigIcon = "glyph2x-magic";
-		$sBaikalVersion = BAIKAL_VERSION;
-		
-		$oView = new \BaikalAdmin\View\Install\Database();
-		$oView->setData("baikalversion", BAIKAL_VERSION);
-		
-		if($this->oForm->persisted()) {
-			
-			\BaikalAdmin\Core\Auth::lockInstall();
-
-			$sMessage = "
Baïkal is now installed, and it's database properly configured. For security reasons, this installation wizard is now disabled.
";
-			$sMessage . "
 
";
-			$sMessage .= "
Start using Baïkal
";
-			$sForm = "";
-		} else {
-			$sMessage = "";
-			$sForm = $this->oForm->render();
-		}
-		
-		$oView->setData("message", $sMessage);
-		$oView->setData("form", $sForm);
-		
-		return $oView->render();
-	}
-
-	public function validateMySQLConnection($oForm, $oMorpho) {
-
-		$bMySQLEnabled = $oMorpho->element("PROJECT_DB_MYSQL")->value();
-
-		if($bMySQLEnabled) {
-			
-			$sHost = $oMorpho->element("PROJECT_DB_MYSQL_HOST")->value();
-			$sDbname = $oMorpho->element("PROJECT_DB_MYSQL_DBNAME")->value();
-			$sUsername = $oMorpho->element("PROJECT_DB_MYSQL_USERNAME")->value();
-			$sPassword = $oMorpho->element("PROJECT_DB_MYSQL_PASSWORD")->value();
-
-			try {
-				$oDb = new \Flake\Core\Database\Mysql(
-					$sHost,
-					$sDbname,
-					$sUsername,
-					$sPassword
-				);
-
-				if(($aMissingTables = \Baikal\Core\Tools::isDBStructurallyComplete($oDb)) !== TRUE) {
-
-					# Checking if all tables are missing
-					$aRequiredTables = \Baikal\Core\Tools::getRequiredTablesList();
-					if(count($aRequiredTables) !== count($aMissingTables)) {
-						$sMessage = "
Database is not structurally complete.
";
-						$sMessage .= "
Missing tables are: " . implode(", ", $aMissingTables) . "
";
-						$sMessage .= "
You will find the SQL definition of Baïkal tables in this file: Core/Resources/Db/MySQL/db.sql
";
-						$sMessage .= "
Nothing has been saved. Please, add these tables to the database before pursuing Baïkal initialization.
";
-
-						$oForm->declareError(
-							$oMorpho->element("PROJECT_DB_MYSQL"),
-							$sMessage
-						);
-					} else {
-						# All tables are missing
-						# We add these tables ourselves to the database, to initialize Baïkal
-						$sSqlDefinition = file_get_contents(PROJECT_PATH_CORERESOURCES . "Db/MySQL/db.sql");
-						$oDb->query($sSqlDefinition);
-					}
-				}
-
-				return TRUE;
-			} catch(\Exception $e) {
-				$oForm->declareError(
-					$oMorpho->element("PROJECT_DB_MYSQL"),
-					"Baïkal was not able to establish a connexion to the MySQL database as configured.
MySQL says: " . $e->getMessage()
-				);
-
-				$oForm->declareError(
-					$oMorpho->element("PROJECT_DB_MYSQL_HOST")
-				);
-
-				$oForm->declareError(
-					$oMorpho->element("PROJECT_DB_MYSQL_DBNAME")
-				);
-
-				$oForm->declareError(
-					$oMorpho->element("PROJECT_DB_MYSQL_USERNAME")
-				);
-
-				$oForm->declareError(
-					$oMorpho->element("PROJECT_DB_MYSQL_PASSWORD")
-				);
-			}
-		}
-	}
-
-	public function hideMySQLFieldWhenNeeded(\Formal\Form $oForm, \Formal\Form\Morphology $oMorpho) {
-
-		if($oForm->submitted()) {
-			$bMySQL = (intval($oForm->postValue("PROJECT_DB_MYSQL")) === 1);
-		} else {
-			$bMySQL = PROJECT_DB_MYSQL;
-		}
-
-		if($bMySQL === TRUE) {
-			$oMorpho->remove("PROJECT_SQLITE_FILE");
-		} else {
-			
-			$oMorpho->remove("PROJECT_DB_MYSQL_HOST");
-			$oMorpho->remove("PROJECT_DB_MYSQL_DBNAME");
-			$oMorpho->remove("PROJECT_DB_MYSQL_USERNAME");
-			$oMorpho->remove("PROJECT_DB_MYSQL_PASSWORD");
-		}
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php b/sources/Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php
deleted file mode 100644
index faec088..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php
+++ /dev/null
@@ -1,124 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Install;
-
-class Initialize extends \Flake\Core\Controller {
-	
-	protected $aMessages = array();
-	protected $oModel;
-	protected $oForm;	# \Formal\Form
-	
-	public function execute() {
-		# Assert that /Specific is writable
-
-		if(!file_exists(PROJECT_PATH_SPECIFIC) || !is_dir(PROJECT_PATH_SPECIFIC) || !is_writable(PROJECT_PATH_SPECIFIC)) {
-			$message = "
Error - Insufficient  permissions on the Specific/ folder
";
-			$message .= "
In order to work properly, Baïkal needs to have write permissions in the Specific/ folder.
";
-
-			die($message);
-		}
-
-		$this->createHtaccessFilesIfNeeded();
-		
-		$this->oModel = new \Baikal\Model\Config\Standard(PROJECT_PATH_SPECIFIC . "config.php");
-		
-		$this->oForm = $this->oModel->formForThisModelInstance(array(
-			"close" => FALSE
-		));
-		
-		if($this->oForm->submitted()) {
-			$this->oForm->execute();
-			
-			if($this->oForm->persisted()) {
-
-				# Creating system config, and initializing BAIKAL_ENCRYPTION_KEY
-				$oSystemConfig = new \Baikal\Model\Config\System(PROJECT_PATH_SPECIFIC . "config.system.php");
-				$oSystemConfig->set("BAIKAL_ENCRYPTION_KEY",  md5(microtime() . rand()));
-
-				# Default: PDO::SQLite or PDO::MySQL ?
-				$aPDODrivers = \PDO::getAvailableDrivers();
-				if(!in_array('sqlite', $aPDODrivers)) {	# PDO::MySQL is already asserted in \Baikal\Core\Tools::assertEnvironmentIsOk()
-					$oSystemConfig->set("PROJECT_DB_MYSQL",  TRUE);
-				}
-
-				$oSystemConfig->persist();
-
-				# Using default PROJECT_SQLITE_FILE
-				$PROJECT_SQLITE_FILE = PROJECT_PATH_SPECIFIC . "db/db.sqlite";
-
-				if(!file_exists($PROJECT_SQLITE_FILE)) {
-					# Installing default sqlite database
-					@copy(PROJECT_PATH_CORERESOURCES . "Db/SQLite/db.sqlite", $PROJECT_SQLITE_FILE);
-				}
-			}
-		}
-	}
-
-	public function render() {
-		$sBigIcon = "glyph2x-magic";
-		$sBaikalVersion = BAIKAL_VERSION;
-		
-		$oView = new \BaikalAdmin\View\Install\Initialize();
-		$oView->setData("baikalversion", BAIKAL_VERSION);
-		
-		if($this->oForm->persisted()) {
-			$sLink = PROJECT_URI . "admin/install/?/database";
-			\Flake\Util\Tools::redirect($sLink);
-			exit(0);
-
-			#$sMessage = "
Baïkal is now configured. You may Access the Baïkal admin
";
-			#$sForm = "";
-		} else {
-			$sMessage = "";
-			$sForm = $this->oForm->render();
-		}
-		
-		$oView->setData("message", $sMessage);
-		$oView->setData("form", $sForm);
-		
-		return $oView->render();
-	}
-	
-	protected function createHtaccessFilesIfNeeded() {
-
-		if(!file_exists(PROJECT_PATH_DOCUMENTROOT . ".htaccess")) {
-			@copy(PROJECT_PATH_CORERESOURCES . "System/htaccess-documentroot", PROJECT_PATH_DOCUMENTROOT . ".htaccess");
-		}
-		
-		if(!file_exists(PROJECT_PATH_DOCUMENTROOT . ".htaccess")) {
-			throw new \Exception("Unable to create " . PROJECT_PATH_DOCUMENTROOT . ".htaccess; you may try to create it manually by copying " . PROJECT_PATH_CORERESOURCES . "System/htaccess-documentroot");
-		}
-		
-		if(!file_exists(PROJECT_PATH_SPECIFIC . ".htaccess")) {
-			@copy(PROJECT_PATH_CORERESOURCES . "System/htaccess-specific", PROJECT_PATH_SPECIFIC . ".htaccess");
-		}
-		
-		if(!file_exists(PROJECT_PATH_SPECIFIC . ".htaccess")) {
-			throw new \Exception("Unable to create " . PROJECT_PATH_SPECIFIC . ".htaccess; you may try to create it manually by copying " . PROJECT_PATH_CORERESOURCES . "System/htaccess-specific");
-		}
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Controller/Install/VersionUpgrade.php b/sources/Core/Frameworks/BaikalAdmin/Controller/Install/VersionUpgrade.php
deleted file mode 100644
index 6a19100..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Controller/Install/VersionUpgrade.php
+++ /dev/null
@@ -1,168 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Install;
-
-class VersionUpgrade extends \Flake\Core\Controller {
-	
-	protected $aMessages = array();
-	protected $oModel;
-	protected $oForm;	# \Formal\Form
-	
-	protected $aErrors = array();
-	protected $aSuccess = array();
-	
-	public function execute() {
-	}
-
-	public function render() {
-		$sBigIcon = "glyph2x-magic";
-		$sBaikalVersion = BAIKAL_VERSION;
-		$sBaikalConfiguredVersion = BAIKAL_CONFIGURED_VERSION;
-		
-		if(BAIKAL_CONFIGURED_VERSION === BAIKAL_VERSION) {
-			$sMessage = "Your system is configured to use version " . $sBaikalConfiguredVersion . ".
There's no upgrade to be done.";
-		} else {
-			$sMessage = "Upgrading Baïkal from version " . $sBaikalConfiguredVersion . " to version " . $sBaikalVersion . "";
-		}
-		
-		$sHtml = <<
-	
Baïkal upgrade wizard

-	
{$sMessage}

-
-HTML;
-		
-		$bSuccess = $this->upgrade(BAIKAL_CONFIGURED_VERSION, BAIKAL_VERSION);
-		
-		if(!empty($this->aErrors)) {
-			$sHtml .= "
Errors
" . implode("
\n", $this->aErrors);
-		}
-		
-		if(!empty($this->aSuccess)) {
-			$sHtml .= "
Successful operations
" . implode("
\n", $this->aSuccess);
-		}
-		
-		if($bSuccess === FALSE) {
-			$sHtml .= "
 
Error Baïkal has not been upgraded. See the section 'Errors' for details.
";
-		} else {
-			$sHtml .= "
 
Baïkal has been successfully upgraded. You may now Access the Baïkal admin
";
-		}
-		
-		return $sHtml;
-	}
-	
-	protected function upgrade($sVersionFrom, $sVersionTo) {
-		
-		if($sVersionFrom === "0.2.0") {
-			
-			$sOldDbFilePath = PROJECT_PATH_SPECIFIC . "Db/.ht.db.sqlite";
-			
-			if(PROJECT_SQLITE_FILE === $sOldDbFilePath) {
-				$sNewDbFilePath = PROJECT_PATH_SPECIFIC . "Db/db.sqlite";
-				
-				# Move old db from Specific/Db/.ht.db.sqlite to Specific/Db/db.sqlite
-				if(!file_exists($sNewDbFilePath)) {
-					if(!is_writable(dirname($sNewDbFilePath))) {
-						$this->aErrors[] = "DB file path '" . dirname($sNewDbFilePath) . "' is not writable";
-						return FALSE;
-					}
-					
-					if(!@copy($sOldDbFilePath, $sNewDbFilePath)) {
-						$this->aErrors[] = "DB could not be copied from '" . $sOldDbFilePath . "' to '" . $sNewDbFilePath . "'.";
-						return FALSE;
-					}
-					
-					$this->aSuccess[] = "SQLite database has been renamed from '" . $sOldDbFilePath . "' to '" . $sNewDbFilePath . "'";
-				}
-			}
-		}
-
-		if(version_compare($sVersionFrom, '0.2.3', '<=')) {
-			# Upgrading DB
-
-			#	etag VARCHAR(32),
-			#	size INT(11) UNSIGNED NOT NULL,
-			#	componenttype VARCHAR(8),
-			#	firstoccurence INT(11) UNSIGNED,
-			#	lastoccurence INT(11) UNSIGNED,
-
-			if(defined("PROJECT_DB_MYSQL") && PROJECT_DB_MYSQL === TRUE) {
-				$aSql = array(
-					"ALTER TABLE calendarobjects ADD COLUMN etag VARCHAR(32)",
-					"ALTER TABLE calendarobjects ADD COLUMN size INT(11) UNSIGNED NOT NULL",
-					"ALTER TABLE calendarobjects ADD COLUMN componenttype VARCHAR(8)",
-					"ALTER TABLE calendarobjects ADD COLUMN firstoccurence INT(11) UNSIGNED",
-					"ALTER TABLE calendarobjects ADD COLUMN lastoccurence INT(11) UNSIGNED",
-					"ALTER TABLE calendars ADD COLUMN transparent TINYINT(1) NOT NULL DEFAULT '0'",
-				);
-
-				$this->aSuccess[] = "MySQL database has been successfuly upgraded.";
-			} else {
-				$aSql = array(
-					"ALTER TABLE calendarobjects ADD COLUMN etag text",
-					"ALTER TABLE calendarobjects ADD COLUMN size integer",
-					"ALTER TABLE calendarobjects ADD COLUMN componenttype text",
-					"ALTER TABLE calendarobjects ADD COLUMN firstoccurence integer",
-					"ALTER TABLE calendarobjects ADD COLUMN lastoccurence integer",
-					"ALTER TABLE calendars ADD COLUMN transparent bool",
-					"ALTER TABLE principals ADD COLUMN vcardurl text",	# This one is added in SQLite but not MySQL, because it is already there since the beginning in MySQL
-				);
-
-				$this->aSuccess[] = "SQLite database has been successfuly upgraded.'";
-			}
-
-			try{
-				foreach($aSql as $sAlterTableSql) {
-					$GLOBALS["DB"]->query($sAlterTableSql);
-				}
-			} catch(\Exception $e) {
-				$this->aSuccess = array();
-				$this->aErrors[] = "
Database cannot be upgraded.
Caught exception: " . $e->getMessage() . "
";
-				return FALSE;
-			}
-		}
-
-		if(version_compare($sVersionFrom, '0.2.4', '<=')) {
-			# Nothing to do :)
-		}
-		
-		$this->updateConfiguredVersion($sVersionTo);
-		return TRUE;
-	}
-	
-	protected function updateConfiguredVersion($sVersionTo) {
-		
-		# Create new settings
-		$oConfig = new \Baikal\Model\Config\Standard(PROJECT_PATH_SPECIFIC . "config.php");
-		$oConfig->persist();
-		
-		# Update BAIKAL_CONFIGURED_VERSION
-		$oConfig = new \Baikal\Model\Config\System(PROJECT_PATH_SPECIFIC . "config.system.php");
-		$oConfig->set("BAIKAL_CONFIGURED_VERSION", $sVersionTo);
-		$oConfig->persist();
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Controller/Login.php b/sources/Core/Frameworks/BaikalAdmin/Controller/Login.php
deleted file mode 100644
index c5483ef..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Controller/Login.php
+++ /dev/null
@@ -1,77 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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;
-
-class Login extends \Flake\Core\Controller {
-	
-	public function execute() {
-	}
-	
-	public function render() {
-		$sActionUrl = \Flake\Util\Tools::getCurrentUrl();
-		$sSubmittedFlagName = "auth";
-		$sMessage = "";
-		
-		if(self::isSubmitted() && !\BaikalAdmin\Core\Auth::isAuthenticated()) {
-			$sMessage = \Formal\Core\Message::error(
-				"The login/password you provided is invalid. Please retry.",
-				"Authentication error"
-			);
-		} elseif(self::justLoggedOut()) {
-			$sMessage = \Formal\Core\Message::notice(
-				"You have been disconnected from your session.",
-				"Session ended",
-				FALSE
-			);
-		}
-		
-		$sLogin = htmlspecialchars(\Flake\Util\Tools::POST("login"));
-		$sPassword = htmlspecialchars(\Flake\Util\Tools::POST("password"));
-		
-		if(trim($sLogin) === "") {
-			$sLogin = "admin";
-		}
-		
-		$oView = new \BaikalAdmin\View\Login();
-		$oView->setData("message", $sMessage);
-		$oView->setData("actionurl", $sActionUrl);
-		$oView->setData("submittedflagname", $sSubmittedFlagName);
-		$oView->setData("login", $sLogin);
-		$oView->setData("password", $sPassword);
-		
-		return $oView->render();
-	}
-	
-	protected static function isSubmitted() {
-		return (intval(\Flake\Util\Tools::POST("auth")) === 1);
-	}
-	
-	protected static function justLoggedOut() {
-		$aParams = $GLOBALS["ROUTER"]::getURLParams();
-		return (!empty($aParams) && $aParams[0] === "loggedout");
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Controller/Logout.php b/sources/Core/Frameworks/BaikalAdmin/Controller/Logout.php
deleted file mode 100644
index e028c42..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Controller/Logout.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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;
-
-class Logout extends \Flake\Core\Controller {
-	
-	public function execute() {
-		\BaikalAdmin\Core\Auth::unAuthenticate();
-		
-		$sControllerForDefaultRoute = $GLOBALS["ROUTER"]::getControllerForRoute("default");
-		$sLink = $GLOBALS["ROUTER"]::buildRouteForController($sControllerForDefaultRoute, "loggedout");
-		\Flake\Util\Tools::redirect($sLink);
-	}
-	
-	public function render() {
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Controller/Navigation/Topbar.php b/sources/Core/Frameworks/BaikalAdmin/Controller/Navigation/Topbar.php
deleted file mode 100644
index ceceba4..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Controller/Navigation/Topbar.php
+++ /dev/null
@@ -1,79 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Navigation;
-
-class Topbar extends \Flake\Core\Controller {
-
-	public function execute() {
-	}
-
-	public function render() {
-		
-		$oView = new \BaikalAdmin\View\Navigation\Topbar();
-		
-		$sCurrentRoute = $GLOBALS["ROUTER"]::getCurrentRoute();
-		$sActiveHome = $sActiveUsers = $sActiveSettingsStandard = $sActiveSettingsSystem = "";
-		
-		$sControllerForDefaultRoute = $GLOBALS["ROUTER"]::getControllerForRoute("default");
-		$sHomeLink = $sControllerForDefaultRoute::link();
-		$sUsersLink = \BaikalAdmin\Controller\Users::link();
-		$sSettingsStandardLink = \BaikalAdmin\Controller\Settings\Standard::link();
-		$sSettingsSystemLink = \BaikalAdmin\Controller\Settings\System::link();
-		$sLogoutLink = \BaikalAdmin\Controller\Logout::link();
-		
-		if($sCurrentRoute === "default") {
-			$sActiveHome = "active";
-		}
-		if(
-			$sCurrentRoute === $GLOBALS["ROUTER"]::getRouteForController("\BaikalAdmin\Controller\Users") ||
-			$sCurrentRoute === $GLOBALS["ROUTER"]::getRouteForController("\BaikalAdmin\Controller\User\Calendars") ||
-			$sCurrentRoute === $GLOBALS["ROUTER"]::getRouteForController("\BaikalAdmin\Controller\User\AddressBooks")
-		) {
-			$sActiveUsers = "active";
-		}
-		
-		if($sCurrentRoute === $GLOBALS["ROUTER"]::getRouteForController("\BaikalAdmin\Controller\Settings\Standard")) {
-			$sActiveSettingsStandard = "active";
-		}
-		
-		if($sCurrentRoute === $GLOBALS["ROUTER"]::getRouteForController("\BaikalAdmin\Controller\Settings\System")) {
-			$sActiveSettingsSystem = "active";
-		}
-		
-		$oView->setData("activehome", $sActiveHome);
-		$oView->setData("activeusers", $sActiveUsers);
-		$oView->setData("activesettingsstandard", $sActiveSettingsStandard);
-		$oView->setData("activesettingssystem", $sActiveSettingsSystem);
-		$oView->setData("homelink", $sHomeLink);
-		$oView->setData("userslink", $sUsersLink);
-		$oView->setData("settingsstandardlink", $sSettingsStandardLink);
-		$oView->setData("settingssystemlink", $sSettingsSystemLink);
-		$oView->setData("logoutlink", $sLogoutLink);
-		
-		return $oView->render();
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Anonymous.php b/sources/Core/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Anonymous.php
deleted file mode 100644
index 1497861..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Anonymous.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Navigation\Topbar;
-
-class Anonymous extends \Flake\Core\Controller {
-
-	public function execute() {
-	}
-
-	public function render() {
-		$oView = new \BaikalAdmin\View\Navigation\Topbar\Anonymous();
-		return $oView->render();
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Install.php b/sources/Core/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Install.php
deleted file mode 100644
index 2228781..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Install.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Navigation\Topbar;
-
-class Install extends \Flake\Core\Controller {
-
-	public function execute() {
-	}
-
-	public function render() {
-		$oView = new \BaikalAdmin\View\Navigation\Topbar\Install();
-		return $oView->render();
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Controller/Settings/Standard.php b/sources/Core/Frameworks/BaikalAdmin/Controller/Settings/Standard.php
deleted file mode 100644
index b8cacda..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Controller/Settings/Standard.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Settings;
-
-class Standard extends \Flake\Core\Controller {
-		
-	public function execute() {
-		$this->oModel = new \Baikal\Model\Config\Standard(PROJECT_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
-		));
-		
-		if($this->oForm->submitted()) {
-			$this->oForm->execute();
-		}
-	}
-
-	public function render() {
-		
-		$oView = new \BaikalAdmin\View\Settings\Standard();
-		$oView->setData("form", $this->oForm->render());
-		
-		return $oView->render();
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Controller/Settings/System.php b/sources/Core/Frameworks/BaikalAdmin/Controller/Settings/System.php
deleted file mode 100644
index c369277..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Controller/Settings/System.php
+++ /dev/null
@@ -1,118 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Settings;
-
-class System extends \Flake\Core\Controller {
-	
-	public function execute() {
-		$this->oModel = new \Baikal\Model\Config\System(PROJECT_PATH_SPECIFIC . "config.system.php");
-		
-		# Assert that config file is writable
-		if(!$this->oModel->writable()) {
-			throw new \Exception("System config file is not writable;" . __FILE__ . " > " . __LINE__);
-		}
-		
-		$this->oForm = $this->oModel->formForThisModelInstance(array(
-			"close" => FALSE,
-			"hook.morphology" => array($this, "morphologyHook"),
-			"hook.validation" => array($this, "validationHook"),
-		));
-		
-		if($this->oForm->submitted()) {
-			$this->oForm->execute();
-		}
-	}
-
-	public function render() {
-		
-		$oView = new \BaikalAdmin\View\Settings\System();
-		$oView->setData("message", \Formal\Core\Message::notice(
-			"Do not change anything on this page unless you really know what you are doing.
You might break Baïkal if you misconfigure something here.",
-			"Warning !",
-			FALSE
-		));
-		
-		$oView->setData("form", $this->oForm->render());
-		
-		return $oView->render();
-	}
-	
-	public function morphologyHook(\Formal\Form $oForm, \Formal\Form\Morphology $oMorpho) {
-		if($oForm->submitted()) {
-			$bMySQL = (intval($oForm->postValue("PROJECT_DB_MYSQL")) === 1);
-		} else {
-			$bMySQL = PROJECT_DB_MYSQL;
-		}
-		
-		if($bMySQL === TRUE) {
-			$oMorpho->remove("PROJECT_SQLITE_FILE");
-		} else {
-			
-			$oMorpho->remove("PROJECT_DB_MYSQL_HOST");
-			$oMorpho->remove("PROJECT_DB_MYSQL_DBNAME");
-			$oMorpho->remove("PROJECT_DB_MYSQL_USERNAME");
-			$oMorpho->remove("PROJECT_DB_MYSQL_PASSWORD");
-		}
-	}
-	
-	public function validationHook(\Formal\Form $oForm, \Formal\Form\Morphology $oMorpho) {
-		if(intval($oForm->modelInstance()->get("PROJECT_DB_MYSQL")) === 1) {
-				
-			# We have to check the MySQL connection
-			$sHost = $oForm->modelInstance()->get("PROJECT_DB_MYSQL_HOST");
-			$sDbName = $oForm->modelInstance()->get("PROJECT_DB_MYSQL_DBNAME");
-			$sUsername = $oForm->modelInstance()->get("PROJECT_DB_MYSQL_USERNAME");
-			$sPassword = $oForm->modelInstance()->get("PROJECT_DB_MYSQL_PASSWORD");
-			
-			try {
-				$oDB = new \Flake\Core\Database\Mysql(
-					$sHost,
-					$sDbName,
-					$sUsername,
-					$sPassword
-				);
-			} catch(\Exception $e) {
-				$sMessage = "MySQL error: " . $e->getMessage();
-				$sMessage .= "
Nothing has been saved";
-				$oForm->declareError($oMorpho->element("PROJECT_DB_MYSQL_HOST"), $sMessage);
-				$oForm->declareError($oMorpho->element("PROJECT_DB_MYSQL_DBNAME"));
-				$oForm->declareError($oMorpho->element("PROJECT_DB_MYSQL_USERNAME"));
-				$oForm->declareError($oMorpho->element("PROJECT_DB_MYSQL_PASSWORD"));
-				return;
-			}
-			
-			if(($aMissingTables = \Baikal\Core\Tools::isDBStructurallyComplete($oDB)) !== TRUE) {
-				$sMessage = "MySQL error: These tables, required by Baïkal, are missing: " . implode(", ", $aMissingTables) . "
";
-				$sMessage .= "You may want create these tables using the file Core/Resources/Db/MySQL/db.sql";
-				$sMessage .= "

Nothing has been saved";
-				
-				$oForm->declareError($oMorpho->element("PROJECT_DB_MYSQL"), $sMessage);
-				return;
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php b/sources/Core/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php
deleted file mode 100644
index 717bd88..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php
+++ /dev/null
@@ -1,278 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 execute() {
-		
-		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($this->actionNewRequested()) {
-			$this->actionNew();
-		}
-		
-		if($this->actionEditRequested()) {
-			$this->actionEdit();
-		}
-		
-		if($this->actionDeleteRequested()) {
-			$this->actionDelete();
-		}
-	}
-
-	public function render() {
-		
-		$oView = new \BaikalAdmin\View\User\AddressBooks();
-		
-		# User
-		$oView->setData("user", $this->oUser);
-		
-		# Render list of address books
-		$aAddressBooks = array();
-		$oAddressBooks = $this->oUser->getAddressBooksBaseRequester()->execute();
-		
-		reset($oAddressBooks);
-		foreach($oAddressBooks as $addressbook) {
-			$aAddressBooks[] = array(
-				"linkedit" => $this->linkEdit($addressbook),
-				"linkdelete" => $this->linkDelete($addressbook),
-				"icon" => $addressbook->icon(),
-				"label" => $addressbook->label(),
-				"description" => $addressbook->get("description"),
-			);
-		}
-		
-		$oView->setData("addressbooks", $aAddressBooks);
-		
-		# Messages
-		$sMessages = implode("\n", $this->aMessages);
-		$oView->setData("messages", $sMessages);
-
-		if($this->actionNewRequested() || $this->actionEditRequested()) {
-			$sForm = $this->oForm->render();
-		} else {
-			$sForm = "";
-		}
-		
-		$oView->setData("form", $sForm);
-		$oView->setData("titleicon", \Baikal\Model\AddressBook::bigicon());
-		$oView->setData("modelicon", $this->oUser->mediumIcon());
-		$oView->setData("modellabel", $this->oUser->label());
-		$oView->setData("linkback", \BaikalAdmin\Controller\Users::link());
-		$oView->setData("linknew", $this->linkNew());
-		$oView->setData("addressbookicon", \Baikal\Model\AddressBook::icon());
-
-		return $oView->render();
-	}
-	
-	protected function initForm() {
-		if($this->actionEditRequested() || $this->actionNewRequested()) {
-			$aOptions = array(
-				"closeurl" => $this->linkHome()
-			);
-			
-			$this->oForm = $this->oModel->formForThisModelInstance($aOptions);
-		}
-	}
-	
-	protected function currentUserId() {
-		$aParams = $this->getParams();
-		if(($iUser = intval($aParams["user"])) === 0) {
-			return FALSE;
-		}
-		
-		return $iUser;
-	}
-	
-	# Action new
-	
-	public function linkNew() {
-		return self::buildRoute(array(
-			"user" => $this->currentUserId(),
-			"new" => 1
-		)) . "#form";
-	}
-	
-	protected function actionNewRequested() {
-		$aParams = $this->getParams();
-		if(array_key_exists("new", $aParams) && intval($aParams["new"]) === 1) {
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	protected function actionNew() {
-		
-		# Building floating model object
-		$this->oModel = new \Baikal\Model\AddressBook();
-		$this->oModel->set(
-			"principaluri",
-			$this->oUser->get("uri")
-		);
-		
-		$this->oModel->set(
-			"ctag",
-			"1"
-		);
-		
-		$this->initForm();
-		
-		if($this->oForm->submitted()) {
-			$this->oForm->execute();
-			
-			if($this->oForm->persisted()) {
-				$this->oForm->setOption(
-					"action",
-					$this->linkEdit(
-						$this->oForm->modelInstance()
-					)
-				);
-			}
-		}
-	}
-	
-	# Action edit
-	
-	public function linkEdit(\Baikal\Model\AddressBook $oModel) {
-		return self::buildRoute(array(
-			"user" => $this->currentUserId(),
-			"edit" => $oModel->get("id")
-		)) . "#form";
-	}
-	
-	protected function actionEditRequested() {
-		$aParams = $this->getParams();
-		if(array_key_exists("edit", $aParams) && intval($aParams["edit"]) > 0) {
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	protected function actionEdit() {
-		# Building anchored model object
-		$aParams = $this->getParams();
-		$this->oModel = new \Baikal\Model\AddressBook(intval($aParams["edit"]));
-		
-		# Initialize corresponding form
-		$this->initForm();
-		
-		# Process form
-		if($this->oForm->submitted()) {
-			$this->oForm->execute();
-		}
-	}
-	
-	# Action delete + confirm
-	
-	public function linkDelete(\Baikal\Model\AddressBook $oModel) {
-		return self::buildRoute(array(
-			"user" => $this->currentUserId(),
-			"delete" => $oModel->get("id")
-		)) . "#message";
-	}
-	
-	public function linkDeleteConfirm(\Baikal\Model\AddressBook $oModel) {
-		return self::buildRoute(array(
-			"user" => $this->currentUserId(),
-			"delete" => $oModel->get("id"),
-			"confirm" => 1
-		)) . "#message";
-	}
-	
-	protected function actionDeleteRequested() {
-		$aParams = $this->getParams();
-		if(array_key_exists("delete", $aParams) && intval($aParams["delete"]) > 0) {
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	protected function actionDeleteConfirmed() {
-		if(($iPrimary = $this->actionDeleteRequested()) === FALSE) {
-			return FALSE;
-		}
-		
-		$aParams = $this->getParams();
-		if(array_key_exists("confirm", $aParams) && intval($aParams["confirm"]) > 0) {
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	protected function actionDelete() {
-		
-		$aParams = $this->getParams();
-		$iModel = intval($aParams["delete"]);
-		
-		if($this->actionDeleteConfirmed() !== 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($this->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 ?
",
-				$this->linkDeleteConfirm($oModel),
-				"Delete  " . $oModel->label() . "",
-				$this->linkHome()
-			);
-		}
-	}
-	
-	# Link to home
-	public function linkHome() {
-		return self::buildRoute(array(
-			"user" => $this->currentUserId(),
-		));
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Controller/User/Calendars.php b/sources/Core/Frameworks/BaikalAdmin/Controller/User/Calendars.php
deleted file mode 100644
index ca6be52..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Controller/User/Calendars.php
+++ /dev/null
@@ -1,281 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 Calendars extends \Flake\Core\Controller {
-	
-	protected $aMessages = array();
-	protected $oModel;	# \Baikal\Model\Calendar 
-	protected $oUser;	# \Baikal\Model\User
-	protected $oForm;	# \Formal\Form
-
-	public function execute() {
-		
-		if(($iUser = $this->currentUserId()) === FALSE) {
-			throw new \Exception("BaikalAdmin\Controller\User\Calendars::render(): User get-parameter not found.");
-		}
-
-		$this->oUser = new \Baikal\Model\User($iUser);
-
-		if($this->actionNewRequested()) {
-			$this->actionNew();
-		} elseif($this->actionEditRequested()) {
-			$this->actionEdit();
-		} elseif($this->actionDeleteRequested()) {
-			$this->actionDelete();
-		}
-	}
-
-	public function render() {
-		
-		$oView = new \BaikalAdmin\View\User\Calendars();
-		
-		# User
-		$oView->setData("user", $this->oUser);
-		
-		# List of calendars
-		$oCalendars = $this->oUser->getCalendarsBaseRequester()->execute();
-		$aCalendars = array();
-		
-		foreach($oCalendars as $calendar) {
-			$aCalendars[] = array(
-				"linkedit" => $this->linkEdit($calendar),
-				"linkdelete" => $this->linkDelete($calendar),
-				"icon" => $calendar->icon(),
-				"label" => $calendar->label(),
-				"description" => $calendar->get("description"),
-			);
-		}
-		
-		$oView->setData("calendars", $aCalendars);
-		
-		# Messages
-		$sMessages = implode("\n", $this->aMessages);
-		$oView->setData("messages", $sMessages);
-
-		if($this->actionNewRequested() || $this->actionEditRequested()) {
-			$sForm = $this->oForm->render();
-		} else {
-			$sForm = "";
-		}
-		
-		$oView->setData("form", $sForm);
-		$oView->setData("titleicon", \Baikal\Model\Calendar::bigicon());
-		$oView->setData("modelicon", $this->oUser->mediumicon());
-		$oView->setData("modellabel", $this->oUser->label());
-		$oView->setData("linkback", \BaikalAdmin\Controller\Users::link());
-		$oView->setData("linknew", $this->linkNew());
-		$oView->setData("calendaricon", \Baikal\Model\Calendar::icon());
-		
-		return $oView->render();
-	}
-	
-	protected function initForm() {
-		if($this->actionEditRequested() || $this->actionNewRequested()) {
-			$aOptions = array(
-				"closeurl" => $this->linkHome()
-			);
-			
-			$this->oForm = $this->oModel->formForThisModelInstance($aOptions);
-		}
-	}
-	
-	protected function currentUserId() {
-		$aParams = $this->getParams();
-		if(($iUser = intval($aParams["user"])) === 0) {
-			return FALSE;
-		}
-		
-		return $iUser;
-	}
-	
-	# Action new 
-	
-	public function linkNew() {
-		return self::buildRoute(array(
-			"user" => $this->currentUserId(),
-			"new" => 1
-		)) . "#form";
-	}
-	
-	protected function actionNewRequested() {
-		$aParams = $this->getParams();
-		if(array_key_exists("new", $aParams) && intval($aParams["new"]) === 1) {
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	protected function actionNew() {
-
-		# Building floating model object
-		$this->oModel = new \Baikal\Model\Calendar();
-		$this->oModel->set(
-			"principaluri",
-			$this->oUser->get("uri")
-		);
-		
-		$this->oModel->set(
-			"components",
-			"VEVENT"
-		);
-		
-		$this->oModel->set(
-			"ctag",
-			"1"
-		);
-		
-		# Initialize corresponding form
-		$this->initForm();
-		
-		# Process form
-		if($this->oForm->submitted()) {
-			$this->oForm->execute();
-			
-			if($this->oForm->persisted()) {
-				$this->oForm->setOption(
-					"action",
-					$this->linkEdit(
-						$this->oForm->modelInstance()
-					)
-				);
-			}
-		}
-	}
-	
-	# Action edit
-	
-	public function linkEdit(\Baikal\Model\Calendar $oModel) {
-		return self::buildRoute(array(
-			"user" => $this->currentUserId(),
-			"edit" => $oModel->get("id")
-		)) . "#form";
-	}
-	
-	protected function actionEditRequested() {
-		$aParams = $this->getParams();
-		if(array_key_exists("edit", $aParams) && intval($aParams["edit"]) > 0) {
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	protected function actionEdit() {
-		# Building anchored model object
-		$aParams = $this->getParams();
-		$this->oModel = new \Baikal\Model\Calendar(intval($aParams["edit"]));
-		
-		# Initialize corresponding form
-		$this->initForm();
-		
-		# Process form
-		if($this->oForm->submitted()) {
-			$this->oForm->execute();
-		}
-	}
-	
-	# Action delete + confirm
-	
-	public function linkDelete(\Baikal\Model\Calendar $oModel) {
-		return self::buildRoute(array(
-			"user" => $this->currentUserId(),
-			"delete" => $oModel->get("id")
-		)) . "#message";
-	}
-	
-	public function linkDeleteConfirm(\Baikal\Model\Calendar $oModel) {
-		return self::buildRoute(array(
-			"user" => $this->currentUserId(),
-			"delete" => $oModel->get("id"),
-			"confirm" => 1
-		)) . "#message";
-	}
-	
-	protected function actionDeleteRequested() {
-		$aParams = $this->getParams();
-		if(array_key_exists("delete", $aParams) && intval($aParams["delete"]) > 0) {
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	protected function actionDeleteConfirmed() {
-		if($this->actionDeleteRequested() === FALSE) {
-			return FALSE;
-		}
-		
-		$aParams = $this->getParams();
-		if(array_key_exists("confirm", $aParams) && intval($aParams["confirm"]) === 1) {
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	protected function actionDelete() {
-		
-		$aParams = $this->getParams();
-		$iCalendar = intval($aParams["delete"]);
-		
-		if($this->actionDeleteConfirmed() !== FALSE) {
-			
-			# catching Exception thrown when model already destroyed
-				# happens when user refreshes page on delete-URL, for instance
-			
-			try {
-				$oModel = new \Baikal\Model\Calendar($iCalendar);
-				$oModel->destroy();				
-			} catch(\Exception $e) {
-				# already deleted; silently discarding
-			}
-			
-			# Redirecting to admin home
-			\Flake\Util\Tools::redirectUsingMeta($this->linkHome());
-		} else {
-			
-			$oModel = new \Baikal\Model\Calendar($iCalendar);
-			$this->aMessages[] = \Formal\Core\Message::warningConfirmMessage(
-				"Check twice, you're about to delete " . $oModel->label() . " from the database !",
-				"
You are about to delete a calendar and all it's scheduled events. This operation cannot be undone.
So, now that you know all that, what shall we do ?
",
-				$this->linkDeleteConfirm($oModel),
-				"Delete  " . $oModel->label() . "",
-				$this->linkHome()
-			);
-		}
-	}
-	
-	# Link to home
-	
-	public function linkHome() {
-		return self::buildRoute(array(
-			"user" => $this->currentUserId(),
-		));
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Controller/Users.php b/sources/Core/Frameworks/BaikalAdmin/Controller/Users.php
deleted file mode 100644
index c17af38..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Controller/Users.php
+++ /dev/null
@@ -1,241 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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;
-
-class Users extends \Flake\Core\Controller {
-	
-	protected $aMessages = array();
-	
-	public function execute() {
-		if($this->actionEditRequested()) {
-			$this->actionEdit();
-		}
-		
-		if($this->actionNewRequested()) {
-			$this->actionNew();
-		}
-		
-		if($this->actionDeleteRequested()) {
-			$this->actionDelete();
-		}
-	}
-	
-	public function render() {
-		
-		$oView = new \BaikalAdmin\View\Users();
-		
-		# List of users
-		$aUsers = array();
-		$oUsers = \Baikal\Model\User::getBaseRequester()->execute();
-		
-		reset($oUsers);
-		foreach($oUsers as $user) {
-			$aUsers[] = array(
-				"linkcalendars" => \BaikalAdmin\Controller\Users::linkCalendars($user),
-				"linkaddressbooks" => \BaikalAdmin\Controller\Users::linkAddressBooks($user),
-				"linkedit" => \BaikalAdmin\Controller\Users::linkEdit($user),
-				"linkdelete" => \BaikalAdmin\Controller\Users::linkDelete($user),
-				"mailtouri" => $user->getMailtoURI(),
-				"username" => $user->get("username"),
-				"displayname" => $user->get("displayname"),
-				"email" => $user->get("email"),
-			);
-		}
-		
-		$oView->setData("users", $aUsers);
-		$oView->setData("calendaricon", \Baikal\Model\Calendar::icon());
-		$oView->setData("usericon", \Baikal\Model\User::icon());
-		
-		# Messages
-		$sMessages = implode("\n", $this->aMessages);
-		$oView->setData("messages", $sMessages);
-		
-		# Form
-		if($this->actionNewRequested() || $this->actionEditRequested()) {
-			$sForm = $this->oForm->render();
-		} else {
-			$sForm = "";
-		}
-		
-		$oView->setData("form", $sForm);
-		$oView->setData("usericon", \Baikal\Model\User::icon());
-		$oView->setData("controller", $this);
-		
-		return $oView->render();
-	}
-	
-	protected function initForm() {
-		if($this->actionEditRequested() || $this->actionNewRequested()) {
-			$aOptions = array(
-				"closeurl" => self::link()
-			);
-			
-			$this->oForm = $this->oModel->formForThisModelInstance($aOptions);
-		}
-	}
-	
-	# Action edit
-	protected function actionEditRequested() {
-		$aParams = $this->getParams();
-		if(array_key_exists("edit", $aParams) && intval($aParams["edit"]) > 0) {
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	protected function actionEdit() {
-		$aParams = $this->getParams();
-		$this->oModel = new \Baikal\Model\User(intval($aParams["edit"]));
-		$this->initForm();
-		
-		if($this->oForm->submitted()) {
-			$this->oForm->execute();
-		}
-	}
-	
-	# Action delete
-	
-	protected function actionDeleteRequested() {
-		$aParams = $this->getParams();
-		if(array_key_exists("delete", $aParams) && intval($aParams["delete"]) > 0) {
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	protected function actionDeleteConfirmed() {
-		if($this->actionDeleteRequested() === FALSE) {
-			return FALSE;
-		}
-		
-		$aParams = $this->getParams();
-		
-		if(array_key_exists("confirm", $aParams) && intval($aParams["confirm"]) === 1) {
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	protected function actionDelete() {
-		$aParams = $this->getParams();
-		$iUser = intval($aParams["delete"]);
-		
-		if($this->actionDeleteConfirmed() !== FALSE) {
-			
-			# catching Exception thrown when model already destroyed
-				# happens when user refreshes delete-page, for instance
-				
-			try {
-				$oUser = new \Baikal\Model\User($iUser);
-				$oUser->destroy();				
-			} catch(\Exception $e) {
-				# user is already deleted; silently discarding
-			}
-			
-			# Redirecting to admin home
-			\Flake\Util\Tools::redirectUsingMeta($this->link());
-		} else {
-			
-			$oUser = new \Baikal\Model\User($iUser);
-			$this->aMessages[] = \Formal\Core\Message::warningConfirmMessage(
-				"Check twice, you're about to delete " . $oUser->label() . " from the database !",
-				"
You are about to delete a user and all it's calendars / contacts. This operation cannot be undone.
So, now that you know all that, what shall we do ?
",
-				$this->linkDeleteConfirm($oUser),
-				"Delete  " . $oUser->label() . "",
-				$this->link()
-			);
-		}
-	}
-	
-	# Action new
-	protected function actionNewRequested() {
-		$aParams = $this->getParams();
-		if(array_key_exists("new", $aParams) && intval($aParams["new"]) === 1) {
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	protected function actionNew() {
-		$this->oModel = new \Baikal\Model\User();
-		$this->initForm();
-		
-		if($this->oForm->submitted()) {
-			$this->oForm->execute();
-			
-			if($this->oForm->persisted()) {
-				$this->oForm->setOption(
-					"action",
-					$this->linkEdit(
-						$this->oForm->modelInstance()
-					)
-				);
-			}
-		}
-	}
-	
-	public function linkNew() {
-		return self::buildRoute(array(
-			"new" => 1
-		)) . "#form";
-	}
-	
-	public static function linkEdit(\Baikal\Model\User $user) {
-		return self::buildRoute(array(
-			"edit" => $user->get("id")
-		)) . "#form";
-	}
-	
-	public static function linkDelete(\Baikal\Model\User $user) {
-		return self::buildRoute(array(
-			"delete" => $user->get("id")
-		)) . "#message";
-	}
-	
-	public static function linkDeleteConfirm(\Baikal\Model\User $user) {
-		return self::buildRoute(array(
-			"delete" => $user->get("id"),
-			"confirm" => 1
-		)) . "#message";
-	}
-	
-	public static function linkCalendars(\Baikal\Model\User $user) {
-		return \BaikalAdmin\Controller\User\Calendars::buildRoute(array(
-			"user" => $user->get("id"),
-		));
-	}
-	
-	public static function linkAddressBooks(\Baikal\Model\User $user) {
-		return \BaikalAdmin\Controller\User\AddressBooks::buildRoute(array(
-			"user" => $user->get("id"),
-		));
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Core/Auth.php b/sources/Core/Frameworks/BaikalAdmin/Core/Auth.php
deleted file mode 100644
index ed58a60..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Core/Auth.php
+++ /dev/null
@@ -1,128 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Core;
-
-class Auth {
-	public static function assertEnabled() {
-		if(!defined("BAIKAL_ADMIN_ENABLED") || BAIKAL_ADMIN_ENABLED !== TRUE) {
-			die("
Baïkal Admin is disabled.
To enable it, set BAIKAL_ADMIN_ENABLED to TRUE in Specific/config.php");
-		}
-		
-		self::assertUnlocked();
-	}
-	
-	public static function assertUnlocked() {
-
-		if(defined("BAIKAL_CONTEXT_INSTALL") && BAIKAL_CONTEXT_INSTALL === TRUE) {
-			$sToolName = "Baïkal Install Tool";
-			$sFileName = "ENABLE_INSTALL";
-		} else {
-			if(!defined("BAIKAL_ADMIN_AUTOLOCKENABLED") || BAIKAL_ADMIN_AUTOLOCKENABLED === FALSE) {
-				return TRUE;
-			}
-
-			$sToolName = "Baïkal Admin";
-			$sFileName = "ENABLE_ADMIN";
-		}
-
-		$sEnableFile = PROJECT_PATH_SPECIFIC . $sFileName;
-		
-		$bLocked = TRUE;
-		if(file_exists($sEnableFile)) {
-
-			clearstatcache();
-			$iTime = intval(filemtime($sEnableFile));
-			if((time() - $iTime) < 3600) {
-				# file has been created/updated less than an hour ago; update it's mtime
-				if(is_writable($sEnableFile)) {
-					@file_put_contents($sEnableFile, '');
-				}
-				$bLocked = FALSE;
-			} else {
-				// file has been created more than an hour ago
-				// delete and declare locked
-				if(!@unlink($sEnableFile)) {
-					die("
" . $sToolName . " is locked.
To unlock it, create (or re-create if it exists already) an empty file named " . $sFileName . " (uppercase, no file extension) in the Specific/ folder of Baïkal.");
-				}
-			}
-		}
-
-		if($bLocked) {
-			die("
" . $sToolName . " is locked.
To unlock it, create (or re-create if it exists already) an empty file named " . $sFileName . " (uppercase, no file extension) in the Specific/ folder of Baïkal.");
-		}
-	}
-	
-	public static function isAuthenticated() {
-		if(isset($_SESSION["baikaladminauth"]) && $_SESSION["baikaladminauth"] === md5(BAIKAL_ADMIN_PASSWORDHASH)) {
-			return TRUE;
-		}
-		
-		return FALSE;		
-	}
-	
-	public static function authenticate() {
-		
-		if(intval(\Flake\Util\Tools::POST("auth")) !== 1) {
-			return FALSE;
-		}
-		
-		$sUser = \Flake\Util\Tools::POST("login");
-		$sPass = \Flake\Util\Tools::POST("password");
-		
-		$sPassHash = self::hashAdminPassword($sPass);
-		
-		if($sUser === "admin" && $sPassHash === BAIKAL_ADMIN_PASSWORDHASH) {
-			$_SESSION["baikaladminauth"] = md5(BAIKAL_ADMIN_PASSWORDHASH);
-			return TRUE;
-		}
-
-		return FALSE;
-		
-	}
-	
-	public static function unAuthenticate() {
-		unset($_SESSION["baikaladminauth"]);
-	}
-
-	public static function hashAdminPassword($sPassword) {
-		if(defined("BAIKAL_AUTH_REALM")) {
-			$sAuthRealm = BAIKAL_AUTH_REALM;
-		} else {
-			$sAuthRealm = "BaikalDAV";	# Fallback to default value; useful when initializing App, as all constants are not set yet
-		}
-
-		return md5('admin:' . $sAuthRealm . ':' . $sPassword);
-	}
-
-	public static function lockAdmin() {
-		@unlink(PROJECT_PATH_SPECIFIC . "ENABLE_ADMIN");
-	}
-
-	public static function lockInstall() {
-		@unlink(PROJECT_PATH_SPECIFIC . "ENABLE_INSTALL");
-	}
-}
diff --git a/sources/Core/Frameworks/BaikalAdmin/Core/View.php b/sources/Core/Frameworks/BaikalAdmin/Core/View.php
deleted file mode 100644
index 4eac687..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Core/View.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Core;
-
-class View extends \Flake\Core\View {
-	public function templatesPath() {
-		$sViewName = get_class($this);
-		$sTemplate = str_replace("\\", "/", substr($sViewName, strlen("BaikalAdmin\\View\\"))) . ".html";
-		return BAIKALADMIN_PATH_TEMPLATES . $sTemplate;
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Framework.php b/sources/Core/Frameworks/BaikalAdmin/Framework.php
deleted file mode 100644
index b62fca0..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Framework.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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;
-
-class Framework extends \Flake\Core\Framework {
-	
-	public static function bootstrap() {
-		define("BAIKALADMIN_PATH_ROOT", PROJECT_PATH_ROOT . "Core/Frameworks/BaikalAdmin/");	# ./
-		
-		\Baikal\Framework::bootstrap();
-		\Formal\Framework::bootstrap();
-
-		$GLOBALS["ROUTER"]::setURIPath("admin/");
-
-		# Include BaikalAdmin Framework config
-		require_once(BAIKALADMIN_PATH_ROOT . "config.php");
-	}
-}
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/GlyphiconsPro/generate-sprite.php b/sources/Core/Frameworks/BaikalAdmin/Resources/GlyphiconsPro/generate-sprite.php
deleted file mode 100644
index ed3f43a..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/GlyphiconsPro/generate-sprite.php
+++ /dev/null
@@ -1,461 +0,0 @@
-#!/usr/bin/env php
- $sClass,
-			"x" => round($iX),
-			"y" => round($iY),
-			"width" => ceil($iSymbolWidth),
-			"height" => ceil($iSymbolHeight)
-		);
-		
-		$iKey++;
-	}
-	
-	##########################################################################
-	# Generate CSS
-	
-	$iSpriteWidth = ceil($iSymbolWidth);
-	$iSpriteHeight = ceil($iSymbolHeight);
-	
-	$sCss =<< $aSprite) {
-		$iX = (-1 * intval($aSprite["x"]));
-		$iY = (-1 * intval($aSprite["y"]));
-		
-		if($iX < 0) {
-			$iX .= "px";
-		}
-		
-		if($iY < 0) {
-			$iY .= "px";
-		}
-		
-		$sCss .= <<
-	.label-intext { vertical-align: top;}
-
-

-	
Dashboard

-

-
-

-	

-		
About this system

-	

-	

-		

-			
Version

-			
This systems runs

-				Baïkal {{ BAIKAL_VERSION }}, {{ PROJECT_PACKAGE }} package

-				{{ url }}
-			

-		

-		

-			
Services

-			{% if BAIKAL_CAL_ENABLED %}
-				{% set caldavclass = 'label-success' %}
-				{% set caldavtext = 'On' %}
-			{% else %}
-				{% set caldavclass = 'label-important' %}
-				{% set caldavtext = 'Off' %}
-			{% endif %}
-			
-			{% if BAIKAL_CARD_ENABLED %}
-				{% set carddavclass = 'label-success' %}
-				{% set carddavtext = 'On' %}
-			{% else %}
-				{% set carddavclass = 'label-important' %}
-				{% set carddavtext = 'Off' %}
-			{% endif %}
-			
-			
-				
-					
-						
-						
-					
-					
-						
-						
-					
-					
-						
-						
-					
-				
-			
Web adminOn
CalDAV{{ caldavtext }}
CardDAV{{ carddavtext }}

-		

-		

-			
License and credits

-			
Baïkal is open source software licensed under the terms of the GNU GPL v3.

-			
Baïkal is based upon other open source projects.
Read the README.md file to learn about that.

-			
Baïkal is developed by Jérôme Schneider.
-		

-	

-

-
-

-	

-		
Statistics

-	

-	

-		

-			
Users

-			
-				
-					
-						
-						
-					
-				
-			
Registered users{{ nbusers }}

-		

-		

-			
CalDAV

-			
-				
-					
-						
-						
-					
-					
-						
-						
-					
-				
-			
Number of calendars{{ nbcalendars }}
Number of events{{ nbevents }}

-		

-		

-			
CardDAV

-			
-				
-					
-						
-						
-					
-					
-						
-						
-					
-				
-			
Number of address books{{ nbbooks }}
Number of contacts{{ nbcontacts }}

-		

-	

-

-{% endautoescape %}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Install/Database.html b/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Install/Database.html
deleted file mode 100644
index abd330c..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Install/Database.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% autoescape false %}
-

-	
Baïkal Database setup

-	
Configure Baïkal Database.

-

-
-
-{{ message }}
-{{ form }}
-
-{% endautoescape %}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Install/Initialize.html b/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Install/Initialize.html
deleted file mode 100644
index 72791e3..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Install/Initialize.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% autoescape false %}
-

-	
Baïkal initialization wizard

-	
Configure your new Baïkal {{ baikalversion }} installation.

-

-
-
-{{ message }}
-{{ form }}
-
-{% endautoescape %}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Login.html b/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Login.html
deleted file mode 100644
index 28077ca..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Login.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% autoescape false %}
-

-	
Authentication

-	
Please authenticate to access Baïkal Web Admin.

-

-
-{{ message }}
-
-

-	
-	

-		

-			
-			
-		

-
-		

-			
-			
-		

-		
-		

-			
-		

-	

-

-{% endautoescape %}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar.html b/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar.html
deleted file mode 100644
index 55adf15..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% autoescape false %}
-

-	

-		

-			
-				
-				
-				
-			
-			 Web Admin
-			

-				
-			

-		

-	

-

-{% endautoescape %}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar/Anonymous.html b/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar/Anonymous.html
deleted file mode 100644
index e19e7d4..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar/Anonymous.html
+++ /dev/null
@@ -1,7 +0,0 @@
-

-	

-		

-			 Web Admin
-		

-	

-

\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar/Install.html b/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar/Install.html
deleted file mode 100644
index 497b5ed..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar/Install.html
+++ /dev/null
@@ -1,7 +0,0 @@
-

-	

-		

-			 Install Tool
-		

-	

-

\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Page/baikal-text-20.png b/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Page/baikal-text-20.png
deleted file mode 100644
index c8b82b3..0000000
Binary files a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Page/baikal-text-20.png and /dev/null differ
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Page/index.html b/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Page/index.html
deleted file mode 100644
index bfdfb34..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Page/index.html
+++ /dev/null
@@ -1,74 +0,0 @@
-{% autoescape false %}
-
-
-	
-		
-		{{ pagetitle }}
-		
-		
-
-		
-		
-		
-		
-		
-		
-
-		
-		
-		{{ head }}
-	
-	
-		{{ navbar }}
-
-		

-			{{ Payload }}
-		
 
-
-		
-		
-		
-		
-		
-		
-		
-		{{ javascript }}
-	
-
-{% endautoescape %}
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Page/style.css b/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Page/style.css
deleted file mode 100644
index 6a68b33..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Page/style.css
+++ /dev/null
@@ -1,83 +0,0 @@
-/* generics */
-
-body {
-	padding-top: 60px; /* 60px to make the container go all the way to the bottom of the topbar */
-}
-
-.table thead th {
-	background-color: #777;
-	color: white;
-}
-
-.table-striped tbody tr:nth-child(even) td, .table-striped tbody tr:nth-child(even) th {
-	background-color: rgb(240, 240, 240);
-}
-
-table .no-border-left { border-left: none !important;}
-table p {
-	margin-bottom: 0;
-}
-
-p.lead { line-height: 40px;}
-
-
-/* Jumbotrons
--------------------------------------------------- */
-.jumbotron {
-  position: relative;
-}
-.jumbotron h1 {
-  font-size: 40px;
-  font-weight: bold;
-  letter-spacing: -1px;
-  line-height: 90px;
-}
-.jumbotron p {
-  margin-bottom: 18px;
-  font-weight: 300;
-}
-.jumbotron .btn-large {
-  font-size: 20px;
-  font-weight: normal;
-  padding: 14px 24px;
-  margin-right: 10px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-.jumbotron .btn-large small {
-  font-size: 14px;
-}
-
-@media (max-width: 550px) {
-	.jumbotron h1 {
-		font-size: 20px;
-		font-weight: bold;
-		letter-spacing: -1px;
-		line-height: 20px;
-	}
-	
-	p.lead {
-		font-size: 14px;
-		line-height: 14px;
-	}
-	
-	[class^="glyph2x-"],
-	[class*=" glyph2x-"] {
-		display: none;
-	}
-}
-
-/* Address books */
-table.addressbooks .col-displayname { width: 20%;}
-table.addressbooks .col-description { width: 55%;}
-table.addressbooks .col-actions { width: 25%;}
-
-/* Calendars */
-table.calendars .col-displayname { width: 20%;}
-table.calendars .col-description { width: 55%;}
-table.calendars .col-actions { width: 25%;}
-
-/* Users */
-table.users .col-id { width: 2%;}
-table.users .col-username { width: 45%;}
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Settings/Standard.html b/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Settings/Standard.html
deleted file mode 100644
index 1575c93..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Settings/Standard.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% autoescape false %}
-

-	
Baïkal settings

-

-
-{{ form }}
-{% endautoescape %}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Settings/System.html b/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Settings/System.html
deleted file mode 100644
index c12ae52..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Settings/System.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% autoescape false %}
-

-	
Baïkal system settings

-

-
-{{ message }}
-{{ form }}
-
-{% endautoescape %}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/User/AddressBooks.html b/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/User/AddressBooks.html
deleted file mode 100644
index d86c435..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/User/AddressBooks.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% autoescape false %}
-

-	
Address Books

-	
Manage Address Books for{{ modellabel }}.

-	
 Back to users list

-	
 + Add address book

-

-
-
-	
-		
-			
-			
-			
-		
-	
-	
-		{% for addressbook in addressbooks %}
-		
-			
-			
-			
-		
-		{% endfor %}
-	
-
Display nameDescription
{{ addressbook.label|escape }}{{ addressbook.description|escape }}
-				

-					 Edit
-					 Delete
-				

-			

-
-
-{{ messages }}
-{{ form }}
-{% endautoescape %}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/User/Calendars.html b/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/User/Calendars.html
deleted file mode 100644
index acae86a..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/User/Calendars.html
+++ /dev/null
@@ -1,36 +0,0 @@
-{% autoescape false %}
-

-	
Calendars

-	
Manage Calendars for{{ modellabel }}.

-	
 Back to users list

-	
 + Add calendar

-

-
-
-	
-		
-			
-			
-			
-		
-	
-	
-		{% for calendar in calendars %}
-		
-			
-			
-			
-		
-		{% endfor %}
-	
-
Display nameDescription
{{ calendar.label|escape }}{{ calendar.description|escape }}
-				

-					 Edit
-					 Delete
-				

-			

-
-
-{{ messages }}
-{{ form }}
-{% endautoescape %}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Users.html b/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Users.html
deleted file mode 100644
index 465f8da..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/Templates/Users.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% autoescape false %}
-

-	
Users

-	
Manage Baïkal user accounts, and associated resources.

-	
 + Add user

-

-
-
-	{% for user in users %}
-	
-		
-		
-	
-	{% endfor %}
-

-			 {{ user.username|escape }}

-			{{ user.displayname|escape }} <{{ user.email|escape }}>
-				
-			

-				 Calendars
-				 Address Books
-				  Edit
-				 Delete
-			

-		

-
-
-{{ messages }}
-{{ form }}
-{% endautoescape %}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Resources/html5.js b/sources/Core/Frameworks/BaikalAdmin/Resources/html5.js
deleted file mode 100644
index 448cebd..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Resources/html5.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- HTML5 Shiv v3.7.0 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
-*/
-(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
-a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x";
-c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
-"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:"3.7.0",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);
-if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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;
-
-class Dashboard extends \Flake\Core\Route {
-	
-	public static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
-		$oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Dashboard());
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Route/Logout.php b/sources/Core/Frameworks/BaikalAdmin/Route/Logout.php
deleted file mode 100644
index c224967..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Route/Logout.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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;
-
-class Logout extends \Flake\Core\Route {
-	
-	public static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
-		$oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Logout());
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Route/Settings/Standard.php b/sources/Core/Frameworks/BaikalAdmin/Route/Settings/Standard.php
deleted file mode 100644
index 1cbbab9..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Route/Settings/Standard.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Settings;
-
-class Standard extends \Flake\Core\Route {
-	
-	public static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
-		$oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Settings\Standard());
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Route/Settings/System.php b/sources/Core/Frameworks/BaikalAdmin/Route/Settings/System.php
deleted file mode 100644
index 93e5a11..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Route/Settings/System.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Settings;
-
-class System extends \Flake\Core\Route {
-	
-	public static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
-		$oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Settings\System());
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Route/User/AddressBooks.php b/sources/Core/Frameworks/BaikalAdmin/Route/User/AddressBooks.php
deleted file mode 100644
index 2de1b86..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Route/User/AddressBooks.php
+++ /dev/null
@@ -1,56 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 extends \Flake\Core\Route {
-	
-	public static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
-		$oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\User\AddressBooks(
-			self::getParams()
-		));
-	}
-	
-	public static function parametersMap() {
-		return array(
-			"user" => array(
-				"required" => TRUE,
-			),
-			"new" => array(
-				"required" => FALSE,
-			),
-			"edit" => array(
-				"required" => FALSE,
-			),
-			"delete" => array(
-				"required" => FALSE,
-			),
-			"confirm" => array(
-				"required" => FALSE,
-			),
-		);
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Route/User/Calendars.php b/sources/Core/Frameworks/BaikalAdmin/Route/User/Calendars.php
deleted file mode 100644
index a97b9ef..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Route/User/Calendars.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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 Calendars extends \Flake\Core\Route {
-	
-	public static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
-		$aParams = self::getParams();
-		$oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\User\Calendars($aParams));
-	}
-	
-	public static function parametersMap() {
-		return array(
-			"user" => array(
-				"required" => TRUE,
-			),
-			"new" => array(
-				"required" => FALSE,
-			),
-			"edit" => array(
-				"required" => FALSE,
-			),
-			"delete" => array(
-				"required" => FALSE,
-			),
-			"confirm" => array(
-				"required" => FALSE,
-			),
-		);
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/Route/Users.php b/sources/Core/Frameworks/BaikalAdmin/Route/Users.php
deleted file mode 100644
index 2a9ad59..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/Route/Users.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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;
-
-class Users extends \Flake\Core\Route {
-	
-	public static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
-		$aParams = self::getParams();
-		$oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Users($aParams));
-	}
-	
-	public static function parametersMap() {
-		return array(
-			"new" => array(
-				"required" => FALSE,
-			),
-			"edit" => array(
-				"required" => FALSE,
-			),
-			"delete" => array(
-				"required" => FALSE,
-			),
-			"confirm" => array(
-				"required" => FALSE,
-			),
-		);
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/View/Dashboard.php b/sources/Core/Frameworks/BaikalAdmin/View/Dashboard.php
deleted file mode 100644
index 01d33c4..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/View/Dashboard.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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;
-
-class Dashboard extends \BaikalAdmin\Core\View {
-	
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/View/Install/Database.php b/sources/Core/Frameworks/BaikalAdmin/View/Install/Database.php
deleted file mode 100644
index 9c8de80..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/View/Install/Database.php
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Install;
-
-class Database extends \BaikalAdmin\Core\View {
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/View/Install/Initialize.php b/sources/Core/Frameworks/BaikalAdmin/View/Install/Initialize.php
deleted file mode 100644
index 66b4229..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/View/Install/Initialize.php
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Install;
-
-class Initialize extends \BaikalAdmin\Core\View {
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/View/Login.php b/sources/Core/Frameworks/BaikalAdmin/View/Login.php
deleted file mode 100644
index 4bb1980..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/View/Login.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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;
-
-class Login extends \BaikalAdmin\Core\View {
-	
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/View/Navigation/Topbar.php b/sources/Core/Frameworks/BaikalAdmin/View/Navigation/Topbar.php
deleted file mode 100644
index 12590bc..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/View/Navigation/Topbar.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Navigation;
-
-class Topbar extends \BaikalAdmin\Core\View {
-	
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/View/Navigation/Topbar/Anonymous.php b/sources/Core/Frameworks/BaikalAdmin/View/Navigation/Topbar/Anonymous.php
deleted file mode 100644
index 1ef3fa3..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/View/Navigation/Topbar/Anonymous.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Navigation\Topbar;
-
-class Anonymous extends \BaikalAdmin\Core\View {
-	
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/View/Navigation/Topbar/Install.php b/sources/Core/Frameworks/BaikalAdmin/View/Navigation/Topbar/Install.php
deleted file mode 100644
index 5ecf022..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/View/Navigation/Topbar/Install.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Navigation\Topbar;
-
-class Install extends \BaikalAdmin\Core\View {
-	
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/View/Settings/Standard.php b/sources/Core/Frameworks/BaikalAdmin/View/Settings/Standard.php
deleted file mode 100644
index 0df1016..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/View/Settings/Standard.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Settings;
-
-class Standard extends \BaikalAdmin\Core\View {
-	
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/View/Settings/System.php b/sources/Core/Frameworks/BaikalAdmin/View/Settings/System.php
deleted file mode 100644
index 55b6673..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/View/Settings/System.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\Settings;
-
-class System extends \BaikalAdmin\Core\View {
-	
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/View/User/AddressBooks.php b/sources/Core/Frameworks/BaikalAdmin/View/User/AddressBooks.php
deleted file mode 100644
index 4227664..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/View/User/AddressBooks.php
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\User;
-
-class AddressBooks extends \BaikalAdmin\Core\View {
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/View/User/Calendars.php b/sources/Core/Frameworks/BaikalAdmin/View/User/Calendars.php
deleted file mode 100644
index 0534eca..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/View/User/Calendars.php
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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\User;
-
-class Calendars extends \BaikalAdmin\Core\View {
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/View/Users.php b/sources/Core/Frameworks/BaikalAdmin/View/Users.php
deleted file mode 100644
index a9ab000..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/View/Users.php
+++ /dev/null
@@ -1,30 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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;
-
-class Users extends \BaikalAdmin\Core\View {
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/BaikalAdmin/WWWRoot/index.php b/sources/Core/Frameworks/BaikalAdmin/WWWRoot/index.php
deleted file mode 100644
index ea10540..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/WWWRoot/index.php
+++ /dev/null
@@ -1,81 +0,0 @@
-
-*  All rights reserved
-*
-*  http://baikal-server.com
-*
-*  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!
-***************************************************************/
-
-ini_set("session.cookie_httponly", 1);
-ini_set("display_errors", 0);
-ini_set("log_errors", 1);
-error_reporting(E_ALL);
-
-define("BAIKAL_CONTEXT", TRUE);
-define("BAIKAL_CONTEXT_ADMIN", TRUE);
-define("PROJECT_CONTEXT_BASEURI", "/admin/");
-
-if(file_exists(dirname(getcwd()). "/Core")) {
-	# Flat FTP mode
-	define("PROJECT_PATH_ROOT", dirname(getcwd()) . "/");	#../
-} else {
-	# Dedicated server mode
-	define("PROJECT_PATH_ROOT", dirname(dirname(getcwd())) . "/");	#../../
-}
-
-if(!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
-	die('
Incomplete installation
Baïkal dependencies have not been installed. Please, execute "composer install" in the folder where you installed Baïkal.');
-}
-
-require PROJECT_PATH_ROOT . 'vendor/autoload.php';
-
-# Bootstraping Flake
-\Flake\Framework::bootstrap();
-
-# Bootstrap BaikalAdmin
-\BaikalAdmin\Framework::bootstrap();
-
-# Assert that BaikalAdmin is enabled
-\BaikalAdmin\Core\Auth::assertEnabled();
-
-# Create and setup a page object
-$oPage = new \Flake\Controller\Page(BAIKALADMIN_PATH_TEMPLATES . "Page/index.html");
-$oPage->injectHTTPHeaders();
-
-$oPage->setTitle("Baïkal " . BAIKAL_VERSION . " Web Admin");
-$oPage->setBaseUrl(PROJECT_URI);
-
-# Authentication
-if(
-	\BaikalAdmin\Core\Auth::isAuthenticated() === FALSE &&
-	\BaikalAdmin\Core\Auth::authenticate() === FALSE
-) {
-	$oPage->zone("navbar")->addBlock(new \BaikalAdmin\Controller\Navigation\Topbar\Anonymous());
-	$oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Login());
-} else {
-	$oPage->zone("navbar")->addBlock(new \BaikalAdmin\Controller\Navigation\Topbar());
-
-	# Route the request
-	$GLOBALS["ROUTER"]::route($oPage);
-}
-
-# Render the page
-echo $oPage->render();
diff --git a/sources/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php b/sources/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php
deleted file mode 100644
index 4789fe8..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php
+++ /dev/null
@@ -1,84 +0,0 @@
-
-*  All rights reserved
-*
-*  http://baikal-server.com
-*
-*  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!
-***************************************************************/
-
-ini_set("session.cookie_httponly", 1);
-ini_set("display_errors", 0);
-ini_set("log_errors", 1);
-error_reporting(E_ALL);
-
-define("BAIKAL_CONTEXT", TRUE);
-define("BAIKAL_CONTEXT_INSTALL", TRUE);
-define("PROJECT_CONTEXT_BASEURI", "/admin/install/");
-
-if(file_exists(dirname(dirname(getcwd())) . "/Core")) {
-	# Flat FTP mode
-	define("PROJECT_PATH_ROOT", dirname(dirname(getcwd())) . "/");	#../../
-} else {
-	# Dedicated server mode
-	define("PROJECT_PATH_ROOT", dirname(dirname(dirname(getcwd()))) . "/");	# ../../../
-}
-
-if(!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
-	die('
Incomplete installation
Baïkal dependencies have not been installed. Please, execute "composer install" in the folder where you installed Baïkal.');
-}
-
-require PROJECT_PATH_ROOT . "vendor/autoload.php";
-
-# Bootstraping Flake
-\Flake\Framework::bootstrap();
-
-# Bootstrap BaikalAdmin
-\BaikalAdmin\Framework::bootstrap();
-
-# Evaluate assertions
-\BaikalAdmin\Core\Auth::assertUnlocked();
-
-# Create and setup a page object
-$oPage = new \Flake\Controller\Page(BAIKALADMIN_PATH_TEMPLATES . "Page/index.html");
-$oPage->injectHTTPHeaders();
-$oPage->setTitle("Baïkal Maintainance");
-$oPage->setBaseUrl(PROJECT_URI);
-
-$oPage->zone("navbar")->addBlock(new \BaikalAdmin\Controller\Navigation\Topbar\Install());
-
-if(!defined("BAIKAL_CONFIGURED_VERSION")) {
-	# we have to upgrade Baïkal (existing installation)
-	$oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Install\Initialize());
-	
-} elseif(!defined("BAIKAL_ADMIN_PASSWORDHASH")) {
-	# we have to set an admin password
-	$oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Install\Initialize());
-} else {
-	if(BAIKAL_CONFIGURED_VERSION !== BAIKAL_VERSION) {
-		# we have to upgrade Baïkal
-		$oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Install\VersionUpgrade());
-	} else {
-		$oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Install\Database());
-	}
-}
-
-# Render the page
-echo $oPage->render();
diff --git a/sources/Core/Frameworks/BaikalAdmin/config.php b/sources/Core/Frameworks/BaikalAdmin/config.php
deleted file mode 100644
index e8836ca..0000000
--- a/sources/Core/Frameworks/BaikalAdmin/config.php
+++ /dev/null
@@ -1,37 +0,0 @@
-
-#  All rights reserved
-#
-#  http://baikal-server.com
-#
-#  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!
-#################################################################
-
-define("BAIKALADMIN_PATH_TEMPLATES", BAIKALADMIN_PATH_ROOT . "Resources/Templates/");
-
-$GLOBALS["ROUTES"] = array(
-	"default" => "\BaikalAdmin\Route\Dashboard",
-	"users" => "\BaikalAdmin\Route\Users",
-	"users/calendars" => "\BaikalAdmin\Route\User\Calendars",
-	"users/addressbooks" => "\BaikalAdmin\Route\User\AddressBooks",
-	"settings/standard" => "\BaikalAdmin\Route\Settings\Standard",
-	"settings/system" => "\BaikalAdmin\Route\Settings\System",
-	"logout" => "\BaikalAdmin\Route\Logout"
-);
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Controller/Cli.php b/sources/Core/Frameworks/Flake/Controller/Cli.php
deleted file mode 100644
index 7d60112..0000000
--- a/sources/Core/Frameworks/Flake/Controller/Cli.php
+++ /dev/null
@@ -1,154 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Controller;
-
-class Cli extends \Flake\Core\Render\Container {
-	
-	function render() {
-		$this->sys_init();
-		$this->init();
-		
-		$this->echoFlush($this->notice("process started @" . strftime("%d/%m/%Y %H:%M:%S")));
-		$this->execute();
-		$this->echoFlush($this->notice("process ended @" . strftime("%d/%m/%Y %H:%M:%S")) . "\n\n");
-	}
-
-	function execute() {
-		reset($this->aSequence);
-		while(list($sKey,) = each($this->aSequence)) {
-			$this->aSequence[$sKey]["block"]->execute();
-		}
-	}
-	
-	/**************************************************************************/
-	
-	var $sLog = "";
-
-	function sys_init() {
-		$this->rawLine("Command line: " . (implode(" ", $_SERVER["argv"])));
-		$this->initArgs();
-	}
-
-	function init() {
-	}
-
-	function initArgs() {
-		$sShortOpts = "";
-		$sShortOpts .= "h";		// help; pas de valeur
-		$sShortOpts .= "w:";	// author; valeur obligatoire
-
-		$aLongOpts = array(
-			"help",		// help; pas de valeur
-			"helloworld",	// author; pas de valeur
-		);
-
-		$this->aArgs = getopt($sShortOpts, $aLongOpts);
-	}
-
-	function getScriptPath() {
-		return realpath($_SERVER['argv'][0]);
-	}
-	
-	function getSyntax() {
-		return $this->getScriptPath();
-	}
-
-	function syntaxError() {
-		$sStr = $this->rawLine("Syntax error.\nUsage: " . $this->getSyntax());
-		die("\n\n" . $sStr . "\n\n");
-	}
-
-	function log($sStr) {
-		$this->sLog .= $sStr;
-	}
-	
-	function header($sMsg) {
-
-		$sStr = "\n" . str_repeat("#", 80);
-		$sStr .= "\n" . "#" . str_repeat(" ", 78) . "#";
-		$sStr .= "\n" . "#" . str_pad(strtoupper($sMsg), 78, " ", STR_PAD_BOTH) . "#";
-		$sStr .= "\n" . "#" . str_repeat(" ", 78) . "#";
-		$sStr .= "\n" . str_repeat("#", 80);
-		$sStr .= "\n";
-
-		$this->log($sStr);
-		return $sStr;
-	}
-
-	function subHeader($sMsg) {
-		$sStr = "\n\n# " . str_pad(strtoupper($sMsg) . " ", 78, "-", STR_PAD_RIGHT) . "\n";
-		$this->log($sStr);
-		return $sStr;
-	}
-
-	function subHeader2($sMsg) {
-		$sStr = "\n# # " . str_pad($sMsg . " ", 76, "-", STR_PAD_RIGHT) . "\n";
-		$this->log($sStr);
-		return $sStr;
-	}
-
-	function textLine($sMsg) {
-		$sStr = ". " . $sMsg . "\n";
-		$this->log($sStr);
-		return $sStr;
-	}
-
-	function rawLine($sMsg) {
-		$sStr = $sMsg . "\n";
-		$this->log($sStr);
-		return $sStr;
-	}
-
-	function notice($sMsg) {
-		$sStr = "\n" . str_pad($sMsg, 80, ".", STR_PAD_BOTH) . "\n";
-		$this->log($sStr);
-		return $sStr;
-	}
-
-	function getLog() {
-		return $this->sLog;
-	}
-
-	function file_writeBin($sPath, $sData, $bUTF8 = TRUE) {
-		
-		$rFile = fopen($sPath, "wb");
-		
-		if($bUTF8 === TRUE) {
-			fputs($rFile, "\xEF\xBB\xBF" . $sData);
-		} else {
-			fputs($rFile, $sData);
-		}
-		
-		fclose($rFile);
-	}
-	
-	function echoFlush($sString = "") {
-		echo $sString;
-		ob_flush();
-		flush();
-	}
-}
diff --git a/sources/Core/Frameworks/Flake/Controller/HtmlBlock.php b/sources/Core/Frameworks/Flake/Controller/HtmlBlock.php
deleted file mode 100644
index 4565880..0000000
--- a/sources/Core/Frameworks/Flake/Controller/HtmlBlock.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Controller;
-
-class HtmlBlock extends \Flake\Core\Controller {
-	
-	function __construct($sHtml) {
-		$this->sHtml = $sHtml;
-	}
-	
-	function execute() {
-		
-	}
-	
-	function render() {
-		return $this->sHtml;
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Controller/HtmlBlockTemplated.php b/sources/Core/Frameworks/Flake/Controller/HtmlBlockTemplated.php
deleted file mode 100644
index 6a233b0..0000000
--- a/sources/Core/Frameworks/Flake/Controller/HtmlBlockTemplated.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Controller;
-
-class HtmlBlockTemplated extends \Flake\Core\Controller {
-	
-	function __construct($sTemplatePath, $aMarkers = array()) {
-		$this->sTemplatePath = $sTemplatePath;
-		$this->aMarkers = $aMarkers;
-	}
-	
-	function render() {
-		$oTemplate = new \Flake\Core\Template($this->sTemplatePath);
-		$sHtml = $oTemplate->parse(
-			$this->aMarkers
-		);
-		
-		return $sHtml;
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Controller/Page.php b/sources/Core/Frameworks/Flake/Controller/Page.php
deleted file mode 100644
index 6e0c156..0000000
--- a/sources/Core/Frameworks/Flake/Controller/Page.php
+++ /dev/null
@@ -1,126 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Controller;
-
-class Page extends \Flake\Core\Render\Container {
-	
-	protected $sTitle = "";
-	protected $sMetaKeywords = "";
-	protected $sMetaDescription = "";
-	protected $sTemplatePath = "";
-	
-	public function __construct($sTemplatePath) {
-		$this->sTemplatePath = $sTemplatePath;
-	}
-	
-	public function setTitle($sTitle) {
-		$this->sTitle = $sTitle;
-	}
-	
-	public function setMetaKeywords($sKeywords) {
-		$this->sMetaKeywords = $sKeywords;
-	}
-	
-	public function setMetaDescription($sDescription) {
-		$this->sMetaDescription = $sDescription;
-	}
-	
-	public function getTitle() {
-		return $this->sTitle;
-	}
-	
-	public function getMetaKeywords() {
-		$sString = str_replace(array("le", "la", "les", "de", "des", "un", "une"), " ", $this->sMetaKeywords);
-		$sString = \Flake\Util\Tools::stringToUrlToken($sString);
-		return implode(", ", explode("-", $sString));
-	}
-	
-	public function getMetaDescription() {
-		return $this->sMetaDescription;
-	}
-	
-	public function setBaseUrl($sBaseUrl) {
-		$this->sBaseUrl = $sBaseUrl;
-	}
-	
-	public function getBaseUrl() {
-		return $this->sBaseUrl;
-	}
-	
-	public function injectHTTPHeaders() {
-		header("Content-Type: text/html; charset=UTF-8");
-
-		header("X-Frame-Options: DENY");	# Prevent Clickjacking attacks
-		header("X-Content-Type-Options: nosniff");	# Prevent code injection via mime type sniffing
-	}
-	
-	public function render() {
-		$this->execute();
-		
-		$aRenderedBlocks = $this->renderBlocks();
-		$aRenderedBlocks["pagetitle"] = $this->getTitle();
-		$aRenderedBlocks["pagemetakeywords"] = $this->getMetaKeywords();
-		$aRenderedBlocks["pagemetadescription"] = $this->getMetaDescription();
-		$aRenderedBlocks["baseurl"] = $this->getBaseUrl();
-		
-		$oTemplate = new \Flake\Core\Template($this->sTemplatePath);
-		$sHtml = $oTemplate->parse(
-			$aRenderedBlocks
-		);
-
-		return $sHtml;
-	}
-	
-	public function addCss($sCssAbsPath) {
-		
-		if(\Flake\Util\Frameworks::enabled("LessPHP")) {
-			$sCompiledPath = PATH_buildcss;
-			$sFileName = basename($sCssAbsPath);
-
-			$sCompiledFilePath = $sCompiledPath . \Flake\Util\Tools::shortMD5($sFileName) . "_" . $sFileName;
-
-			if(substr(strtolower($sCompiledFilePath), -4) !== ".css") {
-				$sCompiledFilePath .= ".css";
-			}
-
-			if(!file_exists($sCompiledPath)) {
-				@mkdir($sCompiledPath);
-				if(!file_exists($sCompiledPath)) {
-					die("Page: Cannot create " . $sCompiledPath);
-				}
-			}
-
-			\Frameworks\LessPHP\Delegate::compileCss($sCssAbsPath, $sCompiledFilePath);
-			$sCssUrl = \Flake\Util\Tools::serverToRelativeWebPath($sCompiledFilePath);
-		} else {
-			$sCssUrl = \Flake\Util\Tools::serverToRelativeWebPath($sCssAbsPath);
-		}
-		
-		$sHtml = "";
-		$this->zone("head")->addBlock(new \Flake\Controller\HtmlBlock($sHtml));
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Controller/Rpc.php b/sources/Core/Frameworks/Flake/Controller/Rpc.php
deleted file mode 100644
index d230ad2..0000000
--- a/sources/Core/Frameworks/Flake/Controller/Rpc.php
+++ /dev/null
@@ -1,68 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Controller;
-
-class Rpc extends \Flake\Core\Render\Container {
-	
-	public function initializeContext() {
-		$this->injectHTTPHeaders();
-		$GLOBALS["POSTCONNECTIONSERVICES"] = array();
-	}
-	
-	public function injectHTTPHeaders() {
-		ob_start();
-
-		header("Access-Control-Allow-Origin: *");	# To allow cross domain AJAX response
-		header("Access-Control-Allow-Credentials: true");	# To allow cross domain cookies
-		header("Content-Type: application/json; charset=UTF-8");
-
-		# Needed to cut client off when needed
-		header("Connection: close\r\n");
-		ignore_user_abort(TRUE);
-
-	}
-	
-	public function P3PAllowCrossDomainCookies() {
-		# This tells IE6+ to accept passing cookies allong when establishing a XHR connection to read.codr.fr
-		header('P3P: CP="IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"');
-	}
-	
-	public function sendResponseCutClientAndRunPostConnectionTasks() {
-		header("Content-Length: " . ob_get_length());
-		ob_end_flush();
-		flush();
-		
-		reset($GLOBALS["POSTCONNECTIONSERVICES"]);
-		
-		# If post-connection services are registered, process
-		foreach($GLOBALS["POSTCONNECTIONSERVICES"] as $service) {
-			$service->execute();
-		}
-
-		session_write_close();
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Collection.php b/sources/Core/Frameworks/Flake/Core/Collection.php
deleted file mode 100644
index db4b361..0000000
--- a/sources/Core/Frameworks/Flake/Core/Collection.php
+++ /dev/null
@@ -1,214 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core;
-
-class Collection extends \Flake\Core\FLObject implements \Iterator {
-	protected $aCollection = array();
-	protected $aMeta = array();
-	
-	public function current() {
-		return current($this->aCollection);
-	}
-	
-	public function key() {
-		return key($this->aCollection);
-	}
-	
-	public function next() {
-		return next($this->aCollection);
-	}
-	
-	public function rewind() {
-		$this->reset();
-	}
-	
-	public function valid() {
-		$key = key($this->aCollection);
-		return ($key !== NULL && $key !== FALSE);
-	}
-	
-	public function &getForKey($sKey) {
-		$aKeys = $this->keys();
-		if(!in_array($sKey, $aKeys)) {
-			throw new \Exception("\Flake\Core\Collection->getForKey(): key '" . $sKey . "' not found in Collection");
-		}
-		
-		$oRes = $this->aCollection[$sKey];
-		return $oRes;
-	}
-
-	public function &each() {
-		list($key, $val) = each($this->aCollection);
-		return $val;
-	}
-
-	public function reset() {
-		reset($this->aCollection);
-	}
-
-	public function prev() {
-		return prev($this->aCollection);
-	}
-	
-	public function count() {
-		return count($this->aCollection);
-	}
-	
-	public function keys() {
-		return array_keys($this->aCollection);
-	}
-	
-	public function isEmpty() {
-		return $this->count() === 0;
-	}
-	
-	public function isAtFirst() {
-		return $this->key() === array_shift($this->keys());
-	}
-	
-	public function isAtLast() {
-		return $this->key() === array_pop($this->keys());
-	}
-	
-	public function push(&$mMixed) {
-		array_push($this->aCollection, $mMixed);
-	}
-	
-	public function flush() {
-		unset($this->aCollection);
-		$this->aCollection = array();
-	}
-	
-	public function &first() {
-		if(!$this->isEmpty()) {
-			$aKeys = $this->keys();
-			return $this->aCollection[array_shift($aKeys)];
-		}
-		
-		$var = null;	# two lines instead of one
-		return $var;	# as PHP needs a variable to return by ref
-	}
-	
-	public function &last() {
-		if(!$this->isEmpty()) {
-			$aKeys = $this->keys();
-			return $this->aCollection[array_pop($aKeys)];
-		}
-
-		$var = null;
-		return $var;
-	}
-	
-	public function toArray() {
-		return $this->aCollection;
-	}
-	
-	public static function fromArray($aData) {
-		$oColl = new \Flake\Core\Collection();
-		reset($aData);
-		foreach($aData as $mData) {
-			$oColl->push($mData);
-		}
-		
-		return $oColl;
-	}
-	
-	# Create a new collection like this one
-	# This abstraction is useful because of CollectionTyped
-	protected function newCollectionLikeThisOne() {
-		$oCollection = new \Flake\Core\Collection();	# two lines instead of one
-		return $oCollection;							# as PHP needs a variable to return by ref
-	}
-	
-	public function map($sFunc) {
-		$aData = $this->toArray();
-		$oNewColl = $this->fromArray(array_map($sFunc, $aData));
-		return $oNewColl;
-	}
-	
-	public function walk($sFunc, $aParams=array()) {
-		$aData = $this->toArray();
-		$oNewColl = $this->fromArray(array_walk($aData, $sFunc, $aParams));
-		return $oNewColl;
-	}
-	
-	public function remove($sKey) {
-		$aKeys = $this->keys();
-		if(!in_array($sKey, $aKeys)) {
-			throw new \Exception("\Flake\Core\Collection->remove(): key '" . $sKey . "' not found in Collection");
-		}
-		
-		unset($this->aCollection[$sKey]);
-		$this->aCollection = array_values($this->aCollection);
-	}
-	
-	public function &__call($sName, $aArguments) {
-		if(
-			strlen($sName) > 7 &&
-			$sName{0} === "s" &&
-			$sName{1} === "e" &&
-			$sName{2} === "t" &&
-			$sName{3} === "M" &&
-			$sName{4} === "e" &&
-			$sName{5} === "t" &&
-			$sName{6} === "a"
-		) {
-			$sKey = strtolower(substr($sName, 7, 1)) . substr($sName, 8);
-			$mValue =& $aArguments[0];
-
-			if(is_null($mValue)) {
-				if(array_key_exists($sKey, $this->aMeta)) {
-					unset($this->aMeta[$sKey]);
-				}
-			} else {
-				$this->aMeta[$sKey] =& $mValue;
-			}
-			
-			$res = NULL;
-			return $res;	# To avoid 'Notice: Only variable references should be returned by reference'
-
-		} elseif(
-			strlen($sName) > 7 &&
-			$sName{0} === "g" &&
-			$sName{1} === "e" &&
-			$sName{2} === "t" &&
-			$sName{3} === "M" &&
-			$sName{4} === "e" &&
-			$sName{5} === "t" &&
-			$sName{6} === "a"
-		) {
-			$sKey = strtolower(substr($sName, 7, 1)) . substr($sName, 8);
-			if(array_key_exists($sKey, $this->aMeta)) {
-				return $this->aMeta[$sKey];
-			} else {
-				return null;
-			}
-		} else {
-			throw new \Exception("Method " . $sName . "() not found on " . get_class($this));
-		}
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/CollectionTyped.php b/sources/Core/Frameworks/Flake/Core/CollectionTyped.php
deleted file mode 100644
index 119d884..0000000
--- a/sources/Core/Frameworks/Flake/Core/CollectionTyped.php
+++ /dev/null
@@ -1,51 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core;
-
-class CollectionTyped extends \Flake\Core\Collection {
-
-	protected $sTypeClassOrProtocol;
-
-	public function __construct($sTypeClassOrProtocol) {
-		$this->sTypeClassOrProtocol = $sTypeClassOrProtocol;
-		$this->setMetaType($this->sTypeClassOrProtocol);
-	}
-
-	public function push(&$mMixed) {
-		if(!\Flake\Util\Tools::is_a($mMixed, $this->sTypeClassOrProtocol)) {
-			throw new \Exception("\Flake\Core\CollectionTyped<" . $this->sTypeClassOrProtocol . ">: Given object is not correctly typed.");
-		}
-
-		parent::push($mMixed);
-	}
-	
-	# Create a new collection like this one
-	public function newCollectionLikeThisOne() {
-		$oCollection = new \Flake\Core\CollectionTyped($this->sTypeClassOrProtocol);
-		return $oCollection;
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Controller.php b/sources/Core/Frameworks/Flake/Core/Controller.php
deleted file mode 100644
index 8136fa9..0000000
--- a/sources/Core/Frameworks/Flake/Core/Controller.php
+++ /dev/null
@@ -1,56 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core;
-
-abstract class Controller extends \Flake\Core\FLObject {
-	
-	protected $aParams = array();
-	
-	public function __construct($aParams = array()) {
-		$this->aParams = $aParams;
-	}
-	
-	public function getParams() {
-		return $this->aParams;
-	}
-	
-	public static function link(/*[$sParam, $sParam2, ...]*/) {
-		return static::buildRoute();
-	}
-	
-	public static function buildRoute($aParams = array()) {
-		# TODO: il faut remplacer le mécanisme basé sur un nombre variable de paramètres en un mécanisme basé sur un seul paramètre "tableau"
-		#$aParams = func_get_args();
-		$sController = "\\" . get_called_class();
-		#array_unshift($aParams, $sController);		# Injecting current controller as first param
-		#return call_user_func_array($GLOBALS["ROUTER"] . "::buildRouteForController", $aParams);
-		return $GLOBALS["ROUTER"]::buildRouteForController($sController, $aParams);
-	}
-	
-	public abstract function execute();
-	public abstract function render();
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/DOM/HTMLElement.php b/sources/Core/Frameworks/Flake/Core/DOM/HTMLElement.php
deleted file mode 100644
index 3c7fc62..0000000
--- a/sources/Core/Frameworks/Flake/Core/DOM/HTMLElement.php
+++ /dev/null
@@ -1,130 +0,0 @@
-
-#  All rights reserved
-#
-#  http://bootstrap.codr.fr
-#
-#  This script is part of the CodrBootstrap project. The CodrBootstrap 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 Flake\Core\DOM;
-
-class HTMLElement extends \DOMElement {
-	public function getInnerText() {
-		return $this->nodeValue;
-	}
-	
-	public function getOuterHTML() {
-		return $this->ownerDocument->saveHTML($this);
-	}
-	
-	public function getNormalizedInnerText() {
-		return $this->normalizeWhiteSpace($this->getInnerText());
-	}
-	
-	public function getNormalizedOuterHTML() {
-		return $this->normalizeWhitespace($this->getOuterHTML());
-	}
-	
-	protected function normalizeWhitespace($sText) {
-		$sText = str_replace(array("\t", "\r\n", "\n"), ' ', $sText);
-		
-		# using multiple str_replace has proven to be twice as fast that regexp on big strings
-		$iCount = 0;	
-		do {
-			$sText = str_replace('  ', ' ', $sText, $iCount);
-		} while($iCount > 0);
-		
-		return trim($sText);
-	}
-	
-	public function setInnerHTML($sHtml) {
-		// first, empty the element
-		for ($x=$this->childNodes->length-1; $x>=0; $x--) {
-			$this->removeChild($this->childNodes->item($x));
-		}
-		// $value holds our new inner HTML
-		if ($sHtml != '') {
-			$f = $this->ownerDocument->createDocumentFragment();
-			// appendXML() expects well-formed markup (XHTML)
-			$result = @$f->appendXML($sHtml); // @ to suppress PHP warnings
-			if ($result) {
-				if ($f->hasChildNodes()) $this->appendChild($f);
-			} else {
-				// $value is probably ill-formed
-				$f = new \DOMDocument();
-				$sHtml = mb_convert_encoding($sHtml, 'HTML-ENTITIES', 'UTF-8');
-				// Using  will generate a warning, but so will bad HTML
-				// (and by this point, bad HTML is what we've got).
-				// We use it (and suppress the warning) because an HTML fragment will 
-				// be wrapped around  tags which we don't really want to keep.
-				// Note: despite the warning, if loadHTML succeeds it will return true.
-				$result = @$f->loadHTML(''.$sHtml.'');
-				if ($result) {
-					$import = $f->getElementsByTagName('htmlfragment')->item(0);
-					foreach ($import->childNodes as $child) {
-						$importedNode = $this->ownerDocument->importNode($child, true);
-						$this->appendChild($importedNode);
-					}
-				} else {
-					// oh well, we tried, we really did. :(
-					// this element is now empty
-				}
-			}
-		}
-	}
-	
-	public function getInnerHTML() {
-		$sHtml = '';
-		$iNodes = $this->childNodes->length;
-		for($i = 0; $i < $iNodes; $i++) {
-			$oItem = $this->childNodes->item($i);
-			$sHtml .= $oItem->ownerDocument->saveHTML($oItem);
-		}
-		
-		return $sHtml;
-	}
-	
-	public function isDOMText() {
-		return $this->nodeType === XML_TEXT_NODE;
-	}
-	
-	public function getSiblingPosition() {
-		$iPos = 0;
-		$oNode = $this;
-		
-		while(!is_null($oNode->previousSibling)) {
-			$oNode = $oNode->previousSibling;
-			$iPos++;
-		}
-		
-		return $iPos;
-	}
-	
-	public function getTreePosition() {
-		# Tree position is number 100^level + sibling offset
-		$iLevel = substr_count($this->getNodePath(), "/") - 2;	# -1 to align on 0, and -1 to compensate for /document
-		if($iLevel === 0) {
-			return $this->getSiblingPosition();
-		} else {
-			return pow(10, $iLevel) + $this->getSiblingPosition();
-		}
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Database.php b/sources/Core/Frameworks/Flake/Core/Database.php
deleted file mode 100644
index 4f3b034..0000000
--- a/sources/Core/Frameworks/Flake/Core/Database.php
+++ /dev/null
@@ -1,208 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core;
-
-abstract class Database extends \Flake\Core\FLObject {
-
-	/* common stuff */
-
-	protected function messageAndDie($sMessage) {
-		$sError = "
" . get_class($this) . ": " . $sMessage . "
";
-		die($sError);
-	}
-
-	public function exec_INSERTquery($table,$fields_values,$no_quote_fields=FALSE)	{
-		return $this->query($this->INSERTquery($table,$fields_values,$no_quote_fields));
-	}
-
-	public function INSERTquery($table,$fields_values,$no_quote_fields=FALSE)	{
-
-			// Table and fieldnames should be "SQL-injection-safe" when supplied to this function (contrary to values in the arrays which may be insecure).
-		if (is_array($fields_values) && count($fields_values))	{
-
-				// quote and escape values
-			$fields_values = $this->fullQuoteArray($fields_values,$table,$no_quote_fields);
-
-				// Build query:
-			$query = 'INSERT INTO '.$table.'
-				(
-					'.implode(',
-					',array_keys($fields_values)).'
-				) VALUES (
-					'.implode(',
-					',$fields_values).'
-				)';
-
-				// Return query:
-			if ($this->debugOutput || $this->store_lastBuiltQuery) $this->debug_lastBuiltQuery = $query;
-			return $query;
-		}
-	}
-
-	public function exec_UPDATEquery($table,$where,$fields_values,$no_quote_fields=FALSE)	{
-		return $this->query($this->UPDATEquery($table,$where,$fields_values,$no_quote_fields));
-	}
-
-	public function UPDATEquery($table,$where,$fields_values,$no_quote_fields=FALSE)	{
-
-			// Table and fieldnames should be "SQL-injection-safe" when supplied to this function (contrary to values in the arrays which may be insecure).
-		if (is_string($where))	{
-			if (is_array($fields_values) && count($fields_values))	{
-
-					// quote and escape values
-				$nArr = $this->fullQuoteArray($fields_values,$table,$no_quote_fields);
-
-				$fields = array();
-				foreach ($nArr as $k => $v) {
-					$fields[] = $k.'='.$v;
-				}
-
-					// Build query:
-				$query = 'UPDATE '.$table.'
-					SET
-						'.implode(',
-						',$fields).
-					(strlen($where)>0 ? '
-					WHERE
-						'.$where : '');
-
-					// Return query:
-				if ($this->debugOutput || $this->store_lastBuiltQuery) $this->debug_lastBuiltQuery = $query;
-				return $query;
-			}
-		} else {
-			die('Fatal Error: "Where" clause argument for UPDATE query was not a string in $this->UPDATEquery() !');
-		}
-	}
-
-	public function exec_DELETEquery($table,$where)	{
-		return $this->query($this->DELETEquery($table,$where));
-	}
-
-	public function DELETEquery($table,$where)	{
-		if (is_string($where))	{
-
-				// Table and fieldnames should be "SQL-injection-safe" when supplied to this function
-			$query = 'DELETE FROM '.$table.
-				(strlen($where)>0 ? '
-				WHERE
-					'.$where : '');
-
-			if ($this->debugOutput || $this->store_lastBuiltQuery) $this->debug_lastBuiltQuery = $query;
-			return $query;
-		} else {
-			die('Fatal Error: "Where" clause argument for DELETE query was not a string in $this->DELETEquery() !');
-		}
-	}
-
-	public function exec_SELECTquery($select_fields,$from_table,$where_clause,$groupBy='',$orderBy='',$limit='')	{
-		return $this->query($this->SELECTquery($select_fields,$from_table,$where_clause,$groupBy,$orderBy,$limit));
-	}
-
-	public function SELECTquery($select_fields,$from_table,$where_clause,$groupBy='',$orderBy='',$limit='')	{
-
-			// Table and fieldnames should be "SQL-injection-safe" when supplied to this function
-			// Build basic query:
-		$query = 'SELECT '.$select_fields.'
-			FROM '.$from_table.
-			(strlen($where_clause)>0 ? '
-			WHERE
-				'.$where_clause : '');
-
-			// Group by:
-		if (strlen($groupBy)>0)	{
-			$query.= '
-			GROUP BY '.$groupBy;
-		}
-			// Order by:
-		if (strlen($orderBy)>0)	{
-			$query.= '
-			ORDER BY '.$orderBy;
-		}
-			// Group by:
-		if (strlen($limit)>0)	{
-			$query.= '
-			LIMIT '.$limit;
-		}
-
-			// Return query:
-		if ($this->debugOutput || $this->store_lastBuiltQuery) $this->debug_lastBuiltQuery = $query;
-		return $query;
-	}
-	
-	public function fullQuote($str, $table)	{
-		return '\''.$this->quote($str, $table).'\'';
-	}
-
-	public function fullQuoteArray($arr, $table, $noQuote=FALSE)	{
-		if (is_string($noQuote))	{
-			$noQuote = explode(',',$noQuote);
-		} elseif (!is_array($noQuote))	{	// sanity check
-			$noQuote = FALSE;
-		}
-
-		foreach($arr as $k => $v)	{
-			if ($noQuote===FALSE || !in_array($k,$noQuote))     {
-				$arr[$k] = $this->fullQuote($v, $table);
-			}
-		}
-		return $arr;
-	}
-	
-	/* Should be abstract, but we provide a body anyway as PDO abstracts these methods for us */
-	
-	public function query($sSql) {
-		if(($stmt = $this->oDb->query($sSql)) === FALSE) {
-			$sMessage = print_r($this->oDb->errorInfo(), TRUE);
-			throw new \Exception("SQL ERROR in: '" . $sSql . "'; Message: " . $sMessage);
-		}
-		
-		return new \Flake\Core\Database\Statement($stmt);
-	}
-	
-	public function lastInsertId() {
-		return $this->oDb->lastInsertId();
-	}
-
-	public function quote($str) {
-		return substr($this->oDb->quote($str), 1, -1);	# stripping first and last quote
-	}
-	
-	public function getPDO() {
-		return $this->oDb;
-	}
-	
-	public function close() {
-		$this->oDb = null;
-	}
-	
-	public function __destruct() {
-		$this->close();
-	}
-	
-	public abstract function tables();
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Database/Mysql.php b/sources/Core/Frameworks/Flake/Core/Database/Mysql.php
deleted file mode 100644
index 9379378..0000000
--- a/sources/Core/Frameworks/Flake/Core/Database/Mysql.php
+++ /dev/null
@@ -1,67 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core\Database;
-
-class Mysql extends \Flake\Core\Database {
-
-	protected $oDb = FALSE;	// current DB link
-	protected $debugOutput = FALSE;
-	protected $store_lastBuiltQuery = TRUE;
-	protected $debug_lastBuiltQuery = "";
-	protected $sHost = "";
-	protected $sDbName = "";
-	protected $sUsername = "";
-	protected $sPassword = "";
-
-	public function __construct($sHost, $sDbName, $sUsername, $sPassword) {
-		$this->sHost = $sHost;
-		$this->sDbName = $sDbName;
-		$this->sUsername = $sUsername;
-		$this->sPassword = $sPassword;
-		
-		$this->oDb = new \PDO(
-			'mysql:host=' . $this->sHost . ';dbname=' . $this->sDbName,
-			$this->sUsername,
-			$this->sPassword
-		);
-	}
-	
-	public function tables() {
-		$aTables = array();
-		
-		$sSql = "SHOW TABLES FROM " . $this->sDbName;
-		$oStmt = $this->query($sSql);
-		
-		while(($aRs = $oStmt->fetch()) !== FALSE) {
-			$aTables[] = array_shift($aRs);
-		}
-		
-		asort($aTables);
-		reset($aTables);
-		return $aTables;
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Database/Sqlite.php b/sources/Core/Frameworks/Flake/Core/Database/Sqlite.php
deleted file mode 100644
index 47b0420..0000000
--- a/sources/Core/Frameworks/Flake/Core/Database/Sqlite.php
+++ /dev/null
@@ -1,60 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core\Database;
-
-class Sqlite extends \Flake\Core\Database {
-
-	protected $oDb = FALSE;	// current DB link
-	protected $debugOutput = FALSE;
-	protected $store_lastBuiltQuery = TRUE;
-	protected $debug_lastBuiltQuery = "";
-	protected $sDbPath = "";
-
-	public function __construct($sDbPath) {
-		$this->sDbPath = $sDbPath;
-		$this->oDb = new \PDO('sqlite:' . $this->sDbPath);
-	}
-	
-	# Taken from http://dev.kohanaframework.org/issues/2985
-	public function tables() {
-		$aTables = array();
-		
-		# Find all user level table names
-		$oStmt = $this->query('SELECT name '
-		.'FROM sqlite_master '
-		.'WHERE type=\'table\' AND name NOT LIKE \'sqlite_%\' '
-		.'ORDER BY name');
-		
-		while(($aRs = $oStmt->fetch()) !== FALSE) {
-			// Get the table name from the results
-			$aTables[] = array_shift($aRs);
-		}
-		
-		reset($aTables);
-		return $aTables;
-    }
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Database/Statement.php b/sources/Core/Frameworks/Flake/Core/Database/Statement.php
deleted file mode 100644
index b2ed9cb..0000000
--- a/sources/Core/Frameworks/Flake/Core/Database/Statement.php
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core\Database;
-
-class Statement extends \Flake\Core\FLObject {
-	protected $stmt = null;
-
-	public function __construct($stmt) {
-		$this->stmt = $stmt;
-	}
-
-	public function fetch() {
-		if($this->stmt !== FALSE) {
-			return $this->stmt->fetch(\PDO::FETCH_ASSOC, \PDO::FETCH_ORI_FIRST);
-		}
-
-		return FALSE;
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Datastructure/Chain.php b/sources/Core/Frameworks/Flake/Core/Datastructure/Chain.php
deleted file mode 100644
index ccd972a..0000000
--- a/sources/Core/Frameworks/Flake/Core/Datastructure/Chain.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core\Datastructure;
-
-class Chain extends \SplDoublyLinkedList {
-	
-	public function push(\Flake\Core\Datastructure\Chainable $value) {
-		$value->chain($this, $this->count());
-		parent::push($value);
-	}
-	
-	public function offsetUnset($offset) {
-		throw new \Exception("Cannot delete Chainable in Chain");
-	}
-	
-	public function &first() {
-		$oRes = $this->bottom();
-		return $oRes;
-	}
-	
-	public function &last() {
-		$oRes = $this->top();
-		return $oRes;
-	}
-	
-	public function reset() {
-		reset($this);
-	}
-	
-	public function __toString() {
-		ob_start();
-		var_dump($this);
-		$sDump = ob_get_contents();
-		ob_end_clean();
-		
-		return "
" . htmlspecialchars($sDump) . "
";
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Datastructure/ChainLink.php b/sources/Core/Frameworks/Flake/Core/Datastructure/ChainLink.php
deleted file mode 100644
index f69cd1c..0000000
--- a/sources/Core/Frameworks/Flake/Core/Datastructure/ChainLink.php
+++ /dev/null
@@ -1,110 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core\Datastructure;
-
-abstract class ChainLink implements \Flake\Core\Datastructure\Chainable {
-	protected $__container = null;
-	protected $__key = null;
-	
-	public function chain(Chain $container, $key) {
-		$this->__container = $container;
-		$this->__key = $key;
-	}
-	
-	public function offsetSet($offset,$value) {
-		if(is_null($this->__container)) {
-			return;
-		}
-		
-		$this->__container->offsetSet($offset, $value);
-	}
-
-	public function offsetExists($offset) {
-		if(is_null($this->__container)) {
-			return FALSE;
-		}
-		
-		return $this->__container->offsetExists($offset);
-	}
-
-	public function offsetUnset($offset) {
-		if(is_null($this->__container)) {
-			return;
-		}
-		
-		$this->__container->offsetUnset($offset);
-	}
-
-	public function &offsetGet($offset) {
-		if(is_null($this->__container)) {
-			return null;
-		}
-		
-		$oRes = $this->__container->offsetGet($offset);
-		return $oRes;
-	}
-
-	public function rewind() {
-		$this->__container->rewind();
-	}
-
-	public function current() {
-		return $this->__container->current();
-	}
-
-	public function key() {
-		return $this->__container->key();
-	}
-
-	public function &next() {
-		$oRes = $this->__container->next();
-		return $oRes;
-	}
-	
-	public function &prev() {
-		$oPrev = $this->__container->prev();
-		return $oPrev;
-	}
-
-	public function valid() {
-		return $this->__container->valid();
-	}    
-
-	public function count() {
-		return $this->__container->count();
-	}
-	
-	public function &first() {
-		$oRes = $this->__container->first();
-		return $oRes;
-	}
-	
-	public function &last() {
-		$oRes = $this->__container->last();
-		return $oRes;
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Datastructure/Chainable.php b/sources/Core/Frameworks/Flake/Core/Datastructure/Chainable.php
deleted file mode 100644
index 8cf035d..0000000
--- a/sources/Core/Frameworks/Flake/Core/Datastructure/Chainable.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core\Datastructure;
-
-interface Chainable extends \ArrayAccess, \Iterator, \Countable {
-	
-#	public function &next();	# This is already specified by interface Iterator
-	public function &prev();
-	
-	public function &first();	
-	public function &last();
-	
-	public function chain(\Flake\Core\Datastructure\Chain $chain, $key);
-}
diff --git a/sources/Core/Frameworks/Flake/Core/FLObject.php b/sources/Core/Frameworks/Flake/Core/FLObject.php
deleted file mode 100644
index 4a4773c..0000000
--- a/sources/Core/Frameworks/Flake/Core/FLObject.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core;
-
-class FLObject {
-	public function __toString() {
-		ob_start();
-		var_dump($this);
-		$sDump = ob_get_contents();
-		ob_end_clean();
-		
-		return "
" . htmlspecialchars($sDump) . "
";
-	}
-	
-	public function isA($sClassOrProtocolName) {
-		return \Flake\Util\Tools::is_a($this, $sClassOrProtocolName);
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Framework.php b/sources/Core/Frameworks/Flake/Core/Framework.php
deleted file mode 100644
index a86df32..0000000
--- a/sources/Core/Frameworks/Flake/Core/Framework.php
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core;
-
-class Framework {
-	
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Model.php b/sources/Core/Frameworks/Flake/Core/Model.php
deleted file mode 100644
index 8e1b63e..0000000
--- a/sources/Core/Frameworks/Flake/Core/Model.php
+++ /dev/null
@@ -1,106 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core;
-
-abstract class Model extends \Flake\Core\FLObject {
-	protected $aData = array();
-	
-	protected function getData() {
-		reset($this->aData);
-		return $this->aData;
-	}
-	
-	public function __get($sPropName) {
-		return $this->get($sPropName);
-	}
-	
-	public function __isset($name) {
-		if(array_key_exists($name, $this->aData)) {
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	public function get($sPropName) {
-		if(array_key_exists($sPropName, $this->aData)) {
-			return $this->aData[$sPropName];
-		}
-		
-		throw new \Exception("\Flake\Core\Model->get(): property " . htmlspecialchars($sPropName) . " does not exist on " . get_class($this));
-	}
-	
-	public function set($sPropName, $sPropValue) {
-		if(array_key_exists($sPropName, $this->aData)) {
-			$this->aData[$sPropName] = $sPropValue;
-			return $this;
-		}
-		
-		throw new \Exception("\Flake\Core\Model->set(): property " . htmlspecialchars($sPropName) . " does not exist on " . get_class($this));
-	}
-	
-	public function label() {
-		return $this->get($this::LABELFIELD);
-	}
-	
-	public static function icon() {
-		return "icon-book";
-	}
-	
-	public static function mediumicon() {
-		return "glyph-book";
-	}
-	
-	public static function bigicon() {
-		return "glyph2x-book";
-	}
-	
-	public static function humanName() {
-		$aRes = explode("\\", get_called_class());
-		return array_pop($aRes);
-	}
-	
-	public function floating() {
-		return TRUE;
-	}
-	
-	public function formForThisModelInstance($options = array()) {
-		$sClass = get_class($this);
-		$oForm = new \Formal\Form($sClass, $options);
-		$oForm->setModelInstance($this);
-		
-		return $oForm;
-	}
-	
-	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/sources/Core/Frameworks/Flake/Core/Model/Db.php b/sources/Core/Frameworks/Flake/Core/Model/Db.php
deleted file mode 100644
index b96d8ee..0000000
--- a/sources/Core/Frameworks/Flake/Core/Model/Db.php
+++ /dev/null
@@ -1,119 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core\Model;
-
-abstract class Db extends \Flake\Core\Model {
-	
-	protected $bFloating = TRUE;
-	
-	public function __construct($sPrimary = FALSE) {
-		if($sPrimary === FALSE) {
-			# Object will be floating
-			$this->initFloating();
-			$this->bFloating = TRUE;
-		} else {
-			$this->initByPrimary($sPrimary);
-			$this->bFloating = FALSE;
-		}
-	}
-
-	public static function &getBaseRequester() {
-		$oRequester = new \Flake\Core\Requester\Sql(get_called_class());
-		$oRequester->setDataTable(self::getDataTable());
-	
-		return $oRequester;
-	}
-
-	public static function &getByRequest(\FS\Core\Requester\Sql $oRequester) {
-		// renvoie une collection de la classe du modèle courant (this)
-		return $oRequester->execute();
-	}
-
-	public static function getDataTable() {
-		$sClass = get_called_class();
-		return $sClass::DATATABLE;
-	}
-	
-	public static function getPrimaryKey() {
-		$sClass = get_called_class();
-		return $sClass::PRIMARYKEY;
-	}
-	
-	public function getPrimary() {
-		return $this->get(self::getPrimaryKey());
-	}
-
-	protected function initByPrimary($sPrimary) {
-		
-		$rSql = $GLOBALS["DB"]->exec_SELECTquery(
-			"*",
-			self::getDataTable(),
-			self::getPrimaryKey() . "='" . $GLOBALS["DB"]->quote($sPrimary) . "'"
-		);
-	
-		if(($aRs = $rSql->fetch()) === FALSE) {
-			throw new \Exception("\Flake\Core\Model '" . htmlspecialchars($sPrimary) . "' not found for model " . get_class($this));
-		}
-		
-		reset($aRs);
-		$this->aData = $aRs;
-	}
-	
-	public function persist() {
-		if($this->floating()) {
-			$GLOBALS["DB"]->exec_INSERTquery(
-				self::getDataTable(),
-				$this->getData()
-			);
-			
-			$sPrimary = $GLOBALS["DB"]->lastInsertId();
-			$this->initByPrimary($sPrimary);
-			$this->bFloating = FALSE;
-		} else {
-			$GLOBALS["DB"]->exec_UPDATEquery(
-				self::getDataTable(),
-				self::getPrimaryKey() . "='" . $GLOBALS["DB"]->quote($this->getPrimary()) . "'",
-				$this->getData()
-			);
-		}
-	}
-	
-	public function destroy() {
-		$GLOBALS["DB"]->exec_DELETEquery(
-			self::getDataTable(),
-			self::getPrimaryKey() . "='" . $GLOBALS["DB"]->quote($this->getPrimary()) . "'"
-		);
-	}
-	
-	protected function initFloating() {
-		# nothing; object will be blank	
-	}
-	
-	public function floating() {
-		return $this->bFloating;
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Model/NoDb.php b/sources/Core/Frameworks/Flake/Core/Model/NoDb.php
deleted file mode 100644
index e8823cf..0000000
--- a/sources/Core/Frameworks/Flake/Core/Model/NoDb.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core\Model;
-
-abstract class NoDb extends \Flake\Core\Model {
-	
-	public function __construct($aData = FALSE) {
-		if($aData !== FALSE) {
-			$this->aData = $aData;
-		}
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/PostConnectionService.php b/sources/Core/Frameworks/Flake/Core/PostConnectionService.php
deleted file mode 100644
index 99791ce..0000000
--- a/sources/Core/Frameworks/Flake/Core/PostConnectionService.php
+++ /dev/null
@@ -1,39 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core;
-
-abstract class PostConnectionService extends \Flake\Core\FLObject {
-	
-	public function __construct($aParams = array()) {
-		$this->aParams = $aParams;
-	}
-	
-	public function execute() {
-		sleep(10);
-		mail("mail@jeromeschneider.fr", "Hello", "je suis la");
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Render/Container.php b/sources/Core/Frameworks/Flake/Core/Render/Container.php
deleted file mode 100644
index 471d0ff..0000000
--- a/sources/Core/Frameworks/Flake/Core/Render/Container.php
+++ /dev/null
@@ -1,82 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core\Render;
-
-abstract class Container extends \Flake\Core\Controller {
-	
-	var $aSequence = array();
-	var $aBlocks = array();
-	var $aRendu = array();
-	var $aZones = array();
-
-	function addBlock(&$oBlock, $sZone = "_DEFAULT_") {
-		$aTemp = array(
-			"block" => &$oBlock,
-			"rendu" => "",
-		);
-		$this->aSequence[] =& $aTemp;
-		$this->aBlocks[$sZone][] =& $aTemp["rendu"];
-	}
-	
-	function &zone($sZone) {
-		if(!array_key_exists($sZone, $this->aZones)) {
-			$this->aZones[$sZone] = new \Flake\Core\Render\Zone($this, $sZone);
-		}
-		
-		return $this->aZones[$sZone];
-	}
-	
-	public function render() {
-		$this->execute();
-		$aRenderedBlocks = $this->renderBlocks();
-		return implode("", $aRenderedBlocks);
-	}
-	
-	public function execute() {
-		reset($this->aSequence);
-		while(list($sKey,) = each($this->aSequence)) {
-			$this->aSequence[$sKey]["block"]->execute();
-		}
-	}
-	
-	protected function renderBlocks() {
-		$aHtml = array();
-		reset($this->aSequence);
-		while(list($sKey,) = each($this->aSequence)) {
-			$this->aSequence[$sKey]["rendu"] = $this->aSequence[$sKey]["block"]->render();
-		}
-		
-		$aHtml = array();
-		reset($this->aBlocks);
-		while(list($sZone,) = each($this->aBlocks)) {
-			$aHtml[$sZone] = implode("", $this->aBlocks[$sZone]);
-		}
-		
-		reset($aHtml);
-		return $aHtml;
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Render/Zone.php b/sources/Core/Frameworks/Flake/Core/Render/Zone.php
deleted file mode 100644
index 875aa35..0000000
--- a/sources/Core/Frameworks/Flake/Core/Render/Zone.php
+++ /dev/null
@@ -1,41 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core\Render;
-
-class Zone extends \Flake\Core\FLObject {
-	function __construct(&$oZonableObject, $sZone) {
-		$this->oZonableObject =& $oZonableObject;
-		$this->sZone = $sZone;
-	}
-	
-	function addBlock(&$oBlock) {
-		$this->oZonableObject->addBlock(
-			$oBlock,
-			$this->sZone
-		);
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Requester.php b/sources/Core/Frameworks/Flake/Core/Requester.php
deleted file mode 100644
index 87234ae..0000000
--- a/sources/Core/Frameworks/Flake/Core/Requester.php
+++ /dev/null
@@ -1,65 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core;
-
-abstract class Requester extends \Flake\Core\FLObject {
-	public function __construct($sModelClass) {
-		$this->sModelClass = $sModelClass;
-	}
-
-	protected function addClause($sField, $sValue) {
-		$this->addClauseEquals($sField, $sValue);
-		return $this;
-	}
-	
-	public function limit($iStart, $iNumber = FALSE) {
-		if($iNumber !== FALSE) {
-			return $this->setLimitStart($iStart)->setLimitNumber($iLimitNumber);
-		}
-		
-		return $this->setLimitStart($iStart);
-	}
-	
-	public function orderBy($sOrderField, $sOrderDirection = "ASC") {
-		$this->sOrderField = $sOrderField;
-		$this->sOrderDirection = $sOrderDirection;
-		return $this;
-	}
-
-	public function setLimitStart($iLimitStart) {
-		$this->iLimitStart = $iLimitStart;
-		return $this;
-	}
-
-	public function setLimitNumber($iLimitNumber) {
-		$this->iLimitNumber = $iLimitNumber;
-		return $this;
-	}
-	
-	public abstract function execute();
-	public abstract function count();
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Requester/Sql.php b/sources/Core/Frameworks/Flake/Core/Requester/Sql.php
deleted file mode 100644
index 207f7aa..0000000
--- a/sources/Core/Frameworks/Flake/Core/Requester/Sql.php
+++ /dev/null
@@ -1,208 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core\Requester;
-
-class Sql extends \Flake\Core\Requester {
-
-	protected $sDataTable = "";
-	protected $aClauses = array();
-	protected $sModelClass = "";
-	protected $sOrderField = "";
-	protected $sOrderDirection = "ASC";
-	protected $iLimitStart = FALSE;
-	protected $iLimitNumber = FALSE;
-	protected $bHasBeenExecuted = FALSE;
-
-	public function setDataTable($sDataTable) {
-		$this->sDataTable = $sDataTable;
-		return $this;
-	}
-
-	public function addClauseEquals($sField, $sValue) {
-		$sWrap = "{field}='{value}'";
-		$this->addClauseWrapped($sField, $sValue, $sWrap);
-		return $this;
-	}
-
-	public function addClauseNotEquals($sField, $sValue) {
-		$sWrap = "{field}!='{value}'";
-		$this->addClauseWrapped($sField, $sValue, $sWrap);
-		return $this;
-	}
-
-	public function addClauseLike($sField, $sValue) {
-		$sWrap = "{field} LIKE '%{value}%'";
-		$this->addClauseWrapped($sField, $sValue, $sWrap);
-		return $this;
-	}
-
-	public function addClauseLikeBeginning($sField, $sValue) {
-		$sWrap = "{field} LIKE '{value}%'";
-		$this->addClauseWrapped($sField, $sValue, $sWrap);
-		return $this;
-	}
-
-	public function addClauseLikeEnd($sField, $sValue) {
-		$sWrap = "{field} LIKE '%{value}'";
-		$this->addClauseWrapped($sField, $sValue, $sWrap);
-		return $this;
-	}
-
-	public function addClauseNotLike($sField, $sValue) {
-		$sWrap = "{field} NOT LIKE '%{value}%'";
-		$this->addClauseWrapped($sField, $sValue, $sWrap);
-		return $this;
-	}
-
-	public function addClauseNotLikeBeginning($sField, $sValue) {
-		$sWrap = "{field} NOT LIKE '{value}%'";
-		$this->addClauseWrapped($sField, $sValue, $sWrap);
-		return $this;
-	}
-
-	public function addClauseNotLikeEnd($sField, $sValue) {
-		$sWrap = "{field} NOT LIKE '%{value}'";
-		$this->addClauseWrapped($sField, $sValue, $sWrap);
-		return $this;
-	}
-
-	public function addClauseIn($sField, $sValue) {
-		$sWrap = "{field} IN ({value})";
-		$this->addClauseWrapped($sField, $sValue, $sWrap);
-		return $this;
-	}
-
-	public function addClauseNotIn($sField, $sValue) {
-		$sWrap = "{field} NOT IN ({value})";
-		$this->addClauseWrapped($sField, $sValue, $sWrap);
-		return $this;
-	}
-
-	protected function addClauseWrapped($sField, $sValue, $sWrap) {
-		$sValue = $this->escapeSqlValue($sValue);
-		$sClause = str_replace(
-			array(
-				"{field}",
-				"{value}",
-			),
-			array(
-				$sField,
-				$sValue
-			),
-			$sWrap
-		);
-
-		$this->addClauseLiteral($sClause);
-		return $this;
-	}
-
-	public function addClauseLiteral($sClause) {
-		$this->aClauses[] = $sClause;
-		return $this;
-	}
-
-	protected function escapeSqlValue($sValue) {
-		return $GLOBALS["DB"]->quote(
-			$sValue,
-			$this->sDataTable
-		);
-	}
-
-	protected function &reify($aData) {
-		$sTemp = $this->sModelClass;
-		$res = new $sTemp($aData[$sTemp::getPrimaryKey()]);
-		return $res;	# To address 'Notice: Only variable references should be returned by reference'
-	}
-
-	public function hasBeenExecuted() {
-		return $this->bHasBeenExecuted;
-	}
-
-	public function getQuery($sFields = "*") {
-		$sWhere = "1=1";
-		$sOrderBy = "";
-		$sLimit = "";
-
-		if(!empty($this->aClauses)) {
-			$sWhere = implode(" AND ", $this->aClauses);
-		}
-
-		if(trim($this->sOrderField) !== "") {
-			$sOrderBy = $this->sOrderField . " " . $this->sOrderDirection;
-		}
-
-		if($this->iLimitStart !== FALSE) {
-			if($this->iLimitNumber !== FALSE) {
-				$sLimit = $this->iLimitStart . ", " . $this->iLimitNumber;
-			} else {
-				$sLimit = $this->iLimitStart;
-			}
-		} elseif($this->iLimitNumber !== FALSE) {
-			$sLimit = "0, " . $this->iLimitNumber;
-		}
-
-		return $GLOBALS["DB"]->SELECTquery(
-			$sFields,
-			$this->sDataTable,
-			$sWhere,
-			"",
-			$sOrderBy,
-			$sLimit
-		);
-	}
-	
-	public function getCountQuery() {
-		return $this->getQuery("count(*) as nbitems");
-	}
-
-	public function execute() {
-		$oCollection = new \Flake\Core\CollectionTyped($this->sModelClass);
-		$sSql = $this->getQuery();
-
-		$rSql = $GLOBALS["DB"]->query($sSql);
-		while(($aRs = $rSql->fetch()) !== FALSE) {
-			$oCollection->push(
-				$this->reify($aRs)
-			);
-		}
-
-		$this->bHasBeenExecuted = TRUE;
-
-		return $oCollection;
-	}
-	
-	public function count() {
-		$sSql = $this->getCountQuery();
-		
-		$rSql = $GLOBALS["DB"]->query($sSql);
-		if(($aRs = $rSql->fetch()) !== FALSE) {
-			return intval($aRs["nbitems"]);
-		}
-		
-		return 0;
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Route.php b/sources/Core/Frameworks/Flake/Core/Route.php
deleted file mode 100644
index 77c10b5..0000000
--- a/sources/Core/Frameworks/Flake/Core/Route.php
+++ /dev/null
@@ -1,63 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core;
-
-abstract class Route extends \Flake\Core\FLObject {
-	
-	# should be abstract, but is not, due to PHP strict standard
-	public static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
-		
-	}
-	public static function parametersMap() {
-		return array();
-	}
-	
-	# converts raw url params "a/b/c/d"=[a, b, c, d] in route params [a=>b, c=>d]
-	
-	public static function getParams() {
-		$aRouteParams = array();
-		
-		$aParametersMap = static::parametersMap();	# static to use method as defined in derived class
-		$aURLParams = $GLOBALS["ROUTER"]::getURLParams();
-		
-		reset($aParametersMap);
-		foreach($aParametersMap as $sParam => $aMap) {
-			$sURLToken = $sParam;
-			
-			if(array_key_exists("urltoken", $aMap)) {
-				$sURLToken = $aMap["urltoken"];
-			}
-			
-			if(($iPos = array_search($sURLToken, $aURLParams)) !== FALSE) {
-				$aRouteParams[$sParam] = $aURLParams[($iPos + 1)];	# the value corresponding to this param is the next one in the URL
-			}
-		}
-		
-		reset($aRouteParams);
-		return $aRouteParams;
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/Template.php b/sources/Core/Frameworks/Flake/Core/Template.php
deleted file mode 100644
index 05837ac..0000000
--- a/sources/Core/Frameworks/Flake/Core/Template.php
+++ /dev/null
@@ -1,51 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core;
-
-class Template extends \Flake\Core\FLObject {
-	
-	private $sAbsPath = "";
-	private $sHtml = "";
-	
-	public function __construct($sAbsPath) {
-		$this->sAbsPath = $sAbsPath;
-		$this->sHtml = $this->getTemplateFile(
-			$this->sAbsPath
-		);
-	}
-	
-	private function getTemplateFile($sAbsPath) {
-		return file_get_contents($sAbsPath);
-	}
-
-	function parse($aMarkers = array()) {
-		return \Flake\Util\Tools::parseTemplateCode(
-			$this->sHtml,
-			$aMarkers
-		);
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Core/View.php b/sources/Core/Frameworks/Flake/Core/View.php
deleted file mode 100644
index 5e2fc3f..0000000
--- a/sources/Core/Frameworks/Flake/Core/View.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Core;
-
-abstract class View extends \Flake\Core\FLObject {
-	protected $aData;
-	
-	public function __construct() {
-		$this->aData = array();
-	}
-	
-	public function setData($sName, $mData) {
-		$this->aData[$sName] = $mData;
-	}
-	
-	public function getData() {
-		return $this->aData;
-	}
-	
-	public function get($sWhat) {
-		if(array_key_exists($sWhat, $this->aData)) {
-			return $this->aData[$sWhat];
-		}
-		
-		return FALSE;
-	}
-	
-	public function render() {
-		$sTemplatePath = $this->templatesPath();
-		$oTemplate = new \Flake\Core\Template($this->templatesPath());
-		return $oTemplate->parse($this->getData());
-	}
-	
-	public abstract function templatesPath();
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Framework.php b/sources/Core/Frameworks/Flake/Framework.php
deleted file mode 100644
index 8cfe7b4..0000000
--- a/sources/Core/Frameworks/Flake/Framework.php
+++ /dev/null
@@ -1,299 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake;
-
-class Framework extends \Flake\Core\Framework {
-	
-	public static function rmBeginSlash($sString) {
-		if(substr($sString, 0, 1) === "/") {
-			$sString = substr($sString, 1);
-		}
-
-		return $sString;
-	}
-
-	public static function rmEndSlash($sString) {
-		if(substr($sString, -1) === "/") {
-			$sString = substr($sString, 0, -1);
-		}
-
-		return $sString;
-	}
-
-	public static function appendSlash($sString) {
-		if(substr($sString, -1) !== "/") {
-			$sString .= "/";
-		}
-
-		return $sString;
-	}
-
-	public static function prependSlash($sString) {
-		if(substr($sString, 0, 1) !== "/") {
-			$sString = "/" . $sString;
-		}
-
-		return $sString;
-	}
-
-	public static function rmQuery($sString) {
-		$iStart = strpos($sString, "?");
-		return ($iStart === FALSE) ? $sString : substr($sString, 0, $iStart);
-	}
-
-	public static function rmScriptName($sString, $sScriptName) {
-		$sScriptBaseName = basename($sScriptName);
-		if( self::endswith($sString, $sScriptBaseName) )
-			return substr($sString, 0, -strlen($sScriptBaseName));
-		return $sString;
-	}
-
-	public static function rmProjectContext($sString) {
-		return self::appendSlash(
-			substr($sString, 0, -1 * strlen(PROJECT_CONTEXT_BASEURI))
-		);
-	}
-
-	public static function endsWith($sString, $sTest) {
-		$iTestLen = strlen($sTest);
-		if ($iTestLen > strlen($sString)) return false;
-		return substr_compare($sString, $sTest, -$iTestLen) === 0;
-	}
-
-	public static function bootstrap() {
-		
-		# Asserting PHP 5.3.0+
-		if(version_compare(PHP_VERSION, '5.3.0', '<')) {
-			die('Flake Fatal Error: Flake requires PHP 5.3.0+ to run properly. Your version is: ' . PHP_VERSION . '.');
-		}
-		
-		# Define safehash salt
-		define("PROJECT_SAFEHASH_SALT", "strong-secret-salt");
-
-		# Define absolute server path to Flake Framework
-		define("FLAKE_PATH_ROOT", PROJECT_PATH_ROOT . "Core/Frameworks/Flake/");	# ./
-
-		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 {
-			define("MONGOOSE_SERVER", FALSE);
-		}
-
-		# Undo magic_quotes as this cannot be disabled by .htaccess on PHP ran as CGI
-		# Source: http://stackoverflow.com/questions/517008/how-to-turn-off-magic-quotes-on-shared-hosting
-		if(in_array(strtolower(ini_get('magic_quotes_gpc')), array('1', 'on'))) {
-			$_POST = array_map('stripslashes', $_POST);
-			$_GET = array_map('stripslashes', $_GET);
-			$_COOKIE = array_map('stripslashes', $_COOKIE);
-		}
-
-		# Fixing some CGI environments, that prefix HTTP_AUTHORIZATION (forwarded in .htaccess) with "REDIRECT_"
-		if(array_key_exists("REDIRECT_HTTP_AUTHORIZATION", $_SERVER)) {
-			$_SERVER["HTTP_AUTHORIZATION"] = $_SERVER["REDIRECT_HTTP_AUTHORIZATION"];
-		}
-
-		#################################################################################################
-
-		# determine Flake install root path
-		# not using realpath here to avoid symlinks resolution
-
-		define("PROJECT_PATH_CORE", PROJECT_PATH_ROOT . "Core/");
-		define("PROJECT_PATH_CORERESOURCES", PROJECT_PATH_CORE . "Resources/");
-		define("PROJECT_PATH_SPECIFIC", PROJECT_PATH_ROOT . "Specific/");
-		define("PROJECT_PATH_FRAMEWORKS", PROJECT_PATH_CORE . "Frameworks/");
-		define("PROJECT_PATH_WWWROOT", PROJECT_PATH_CORE . "WWWRoot/");
-
-		require_once(PROJECT_PATH_CORE . "Distrib.php");
-
-		if(PROJECT_PACKAGE === "regular") {
-			define("PROJECT_PATH_DOCUMENTROOT", PROJECT_PATH_ROOT . "html/");
-		} elseif(PROJECT_PACKAGE === "flat") {
-			define("PROJECT_PATH_DOCUMENTROOT", PROJECT_PATH_ROOT);
-		} else {
-			throw new \Exception("Unrecognized PROJECT_PACKAGE value.");
- 		}
-
-		# Determine PROJECT_BASEURI
-		$sScript = substr($_SERVER["SCRIPT_FILENAME"], strlen($_SERVER["DOCUMENT_ROOT"]));
-		$sDirName = str_replace("\\", "/", dirname($sScript));	# fix windows backslashes
-
-		if($sDirName !== ".") {
-			$sDirName = self::appendSlash($sDirName);
-		} else {
-			$sDirName = "/";
-		}
-		
-		$sBaseUrl = self::rmBeginSlash(self::rmProjectContext($sDirName));
-		define("PROJECT_BASEURI", self::prependSlash($sBaseUrl));	# SabreDAV needs a "/" at the beginning of BASEURL
-
-		# Determine PROJECT_URI
-		$sProtocol = \Flake\Util\Tools::getCurrentProtocol();
-		$sHttpBaseUrl = strtolower($_SERVER["REQUEST_URI"]);
-		$sHttpBaseUrl = self::rmQuery($sHttpBaseUrl);
-		$sHttpBaseUrl = self::rmScriptName($sHttpBaseUrl, $sScript);
-		$sHttpBaseUrl = self::rmProjectContext($sHttpBaseUrl);
-		define("PROJECT_URI", $sProtocol . "://" . $_SERVER["HTTP_HOST"] . $sHttpBaseUrl);
-		unset($sScript); unset($sDirName); unset($sBaseUrl); unset($sProtocol); unset($sHttpBaseUrl);
-
-		#################################################################################################
-		
-		require_once(FLAKE_PATH_ROOT . 'Util/Twig/lib/Twig/Autoloader.php');
-		\Twig_Autoloader::register();
-
-		# Include Flake Framework config
-		require_once(FLAKE_PATH_ROOT . "config.php");
-
-		# Determine Router class
-		$GLOBALS["ROUTER"] = \Flake\Util\Tools::router();
-
-		if(!\Flake\Util\Tools::isCliPhp()) {
-			ini_set("html_errors", TRUE);
-			session_start();
-		}
-
-		setlocale(LC_ALL, FLAKE_LOCALE);
-		date_default_timezone_set(FLAKE_TIMEZONE);
-
-		$GLOBALS["TEMPLATESTACK"] = array();
-
-		$aUrlInfo = parse_url(PROJECT_URI);
-		define("FLAKE_DOMAIN", $_SERVER["HTTP_HOST"]);
-		define("FLAKE_URIPATH", \Flake\Util\Tools::stripBeginSlash($aUrlInfo["path"]));
-		unset($aUrlInfo);
-		
-		
-		# Include Project config
-		# NOTE: DB initialization and App config files inclusion
-		# do not break execution if not properly executed, as
-		# these errors will have to be caught later in the process
-		# notably by the App install tool, if available; breaking right now
-		# would forbid such install tool forwarding, for instance
-		
-		$sConfigPath = PROJECT_PATH_SPECIFIC . "config.php";
-		$sConfigSystemPath = PROJECT_PATH_SPECIFIC . "config.system.php";
-		
-		if(file_exists($sConfigPath)) {
-			require_once($sConfigPath);
-		}
-		
-		if(file_exists($sConfigSystemPath)) {
-			require_once($sConfigSystemPath);
-		}
-		
-		self::initDb();
-	}
-	
-	protected static function initDb() {
-
-		if(defined("PROJECT_DB_MYSQL") && PROJECT_DB_MYSQL === TRUE) {
-			self::initDbMysql();
-		} else {
-			self::initDbSqlite();
-		}
-	}
-	
-	protected static function initDbSqlite() {
-		# Asserting DB filepath is set
-		if(!defined("PROJECT_SQLITE_FILE")) {
-			return FALSE;
-		}
-		
-		# Asserting DB file exists
-		if(!file_exists(PROJECT_SQLITE_FILE)) {
-			die("
DB file does not exist. To create it, please copy 'Core/Resources/Db/SQLite/db.sqlite' to '" . PROJECT_SQLITE_FILE . "'
");
-		}
-		
-		# Asserting DB file is readable
-		if(!is_readable(PROJECT_SQLITE_FILE)) {
-			die("
DB file is not readable. Please give read permissions on file '" . PROJECT_SQLITE_FILE . "'
");
-		}
-		
-		# Asserting DB file is writable
-		if(!is_writable(PROJECT_SQLITE_FILE)) {
-			die("
DB file is not writable. Please give write permissions on file '" . PROJECT_SQLITE_FILE . "'
");
-		}
-		
-		# Asserting DB directory is writable
-		if(!is_writable(dirname(PROJECT_SQLITE_FILE))) {
-			die("
The FOLDER containing the DB file is not writable, and it has to.
Please give write permissions on folder '" . dirname(PROJECT_SQLITE_FILE) . "'
");
-		}
-		
-		if(file_exists(PROJECT_SQLITE_FILE) && is_readable(PROJECT_SQLITE_FILE) && !isset($GLOBALS["DB"])) {
-			$GLOBALS["DB"] = new \Flake\Core\Database\Sqlite(PROJECT_SQLITE_FILE);
-			return TRUE;
-		}
-		
-		return FALSE;
-	}
-	
-	protected static function initDbMysql() {
-		
-		if(!defined("PROJECT_DB_MYSQL_HOST")) {
-			die("
The constant PROJECT_DB_MYSQL_HOST, containing the MySQL host name, is not set.
You should set it in Specific/config.system.php
");
-		}
-		
-		if(!defined("PROJECT_DB_MYSQL_DBNAME")) {
-			die("
The constant PROJECT_DB_MYSQL_DBNAME, containing the MySQL database name, is not set.
You should set it in Specific/config.system.php
");
-		}
-		
-		if(!defined("PROJECT_DB_MYSQL_USERNAME")) {
-			die("
The constant PROJECT_DB_MYSQL_USERNAME, containing the MySQL database username, is not set.
You should set it in Specific/config.system.php
");
-		}
-		
-		if(!defined("PROJECT_DB_MYSQL_PASSWORD")) {
-			die("
The constant PROJECT_DB_MYSQL_PASSWORD, containing the MySQL database password, is not set.
You should set it in Specific/config.system.php
");
-		}
-		
-		try {
-			$GLOBALS["DB"] = new \Flake\Core\Database\Mysql(
-				PROJECT_DB_MYSQL_HOST,
-				PROJECT_DB_MYSQL_DBNAME,
-				PROJECT_DB_MYSQL_USERNAME,
-				PROJECT_DB_MYSQL_PASSWORD
-			);
-
-			# We now setup the connexion to use UTF8
-			$GLOBALS["DB"]->query("SET NAMES UTF8");
-		} catch(\Exception $e) {
-			#die("
Baïkal was not able to establish a connexion to the configured MySQL database (as configured in Specific/config.system.php).
");
-		}
-		
-		return TRUE;
-	}
-	
-	public static function isDBInitialized() {
-		return isset($GLOBALS["DB"]) && \Flake\Util\Tools::is_a($GLOBALS["DB"], "\Flake\Core\Database");
-	}
-}
diff --git a/sources/Core/Frameworks/Flake/Model/IUser.php b/sources/Core/Frameworks/Flake/Model/IUser.php
deleted file mode 100644
index 5104500..0000000
--- a/sources/Core/Frameworks/Flake/Model/IUser.php
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Model;
-
-interface IUser {
-	public function isAdmin();
-	public function getDisplayName();
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Model/User/Admin.php b/sources/Core/Frameworks/Flake/Model/User/Admin.php
deleted file mode 100644
index 5cc0ca4..0000000
--- a/sources/Core/Frameworks/Flake/Model/User/Admin.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Model\User;
-
-class Admin extends \Flake\Core\Model\NoDb {
-	
-	public function isAdmin() {
-		return TRUE;
-	}
-	
-	public function getDisplayName() {
-		return "Admin";
-	}
-	
-	public function persist() {
-		
-	}
-	
-	public function destroy() {
-		
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Model/User/Customer.php b/sources/Core/Frameworks/Flake/Model/User/Customer.php
deleted file mode 100644
index 39180eb..0000000
--- a/sources/Core/Frameworks/Flake/Model/User/Customer.php
+++ /dev/null
@@ -1,89 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Model\User;
-
-class Customer extends \Flake\Core\Model\Db implements \Flake\Model\IUser {
-	
-	const DATATABLE = "user";
-	const PRIMARYKEY = "uid";
-	const LABELFIELD = "username";
-	
-	protected $aData = array(
-		"username" => "",
-		"firstname" => "",
-		"lastname" => "",
-		"email" => "",
-		"password" => "",
-		"salt" => "",
-		"crdate" => 0,
-		"enabled" => 0,
-	);
-	
-	public function isAdmin() {
-		return FALSE;
-	}
-	
-	public function getDisplayName() {
-		return $this->get("firstname") . " " . $this->get("lastname");
-	}
-	
-	public function persist() {
-		
-	}
-	
-	public function destroy() {
-		
-	}
-	
-	public static function hashPassword($sClearPassword, $sSalt) {
-		return sha1(APP_ENCRYPTION_KEY . ":" . $sClearPassword . ":" . $sSalt);
-	}
-	
-	public static function fetchByCredentials($sUsername, $sClearPassword) {
-		# Algorithm:
-		#	1- find the user by username
-		#	2- hash the given password using the salt for this user
-		#	3- compare hashes
-		
-		$oUser = self::getBaseRequester()
-			->addClauseEquals("username", $sUsername)
-			->addClauseEquals("enabled", 1)
-			->execute()
-			->first();
-			
-		if(is_null($oUser)) {
-			return FALSE;
-		}
-		
-		if($oUser->get("password") !== self::hashPassword($sClearPassword, $oUser->get("salt"))) {
-			return FALSE;
-		}
-		
-		return $oUser;
-	}
-	
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Util/Frameworks.php b/sources/Core/Frameworks/Flake/Util/Frameworks.php
deleted file mode 100644
index 2758244..0000000
--- a/sources/Core/Frameworks/Flake/Util/Frameworks.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Util;
-
-class Frameworks extends \Flake\Core\FLObject {
-	private function __construct() {	# private constructor to force static class
-	}
-	
-	public function isAFramework($sName) {
-		$sName = trim(\Flake\Util\Tools::trimSlashes($sName));
-		if($sName === "" || $sName === "." || $sName === "..") {
-			return FALSE;
-		}
-		
-		$sFrameworkPath = PROJECT_PATH_FRAMEWORKS . $sName;
-		return file_exists($sFrameworkPath) && is_dir($sFrameworkPath);
-	}
-	
-	public static function enabled($sFramework) {
-		return FALSE;
-	}
-	
-	# TODO: Create a 'Framework' Model	
-	public function getPath($sName) {
-		if(self::isAFramework($sName)) {
-			throw new \Flake\Core\Exception(htmlspecialchars($$sName) . " is not a framework.", $sName);
-		}
-		
-		return \Flake\Util\Tools::appendSlash(PROJECT_PATH_FRAMEWORKS . $sName);
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Util/Profiler.php b/sources/Core/Frameworks/Flake/Util/Profiler.php
deleted file mode 100644
index 48cebcc..0000000
--- a/sources/Core/Frameworks/Flake/Util/Profiler.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Util;
-
-class Profiler extends \Flake\Core\FLObject {
-	
-	protected static $TUSAGE;
-	protected static $RUSAGE;
-	
-	protected function __construct() {
-		# Static class
-	}
-	
-	public static function start() {
-		$dat = getrusage();
-		self::$TUSAGE = microtime(TRUE);
-		self::$RUSAGE = $dat["ru_utime.tv_sec"] * 1e6 + $dat["ru_utime.tv_usec"];
-	}
-
-	public static function cpuUsage() {
-	    $dat = getrusage();
-	    $tv_usec = (($dat["ru_utime.tv_sec"] * 1e6) + $dat["ru_utime.tv_usec"]) - self::$RUSAGE;
-	    $time = (microtime(true) - self::$TUSAGE) * 1e6;
-
-	    // cpu per request
-	    if($time > 0) {
-	        $cpu = number_format(($tv_usec / $time) * 100, 2);
-	    } else {
-	        $cpu = '0.00';
-	    }
-
-	    return $cpu;
-	}
-	
-	public static function cpuTime() {
-	    $dat = getrusage();
-	    $tv_usec = (($dat["ru_utime.tv_sec"] * 1e6) + $dat["ru_utime.tv_usec"]) - self::$RUSAGE;
-	    $time = (microtime(true) - self::$TUSAGE) * 1e6;
-		$cpuusage = ($tv_usec / $time);
-	    return round(($time  / 1000) * $cpuusage);
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Util/Router.php b/sources/Core/Frameworks/Flake/Util/Router.php
deleted file mode 100644
index fc595bf..0000000
--- a/sources/Core/Frameworks/Flake/Util/Router.php
+++ /dev/null
@@ -1,144 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Util;
-
-abstract class Router extends \Flake\Core\FLObject {
-	
-	static $sURIPath = "";
-	
-	/* ----------------------- COMMON METHODS ------------------------------*/
-	
-	private function __construct() {
-		# private constructor for static class
-	}
-	
-	public static function getRoutes() {
-		reset($GLOBALS["ROUTES"]);
-		return $GLOBALS["ROUTES"];
-	}
-	
-	public static function getControllerForRoute($sRoute) {
-		return str_replace("\\Route", "\\Controller", self::getRouteClassForRoute($sRoute));
-	}
-	
-	public static function getRouteClassForRoute($sRoute) {
-		$aRoutes = $GLOBALS["ROUTER"]::getRoutes();
-		return $aRoutes[$sRoute];
-	}
-	
-	public static function getRouteForController($sController) {
-		
-		if($sController{0} !== "\\") {
-			$sController = "\\" . $sController;
-		}
-		
-		$aRoutes = $GLOBALS["ROUTER"]::getRoutes();
-		
-		reset($aRoutes);
-		while(list($sRoute,) = each($aRoutes)) {
-			if(str_replace("\\Route", "\\Controller", $aRoutes[$sRoute]) === $sController) {
-				return $sRoute;
-			}
-		}
-		
-		return FALSE;
-	}
-	
-	public static function route(\Flake\Core\Render\Container &$oRenderContainer) {
-		$sRouteClass = $GLOBALS["ROUTER"]::getRouteClassForRoute(
-			$GLOBALS["ROUTER"]::getCurrentRoute()
-		);
-		
-		$sRouteClass::layout($oRenderContainer);
-	}
-	
-	public static function buildRouteForController($sController, $aParams = array()) {
-
-		#$aParams = func_get_args();
-		#array_shift($aParams);	# stripping $sController
-		if(($sRouteForController = $GLOBALS["ROUTER"]::getRouteForController($sController)) === FALSE) {
-			throw new \Exception("buildRouteForController '" . htmlspecialchars($sController) . "': no route available.");
-		}
-
-		$aRewrittenParams = array();
-
-		$sRouteClass = self::getRouteClassForRoute($sRouteForController);
-		$aParametersMap = $sRouteClass::parametersMap();
-		reset($aParametersMap);
-		foreach($aParametersMap as $sParam => $aMap) {
-			if(!array_key_exists($sParam, $aParams)) {
-				# if parameter not in parameters map, skip !
-				continue;
-			}
-
-			$sUrlToken = $sParam;
-			if(array_key_exists("urltoken", $aMap)) {
-				$sUrlToken = $aMap["urltoken"];
-			}
-
-			$aRewrittenParams[$sUrlToken] = $aParams[$sParam];
-		}
-		
-		#array_unshift($aParams, $sRouteForController);	# Injecting route as first param
-		#return call_user_func_array($GLOBALS["ROUTER"] . "::buildRoute", $aParams);
-		return $GLOBALS["ROUTER"]::buildRoute($sRouteForController, $aRewrittenParams);
-	}
-	
-	public static function buildCurrentRoute(/*[$sParam, $sParam2, ...]*/) {
-		$aParams = func_get_args();
-		$sCurrentRoute = $GLOBALS["ROUTER"]::getCurrentRoute();
-		
-		array_unshift($aParams, $sCurrentRoute);	# Injecting route as first param
-		return call_user_func_array($GLOBALS["ROUTER"] . "::buildRoute", $aParams);
-	}
-	
-	public static function setURIPath($sURIPath) {
-		static::$sURIPath = $sURIPath;
-	}
-	
-	public static function getUriPath() {
-		return FLAKE_URIPATH . static::$sURIPath;
-	}
-	
-	/* ----------------------- CHANGING METHODS ----------------------------*/
-	
-	# this method is likely to change with every Router implementation
-	# should be abstract, but is not, because of PHP's strict standards
-	public static function buildRoute($sRoute, $aParams/* [, $sParam, $sParam2, ...] */) {
-
-	}
-	
-	# should be abstract, but is not, because of PHP's strict standards
-	public static function getCurrentRoute() {
-		
-	}
-	
-	# should be abstract, but is not, because of PHP's strict standards
-	public static function getURLParams() {
-		
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Util/Router/QuestionMarkRewrite.php b/sources/Core/Frameworks/Flake/Util/Router/QuestionMarkRewrite.php
deleted file mode 100644
index de0dd74..0000000
--- a/sources/Core/Frameworks/Flake/Util/Router/QuestionMarkRewrite.php
+++ /dev/null
@@ -1,153 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Util\Router;
-
-class QuestionMarkRewrite extends \Flake\Util\Router {
-	
-	public static function getCurrentRoute() {
-		
-		$aMatches = array();
-		$sRouteTokens = implode("/", self::getRouteTokens());
-		
-		$aRoutes = self::getRoutes();
-		reset($aRoutes);
-		foreach($aRoutes as $sDefinedRoute => $sDefinedController) {
-
-			if(strpos($sRouteTokens, $sDefinedRoute) === 0) {
-				
-				# found a match
-				$iSlashCount = substr_count($sDefinedRoute, "/");
-				if(!array_key_exists($iSlashCount, $aMatches)) {
-					$aMatches[$iSlashCount] = array();
-				}
-				
-				$aMatches[$iSlashCount][] = $sDefinedRoute;
-			}
-		}
-		
-		if(empty($aMatches)) {
-			return "default";
-		}
-		
-		$aBestMatches = array_pop($aMatches);	// obtains the deepest matching route (higher number of slashes)
-		return array_shift($aBestMatches);		// first route amongst best matches
-	}
-	
-	public static function buildRoute($sRoute, $aParams = array()/* [, $sParam, $sParam2, ...] */) {
-#		$aParams = func_get_args();
-#		array_shift($aParams);	# Stripping $sRoute
-		
-#		$sParams = implode("/", $aParams);
-		
-		$aParamsSegments = array();
-		reset($aParams);
-		foreach($aParams as $sParamName => $sParamValue) {
-			$aParamsSegments[] = rawurlencode($sParamName) . "/" . rawurlencode($sParamValue);
-		}
-
-		$sParams = implode("/", $aParamsSegments);
-
-		if(trim($sParams) !== "") {
-			$sParams .= "/";
-		}
-		
-		if($sRoute === "default" && empty($aParams)) {
-			$sUrl =  "/";
-		} else {
-			$sUrl = "/" . $sRoute . "/" . $sParams;
-		}
-		
-		$sUriPath = self::getUriPath();
-		if($sUriPath === "" || $sUriPath === "/") {
-			if($sUrl !== "/") {
-				$sUrl = "?" . $sUrl;
-			}
-		} else {
-			if($sUrl !== "/") {
-				$sUrl = "/" . self::getUriPath() . "?" . $sUrl;
-			} else {
-				$sUrl = "/" . self::getUriPath();
-			}
-		}
-		
-		return $sUrl;
-	}
-	
-	protected static function getUrlTokens() {
-		$sQuery = "";
-		$sUrl = \Flake\Util\Tools::stripBeginSlash(\Flake\Util\Tools::getCurrentUrl());
-		$aUrlParts = parse_url($sUrl);
-		
-		$aParams = array();
-		if(array_key_exists("query", $aUrlParts)) {
-			$aParams = explode("/", "?" . $aUrlParts["query"]);		
-		}
-		
-		return $aParams;
-	}
-	
-	protected static function getRouteTokens() {
-		$aUrlTokens = self::getUrlTokens();
-		
-		if(!empty($aUrlTokens)) {
-			return array_slice($aUrlTokens, 1);
-		}
-		
-		return array();
-	}
-	
-	public static function getURLParams() {
-		$aTokens = self::getRouteTokens();
-		
-		# stripping route
-		if(!empty($aTokens)) {
-			
-			$sRouteUrl = implode("/", $aTokens);
-			$sCurrentRoute = $GLOBALS["ROUTER"]::getCurrentRoute();
-			
-			if(strpos($sRouteUrl, $sCurrentRoute) === FALSE) {
-				throw new \Exception("Flake\Util\Router\QuestionMarkRewrite::getURLParams(): unrecognized route.");
-			}
-			
-			$sParams = \Flake\Util\Tools::trimSlashes(substr($sRouteUrl, strlen($sCurrentRoute)));
-			
-			$aParams = array();
-			if($sParams !== "") {
-				$aParams = explode("/", $sParams);
-			}
-			
-			reset($aParams);
-			foreach($aParams as $sParam => $sValue) {
-				$aParams[$sParam] = rawurldecode($sValue);
-			}
-			
-			return $aParams;
-		}
-
-		return array();
-	}
-}
\ No newline at end of file
diff --git a/sources/Core/Frameworks/Flake/Util/Tools.php b/sources/Core/Frameworks/Flake/Util/Tools.php
deleted file mode 100644
index 7832f70..0000000
--- a/sources/Core/Frameworks/Flake/Util/Tools.php
+++ /dev/null
@@ -1,768 +0,0 @@
-
-#  All rights reserved
-#
-#  http://flake.codr.fr
-#
-#  This script is part of the Flake project. The Flake
-#  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 Flake\Util;
-
-class Tools extends \Flake\Core\FLObject {
-	
-	private function __construct() {	# private constructor to force static class
-	}
-	
-	public static function getCurrentUrl() {
-		if(MONGOOSE_SERVER) {
-			$sUrl = $GLOBALS["_SERVER"]["REQUEST_URI"];
-			if(array_key_exists("QUERY_STRING", $GLOBALS["_SERVER"]) && trim($GLOBALS["_SERVER"]["QUERY_STRING"]) !== "") {
-				$sUrl .= "?" . $GLOBALS["_SERVER"]["QUERY_STRING"];
-			}
-		} else {
-			$sUrl = $GLOBALS["_SERVER"]["REQUEST_URI"];	# Would be REDIRECT_URL for ServerRewrite
-		}
-		
-		return $sUrl;
-	}
-	
-	public static function getCurrentProtocol() {
-		if(isset($GLOBALS['_SERVER']['HTTP_X_FORWARDED_PROTO']) && !empty($GLOBALS['_SERVER']['HTTP_X_FORWARDED_PROTO'])) {
-			return $GLOBALS['_SERVER']['HTTP_X_FORWARDED_PROTO'];
-		}
-		
-		if((!empty($GLOBALS["_SERVER"]["HTTPS"]) && $GLOBALS["_SERVER"]['HTTPS'] !== 'off') || intval($_SERVER['SERVER_PORT']) === 443) {
-			return "https";
-		}
-		
-		return "http";
-	}
-	
-	public static function deCamelCase($sString, $sGlue=" ") {
-		$sSep = md5(rand());
-		$sRes = preg_replace('/(?!^)[[:upper:]][[:lower:]]/', '$0', preg_replace('/(?!^)[[:upper:]]+/', $sSep . '$0', $sString));
-		if($sGlue !== "" && preg_match('/^[[:upper:]].*/', $sRes)) {
-			$sRes = $sSep . $sRes;
-		}
-		
-		return str_replace($sSep, $sGlue, $sRes);
-	}
-	
-	public static function serverToRelativeWebPath($sAbsPath) {
-		return "/" . str_replace(PROJECT_PATH_WWWROOT, "", $sAbsPath);
-	}
-
-	public static function view_array($array_in) {
-		if (is_array($array_in))	{
-			$result='';
-			if (!count($array_in))	{$result.= '';}
-			while (list($key,$val)=each($array_in))	{
-				$result.= '';
-			}
-			$result.= '
'.htmlspecialchars("EMPTY!").'
'.htmlspecialchars((string)$key).'';
-				if (is_array($array_in[$key]))	{
-					$result.= \Flake\Util\Tools::view_array($array_in[$key]);
-				} else {
-					if(is_object($val)) {
-						if(method_exists($val, "__toString")) {
-							$sWhat = nl2br(htmlspecialchars((string)$val));
-						} else {
-							$sWhat = nl2br(htmlspecialchars(get_class($val)));
-						}
-					} elseif(is_bool($val)) {
-						$sWhat = ($val === TRUE ? "boolean:TRUE" : "boolean:FALSE");
-					} else {
-						$sWhat = nl2br(htmlspecialchars((string)$val));
-					}
-					
-					$result .= '' . $sWhat . '
';
-				}
-				
-				$result.= '
';
-		} else	{
-			$result  = '
-				
-					
-				
-			
'.nl2br(htmlspecialchars((string)$array_in)).'
';	// Output it as a string.
-		}
-		return $result;
-	}
-
-	public static function debug($var="",$brOrHeader=0)	{
-		if($brOrHeader === 0) {
-			try {
-				$trail = debug_backtrace();
-				$trail = array_reverse($trail);
-				array_pop($trail);	// la ligne d'appel à debug
-				array_pop($trail);	// la ligne d'appel à debug
-				$aLastNode = array_pop($trail);	// l'appel qui nous intéresse
-
-				if(array_key_exists("class", $aLastNode)) {
-					$sClass = @strval($aLastNode["class"]);
-				} else {
-					$sClass = "";
-				}
-				
-				if(array_key_exists("type", $aLastNode)) {
-					$sType = @strval($aLastNode["type"]);
-				} else {
-					$sType = "";
-				}
-				
-				$brOrHeader = $sClass.$sType.@strval($aLastNode['function']);
-			} catch(\Exception $e) {
-				$brOrHeader = "Undetermined context";
-			}
-		}
-
-		if ($brOrHeader)	{
-			echo '
'.htmlspecialchars((string)$brOrHeader).'
';
-		}
-
-		if (is_array($var))	{
-			echo \Flake\Util\Tools::view_array($var);
-		} elseif (is_object($var))	{
-			echo '|Object:
';
-			print_r($var);
-			echo '
|';
-		} elseif ((string)$var!='')	{
-			echo '|'.htmlspecialchars((string)$var).'|';
-		} else {
-			echo '| debug |';
-		}
-
-		if ($brOrHeader) {
-			echo '
';
-		}
-	}
-
-	public static function debug_trail()	{
-		$trail = debug_backtrace();
-		$trail = array_reverse($trail);
-		array_pop($trail);
-
-		$path = array();
-		foreach($trail as $dat)	{
-			$path[] = $dat['class'].$dat['type'].$dat['function'];
-		}
-
-		return implode(' // ',$path);
-	}
-
-	public static function POST($sVar = FALSE) {
-		if($sVar !== FALSE) {
-			$aData = \Flake\Util\Tools::POST();
-			if(array_key_exists($sVar, $aData)) {
-				return $aData[$sVar];
-			}
-			
-			return "";
-		}
-		
-		return is_array($GLOBALS["_POST"]) ? $GLOBALS["_POST"] : array();
-	}
-
-	public static function GET($sVar = FALSE) {
-		if($sVar !== FALSE) {
-			$aData = \Flake\Util\Tools::GET();
-			if(array_key_exists($sVar, $aData)) {
-				return $aData[$sVar];
-			}
-			
-			return "";
-		}
-		
-		return is_array($GLOBALS["_GET"]) ? $GLOBALS["_GET"] : array();
-	}
-
-	public static function GP($sVar = FALSE) {
-		if($sVar !== FALSE) {
-			$aData = \Flake\Util\Tools::GP();
-			if(array_key_exists($sVar, $aData)) {
-				return $aData[$sVar];
-			}
-			
-			return "";
-		}
-		
-		return array_merge(
-			\Flake\Util\Tools::GET(),
-			\Flake\Util\Tools::POST()
-		);
-	}
-	
-	public static function safelock($sString) {
-		return substr(md5(PROJECT_SAFEHASH_SALT . ":" . $sString), 0, 5);
-	}
-	
-	public static function redirect($sUrl) {
-		header("Location: " . $sUrl);
-		exit(0);
-	}
-	
-	public static function redirectUsingMeta($sUrl) {
-		$sDoc = "";
-		echo $sDoc;
-		exit(0);
-	}
-	
-	public static function refreshPage() {
-		header("Location: " . \Flake\Util\Tools::getCurrentUrl());
-		exit(0);
-	}
-	
-	public static function validEmail($sEmail) {
-		return (filter_var($sEmail, FILTER_VALIDATE_EMAIL) !== FALSE);
-	}
-	
-	public static function filterFormInput($sInput) {
-		return strip_tags($sInput);
-	}
-	
-	public static function getHumanDate($iStamp) {
-		return ucwords(strftime("%A, %d %B %Y", $iStamp));
-	}
-	
-	public static function getHumanTime($iStamp) {
-		return strftime("%Hh%M", $iStamp);
-	}
-	
-	public static function trimExplode($string, $delim=",", $removeEmptyValues = false, $limit = 0) {
-		$explodedValues = explode($delim, $string);
-
-		$result = array_map('trim', $explodedValues);
-
-		if ($removeEmptyValues) {
-			$temp = array();
-			foreach($result as $value) {
-				if ($value !== '') {
-					$temp[] = $value;
-				}
-			}
-			$result = $temp;
-		}
-
-		if ($limit != 0) {
-			if ($limit < 0) {
-				$result = array_slice($result, 0, $limit);
-			} elseif (count($result) > $limit) {
-				$lastElements = array_slice($result, $limit - 1);
-				$result = array_slice($result, 0, $limit - 1);
-				$result[] = implode($delim, $lastElements);
-			}
-		}
-
-		return $result;
-	}
-		
-	/**
-	 * Taken from TYPO3
-	 * Returns true if the first part of $str matches the string $partStr
-	 *
-	 * @param	string		Full string to check
-	 * @param	string		Reference string which must be found as the "first part" of the full string
-	 * @return	boolean		True if $partStr was found to be equal to the first part of $str
-	 */
-	public static function isFirstPartOfStr($str,$partStr)	{
-		// Returns true, if the first part of a $str equals $partStr and $partStr is not ''
-		$psLen = strlen($partStr);
-		if ($psLen)	{
-			return substr($str,0,$psLen)==(string)$partStr;
-		} else return false;
-	}
-	
-	/**
-	 * Binary-reads a file
-	 *
-	 * @param	string		$sPath: absolute server path to file
-	 * @return	string		file contents
-	 */
-	public static function file_readBin($sPath) {
-		$sData = "";
-		$rFile = fopen($sPath, "rb");
-		while(!feof($rFile)) {
-			$sData .= fread($rFile, 1024);
-		}
-		fclose($rFile);
-
-		return $sData;
-	}
-	
-	/**
-	 * Binary-writes a file
-	 *
-	 * @param	string		$sPath: absolute server path to file
-	 * @param	string		$sData: file contents
-	 * @param	boolean		$bUTF8: add UTF8-BOM or not ?
-	 * @return	void
-	 */
-	public static function file_writeBin($sPath, $sData) {
-		$rFile=fopen($sPath, "wb");
-		fputs($rFile, $sData);
-		fclose($rFile);
-	}
-	
-	public static function sendHtmlMail($sToAddress, $sSubject, $sBody, $sFromName, $sFromAddress, $sReplyToName, $sReplyToAddress) {
-		
-		$sMessage = <<
-
-	
-		Email
-	
-	
-	{$sBody}
-	
-
-TEST;
-
-		$sHeaders  = "From: " . $sFromName . "<" . $sFromAddress . ">" . "\r\n";
-		$sHeaders .= "Reply-To: " . $sReplyToName . "<" . $sReplyToAddress . ">" . "\r\n";
-		$sHeaders .= "Bcc: " . $sReplyToName . "<" . $sReplyToAddress . ">" . "\r\n";
-		$sHeaders .= "Content-Type: text/html" . "\r\n";
-		
-		mail($sToAddress, $sSubject, $sMessage, $sHeaders);
-	}
-	
-	public static function shortMD5($sValue) {
-		return strtolower(substr(md5($sValue), 0, 5));
-	}
-	
-	public static function overrideFirstWithSecond($sFirst, $sSecond) {
-		if(trim($sSecond) !== "") {
-			return $sSecond;
-		}
-		
-		return "" . $sFirst;
-	}
-		
-	public static function parseTemplateCode($sCode, $aMarkers) {
-		
-		$loader = new \Twig_Loader_String();
-		$twig = new \Twig_Environment($loader);
-		
-		return $twig->render($sCode, $aMarkers);
-	}
-	
-	
-	public static function is_a($object, $class) {
-	    if(is_object($object)) return $object instanceof $class;
-	    if(is_string($object)){
-			if(is_object($class)) $class=get_class($class);
-			
-			if(class_exists($class, TRUE)) {	# TRUE to autoload class
-				return @is_subclass_of($object, $class) || $object==$class;
-			}
-			
-			if(interface_exists($class)) {
-				$reflect = new \ReflectionClass($object);
-				return $reflect->implementsInterface($class);
-			}
-			
-		}
-		return false;
-	}
-	
-	public static function HTTPStatus($iCode, $sMessage) {
-		header("HTTP/1.1 404 Not Found");
-		header("Status: 404 Not Found");
-		die("
HTTP Status " . $iCode . " : " . $sMessage . "
");
-	}
-	
-	public static function number2Rank($a) {
-		$a = intval($a);
-		
-		if ($a === 1) {
-			return "premier";
-		} elseif($a === 2) {
-			return "second";
-		}
-		
-		$sNumber = self::number2Human($a);
-		
-		$sLastLetter = substr($sNumber, -1, 1);
-		if($sLastLetter === "e") {
-			$sNumber = substr($sNumber, 0, -1);
-		} elseif($sLastLetter === "q") {
-			$sNumber = $sNumber . "u";
-		} elseif($sLastLetter === "f") {
-			$sNumber = substr($sNumber, 0, -1) . "v";
-		}
-		
-		return $sNumber . "ième";
-	}
-	
-	public static function number2Human($a) {
-		$temp = explode('.',$a);
-		if (isset($temp[1]) && $temp[1]!='') {
-			return self::number2Human($temp[0]).' virgule '.self::number2Human($temp[1]) ;
-		}
-		
-		if ($a<0) return 'moins '.self::number2Human(-$a);
-		
-		if ($a<17) {
-			switch ($a) {
-				case 0: return 'zero';
-				case 1: return 'un';
-				case 2: return 'deux';
-				case 3: return 'trois';
-				case 4: return 'quatre';
-				case 5: return 'cinq';
-				case 6: return 'six';
-				case 7: return 'sept';
-				case 8: return 'huit';
-				case 9: return 'neuf';
-				case 10: return 'dix';
-				case 11: return 'onze';
-				case 12: return 'douze';
-				case 13: return 'treize';
-				case 14: return 'quatorze';
-				case 15: return 'quinze';
-				case 16: return 'seize';
-			}
-		} else if ($a<20) {
-			return 'dix-' . self::number2Human($a-10);
-		} else if ($a<100) {
-			if ($a%10==0) {
-				switch($a) {
-					case 20: return 'vingt';
-					case 30: return 'trente';
-					case 40: return 'quarante';
-					case 50: return 'cinquante';
-					case 60: return 'soixante';
-					case 70: return 'soixante-dix';
-					case 80: return 'quatre-vingt';
-					case 90: return 'quatre-vingt-dix';
-				}
-			} elseif(substr($a, -1) == 1) {
-				if( ((int)($a/10)*10)<70 ) {
-					return self::number2Human((int)($a/10)*10).'-et-un';
-				} elseif ($a==71) {
-					return 'soixante-et-onze';
-				} elseif ($a==81) {
-					return 'quatre-vingt-un';
-				} elseif ($a==91) {
-					return 'quatre-vingt-onze';
-				}
-			} elseif ($a<70) {
-				return self::number2Human($a-$a%10).'-'.self::number2Human($a%10);
-			} elseif ($a<80) {
-				return self::number2Human(60).'-'.self::number2Human($a%20);
-			} else {
-				return self::number2Human(80).'-'.self::number2Human($a%20);
-			}
-		} else if ($a==100) {
-			return 'cent';
-		} else if ($a<200) {
-			return self::number2Human(100).' '.self::number2Human($a%100);
-		} else if ($a<1000) {
-			return self::number2Human((int)($a/100)).' '.self::number2Human(100).' '.self::number2Human($a%100);
-		} else if ($a==1000) {
-			return 'mille';
-		} else if ($a<2000) {
-			return self::number2Human(1000).' '.self::number2Human($a%1000).' ';
-		} else if ($a<1000000) {
-			return self::number2Human((int)($a/1000)).' '.self::number2Human(1000).' '.self::number2Human($a%1000);
-		}
-	}
-	
-	public static function stringToUrlToken($sString) {
-		
-		# Taken from TYPO3 extension realurl
-				
-		$space = "-";
-		$sString = strtr($sString, ' -+_\'', $space . $space . $space . $space . $space); // convert spaces
-		
-		if(function_exists("iconv")) {
-			$sString = iconv('UTF-8', 'ASCII//TRANSLIT', $sString);
-		}
-		
-		$sString = strtolower($sString);
-		
-		$sString = preg_replace('/[^a-zA-Z0-9\\' . $space . ']/', '', $sString);
-		$sString = preg_replace('/\\' . $space . '{2,}/', $space, $sString); // Convert multiple 'spaces' to a single one
-		$sString = trim($sString, $space);
-		
-		return $sString;
-	}
-	
-	public static function isCliPhp() {
-		return strtolower(php_sapi_name()) === "cli";
-	}
-	
-	public static function getIP() {
-
-		$alt_ip = $_SERVER['REMOTE_ADDR'];
-
-		if(isset($_SERVER['HTTP_CLIENT_IP'])) {
-			$alt_ip = $_SERVER['HTTP_CLIENT_IP'];
-		} else if(isset($_SERVER['HTTP_X_FORWARDED_FOR']) AND preg_match_all('#\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}#s', $_SERVER['HTTP_X_FORWARDED_FOR'], $matches)) {
-			
-			// make sure we dont pick up an internal IP defined by RFC1918
-			foreach($matches[0] AS $ip) {
-				if (!preg_match('#^(10|172\.16|192\.168)\.#', $ip)) {
-					$alt_ip = $ip;
-					break;
-				}
-			}
-		} else if (isset($_SERVER['HTTP_FROM'])) {
-			$alt_ip = $_SERVER['HTTP_FROM'];
-		}
-		
-		return $alt_ip;
-	}
-	
-	public static function getUserAgent() {
-		return $_SERVER['HTTP_USER_AGENT'];
-	}
-	
-	###########
-	public static function appendSlash($sString) {
-		return self::appendString($sString, "/");
-	}
-	
-	public static function prependSlash($sString) {
-		return self::prependString($sString, "/");
-	}
-	
-	public static function stripBeginSlash($sString) {
-		return self::stripBeginString($sString, "/");
-	}
-	
-	public static function stripEndSlash($sString) {
-		return self::stripEndString($sString, "/");
-	}
-	
-	public static function trimSlashes($sString) {
-		return self::stripBeginSlash(self::stripEndSlash($sString));
-	}
-	
-	###########
-	public static function appendString($sString, $sAppend) {
-		if(substr($sString, -1 * strlen($sAppend)) !== $sAppend) {
-			$sString .= $sAppend;
-		}
-		
-		return $sString;
-	}
-	
-	public static function prependString($sString, $sAppend) {
-		if(substr($sString, 0, 1 * strlen($sAppend)) !== $sAppend) {
-			$sString = $sAppend . $sString;
-		}
-		
-		return $sString;
-	}
-	
-	public static function stripBeginString($sString, $sAppend) {
-		if(substr($sString, 0, 1 * strlen($sAppend)) === $sAppend) {
-			$sString = substr($sString, strlen($sAppend));
-		}
-		
-		return $sString;
-	}
-	
-	public static function stripEndString($sString, $sAppend) {
-		if(substr($sString, -1 * strlen($sAppend)) === $sAppend) {
-			$sString = substr($sString, 0, -1 * strlen($sAppend));
-		}
-		
-		return $sString;
-	}
-	
-	public static function trimStrings($sString, $sAppend) {
-		return self::stripBeginString(self::stripEndString($sString, $sAppend), $sAppend);
-	}
-	
-	public static function stringEndsWith($sHaystack, $sNeedle) {
-		return substr($sHaystack, strlen($sNeedle) * -1) === $sNeedle;
-	}
-	
-	###########
-	
-	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);
-	}
-	
-	public static function echoAndCutClient($sMessage='') {
-		ignore_user_abort(TRUE);
-#		set_time_limit(0); 
-
-		header("Connection: close");
-		header("Content-Length: ".strlen($sMessage)); 
-		echo $sMessage; 
-		echo str_repeat("\r\n", 10); // just to be sure 
-		flush(); 
-	}
-	
-	public static function milliseconds() {
-		return intval((microtime(TRUE) * 1000));
-	}
-	
-	public static function stopWatch($sWhat) {
-#		return;
-		$iStop = \Flake\Util\Tools::milliseconds();
-		
-		$trail = debug_backtrace();
-		$aLastNode = $trail[0];	// l'appel qui nous intéresse
-		$sFile = basename($aLastNode["file"]);
-		$iLine = intval($aLastNode["line"]);
-		
-		if(!array_key_exists("FLAKE_STOPWATCHES", $GLOBALS)) {
-			$GLOBALS["FLAKE_STOPWATCHES"] = array();
-		}
-		
-		if(!array_key_exists($sWhat, $GLOBALS["FLAKE_STOPWATCHES"])) {
-			$GLOBALS["FLAKE_STOPWATCHES"][$sWhat] = $iStop;
-		} else {
-			$iTime = $iStop - $GLOBALS["FLAKE_STOPWATCHES"][$sWhat];
-			echo "
@" . $sFile . "+" . $iLine . ":" . $sWhat . ":" . $iTime . " ms
";
-			flush();
-		}
-	}
-	
-	# Taken from http://www.php.net/manual/en/function.gzdecode.php#82930
-	public static function gzdecode($data, &$filename='', &$error='', $maxlength=null) {
-	    $len = strlen($data);
-	    if ($len < 18 || strcmp(substr($data,0,2),"\x1f\x8b")) {
-	        $error = "Not in GZIP format.";
-	        return null;  // Not GZIP format (See RFC 1952)
-	    }
-	    $method = ord(substr($data,2,1));  // Compression method
-	    $flags  = ord(substr($data,3,1));  // Flags
-	    if ($flags & 31 != $flags) {
-	        $error = "Reserved bits not allowed.";
-	        return null;
-	    }
-	    // NOTE: $mtime may be negative (PHP integer limitations)
-	    $mtime = unpack("V", substr($data,4,4));
-	    $mtime = $mtime[1];
-	    $xfl   = substr($data,8,1);
-	    $os    = substr($data,8,1);
-	    $headerlen = 10;
-	    $extralen  = 0;
-	    $extra     = "";
-	    if ($flags & 4) {
-	        // 2-byte length prefixed EXTRA data in header
-	        if ($len - $headerlen - 2 < 8) {
-	            return false;  // invalid
-	        }
-	        $extralen = unpack("v",substr($data,8,2));
-	        $extralen = $extralen[1];
-	        if ($len - $headerlen - 2 - $extralen < 8) {
-	            return false;  // invalid
-	        }
-	        $extra = substr($data,10,$extralen);
-	        $headerlen += 2 + $extralen;
-	    }
-	    $filenamelen = 0;
-	    $filename = "";
-	    if ($flags & 8) {
-	        // C-style string
-	        if ($len - $headerlen - 1 < 8) {
-	            return false; // invalid
-	        }
-	        $filenamelen = strpos(substr($data,$headerlen),chr(0));
-	        if ($filenamelen === false || $len - $headerlen - $filenamelen - 1 < 8) {
-	            return false; // invalid
-	        }
-	        $filename = substr($data,$headerlen,$filenamelen);
-	        $headerlen += $filenamelen + 1;
-	    }
-	    $commentlen = 0;
-	    $comment = "";
-	    if ($flags & 16) {
-	        // C-style string COMMENT data in header
-	        if ($len - $headerlen - 1 < 8) {
-	            return false;    // invalid
-	        }
-	        $commentlen = strpos(substr($data,$headerlen),chr(0));
-	        if ($commentlen === false || $len - $headerlen - $commentlen - 1 < 8) {
-	            return false;    // Invalid header format
-	        }
-	        $comment = substr($data,$headerlen,$commentlen);
-	        $headerlen += $commentlen + 1;
-	    }
-	    $headercrc = "";
-	    if ($flags & 2) {
-	        // 2-bytes (lowest order) of CRC32 on header present
-	        if ($len - $headerlen - 2 < 8) {
-	            return false;    // invalid
-	        }
-	        $calccrc = crc32(substr($data,0,$headerlen)) & 0xffff;
-	        $headercrc = unpack("v", substr($data,$headerlen,2));
-	        $headercrc = $headercrc[1];
-	        if ($headercrc != $calccrc) {
-	            $error = "Header checksum failed.";
-	            return false;    // Bad header CRC
-	        }
-	        $headerlen += 2;
-	    }
-	    // GZIP FOOTER
-	    $datacrc = unpack("V",substr($data,-8,4));
-	    $datacrc = sprintf('%u',$datacrc[1] & 0xFFFFFFFF);
-	    $isize = unpack("V",substr($data,-4));
-	    $isize = $isize[1];
-	    // decompression:
-	    $bodylen = $len-$headerlen-8;
-	    if ($bodylen < 1) {
-	        // IMPLEMENTATION BUG!
-	        return null;
-	    }
-	    $body = substr($data,$headerlen,$bodylen);
-	    $data = "";
-	    if ($bodylen > 0) {
-	        switch ($method) {
-	        case 8:
-	            // Currently the only supported compression method:
-	            $data = gzinflate($body,$maxlength);
-	            break;
-	        default:
-	            $error = "Unknown compression method.";
-	            return false;
-	        }
-	    }  // zero-byte body content is allowed
-	    // Verifiy CRC32
-	    $crc   = sprintf("%u",crc32($data));
-	    $crcOK = $crc == $datacrc;
-	    $lenOK = $isize == strlen($data);
-	    if (!$lenOK || !$crcOK) {
-	        $error = ( $lenOK ? '' : 'Length check FAILED. ') . ( $crcOK ? '' : 'Checksum FAILED.');
-	        return false;
-	    }
-	    return $data;
-	}
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/AUTHORS b/sources/Core/Frameworks/Flake/Util/Twig/AUTHORS
deleted file mode 100644
index eb5db05..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/AUTHORS
+++ /dev/null
@@ -1,9 +0,0 @@
-Twig is written and maintained by the Twig Team:
-
-Lead Developer:
-
-- Fabien Potencier 
-
-Project Founder:
-
-- Armin Ronacher 
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/CHANGELOG b/sources/Core/Frameworks/Flake/Util/Twig/CHANGELOG
deleted file mode 100644
index 23413de..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/CHANGELOG
+++ /dev/null
@@ -1,501 +0,0 @@
-* 1.8.0 (2012-05-08)
-
- * enforced interface when adding tests, filters, functions, and node visitors from extensions
- * fixed a side-effect of the date filter where the timezone might be changed
- * simplified usage of the autoescape tag; the only (optional) argument is now the escaping strategy or false (with a BC layer)
- * added a way to dynamically change the auto-escaping strategy according to the template "filename"
- * changed the autoescape option to also accept a supported escaping strategy (for BC, true is equivalent to html)
- * added an embed tag
-
-* 1.7.0 (2012-04-24)
-
- * fixed a PHP warning when using CIFS
- * fixed template line number in some exceptions
- * added an iterable test
- * added an error when defining two blocks with the same name in a template
- * added the preserves_safety option for filters
- * fixed a PHP notice when trying to access a key on a non-object/array variable
- * enhanced error reporting when the template file is an instance of SplFileInfo
- * added Twig_Environment::mergeGlobals()
- * added compilation checks to avoid misuses of the sandbox tag
- * fixed filesystem loader freshness logic for high traffic websites
- * fixed random function when charset is null
-
-* 1.6.5 (2012-04-11)
-
- * fixed a regression when a template only extends another one without defining any blocks
-
-* 1.6.4 (2012-04-02)
-
- * fixed PHP notice in Twig_Error::guessTemplateLine() introduced in 1.6.3
- * fixed performance when compiling large files
- * optimized parent template creation when the template does not use dynamic inheritance
-
-* 1.6.3 (2012-03-22)
-
- * fixed usage of Z_ADDREF_P for PHP 5.2 in the C extension
- * fixed compilation of numeric values used in templates when using a locale where the decimal separator is not a dot
- * made the strategy used to guess the real template file name and line number in exception messages much faster and more accurate
-
-* 1.6.2 (2012-03-18)
-
- * fixed sandbox mode when used with inheritance
- * added preserveKeys support for the slice filter
- * fixed the date filter when a DateTime instance is passed with a specific timezone
- * added a trim filter
-
-* 1.6.1 (2012-02-29)
-
- * fixed Twig C extension
- * removed the creation of Twig_Markup instances when not needed
- * added a way to set the default global timezone for dates
- * fixed the slice filter on strings when the length is not specified
- * fixed the creation of the cache directory in case of a race condition
-
-* 1.6.0 (2012-02-04)
-
- * fixed raw blocks when used with the whitespace trim option
- * made a speed optimization to macro calls when imported via the "from" tag
- * fixed globals, parsers, visitors, filters, tests, and functions management in Twig_Environment when a new one or new extension is added
- * fixed the attribute function when passing arguments
- * added slice notation support for the [] operator (syntactic sugar for the slice operator)
- * added a slice filter
- * added string support for the reverse filter
- * fixed the empty test and the length filter for Twig_Markup instances
- * added a date function to ease date comparison
- * fixed unary operators precedence
- * added recursive parsing support in the parser
- * added string and integer handling for the random function
-
-* 1.5.1 (2012-01-05)
-
- * fixed a regression when parsing strings
-
-* 1.5.0 (2012-01-04)
-
- * added Traversable objects support for the join filter
-
-* 1.5.0-RC2 (2011-12-30)
-
- * added a way to set the default global date interval format
- * fixed the date filter for DateInterval instances (setTimezone() does not exist for them)
- * refactored Twig_Template::display() to ease its extension
- * added a number_format filter
-
-* 1.5.0-RC1 (2011-12-26)
-
- * removed the need to quote hash keys
- * allowed hash keys to be any expression
- * added a do tag
- * added a flush tag
- * added support for dynamically named filters and functions
- * added a dump function to help debugging templates
- * added a nl2br filter
- * added a random function
- * added a way to change the default format for the date filter
- * fixed the lexer when an operator ending with a letter ends a line
- * added string interpolation support
- * enhanced exceptions for unknown filters, functions, tests, and tags
-
-* 1.4.0 (2011-12-07)
-
- * fixed lexer when using big numbers (> PHP_INT_MAX)
- * added missing preserveKeys argument to the reverse filter
- * fixed macros containing filter tag calls
-
-* 1.4.0-RC2 (2011-11-27)
-
- * removed usage of Reflection in Twig_Template::getAttribute()
- * added a C extension that can optionally replace Twig_Template::getAttribute()
- * added negative timestamp support to the date filter
-
-* 1.4.0-RC1 (2011-11-20)
-
- * optimized variable access when using PHP 5.4
- * changed the precedence of the .. operator to be more consistent with languages that implements such a feature like Ruby
- * added an Exception to Twig_Loader_Array::isFresh() method when the template does not exist to be consistent with other loaders
- * added Twig_Function_Node to allow more complex functions to have their own Node class
- * added Twig_Filter_Node to allow more complex filters to have their own Node class
- * added Twig_Test_Node to allow more complex tests to have their own Node class
- * added a better error message when a template is empty but contain a BOM
- * fixed "in" operator for empty strings
- * fixed the "defined" test and the "default" filter (now works with more than one call (foo.bar.foo) and for both values of the strict_variables option)
- * changed the way extensions are loaded (addFilter/addFunction/addGlobal/addTest/addNodeVisitor/addTokenParser/addExtension can now be called in any order)
- * added Twig_Environment::display()
- * made the escape filter smarter when the encoding is not supported by PHP
- * added a convert_encoding filter
- * moved all node manipulations outside the compile() Node method
- * made several speed optimizations
-
-* 1.3.0 (2011-10-08)
-
-no changes
-
-* 1.3.0-RC1 (2011-10-04)
-
- * added an optimization for the parent() function
- * added cache reloading when auto_reload is true and an extension has been modified
- * added the possibility to force the escaping of a string already marked as safe (instance of Twig_Markup)
- * allowed empty templates to be used as traits
- * added traits support for the "parent" function
-
-* 1.2.0 (2011-09-13)
-
-no changes
-
-* 1.2.0-RC1 (2011-09-10)
-
- * enhanced the exception when a tag remains unclosed
- * added support for empty Countable objects for the "empty" test
- * fixed algorithm that determines if a template using inheritance is valid (no output between block definitions)
- * added better support for encoding problems when escaping a string (available as of PHP 5.4)
- * added a way to ignore a missing template when using the "include" tag ({% include "foo" ignore missing %})
- * added support for an array of templates to the "include" and "extends" tags ({% include ['foo', 'bar'] %})
- * added support for bitwise operators in expressions
- * added the "attribute" function to allow getting dynamic attributes on variables
- * added Twig_Loader_Chain
- * added Twig_Loader_Array::setTemplate()
- * added an optimization for the set tag when used to capture a large chunk of static text
- * changed name regex to match PHP one "[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*" (works for blocks, tags, functions, filters, and macros)
- * removed the possibility to use the "extends" tag from a block
- * added "if" modifier support to "for" loops
-
-* 1.1.2 (2011-07-30)
-
- * fixed json_encode filter on PHP 5.2
- * fixed regression introduced in 1.1.1 ({{ block(foo|lower) }})
- * fixed inheritance when using conditional parents
- * fixed compilation of templates when the body of a child template is not empty
- * fixed output when a macro throws an exception
- * fixed a parsing problem when a large chunk of text is enclosed in a comment tag
- * added PHPDoc for all Token parsers and Core extension functions
-
-* 1.1.1 (2011-07-17)
-
- * added a performance optimization in the Optimizer (also helps to lower the number of nested level calls)
- * made some performance improvement for some edge cases
-
-* 1.1.0 (2011-06-28)
-
- * fixed json_encode filter
-
-* 1.1.0-RC3 (2011-06-24)
-
- * fixed method case-sensitivity when using the sandbox mode
- * added timezone support for the date filter
- * fixed possible security problems with NUL bytes
-
-* 1.1.0-RC2 (2011-06-16)
-
- * added an exception when the template passed to "use" is not a string
- * made 'a.b is defined' not throw an exception if a is not defined (in strict mode)
- * added {% line \d+ %} directive
-
-* 1.1.0-RC1 (2011-05-28)
-
-Flush your cache after upgrading.
-
- * fixed date filter when using a timestamp
- * fixed the defined test for some cases
- * fixed a parsing problem when a large chunk of text is enclosed in a raw tag
- * added support for horizontal reuse of template blocks (see docs for more information)
- * added whitespace control modifier to all tags (see docs for more information)
- * added null as an alias for none (the null test is also an alias for the none test now)
- * made TRUE, FALSE, NONE equivalent to their lowercase counterparts
- * wrapped all compilation and runtime exceptions with Twig_Error_Runtime and added logic to guess the template name and line
- * moved display() method to Twig_Template (generated templates should now use doDisplay() instead)
-
-* 1.0.0 (2011-03-27)
-
- * fixed output when using mbstring
- * fixed duplicate call of methods when using the sandbox
- * made the charset configurable for the escape filter
-
-* 1.0.0-RC2 (2011-02-21)
-
- * changed the way {% set %} works when capturing (the content is now marked as safe)
- * added support for macro name in the endmacro tag
- * make Twig_Error compatible with PHP 5.3.0 >
- * fixed an infinite loop on some Windows configurations
- * fixed the "length" filter for numbers
- * fixed Template::getAttribute() as properties in PHP are case sensitive
- * removed coupling between Twig_Node and Twig_Template
- * fixed the ternary operator precedence rule
-
-* 1.0.0-RC1 (2011-01-09)
-
-Backward incompatibilities:
-
- * the "items" filter, which has been deprecated for quite a long time now, has been removed
- * the "range" filter has been converted to a function: 0|range(10) -> range(0, 10)
- * the "constant" filter has been converted to a function: {{ some_date|date('DATE_W3C'|constant) }} -> {{ some_date|date(constant('DATE_W3C')) }}
- * the "cycle" filter has been converted to a function: {{ ['odd', 'even']|cycle(i) }} -> {{ cycle(['odd', 'even'], i) }}
- * the "for" tag does not support "joined by" anymore
- * the "autoescape" first argument is now "true"/"false" (instead of "on"/"off")
- * the "parent" tag has been replaced by a "parent" function ({{ parent() }} instead of {% parent %})
- * the "display" tag has been replaced by a "block" function ({{ block('title') }} instead of {% display title %})
- * removed the grammar and simple token parser (moved to the Twig Extensions repository)
-
-Changes:
-
- * added "needs_context" option for filters and functions (the context is then passed as a first argument)
- * added global variables support
- * made macros return their value instead of echoing directly (fixes calling a macro in sandbox mode)
- * added the "from" tag to import macros as functions
- * added support for functions (a function is just syntactic sugar for a getAttribute() call)
- * made macros callable when sandbox mode is enabled
- * added an exception when a macro uses a reserved name
- * the "default" filter now uses the "empty" test instead of just checking for null
- * added the "empty" test
-
-* 0.9.10 (2010-12-16)
-
-Backward incompatibilities:
-
- * The Escaper extension is enabled by default, which means that all displayed
-   variables are now automatically escaped. You can revert to the previous
-   behavior by removing the extension via $env->removeExtension('escaper')
-   or just set the 'autoescape' option to 'false'.
- * removed the "without loop" attribute for the "for" tag (not needed anymore
-   as the Optimizer take care of that for most cases)
- * arrays and hashes have now a different syntax
-     * arrays keep the same syntax with square brackets: [1, 2]
-     * hashes now use curly braces (["a": "b"] should now be written as {"a": "b"})
-     * support for "arrays with keys" and "hashes without keys" is not supported anymore ([1, "foo": "bar"] or {"foo": "bar", 1})
- * the i18n extension is now part of the Twig Extensions repository
-
-Changes:
-
- * added the merge filter
- * removed 'is_escaper' option for filters (a left over from the previous version) -- you must use 'is_safe' now instead
- * fixed usage of operators as method names (like is, in, and not)
- * changed the order of execution for node visitors
- * fixed default() filter behavior when used with strict_variables set to on
- * fixed filesystem loader compatibility with PHAR files
- * enhanced error messages when an unexpected token is parsed in an expression
- * fixed filename not being added to syntax error messages
- * added the autoescape option to enable/disable autoescaping
- * removed the newline after a comment (mimicks PHP behavior)
- * added a syntax error exception when parent block is used on a template that does not extend another one
- * made the Escaper extension enabled by default
- * fixed sandbox extension when used with auto output escaping
- * fixed escaper when wrapping a Twig_Node_Print (the original class must be preserved)
- * added an Optimizer extension (enabled by default; optimizes "for" loops and "raw" filters)
- * added priority to node visitors
-
-* 0.9.9 (2010-11-28)
-
-Backward incompatibilities:
- * the self special variable has been renamed to _self
- * the odd and even filters are now tests:
-     {{ foo|odd }} must now be written {{ foo is odd }}
- * the "safe" filter has been renamed to "raw"
- * in Node classes,
-        sub-nodes are now accessed via getNode() (instead of property access)
-        attributes via getAttribute() (instead of array access)
- * the urlencode filter had been renamed to url_encode
- * the include tag now merges the passed variables with the current context by default
-   (the old behavior is still possible by adding the "only" keyword)
- * moved Exceptions to Twig_Error_* (Twig_SyntaxError/Twig_RuntimeError are now Twig_Error_Syntax/Twig_Error_Runtime)
- * removed support for {{ 1 < i < 3 }} (use {{ i > 1 and i < 3 }} instead)
- * the "in" filter has been removed ({{ a|in(b) }} should now be written {{ a in b }})
-
-Changes:
- * added file and line to Twig_Error_Runtime exceptions thrown from Twig_Template
- * changed trans tag to accept any variable for the plural count
- * fixed sandbox mode (__toString() method check was not enforced if called implicitly from complex statements)
- * added the ** (power) operator
- * changed the algorithm used for parsing expressions
- * added the spaceless tag
- * removed trim_blocks option
- * added support for is*() methods for attributes (foo.bar now looks for foo->getBar() or foo->isBar())
- * changed all exceptions to extend Twig_Error
- * fixed unary expressions ({{ not(1 or 0) }})
- * fixed child templates (with an extend tag) that uses one or more imports
- * added support for {{ 1 not in [2, 3] }} (more readable than the current {{ not (1 in [2, 3]) }})
- * escaping has been rewritten
- * the implementation of template inheritance has been rewritten
-   (blocks can now be called individually and still work with inheritance)
- * fixed error handling for if tag when a syntax error occurs within a subparse process
- * added a way to implement custom logic for resolving token parsers given a tag name
- * fixed js escaper to be stricter (now uses a whilelist-based js escaper)
- * added the following filers: "constant", "trans", "replace", "json_encode"
- * added a "constant" test
- * fixed objects with __toString() not being autoescaped
- * fixed subscript expressions when calling __call() (methods now keep the case)
- * added "test" feature (accessible via the "is" operator)
- * removed the debug tag (should be done in an extension)
- * fixed trans tag when no vars are used in plural form
- * fixed race condition when writing template cache
- * added the special _charset variable to reference the current charset
- * added the special _context variable to reference the current context
- * renamed self to _self (to avoid conflict)
- * fixed Twig_Template::getAttribute() for protected properties
-
-* 0.9.8 (2010-06-28)
-
-Backward incompatibilities:
- * the trans tag plural count is now attached to the plural tag:
-    old: `{% trans count %}...{% plural %}...{% endtrans %}`
-    new: `{% trans %}...{% plural count %}...{% endtrans %}`
-
- * added a way to translate strings coming from a variable ({% trans var %})
- * fixed trans tag when used with the Escaper extension
- * fixed default cache umask
- * removed Twig_Template instances from the debug tag output
- * fixed objects with __isset() defined
- * fixed set tag when used with a capture
- * fixed type hinting for Twig_Environment::addFilter() method
-
-* 0.9.7 (2010-06-12)
-
-Backward incompatibilities:
- * changed 'as' to '=' for the set tag ({% set title as "Title" %} must now be {% set title = "Title" %})
- * removed the sandboxed attribute of the include tag (use the new sandbox tag instead)
- * refactored the Node system (if you have custom nodes, you will have to update them to use the new API)
-
- * added self as a special variable that refers to the current template (useful for importing macros from the current template)
- * added Twig_Template instance support to the include tag
- * added support for dynamic and conditional inheritance ({% extends some_var %} and {% extends standalone ? "minimum" : "base" %})
- * added a grammar sub-framework to ease the creation of custom tags
- * fixed the for tag for large arrays (some loop variables are now only available for arrays and objects that implement the Countable interface)
- * removed the Twig_Resource::resolveMissingFilter() method
- * fixed the filter tag which did not apply filtering to included files
- * added a bunch of unit tests
- * added a bunch of phpdoc
- * added a sandbox tag in the sandbox extension
- * changed the date filter to support any date format supported by DateTime
- * added strict_variable setting to throw an exception when an invalid variable is used in a template (disabled by default)
- * added the lexer, parser, and compiler as arguments to the Twig_Environment constructor
- * changed the cache option to only accepts an explicit path to a cache directory or false
- * added a way to add token parsers, filters, and visitors without creating an extension
- * added three interfaces: Twig_NodeInterface, Twig_TokenParserInterface, and Twig_FilterInterface
- * changed the generated code to match the new coding standards
- * fixed sandbox mode (__toString() method check was not enforced if called implicitly from a simple statement like {{ article }})
- * added an exception when a child template has a non-empty body (as it is always ignored when rendering)
-
-* 0.9.6 (2010-05-12)
-
- * fixed variables defined outside a loop and for which the value changes in a for loop
- * fixed the test suite for PHP 5.2 and older versions of PHPUnit
- * added support for __call() in expression resolution
- * fixed node visiting for macros (macros are now visited by visitors as any other node)
- * fixed nested block definitions with a parent call (rarely useful but nonetheless supported now)
- * added the cycle filter
- * fixed the Lexer when mbstring.func_overload is used with an mbstring.internal_encoding different from ASCII
- * added a long-syntax for the set tag ({% set foo %}...{% endset %})
- * unit tests are now powered by PHPUnit
- * added support for gettext via the `i18n` extension
- * fixed twig_capitalize_string_filter() and fixed twig_length_filter() when used with UTF-8 values
- * added a more useful exception if an if tag is not closed properly
- * added support for escaping strategy in the autoescape tag
- * fixed lexer when a template has a big chunk of text between/in a block
-
-* 0.9.5 (2010-01-20)
-
-As for any new release, don't forget to remove all cached templates after
-upgrading.
-
-If you have defined custom filters, you MUST upgrade them for this release. To
-upgrade, replace "array" with "new Twig_Filter_Function", and replace the
-environment constant by the "needs_environment" option:
-
-  // before
-  'even'   => array('twig_is_even_filter', false),
-  'escape' => array('twig_escape_filter', true),
-
-  // after
-  'even'   => new Twig_Filter_Function('twig_is_even_filter'),
-  'escape' => new Twig_Filter_Function('twig_escape_filter', array('needs_environment' => true)),
-
-If you have created NodeTransformer classes, you will need to upgrade them to
-the new interface (please note that the interface is not yet considered
-stable).
-
- * fixed list nodes that did not extend the Twig_NodeListInterface
- * added the "without loop" option to the for tag (it disables the generation of the loop variable)
- * refactored node transformers to node visitors
- * fixed automatic-escaping for blocks
- * added a way to specify variables to pass to an included template
- * changed the automatic-escaping rules to be more sensible and more configurable in custom filters (the documentation lists all the rules)
- * improved the filter system to allow object methods to be used as filters
- * changed the Array and String loaders to actually make use of the cache mechanism
- * included the default filter function definitions in the extension class files directly (Core, Escaper)
- * added the // operator (like the floor() PHP function)
- * added the .. operator (as a syntactic sugar for the range filter when the step is 1)
- * added the in operator (as a syntactic sugar for the in filter)
- * added the following filters in the Core extension: in, range
- * added support for arrays (same behavior as in PHP, a mix between lists and dictionaries, arrays and hashes)
- * enhanced some error messages to provide better feedback in case of parsing errors
-
-* 0.9.4 (2009-12-02)
-
-If you have custom loaders, you MUST upgrade them for this release: The
-Twig_Loader base class has been removed, and the Twig_LoaderInterface has also
-been changed (see the source code for more information or the documentation).
-
- * added support for DateTime instances for the date filter
- * fixed loop.last when the array only has one item
- * made it possible to insert newlines in tag and variable blocks
- * fixed a bug when a literal '\n' were present in a template text
- * fixed bug when the filename of a template contains */
- * refactored loaders
-
-* 0.9.3 (2009-11-11)
-
-This release is NOT backward compatible with the previous releases.
-
-  The loaders do not take the cache and autoReload arguments anymore. Instead,
-  the Twig_Environment class has two new options: cache and auto_reload.
-  Upgrading your code means changing this kind of code:
-
-      $loader = new Twig_Loader_Filesystem('/path/to/templates', '/path/to/compilation_cache', true);
-      $twig = new Twig_Environment($loader);
-
-  to something like this:
-
-      $loader = new Twig_Loader_Filesystem('/path/to/templates');
-      $twig = new Twig_Environment($loader, array(
-        'cache' => '/path/to/compilation_cache',
-        'auto_reload' => true,
-      ));
-
- * deprecated the "items" filter as it is not needed anymore
- * made cache and auto_reload options of Twig_Environment instead of arguments of Twig_Loader
- * optimized template loading speed
- * removed output when an error occurs in a template and render() is used
- * made major speed improvements for loops (up to 300% on even the smallest loops)
- * added properties as part of the sandbox mode
- * added public properties support (obj.item can now be the item property on the obj object)
- * extended set tag to support expression as value ({% set foo as 'foo' ~ 'bar' %} )
- * fixed bug when \ was used in HTML
-
-* 0.9.2 (2009-10-29)
-
- * made some speed optimizations
- * changed the cache extension to .php
- * added a js escaping strategy
- * added support for short block tag
- * changed the filter tag to allow chained filters
- * made lexer more flexible as you can now change the default delimiters
- * added set tag
- * changed default directory permission when cache dir does not exist (more secure)
- * added macro support
- * changed filters first optional argument to be a Twig_Environment instance instead of a Twig_Template instance
- * made Twig_Autoloader::autoload() a static method
- * avoid writing template file if an error occurs
- * added $ escaping when outputting raw strings
- * enhanced some error messages to ease debugging
- * fixed empty cache files when the template contains an error
-
-* 0.9.1 (2009-10-14)
-
-  * fixed a bug in PHP 5.2.6
-  * fixed numbers with one than one decimal
-  * added support for method calls with arguments ({{ foo.bar('a', 43) }})
-  * made small speed optimizations
-  * made minor tweaks to allow better extensibility and flexibility
-
-* 0.9.0 (2009-10-12)
-
- * Initial release
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/LICENSE b/sources/Core/Frameworks/Flake/Util/Twig/LICENSE
deleted file mode 100644
index 5063d8d..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-Copyright (c) 2009 by the Twig Team, see AUTHORS for more details.
-
-Some rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-    * The names of the contributors may not be used to endorse or
-      promote products derived from this software without specific
-      prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/README.markdown b/sources/Core/Frameworks/Flake/Util/Twig/README.markdown
deleted file mode 100644
index 88d6fab..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/README.markdown
+++ /dev/null
@@ -1,17 +0,0 @@
-Twig, the flexible, fast, and secure template language for PHP
-==============================================================
-
-[![Build Status](https://secure.travis-ci.org/fabpot/Twig.png?branch=master)](http://travis-ci.org/fabpot/Twig)
-
-Twig is a template language for PHP, released under the new BSD license (code
-and documentation).
-
-Twig uses a syntax similar to the Django and Jinja template languages which
-inspired the Twig runtime environment.
-
-More Information
-----------------
-
-Read the [documentation][1] for more information.
-
-[1]: http://twig.sensiolabs.org/documentation
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Autoloader.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Autoloader.php
deleted file mode 100644
index a93b8ca..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Autoloader.php
+++ /dev/null
@@ -1,46 +0,0 @@
-
- */
-class Twig_Autoloader
-{
-    /**
-     * Registers Twig_Autoloader as an SPL autoloader.
-     */
-    static public function register()
-    {
-        ini_set('unserialize_callback_func', 'spl_autoload_call');
-        spl_autoload_register(array(new self, 'autoload'));
-    }
-
-    /**
-     * Handles autoloading of classes.
-     *
-     * @param  string  $class  A class name.
-     *
-     * @return boolean Returns true if the class has been loaded
-     */
-    static public function autoload($class)
-    {
-        if (0 !== strpos($class, 'Twig')) {
-            return;
-        }
-
-        if (is_file($file = dirname(__FILE__).'/../'.str_replace(array('_', "\0"), array('/', ''), $class).'.php')) {
-            require $file;
-        }
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Compiler.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Compiler.php
deleted file mode 100644
index ae415a2..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Compiler.php
+++ /dev/null
@@ -1,242 +0,0 @@
-
- */
-class Twig_Compiler implements Twig_CompilerInterface
-{
-    protected $lastLine;
-    protected $source;
-    protected $indentation;
-    protected $env;
-    protected $debugInfo;
-    protected $sourceOffset;
-    protected $sourceLine;
-
-    /**
-     * Constructor.
-     *
-     * @param Twig_Environment $env The twig environment instance
-     */
-    public function __construct(Twig_Environment $env)
-    {
-        $this->env = $env;
-        $this->debugInfo = array();
-    }
-
-    /**
-     * Returns the environment instance related to this compiler.
-     *
-     * @return Twig_Environment The environment instance
-     */
-    public function getEnvironment()
-    {
-        return $this->env;
-    }
-
-    /**
-     * Gets the current PHP code after compilation.
-     *
-     * @return string The PHP code
-     */
-    public function getSource()
-    {
-        return $this->source;
-    }
-
-    /**
-     * Compiles a node.
-     *
-     * @param Twig_NodeInterface $node        The node to compile
-     * @param integer            $indentation The current indentation
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function compile(Twig_NodeInterface $node, $indentation = 0)
-    {
-        $this->lastLine = null;
-        $this->source = '';
-        $this->sourceOffset = 0;
-        $this->sourceLine = 0;
-        $this->indentation = $indentation;
-
-        $node->compile($this);
-
-        return $this;
-    }
-
-    public function subcompile(Twig_NodeInterface $node, $raw = true)
-    {
-        if (false === $raw) {
-            $this->addIndentation();
-        }
-
-        $node->compile($this);
-
-        return $this;
-    }
-
-    /**
-     * Adds a raw string to the compiled code.
-     *
-     * @param  string $string The string
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function raw($string)
-    {
-        $this->source .= $string;
-
-        return $this;
-    }
-
-    /**
-     * Writes a string to the compiled code by adding indentation.
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function write()
-    {
-        $strings = func_get_args();
-        foreach ($strings as $string) {
-            $this->addIndentation();
-            $this->source .= $string;
-        }
-
-        return $this;
-    }
-
-    public function addIndentation()
-    {
-        $this->source .= str_repeat(' ', $this->indentation * 4);
-
-        return $this;
-    }
-
-    /**
-     * Adds a quoted string to the compiled code.
-     *
-     * @param  string $value The string
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function string($value)
-    {
-        $this->source .= sprintf('"%s"', addcslashes($value, "\0\t\"\$\\"));
-
-        return $this;
-    }
-
-    /**
-     * Returns a PHP representation of a given value.
-     *
-     * @param  mixed $value The value to convert
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function repr($value)
-    {
-        if (is_int($value) || is_float($value)) {
-            if (false !== $locale = setlocale(LC_NUMERIC, 0)) {
-                setlocale(LC_NUMERIC, 'C');
-            }
-
-            $this->raw($value);
-
-            if (false !== $locale) {
-                setlocale(LC_NUMERIC, $locale);
-            }
-        } elseif (null === $value) {
-            $this->raw('null');
-        } elseif (is_bool($value)) {
-            $this->raw($value ? 'true' : 'false');
-        } elseif (is_array($value)) {
-            $this->raw('array(');
-            $i = 0;
-            foreach ($value as $key => $value) {
-                if ($i++) {
-                    $this->raw(', ');
-                }
-                $this->repr($key);
-                $this->raw(' => ');
-                $this->repr($value);
-            }
-            $this->raw(')');
-        } else {
-            $this->string($value);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Adds debugging information.
-     *
-     * @param Twig_NodeInterface $node The related twig node
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function addDebugInfo(Twig_NodeInterface $node)
-    {
-        if ($node->getLine() != $this->lastLine) {
-            $this->sourceLine += substr_count($this->source, "\n", $this->sourceOffset);
-            $this->sourceOffset = strlen($this->source);
-            $this->debugInfo[$this->sourceLine] = $node->getLine();
-
-            $this->lastLine = $node->getLine();
-            $this->write("// line {$node->getLine()}\n");
-        }
-
-        return $this;
-    }
-
-    public function getDebugInfo()
-    {
-        return $this->debugInfo;
-    }
-
-    /**
-     * Indents the generated code.
-     *
-     * @param integer $step The number of indentation to add
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function indent($step = 1)
-    {
-        $this->indentation += $step;
-
-        return $this;
-    }
-
-    /**
-     * Outdents the generated code.
-     *
-     * @param integer $step The number of indentation to remove
-     *
-     * @return Twig_Compiler The current compiler instance
-     */
-    public function outdent($step = 1)
-    {
-        $this->indentation -= $step;
-
-        if ($this->indentation < 0) {
-            throw new Twig_Error('Unable to call outdent() as the indentation would become negative');
-        }
-
-        return $this;
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/CompilerInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/CompilerInterface.php
deleted file mode 100644
index 0a13edf..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/CompilerInterface.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- */
-interface Twig_CompilerInterface
-{
-    /**
-     * Compiles a node.
-     *
-     * @param  Twig_NodeInterface $node The node to compile
-     *
-     * @return Twig_CompilerInterface The current compiler instance
-     */
-    function compile(Twig_NodeInterface $node);
-
-    /**
-     * Gets the current PHP code after compilation.
-     *
-     * @return string The PHP code
-     */
-    function getSource();
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Environment.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Environment.php
deleted file mode 100644
index 81c8fe6..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Environment.php
+++ /dev/null
@@ -1,1106 +0,0 @@
-
- */
-class Twig_Environment
-{
-    const VERSION = '1.8.0';
-
-    protected $charset;
-    protected $loader;
-    protected $debug;
-    protected $autoReload;
-    protected $cache;
-    protected $lexer;
-    protected $parser;
-    protected $compiler;
-    protected $baseTemplateClass;
-    protected $extensions;
-    protected $parsers;
-    protected $visitors;
-    protected $filters;
-    protected $tests;
-    protected $functions;
-    protected $globals;
-    protected $runtimeInitialized;
-    protected $loadedTemplates;
-    protected $strictVariables;
-    protected $unaryOperators;
-    protected $binaryOperators;
-    protected $templateClassPrefix = '__TwigTemplate_';
-    protected $functionCallbacks;
-    protected $filterCallbacks;
-    protected $staging;
-
-    /**
-     * Constructor.
-     *
-     * Available options:
-     *
-     *  * debug: When set to `true`, the generated templates have a __toString()
-     *           method that you can use to display the generated nodes (default to
-     *           false).
-     *
-     *  * charset: The charset used by the templates (default to utf-8).
-     *
-     *  * base_template_class: The base template class to use for generated
-     *                         templates (default to Twig_Template).
-     *
-     *  * cache: An absolute path where to store the compiled templates, or
-     *           false to disable compilation cache (default).
-     *
-     *  * auto_reload: Whether to reload the template is the original source changed.
-     *                 If you don't provide the auto_reload option, it will be
-     *                 determined automatically base on the debug value.
-     *
-     *  * strict_variables: Whether to ignore invalid variables in templates
-     *                      (default to false).
-     *
-     *  * autoescape: Whether to enable auto-escaping (default to html):
-     *                  * false: disable auto-escaping
-     *                  * true: equivalent to html
-     *                  * html, js: set the autoescaping to one of the supported strategies
-     *                  * PHP callback: a PHP callback that returns an escaping strategy based on the template "filename"
-     *
-     *  * optimizations: A flag that indicates which optimizations to apply
-     *                   (default to -1 which means that all optimizations are enabled;
-     *                   set it to 0 to disable).
-     *
-     * @param Twig_LoaderInterface   $loader  A Twig_LoaderInterface instance
-     * @param array                  $options An array of options
-     */
-    public function __construct(Twig_LoaderInterface $loader = null, $options = array())
-    {
-        if (null !== $loader) {
-            $this->setLoader($loader);
-        }
-
-        $options = array_merge(array(
-            'debug'               => false,
-            'charset'             => 'UTF-8',
-            'base_template_class' => 'Twig_Template',
-            'strict_variables'    => false,
-            'autoescape'          => 'html',
-            'cache'               => false,
-            'auto_reload'         => null,
-            'optimizations'       => -1,
-        ), $options);
-
-        $this->debug              = (bool) $options['debug'];
-        $this->charset            = $options['charset'];
-        $this->baseTemplateClass  = $options['base_template_class'];
-        $this->autoReload         = null === $options['auto_reload'] ? $this->debug : (bool) $options['auto_reload'];
-        $this->extensions         = array(
-            'core'      => new Twig_Extension_Core(),
-            'escaper'   => new Twig_Extension_Escaper($options['autoescape']),
-            'optimizer' => new Twig_Extension_Optimizer($options['optimizations']),
-        );
-        $this->strictVariables    = (bool) $options['strict_variables'];
-        $this->runtimeInitialized = false;
-        $this->setCache($options['cache']);
-        $this->functionCallbacks = array();
-        $this->filterCallbacks = array();
-        $this->staging = array(
-            'functions'     => array(),
-            'filters'       => array(),
-            'tests'         => array(),
-            'token_parsers' => array(),
-            'visitors'      => array(),
-            'globals'       => array(),
-        );
-    }
-
-    /**
-     * Gets the base template class for compiled templates.
-     *
-     * @return string The base template class name
-     */
-    public function getBaseTemplateClass()
-    {
-        return $this->baseTemplateClass;
-    }
-
-    /**
-     * Sets the base template class for compiled templates.
-     *
-     * @param string $class The base template class name
-     */
-    public function setBaseTemplateClass($class)
-    {
-        $this->baseTemplateClass = $class;
-    }
-
-    /**
-     * Enables debugging mode.
-     */
-    public function enableDebug()
-    {
-        $this->debug = true;
-    }
-
-    /**
-     * Disables debugging mode.
-     */
-    public function disableDebug()
-    {
-        $this->debug = false;
-    }
-
-    /**
-     * Checks if debug mode is enabled.
-     *
-     * @return Boolean true if debug mode is enabled, false otherwise
-     */
-    public function isDebug()
-    {
-        return $this->debug;
-    }
-
-    /**
-     * Enables the auto_reload option.
-     */
-    public function enableAutoReload()
-    {
-        $this->autoReload = true;
-    }
-
-    /**
-     * Disables the auto_reload option.
-     */
-    public function disableAutoReload()
-    {
-        $this->autoReload = false;
-    }
-
-    /**
-     * Checks if the auto_reload option is enabled.
-     *
-     * @return Boolean true if auto_reload is enabled, false otherwise
-     */
-    public function isAutoReload()
-    {
-        return $this->autoReload;
-    }
-
-    /**
-     * Enables the strict_variables option.
-     */
-    public function enableStrictVariables()
-    {
-        $this->strictVariables = true;
-    }
-
-    /**
-     * Disables the strict_variables option.
-     */
-    public function disableStrictVariables()
-    {
-        $this->strictVariables = false;
-    }
-
-    /**
-     * Checks if the strict_variables option is enabled.
-     *
-     * @return Boolean true if strict_variables is enabled, false otherwise
-     */
-    public function isStrictVariables()
-    {
-        return $this->strictVariables;
-    }
-
-    /**
-     * Gets the cache directory or false if cache is disabled.
-     *
-     * @return string|false
-     */
-    public function getCache()
-    {
-        return $this->cache;
-    }
-
-     /**
-      * Sets the cache directory or false if cache is disabled.
-      *
-      * @param string|false $cache The absolute path to the compiled templates,
-      *                            or false to disable cache
-      */
-    public function setCache($cache)
-    {
-        $this->cache = $cache ? $cache : false;
-    }
-
-    /**
-     * Gets the cache filename for a given template.
-     *
-     * @param string $name The template name
-     *
-     * @return string The cache file name
-     */
-    public function getCacheFilename($name)
-    {
-        if (false === $this->cache) {
-            return false;
-        }
-
-        $class = substr($this->getTemplateClass($name), strlen($this->templateClassPrefix));
-
-        return $this->getCache().'/'.substr($class, 0, 2).'/'.substr($class, 2, 2).'/'.substr($class, 4).'.php';
-    }
-
-    /**
-     * Gets the template class associated with the given string.
-     *
-     * @param string  $name  The name for which to calculate the template class name
-     * @param integer $index The index if it is an embedded template
-     *
-     * @return string The template class name
-     */
-    public function getTemplateClass($name, $index = null)
-    {
-        return $this->templateClassPrefix.md5($this->loader->getCacheKey($name)).(null === $index ? '' : '_'.$index);
-    }
-
-    /**
-     * Gets the template class prefix.
-     *
-     * @return string The template class prefix
-     */
-    public function getTemplateClassPrefix()
-    {
-        return $this->templateClassPrefix;
-    }
-
-    /**
-     * Renders a template.
-     *
-     * @param string $name    The template name
-     * @param array  $context An array of parameters to pass to the template
-     *
-     * @return string The rendered template
-     */
-    public function render($name, array $context = array())
-    {
-        return $this->loadTemplate($name)->render($context);
-    }
-
-    /**
-     * Displays a template.
-     *
-     * @param string $name    The template name
-     * @param array  $context An array of parameters to pass to the template
-     */
-    public function display($name, array $context = array())
-    {
-        $this->loadTemplate($name)->display($context);
-    }
-
-    /**
-     * Loads a template by name.
-     *
-     * @param string  $name  The template name
-     * @param integer $index The index if it is an embedded template
-     *
-     * @return Twig_TemplateInterface A template instance representing the given template name
-     */
-    public function loadTemplate($name, $index = null)
-    {
-        $cls = $this->getTemplateClass($name, $index);
-
-        if (isset($this->loadedTemplates[$cls])) {
-            return $this->loadedTemplates[$cls];
-        }
-
-        if (!class_exists($cls, false)) {
-            if (false === $cache = $this->getCacheFilename($name)) {
-                eval('?>'.$this->compileSource($this->loader->getSource($name), $name));
-            } else {
-                if (!is_file($cache) || ($this->isAutoReload() && !$this->isTemplateFresh($name, filemtime($cache)))) {
-                    $this->writeCacheFile($cache, $this->compileSource($this->loader->getSource($name), $name));
-                }
-
-                require_once $cache;
-            }
-        }
-
-        if (!$this->runtimeInitialized) {
-            $this->initRuntime();
-        }
-
-        return $this->loadedTemplates[$cls] = new $cls($this);
-    }
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * Besides checking the loader for freshness information,
-     * this method also checks if the enabled extensions have
-     * not changed.
-     *
-     * @param string    $name The template name
-     * @param timestamp $time The last modification time of the cached template
-     *
-     * @return Boolean true if the template is fresh, false otherwise
-     */
-    public function isTemplateFresh($name, $time)
-    {
-        foreach ($this->extensions as $extension) {
-            $r = new ReflectionObject($extension);
-            if (filemtime($r->getFileName()) > $time) {
-                return false;
-            }
-        }
-
-        return $this->loader->isFresh($name, $time);
-    }
-
-    public function resolveTemplate($names)
-    {
-        if (!is_array($names)) {
-            $names = array($names);
-        }
-
-        foreach ($names as $name) {
-            if ($name instanceof Twig_Template) {
-                return $name;
-            }
-
-            try {
-                return $this->loadTemplate($name);
-            } catch (Twig_Error_Loader $e) {
-            }
-        }
-
-        if (1 === count($names)) {
-            throw $e;
-        }
-
-        throw new Twig_Error_Loader(sprintf('Unable to find one of the following templates: "%s".', implode('", "', $names)));
-    }
-
-    /**
-     * Clears the internal template cache.
-     */
-    public function clearTemplateCache()
-    {
-        $this->loadedTemplates = array();
-    }
-
-    /**
-     * Clears the template cache files on the filesystem.
-     */
-    public function clearCacheFiles()
-    {
-        if (false === $this->cache) {
-            return;
-        }
-
-        foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->cache), RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
-            if ($file->isFile()) {
-                @unlink($file->getPathname());
-            }
-        }
-    }
-
-    /**
-     * Gets the Lexer instance.
-     *
-     * @return Twig_LexerInterface A Twig_LexerInterface instance
-     */
-    public function getLexer()
-    {
-        if (null === $this->lexer) {
-            $this->lexer = new Twig_Lexer($this);
-        }
-
-        return $this->lexer;
-    }
-
-    /**
-     * Sets the Lexer instance.
-     *
-     * @param Twig_LexerInterface A Twig_LexerInterface instance
-     */
-    public function setLexer(Twig_LexerInterface $lexer)
-    {
-        $this->lexer = $lexer;
-    }
-
-    /**
-     * Tokenizes a source code.
-     *
-     * @param string $source The template source code
-     * @param string $name   The template name
-     *
-     * @return Twig_TokenStream A Twig_TokenStream instance
-     */
-    public function tokenize($source, $name = null)
-    {
-        return $this->getLexer()->tokenize($source, $name);
-    }
-
-    /**
-     * Gets the Parser instance.
-     *
-     * @return Twig_ParserInterface A Twig_ParserInterface instance
-     */
-    public function getParser()
-    {
-        if (null === $this->parser) {
-            $this->parser = new Twig_Parser($this);
-        }
-
-        return $this->parser;
-    }
-
-    /**
-     * Sets the Parser instance.
-     *
-     * @param Twig_ParserInterface A Twig_ParserInterface instance
-     */
-    public function setParser(Twig_ParserInterface $parser)
-    {
-        $this->parser = $parser;
-    }
-
-    /**
-     * Parses a token stream.
-     *
-     * @param Twig_TokenStream $tokens A Twig_TokenStream instance
-     *
-     * @return Twig_Node_Module A Node tree
-     */
-    public function parse(Twig_TokenStream $tokens)
-    {
-        return $this->getParser()->parse($tokens);
-    }
-
-    /**
-     * Gets the Compiler instance.
-     *
-     * @return Twig_CompilerInterface A Twig_CompilerInterface instance
-     */
-    public function getCompiler()
-    {
-        if (null === $this->compiler) {
-            $this->compiler = new Twig_Compiler($this);
-        }
-
-        return $this->compiler;
-    }
-
-    /**
-     * Sets the Compiler instance.
-     *
-     * @param Twig_CompilerInterface $compiler A Twig_CompilerInterface instance
-     */
-    public function setCompiler(Twig_CompilerInterface $compiler)
-    {
-        $this->compiler = $compiler;
-    }
-
-    /**
-     * Compiles a Node.
-     *
-     * @param Twig_NodeInterface $node A Twig_NodeInterface instance
-     *
-     * @return string The compiled PHP source code
-     */
-    public function compile(Twig_NodeInterface $node)
-    {
-        return $this->getCompiler()->compile($node)->getSource();
-    }
-
-    /**
-     * Compiles a template source code.
-     *
-     * @param string $source The template source code
-     * @param string $name   The template name
-     *
-     * @return string The compiled PHP source code
-     */
-    public function compileSource($source, $name = null)
-    {
-        try {
-            return $this->compile($this->parse($this->tokenize($source, $name)));
-        } catch (Twig_Error $e) {
-            $e->setTemplateFile($name);
-            throw $e;
-        } catch (Exception $e) {
-            throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the compilation of a template ("%s").', $e->getMessage()), -1, $name, $e);
-        }
-    }
-
-    /**
-     * Sets the Loader instance.
-     *
-     * @param Twig_LoaderInterface $loader A Twig_LoaderInterface instance
-     */
-    public function setLoader(Twig_LoaderInterface $loader)
-    {
-        $this->loader = $loader;
-    }
-
-    /**
-     * Gets the Loader instance.
-     *
-     * @return Twig_LoaderInterface A Twig_LoaderInterface instance
-     */
-    public function getLoader()
-    {
-        return $this->loader;
-    }
-
-    /**
-     * Sets the default template charset.
-     *
-     * @param string $charset The default charset
-     */
-    public function setCharset($charset)
-    {
-        $this->charset = $charset;
-    }
-
-    /**
-     * Gets the default template charset.
-     *
-     * @return string The default charset
-     */
-    public function getCharset()
-    {
-        return $this->charset;
-    }
-
-    /**
-     * Initializes the runtime environment.
-     */
-    public function initRuntime()
-    {
-        $this->runtimeInitialized = true;
-
-        foreach ($this->getExtensions() as $extension) {
-            $extension->initRuntime($this);
-        }
-    }
-
-    /**
-     * Returns true if the given extension is registered.
-     *
-     * @param string $name The extension name
-     *
-     * @return Boolean Whether the extension is registered or not
-     */
-    public function hasExtension($name)
-    {
-        return isset($this->extensions[$name]);
-    }
-
-    /**
-     * Gets an extension by name.
-     *
-     * @param string $name The extension name
-     *
-     * @return Twig_ExtensionInterface A Twig_ExtensionInterface instance
-     */
-    public function getExtension($name)
-    {
-        if (!isset($this->extensions[$name])) {
-            throw new Twig_Error_Runtime(sprintf('The "%s" extension is not enabled.', $name));
-        }
-
-        return $this->extensions[$name];
-    }
-
-    /**
-     * Registers an extension.
-     *
-     * @param Twig_ExtensionInterface $extension A Twig_ExtensionInterface instance
-     */
-    public function addExtension(Twig_ExtensionInterface $extension)
-    {
-        $this->extensions[$extension->getName()] = $extension;
-        $this->parsers = null;
-        $this->visitors = null;
-        $this->filters = null;
-        $this->tests = null;
-        $this->functions = null;
-        $this->globals = null;
-    }
-
-    /**
-     * Removes an extension by name.
-     *
-     * @param string $name The extension name
-     */
-    public function removeExtension($name)
-    {
-        unset($this->extensions[$name]);
-        $this->parsers = null;
-        $this->visitors = null;
-        $this->filters = null;
-        $this->tests = null;
-        $this->functions = null;
-        $this->globals = null;
-    }
-
-    /**
-     * Registers an array of extensions.
-     *
-     * @param array $extensions An array of extensions
-     */
-    public function setExtensions(array $extensions)
-    {
-        foreach ($extensions as $extension) {
-            $this->addExtension($extension);
-        }
-    }
-
-    /**
-     * Returns all registered extensions.
-     *
-     * @return array An array of extensions
-     */
-    public function getExtensions()
-    {
-        return $this->extensions;
-    }
-
-    /**
-     * Registers a Token Parser.
-     *
-     * @param Twig_TokenParserInterface $parser A Twig_TokenParserInterface instance
-     */
-    public function addTokenParser(Twig_TokenParserInterface $parser)
-    {
-        $this->staging['token_parsers'][] = $parser;
-        $this->parsers = null;
-    }
-
-    /**
-     * Gets the registered Token Parsers.
-     *
-     * @return Twig_TokenParserBrokerInterface A broker containing token parsers
-     */
-    public function getTokenParsers()
-    {
-        if (null === $this->parsers) {
-            $this->parsers = new Twig_TokenParserBroker();
-
-            if (isset($this->staging['token_parsers'])) {
-                foreach ($this->staging['token_parsers'] as $parser) {
-                    $this->parsers->addTokenParser($parser);
-                }
-            }
-
-            foreach ($this->getExtensions() as $extension) {
-                $parsers = $extension->getTokenParsers();
-                foreach($parsers as $parser) {
-                    if ($parser instanceof Twig_TokenParserInterface) {
-                        $this->parsers->addTokenParser($parser);
-                    } elseif ($parser instanceof Twig_TokenParserBrokerInterface) {
-                        $this->parsers->addTokenParserBroker($parser);
-                    } else {
-                        throw new Twig_Error_Runtime('getTokenParsers() must return an array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances');
-                    }
-                }
-            }
-        }
-
-        return $this->parsers;
-    }
-
-    /**
-     * Gets registered tags.
-     *
-     * Be warned that this method cannot return tags defined by Twig_TokenParserBrokerInterface classes.
-     *
-     * @return Twig_TokenParserInterface[] An array of Twig_TokenParserInterface instances
-     */
-    public function getTags()
-    {
-        $tags = array();
-        foreach ($this->getTokenParsers()->getParsers() as $parser) {
-            if ($parser instanceof Twig_TokenParserInterface) {
-                $tags[$parser->getTag()] = $parser;
-            }
-        }
-
-        return $tags;
-    }
-
-    /**
-     * Registers a Node Visitor.
-     *
-     * @param Twig_NodeVisitorInterface $visitor A Twig_NodeVisitorInterface instance
-     */
-    public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
-    {
-        $this->staging['visitors'][] = $visitor;
-        $this->visitors = null;
-    }
-
-    /**
-     * Gets the registered Node Visitors.
-     *
-     * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
-     */
-    public function getNodeVisitors()
-    {
-        if (null === $this->visitors) {
-            foreach ($this->getExtensions() as $extension) {
-                foreach ($extension->getNodeVisitors() as $visitor) {
-                    $this->addNodeVisitor($visitor);
-                }
-            }
-
-            $this->visitors = $this->staging['visitors'];
-        }
-
-        return $this->visitors;
-    }
-
-    /**
-     * Registers a Filter.
-     *
-     * @param string               $name   The filter name
-     * @param Twig_FilterInterface $filter A Twig_FilterInterface instance
-     */
-    public function addFilter($name, Twig_FilterInterface $filter)
-    {
-        $this->staging['filters'][$name] = $filter;
-        $this->filters = null;
-    }
-
-    /**
-     * Get a filter by name.
-     *
-     * Subclasses may override this method and load filters differently;
-     * so no list of filters is available.
-     *
-     * @param string $name The filter name
-     *
-     * @return Twig_Filter|false A Twig_Filter instance or false if the filter does not exists
-     */
-    public function getFilter($name)
-    {
-        if (null === $this->filters) {
-            $this->getFilters();
-        }
-
-        if (isset($this->filters[$name])) {
-            return $this->filters[$name];
-        }
-
-        foreach ($this->filters as $pattern => $filter) {
-            $pattern = str_replace('\\*', '(.*?)', preg_quote($pattern, '#'), $count);
-
-            if ($count) {
-                if (preg_match('#^'.$pattern.'$#', $name, $matches)) {
-                    array_shift($matches);
-                    $filter->setArguments($matches);
-
-                    return $filter;
-                }
-            }
-        }
-
-        foreach ($this->filterCallbacks as $callback) {
-            if (false !== $filter = call_user_func($callback, $name)) {
-                return $filter;
-            }
-        }
-
-        return false;
-    }
-
-    public function registerUndefinedFilterCallback($callable)
-    {
-        $this->filterCallbacks[] = $callable;
-    }
-
-    /**
-     * Gets the registered Filters.
-     *
-     * Be warned that this method cannot return filters defined with registerUndefinedFunctionCallback.
-     *
-     * @return Twig_FilterInterface[] An array of Twig_FilterInterface instances
-     *
-     * @see registerUndefinedFilterCallback
-     */
-    public function getFilters()
-    {
-        if (null === $this->filters) {
-            foreach ($this->getExtensions() as $extension) {
-                foreach ($extension->getFilters() as $name => $filter) {
-                    $this->addFilter($name, $filter);
-                }
-            }
-
-            $this->filters = $this->staging['filters'];
-        }
-
-        return $this->filters;
-    }
-
-    /**
-     * Registers a Test.
-     *
-     * @param string             $name The test name
-     * @param Twig_TestInterface $test A Twig_TestInterface instance
-     */
-    public function addTest($name, Twig_TestInterface $test)
-    {
-        $this->staging['tests'][$name] = $test;
-        $this->tests = null;
-    }
-
-    /**
-     * Gets the registered Tests.
-     *
-     * @return Twig_TestInterface[] An array of Twig_TestInterface instances
-     */
-    public function getTests()
-    {
-        if (null === $this->tests) {
-            foreach ($this->getExtensions() as $extension) {
-                foreach ($extension->getTests() as $name => $test) {
-                    $this->addTest($name, $test);
-                }
-            }
-
-            $this->tests = $this->staging['tests'];
-        }
-
-        return $this->tests;
-    }
-
-    /**
-     * Registers a Function.
-     *
-     * @param string                 $name     The function name
-     * @param Twig_FunctionInterface $function A Twig_FunctionInterface instance
-     */
-    public function addFunction($name, Twig_FunctionInterface $function)
-    {
-        $this->staging['functions'][$name] = $function;
-        $this->functions = null;
-    }
-
-    /**
-     * Get a function by name.
-     *
-     * Subclasses may override this method and load functions differently;
-     * so no list of functions is available.
-     *
-     * @param string $name function name
-     *
-     * @return Twig_Function|false A Twig_Function instance or false if the function does not exists
-     */
-    public function getFunction($name)
-    {
-        if (null === $this->functions) {
-            $this->getFunctions();
-        }
-
-        if (isset($this->functions[$name])) {
-            return $this->functions[$name];
-        }
-
-        foreach ($this->functions as $pattern => $function) {
-            $pattern = str_replace('\\*', '(.*?)', preg_quote($pattern, '#'), $count);
-
-            if ($count) {
-                if (preg_match('#^'.$pattern.'$#', $name, $matches)) {
-                    array_shift($matches);
-                    $function->setArguments($matches);
-
-                    return $function;
-                }
-            }
-        }
-
-        foreach ($this->functionCallbacks as $callback) {
-            if (false !== $function = call_user_func($callback, $name)) {
-                return $function;
-            }
-        }
-
-        return false;
-    }
-
-    public function registerUndefinedFunctionCallback($callable)
-    {
-        $this->functionCallbacks[] = $callable;
-    }
-
-    /**
-     * Gets registered functions.
-     *
-     * Be warned that this method cannot return functions defined with registerUndefinedFunctionCallback.
-     *
-     * @return Twig_FunctionInterface[] An array of Twig_FunctionInterface instances
-     *
-     * @see registerUndefinedFunctionCallback
-     */
-    public function getFunctions()
-    {
-        if (null === $this->functions) {
-            foreach ($this->getExtensions() as $extension) {
-                foreach ($extension->getFunctions() as $name => $function) {
-                    $this->addFunction($name, $function);
-                }
-            }
-
-            $this->functions = $this->staging['functions'];
-        }
-
-        return $this->functions;
-    }
-
-    /**
-     * Registers a Global.
-     *
-     * @param string $name  The global name
-     * @param mixed  $value The global value
-     */
-    public function addGlobal($name, $value)
-    {
-        $this->staging['globals'][$name] = $value;
-        $this->globals = null;
-    }
-
-    /**
-     * Gets the registered Globals.
-     *
-     * @return array An array of globals
-     */
-    public function getGlobals()
-    {
-        if (null === $this->globals) {
-            $this->globals = isset($this->staging['globals']) ? $this->staging['globals'] : array();
-            foreach ($this->getExtensions() as $extension) {
-                $this->globals = array_merge($this->globals, $extension->getGlobals());
-            }
-        }
-
-        return $this->globals;
-    }
-
-    /**
-     * Merges a context with the defined globals.
-     *
-     * @param array $context An array representing the context
-     *
-     * @return array The context merged with the globals
-     */
-    public function mergeGlobals(array $context)
-    {
-        // we don't use array_merge as the context being generally
-        // bigger than globals, this code is faster.
-        foreach ($this->getGlobals() as $key => $value) {
-            if (!array_key_exists($key, $context)) {
-                $context[$key] = $value;
-            }
-        }
-
-        return $context;
-    }
-
-    /**
-     * Gets the registered unary Operators.
-     *
-     * @return array An array of unary operators
-     */
-    public function getUnaryOperators()
-    {
-        if (null === $this->unaryOperators) {
-            $this->initOperators();
-        }
-
-        return $this->unaryOperators;
-    }
-
-    /**
-     * Gets the registered binary Operators.
-     *
-     * @return array An array of binary operators
-     */
-    public function getBinaryOperators()
-    {
-        if (null === $this->binaryOperators) {
-            $this->initOperators();
-        }
-
-        return $this->binaryOperators;
-    }
-
-    public function computeAlternatives($name, $items)
-    {
-        $alternatives = array();
-        foreach ($items as $item) {
-            $lev = levenshtein($name, $item);
-            if ($lev <= strlen($name) / 3 || false !== strpos($item, $name)) {
-                $alternatives[$item] = $lev;
-            }
-        }
-        asort($alternatives);
-
-        return array_keys($alternatives);
-    }
-
-    protected function initOperators()
-    {
-        $this->unaryOperators = array();
-        $this->binaryOperators = array();
-        foreach ($this->getExtensions() as $extension) {
-            $operators = $extension->getOperators();
-
-            if (!$operators) {
-                continue;
-            }
-
-            if (2 !== count($operators)) {
-                throw new InvalidArgumentException(sprintf('"%s::getOperators()" does not return a valid operators array.', get_class($extension)));
-            }
-
-            $this->unaryOperators = array_merge($this->unaryOperators, $operators[0]);
-            $this->binaryOperators = array_merge($this->binaryOperators, $operators[1]);
-        }
-    }
-
-    protected function writeCacheFile($file, $content)
-    {
-        $dir = dirname($file);
-        if (!is_dir($dir)) {
-            if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) {
-                throw new RuntimeException(sprintf("Unable to create the cache directory (%s).", $dir));
-            }
-        } elseif (!is_writable($dir)) {
-            throw new RuntimeException(sprintf("Unable to write in the cache directory (%s).", $dir));
-        }
-
-        $tmpFile = tempnam(dirname($file), basename($file));
-        if (false !== @file_put_contents($tmpFile, $content)) {
-            // rename does not work on Win32 before 5.2.6
-            if (@rename($tmpFile, $file) || (@copy($tmpFile, $file) && unlink($tmpFile))) {
-                @chmod($file, 0644);
-
-                return;
-            }
-        }
-
-        throw new Twig_Error_Runtime(sprintf('Failed to write cache file "%s".', $file));
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Error.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Error.php
deleted file mode 100644
index 8ac2a2e..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Error.php
+++ /dev/null
@@ -1,199 +0,0 @@
-
- */
-class Twig_Error extends Exception
-{
-    protected $lineno;
-    protected $filename;
-    protected $rawMessage;
-    protected $previous;
-
-    /**
-     * Constructor.
-     *
-     * @param string    $message  The error message
-     * @param integer   $lineno   The template line where the error occurred
-     * @param string    $filename The template file name where the error occurred
-     * @param Exception $previous The previous exception
-     */
-    public function __construct($message, $lineno = -1, $filename = null, Exception $previous = null)
-    {
-        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-            $this->previous = $previous;
-            parent::__construct('');
-        } else {
-            parent::__construct('', 0, $previous);
-        }
-
-        $this->lineno = $lineno;
-        $this->filename = $filename;
-
-        if (-1 === $this->lineno || null === $this->filename) {
-            $this->guessTemplateInfo();
-        }
-
-        $this->rawMessage = $message;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * Gets the raw message.
-     *
-     * @return string The raw message
-     */
-    public function getRawMessage()
-    {
-        return $this->rawMessage;
-    }
-
-    /**
-     * Gets the filename where the error occurred.
-     *
-     * @return string The filename
-     */
-    public function getTemplateFile()
-    {
-        return $this->filename;
-    }
-
-    /**
-     * Sets the filename where the error occurred.
-     *
-     * @param string $filename The filename
-     */
-    public function setTemplateFile($filename)
-    {
-        $this->filename = $filename;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * Gets the template line where the error occurred.
-     *
-     * @return integer The template line
-     */
-    public function getTemplateLine()
-    {
-        return $this->lineno;
-    }
-
-    /**
-     * Sets the template line where the error occurred.
-     *
-     * @param integer $lineno The template line
-     */
-    public function setTemplateLine($lineno)
-    {
-        $this->lineno = $lineno;
-
-        $this->updateRepr();
-    }
-
-    /**
-     * For PHP < 5.3.0, provides access to the getPrevious() method.
-     *
-     * @param  string $method    The method name
-     * @param  array  $arguments The parameters to be passed to the method
-     *
-     * @return Exception The previous exception or null
-     */
-    public function __call($method, $arguments)
-    {
-        if ('getprevious' == strtolower($method)) {
-            return $this->previous;
-        }
-
-        throw new BadMethodCallException(sprintf('Method "Twig_Error::%s()" does not exist.', $method));
-    }
-
-    protected function updateRepr()
-    {
-        $this->message = $this->rawMessage;
-
-        $dot = false;
-        if ('.' === substr($this->message, -1)) {
-            $this->message = substr($this->message, 0, -1);
-            $dot = true;
-        }
-
-        if (null !== $this->filename) {
-            if (is_string($this->filename) || (is_object($this->filename) && method_exists($this->filename, '__toString'))) {
-                $filename = sprintf('"%s"', $this->filename);
-            } else {
-                $filename = json_encode($this->filename);
-            }
-            $this->message .= sprintf(' in %s', $filename);
-        }
-
-        if ($this->lineno >= 0) {
-            $this->message .= sprintf(' at line %d', $this->lineno);
-        }
-
-        if ($dot) {
-            $this->message .= '.';
-        }
-    }
-
-    protected function guessTemplateInfo()
-    {
-        $template = null;
-        foreach (debug_backtrace() as $trace) {
-            if (isset($trace['object']) && $trace['object'] instanceof Twig_Template && 'Twig_Template' !== get_class($trace['object'])) {
-                $template = $trace['object'];
-
-                // update template filename
-                if (null === $this->filename) {
-                    $this->filename = $template->getTemplateName();
-                }
-
-                break;
-            }
-        }
-
-        if (null === $template || $this->lineno > -1) {
-            return;
-        }
-
-        $r = new ReflectionObject($template);
-        $file = $r->getFileName();
-
-        $exceptions = array($e = $this);
-        while (($e instanceof self || method_exists($e, 'getPrevious')) && $e = $e->getPrevious()) {
-            $exceptions[] = $e;
-        }
-
-        while ($e = array_pop($exceptions)) {
-            $traces = $e->getTrace();
-            while ($trace = array_shift($traces)) {
-                if (!isset($trace['file']) || !isset($trace['line']) || $file != $trace['file']) {
-                    continue;
-                }
-
-                foreach ($template->getDebugInfo() as $codeLine => $templateLine) {
-                    if ($codeLine <= $trace['line']) {
-                        // update template line
-                        $this->lineno = $templateLine;
-
-                        return;
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Error/Loader.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Error/Loader.php
deleted file mode 100644
index 418a776..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Error/Loader.php
+++ /dev/null
@@ -1,20 +0,0 @@
-
- */
-class Twig_Error_Loader extends Twig_Error
-{
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Error/Runtime.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Error/Runtime.php
deleted file mode 100644
index 8a387fa..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Error/Runtime.php
+++ /dev/null
@@ -1,21 +0,0 @@
-
- */
-class Twig_Error_Runtime extends Twig_Error
-{
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Error/Syntax.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Error/Syntax.php
deleted file mode 100644
index a2650c3..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Error/Syntax.php
+++ /dev/null
@@ -1,21 +0,0 @@
-
- */
-class Twig_Error_Syntax extends Twig_Error
-{
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/ExpressionParser.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/ExpressionParser.php
deleted file mode 100644
index 0f35930..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/ExpressionParser.php
+++ /dev/null
@@ -1,488 +0,0 @@
-
- */
-class Twig_ExpressionParser
-{
-    const OPERATOR_LEFT = 1;
-    const OPERATOR_RIGHT = 2;
-
-    protected $parser;
-    protected $unaryOperators;
-    protected $binaryOperators;
-
-    public function __construct(Twig_Parser $parser, array $unaryOperators, array $binaryOperators)
-    {
-        $this->parser = $parser;
-        $this->unaryOperators = $unaryOperators;
-        $this->binaryOperators = $binaryOperators;
-    }
-
-    public function parseExpression($precedence = 0)
-    {
-        $expr = $this->getPrimary();
-        $token = $this->parser->getCurrentToken();
-        while ($this->isBinary($token) && $this->binaryOperators[$token->getValue()]['precedence'] >= $precedence) {
-            $op = $this->binaryOperators[$token->getValue()];
-            $this->parser->getStream()->next();
-
-            if (isset($op['callable'])) {
-                $expr = call_user_func($op['callable'], $this->parser, $expr);
-            } else {
-                $expr1 = $this->parseExpression(self::OPERATOR_LEFT === $op['associativity'] ? $op['precedence'] + 1 : $op['precedence']);
-                $class = $op['class'];
-                $expr = new $class($expr, $expr1, $token->getLine());
-            }
-
-            $token = $this->parser->getCurrentToken();
-        }
-
-        if (0 === $precedence) {
-            return $this->parseConditionalExpression($expr);
-        }
-
-        return $expr;
-    }
-
-    protected function getPrimary()
-    {
-        $token = $this->parser->getCurrentToken();
-
-        if ($this->isUnary($token)) {
-            $operator = $this->unaryOperators[$token->getValue()];
-            $this->parser->getStream()->next();
-            $expr = $this->parseExpression($operator['precedence']);
-            $class = $operator['class'];
-
-            return $this->parsePostfixExpression(new $class($expr, $token->getLine()));
-        } elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-            $this->parser->getStream()->next();
-            $expr = $this->parseExpression();
-            $this->parser->getStream()->expect(Twig_Token::PUNCTUATION_TYPE, ')', 'An opened parenthesis is not properly closed');
-
-            return $this->parsePostfixExpression($expr);
-        }
-
-        return $this->parsePrimaryExpression();
-    }
-
-    protected function parseConditionalExpression($expr)
-    {
-        while ($this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '?')) {
-            $this->parser->getStream()->next();
-            $expr2 = $this->parseExpression();
-            $this->parser->getStream()->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'The ternary operator must have a default value');
-            $expr3 = $this->parseExpression();
-
-            $expr = new Twig_Node_Expression_Conditional($expr, $expr2, $expr3, $this->parser->getCurrentToken()->getLine());
-        }
-
-        return $expr;
-    }
-
-    protected function isUnary(Twig_Token $token)
-    {
-        return $token->test(Twig_Token::OPERATOR_TYPE) && isset($this->unaryOperators[$token->getValue()]);
-    }
-
-    protected function isBinary(Twig_Token $token)
-    {
-        return $token->test(Twig_Token::OPERATOR_TYPE) && isset($this->binaryOperators[$token->getValue()]);
-    }
-
-    public function parsePrimaryExpression()
-    {
-        $token = $this->parser->getCurrentToken();
-        switch ($token->getType()) {
-            case Twig_Token::NAME_TYPE:
-                $this->parser->getStream()->next();
-                switch ($token->getValue()) {
-                    case 'true':
-                    case 'TRUE':
-                        $node = new Twig_Node_Expression_Constant(true, $token->getLine());
-                        break;
-
-                    case 'false':
-                    case 'FALSE':
-                        $node = new Twig_Node_Expression_Constant(false, $token->getLine());
-                        break;
-
-                    case 'none':
-                    case 'NONE':
-                    case 'null':
-                    case 'NULL':
-                        $node = new Twig_Node_Expression_Constant(null, $token->getLine());
-                        break;
-
-                    default:
-                        if ('(' === $this->parser->getCurrentToken()->getValue()) {
-                            $node = $this->getFunctionNode($token->getValue(), $token->getLine());
-                        } else {
-                            $node = new Twig_Node_Expression_Name($token->getValue(), $token->getLine());
-                        }
-                }
-                break;
-
-            case Twig_Token::NUMBER_TYPE:
-                $this->parser->getStream()->next();
-                $node = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
-                break;
-
-            case Twig_Token::STRING_TYPE:
-            case Twig_Token::INTERPOLATION_START_TYPE:
-                $node = $this->parseStringExpression();
-                break;
-
-            default:
-                if ($token->test(Twig_Token::PUNCTUATION_TYPE, '[')) {
-                    $node = $this->parseArrayExpression();
-                } elseif ($token->test(Twig_Token::PUNCTUATION_TYPE, '{')) {
-                    $node = $this->parseHashExpression();
-                } else {
-                    throw new Twig_Error_Syntax(sprintf('Unexpected token "%s" of value "%s"', Twig_Token::typeToEnglish($token->getType(), $token->getLine()), $token->getValue()), $token->getLine());
-                }
-        }
-
-        return $this->parsePostfixExpression($node);
-    }
-
-    public function parseStringExpression()
-    {
-        $stream = $this->parser->getStream();
-
-        $nodes = array();
-        // a string cannot be followed by another string in a single expression
-        $nextCanBeString = true;
-        while (true) {
-            if ($stream->test(Twig_Token::STRING_TYPE) && $nextCanBeString) {
-                $token = $stream->next();
-                $nodes[] = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
-                $nextCanBeString = false;
-            } elseif ($stream->test(Twig_Token::INTERPOLATION_START_TYPE)) {
-                $stream->next();
-                $nodes[] = $this->parseExpression();
-                $stream->expect(Twig_Token::INTERPOLATION_END_TYPE);
-                $nextCanBeString = true;
-            } else {
-                break;
-            }
-        }
-
-        $expr = array_shift($nodes);
-        foreach ($nodes as $node) {
-            $expr = new Twig_Node_Expression_Binary_Concat($expr, $node, $node->getLine());
-        }
-
-        return $expr;
-    }
-
-    public function parseArrayExpression()
-    {
-        $stream = $this->parser->getStream();
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '[', 'An array element was expected');
-
-        $node = new Twig_Node_Expression_Array(array(), $stream->getCurrent()->getLine());
-        $first = true;
-        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
-            if (!$first) {
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'An array element must be followed by a comma');
-
-                // trailing ,?
-                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
-                    break;
-                }
-            }
-            $first = false;
-
-            $node->addElement($this->parseExpression());
-        }
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, ']', 'An opened array is not properly closed');
-
-        return $node;
-    }
-
-    public function parseHashExpression()
-    {
-        $stream = $this->parser->getStream();
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '{', 'A hash element was expected');
-
-        $node = new Twig_Node_Expression_Array(array(), $stream->getCurrent()->getLine());
-        $first = true;
-        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, '}')) {
-            if (!$first) {
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'A hash value must be followed by a comma');
-
-                // trailing ,?
-                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '}')) {
-                    break;
-                }
-            }
-            $first = false;
-
-            // a hash key can be:
-            //
-            //  * a number -- 12
-            //  * a string -- 'a'
-            //  * a name, which is equivalent to a string -- a
-            //  * an expression, which must be enclosed in parentheses -- (1 + 2)
-            if ($stream->test(Twig_Token::STRING_TYPE) || $stream->test(Twig_Token::NAME_TYPE) || $stream->test(Twig_Token::NUMBER_TYPE)) {
-                $token = $stream->next();
-                $key = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
-            } elseif ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-                $key = $this->parseExpression();
-            } else {
-                $current = $stream->getCurrent();
-
-                throw new Twig_Error_Syntax(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s"', Twig_Token::typeToEnglish($current->getType(), $current->getLine()), $current->getValue()), $current->getLine());
-            }
-
-            $stream->expect(Twig_Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
-            $value = $this->parseExpression();
-
-            $node->addElement($value, $key);
-        }
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '}', 'An opened hash is not properly closed');
-
-        return $node;
-    }
-
-    public function parsePostfixExpression($node)
-    {
-        while (true) {
-            $token = $this->parser->getCurrentToken();
-            if ($token->getType() == Twig_Token::PUNCTUATION_TYPE) {
-                if ('.' == $token->getValue() || '[' == $token->getValue()) {
-                    $node = $this->parseSubscriptExpression($node);
-                } elseif ('|' == $token->getValue()) {
-                    $node = $this->parseFilterExpression($node);
-                } else {
-                    break;
-                }
-            } else {
-                break;
-            }
-        }
-
-        return $node;
-    }
-
-    public function getFunctionNode($name, $line)
-    {
-        $args = $this->parseArguments();
-        switch ($name) {
-            case 'parent':
-                if (!count($this->parser->getBlockStack())) {
-                    throw new Twig_Error_Syntax('Calling "parent" outside a block is forbidden', $line);
-                }
-
-                if (!$this->parser->getParent() && !$this->parser->hasTraits()) {
-                    throw new Twig_Error_Syntax('Calling "parent" on a template that does not extend nor "use" another template is forbidden', $line);
-                }
-
-                return new Twig_Node_Expression_Parent($this->parser->peekBlockStack(), $line);
-            case 'block':
-                return new Twig_Node_Expression_BlockReference($args->getNode(0), false, $line);
-            case 'attribute':
-                if (count($args) < 2) {
-                    throw new Twig_Error_Syntax('The "attribute" function takes at least two arguments (the variable and the attributes)', $line);
-                }
-
-                return new Twig_Node_Expression_GetAttr($args->getNode(0), $args->getNode(1), count($args) > 2 ? $args->getNode(2) : new Twig_Node_Expression_Array(array(), $line), Twig_TemplateInterface::ANY_CALL, $line);
-            default:
-                if (null !== $alias = $this->parser->getImportedFunction($name)) {
-                    $arguments = new Twig_Node_Expression_Array(array(), $line);
-                    foreach ($args as $n) {
-                        $arguments->addElement($n);
-                    }
-
-                    $node = new Twig_Node_Expression_MethodCall($alias['node'], $alias['name'], $arguments, $line);
-                    $node->setAttribute('safe', true);
-
-                    return $node;
-                }
-
-                $class = $this->getFunctionNodeClass($name);
-
-                return new $class($name, $args, $line);
-        }
-    }
-
-    public function parseSubscriptExpression($node)
-    {
-        $stream = $this->parser->getStream();
-        $token = $stream->next();
-        $lineno = $token->getLine();
-        $arguments = new Twig_Node_Expression_Array(array(), $lineno);
-        $type = Twig_TemplateInterface::ANY_CALL;
-        if ($token->getValue() == '.') {
-            $token = $stream->next();
-            if (
-                $token->getType() == Twig_Token::NAME_TYPE
-                ||
-                $token->getType() == Twig_Token::NUMBER_TYPE
-                ||
-                ($token->getType() == Twig_Token::OPERATOR_TYPE && preg_match(Twig_Lexer::REGEX_NAME, $token->getValue()))
-            ) {
-                $arg = new Twig_Node_Expression_Constant($token->getValue(), $lineno);
-
-                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-                    $type = Twig_TemplateInterface::METHOD_CALL;
-                    foreach ($this->parseArguments() as $n) {
-                        $arguments->addElement($n);
-                    }
-                }
-            } else {
-                throw new Twig_Error_Syntax('Expected name or number', $lineno);
-            }
-        } else {
-            $type = Twig_TemplateInterface::ARRAY_CALL;
-
-            $arg = $this->parseExpression();
-
-            // slice?
-            if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ':')) {
-                $stream->next();
-
-                if ($stream->test(Twig_Token::PUNCTUATION_TYPE, ']')) {
-                    $length = new Twig_Node_Expression_Constant(null, $token->getLine());
-                } else {
-                    $length = $this->parseExpression();
-                }
-
-                $class = $this->getFilterNodeClass('slice');
-                $arguments = new Twig_Node(array($arg, $length));
-                $filter = new $class($node, new Twig_Node_Expression_Constant('slice', $token->getLine()), $arguments, $token->getLine());
-
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ']');
-
-                return $filter;
-            }
-
-            $stream->expect(Twig_Token::PUNCTUATION_TYPE, ']');
-        }
-
-        return new Twig_Node_Expression_GetAttr($node, $arg, $arguments, $type, $lineno);
-    }
-
-    public function parseFilterExpression($node)
-    {
-        $this->parser->getStream()->next();
-
-        return $this->parseFilterExpressionRaw($node);
-    }
-
-    public function parseFilterExpressionRaw($node, $tag = null)
-    {
-        while (true) {
-            $token = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE);
-
-            $name = new Twig_Node_Expression_Constant($token->getValue(), $token->getLine());
-            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-                $arguments = new Twig_Node();
-            } else {
-                $arguments = $this->parseArguments();
-            }
-
-            $class = $this->getFilterNodeClass($name->getAttribute('value'));
-
-            $node = new $class($node, $name, $arguments, $token->getLine(), $tag);
-
-            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, '|')) {
-                break;
-            }
-
-            $this->parser->getStream()->next();
-        }
-
-        return $node;
-    }
-
-    public function parseArguments()
-    {
-        $args = array();
-        $stream = $this->parser->getStream();
-
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, '(', 'A list of arguments must be opened by a parenthesis');
-        while (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ')')) {
-            if (!empty($args)) {
-                $stream->expect(Twig_Token::PUNCTUATION_TYPE, ',', 'Arguments must be separated by a comma');
-            }
-            $args[] = $this->parseExpression();
-        }
-        $stream->expect(Twig_Token::PUNCTUATION_TYPE, ')', 'A list of arguments must be closed by a parenthesis');
-
-        return new Twig_Node($args);
-    }
-
-    public function parseAssignmentExpression()
-    {
-        $targets = array();
-        while (true) {
-            $token = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE, null, 'Only variables can be assigned to');
-            if (in_array($token->getValue(), array('true', 'false', 'none'))) {
-                throw new Twig_Error_Syntax(sprintf('You cannot assign a value to "%s"', $token->getValue()), $token->getLine());
-            }
-            $targets[] = new Twig_Node_Expression_AssignName($token->getValue(), $token->getLine());
-
-            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, ',')) {
-                break;
-            }
-            $this->parser->getStream()->next();
-        }
-
-        return new Twig_Node($targets);
-    }
-
-    public function parseMultitargetExpression()
-    {
-        $targets = array();
-        while (true) {
-            $targets[] = $this->parseExpression();
-            if (!$this->parser->getStream()->test(Twig_Token::PUNCTUATION_TYPE, ',')) {
-                break;
-            }
-            $this->parser->getStream()->next();
-        }
-
-        return new Twig_Node($targets);
-    }
-
-    protected function getFunctionNodeClass($name)
-    {
-        $functionMap = $this->parser->getEnvironment()->getFunctions();
-        if (isset($functionMap[$name]) && $functionMap[$name] instanceof Twig_Function_Node) {
-            return $functionMap[$name]->getClass();
-        }
-
-        return 'Twig_Node_Expression_Function';
-    }
-
-    protected function getFilterNodeClass($name)
-    {
-        $filterMap = $this->parser->getEnvironment()->getFilters();
-        if (isset($filterMap[$name]) && $filterMap[$name] instanceof Twig_Filter_Node) {
-            return $filterMap[$name]->getClass();
-        }
-
-        return 'Twig_Node_Expression_Filter';
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension.php
deleted file mode 100644
index 931fc03..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension.php
+++ /dev/null
@@ -1,93 +0,0 @@
-dateFormats[0] = $format;
-        }
-
-        if (null !== $dateIntervalFormat) {
-            $this->dateFormats[1] = $dateIntervalFormat;
-        }
-    }
-
-    /**
-     * Gets the default format to be used by the date filter.
-     *
-     * @return array The default date format string and the default date interval format string
-     */
-    public function getDateFormat()
-    {
-        return $this->dateFormats;
-    }
-
-    /**
-     * Sets the default timezone to be used by the date filter.
-     *
-     * @param DateTimeZone|string $timezone  The default timezone string or a DateTimeZone object
-     */
-    public function setTimezone($timezone)
-    {
-        $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
-    }
-
-    /**
-     * Gets the default timezone to be used by the date filter.
-     *
-     * @return DateTimeZone The default timezone currently in use
-     */
-    public function getTimezone()
-    {
-        return $this->timezone;
-    }
-
-    /**
-     * Sets the default format to be used by the number_format filter.
-     *
-     * @param integer $decimal The number of decimal places to use.
-     * @param string $decimalPoint The character(s) to use for the decimal point.
-     * @param string $thousandSep The character(s) to use for the thousands separator.
-     */
-    public function setNumberFormat($decimal, $decimalPoint, $thousandSep)
-    {
-        $this->numberFormat = array($decimal, $decimalPoint, $thousandSep);
-    }
-
-    /**
-     * Get the default format used by the number_format filter.
-     *
-     * @return array The arguments for number_format()
-     */
-    public function getNumberFormat()
-    {
-        return $this->numberFormat;
-    }
-
-    /**
-     * Returns the token parser instance to add to the existing list.
-     *
-     * @return array An array of Twig_TokenParser instances
-     */
-    public function getTokenParsers()
-    {
-        return array(
-            new Twig_TokenParser_For(),
-            new Twig_TokenParser_If(),
-            new Twig_TokenParser_Extends(),
-            new Twig_TokenParser_Include(),
-            new Twig_TokenParser_Block(),
-            new Twig_TokenParser_Use(),
-            new Twig_TokenParser_Filter(),
-            new Twig_TokenParser_Macro(),
-            new Twig_TokenParser_Import(),
-            new Twig_TokenParser_From(),
-            new Twig_TokenParser_Set(),
-            new Twig_TokenParser_Spaceless(),
-            new Twig_TokenParser_Flush(),
-            new Twig_TokenParser_Do(),
-            new Twig_TokenParser_Embed(),
-        );
-    }
-
-    /**
-     * Returns a list of filters to add to the existing list.
-     *
-     * @return array An array of filters
-     */
-    public function getFilters()
-    {
-        $filters = array(
-            // formatting filters
-            'date'          => new Twig_Filter_Function('twig_date_format_filter', array('needs_environment' => true)),
-            'format'        => new Twig_Filter_Function('sprintf'),
-            'replace'       => new Twig_Filter_Function('strtr'),
-            'number_format' => new Twig_Filter_Function('twig_number_format_filter', array('needs_environment' => true)),
-
-            // encoding
-            'url_encode'       => new Twig_Filter_Function('twig_urlencode_filter'),
-            'json_encode'      => new Twig_Filter_Function('twig_jsonencode_filter'),
-            'convert_encoding' => new Twig_Filter_Function('twig_convert_encoding'),
-
-            // string filters
-            'title'      => new Twig_Filter_Function('twig_title_string_filter', array('needs_environment' => true)),
-            'capitalize' => new Twig_Filter_Function('twig_capitalize_string_filter', array('needs_environment' => true)),
-            'upper'      => new Twig_Filter_Function('strtoupper'),
-            'lower'      => new Twig_Filter_Function('strtolower'),
-            'striptags'  => new Twig_Filter_Function('strip_tags'),
-            'trim'       => new Twig_Filter_Function('trim'),
-            'nl2br'      => new Twig_Filter_Function('nl2br', array('pre_escape' => 'html', 'is_safe' => array('html'))),
-
-            // array helpers
-            'join'    => new Twig_Filter_Function('twig_join_filter'),
-            'sort'    => new Twig_Filter_Function('twig_sort_filter'),
-            'merge'   => new Twig_Filter_Function('twig_array_merge'),
-
-            // string/array filters
-            'reverse' => new Twig_Filter_Function('twig_reverse_filter', array('needs_environment' => true)),
-            'length'  => new Twig_Filter_Function('twig_length_filter', array('needs_environment' => true)),
-            'slice'   => new Twig_Filter_Function('twig_slice', array('needs_environment' => true)),
-
-            // iteration and runtime
-            'default' => new Twig_Filter_Node('Twig_Node_Expression_Filter_Default'),
-            '_default' => new Twig_Filter_Function('_twig_default_filter'),
-
-            'keys'    => new Twig_Filter_Function('twig_get_array_keys_filter'),
-
-            // escaping
-            'escape' => new Twig_Filter_Function('twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
-            'e'      => new Twig_Filter_Function('twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
-        );
-
-        if (function_exists('mb_get_info')) {
-            $filters['upper'] = new Twig_Filter_Function('twig_upper_filter', array('needs_environment' => true));
-            $filters['lower'] = new Twig_Filter_Function('twig_lower_filter', array('needs_environment' => true));
-        }
-
-        return $filters;
-    }
-
-    /**
-     * Returns a list of global functions to add to the existing list.
-     *
-     * @return array An array of global functions
-     */
-    public function getFunctions()
-    {
-        return array(
-            'range'    => new Twig_Function_Function('range'),
-            'constant' => new Twig_Function_Function('constant'),
-            'cycle'    => new Twig_Function_Function('twig_cycle'),
-            'random'   => new Twig_Function_Function('twig_random', array('needs_environment' => true)),
-            'date'     => new Twig_Function_Function('twig_date_converter', array('needs_environment' => true)),
-        );
-    }
-
-    /**
-     * Returns a list of tests to add to the existing list.
-     *
-     * @return array An array of tests
-     */
-    public function getTests()
-    {
-        return array(
-            'even'        => new Twig_Test_Node('Twig_Node_Expression_Test_Even'),
-            'odd'         => new Twig_Test_Node('Twig_Node_Expression_Test_Odd'),
-            'defined'     => new Twig_Test_Node('Twig_Node_Expression_Test_Defined'),
-            'sameas'      => new Twig_Test_Node('Twig_Node_Expression_Test_Sameas'),
-            'none'        => new Twig_Test_Node('Twig_Node_Expression_Test_Null'),
-            'null'        => new Twig_Test_Node('Twig_Node_Expression_Test_Null'),
-            'divisibleby' => new Twig_Test_Node('Twig_Node_Expression_Test_Divisibleby'),
-            'constant'    => new Twig_Test_Node('Twig_Node_Expression_Test_Constant'),
-            'empty'       => new Twig_Test_Function('twig_test_empty'),
-            'iterable'    => new Twig_Test_Function('twig_test_iterable'),
-        );
-    }
-
-    /**
-     * Returns a list of operators to add to the existing list.
-     *
-     * @return array An array of operators
-     */
-    public function getOperators()
-    {
-        return array(
-            array(
-                'not' => array('precedence' => 50, 'class' => 'Twig_Node_Expression_Unary_Not'),
-                '-'   => array('precedence' => 500, 'class' => 'Twig_Node_Expression_Unary_Neg'),
-                '+'   => array('precedence' => 500, 'class' => 'Twig_Node_Expression_Unary_Pos'),
-            ),
-            array(
-                'b-and'  => array('precedence' => 5, 'class' => 'Twig_Node_Expression_Binary_BitwiseAnd', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'b-xor'  => array('precedence' => 5, 'class' => 'Twig_Node_Expression_Binary_BitwiseXor', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'b-or'   => array('precedence' => 5, 'class' => 'Twig_Node_Expression_Binary_BitwiseOr', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'or'     => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'and'    => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '=='     => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '!='     => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '<'      => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '>'      => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Greater', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '>='     => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '<='     => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'not in' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotIn', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'in'     => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_In', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '..'     => array('precedence' => 25, 'class' => 'Twig_Node_Expression_Binary_Range', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '+'      => array('precedence' => 30, 'class' => 'Twig_Node_Expression_Binary_Add', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '-'      => array('precedence' => 30, 'class' => 'Twig_Node_Expression_Binary_Sub', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '~'      => array('precedence' => 40, 'class' => 'Twig_Node_Expression_Binary_Concat', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '*'      => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mul', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '/'      => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Div', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '//'     => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_FloorDiv', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '%'      => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'is'     => array('precedence' => 100, 'callable' => array($this, 'parseTestExpression'), 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                'is not' => array('precedence' => 100, 'callable' => array($this, 'parseNotTestExpression'), 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
-                '**'     => array('precedence' => 200, 'class' => 'Twig_Node_Expression_Binary_Power', 'associativity' => Twig_ExpressionParser::OPERATOR_RIGHT),
-            ),
-        );
-    }
-
-    public function parseNotTestExpression(Twig_Parser $parser, $node)
-    {
-        return new Twig_Node_Expression_Unary_Not($this->parseTestExpression($parser, $node), $parser->getCurrentToken()->getLine());
-    }
-
-    public function parseTestExpression(Twig_Parser $parser, $node)
-    {
-        $stream = $parser->getStream();
-        $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
-        $arguments = null;
-        if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
-            $arguments = $parser->getExpressionParser()->parseArguments();
-        }
-
-        $class = $this->getTestNodeClass($parser->getEnvironment(), $name);
-
-        return new $class($node, $name, $arguments, $parser->getCurrentToken()->getLine());
-    }
-
-    protected function getTestNodeClass(Twig_Environment $env, $name)
-    {
-        $testMap = $env->getTests();
-        if (isset($testMap[$name]) && $testMap[$name] instanceof Twig_Test_Node) {
-            return $testMap[$name]->getClass();
-        }
-
-        return 'Twig_Node_Expression_Test';
-    }
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    public function getName()
-    {
-        return 'core';
-    }
-}
-
-/**
- * Cycles over a value.
- *
- * @param ArrayAccess|array $values An array or an ArrayAccess instance
- * @param integer           $i      The cycle value
- *
- * @return string The next value in the cycle
- */
-function twig_cycle($values, $i)
-{
-    if (!is_array($values) && !$values instanceof ArrayAccess) {
-        return $values;
-    }
-
-    return $values[$i % count($values)];
-}
-
-/**
- * Returns a random value depending on the supplied parameter type:
- * - a random item from a Traversable or array
- * - a random character from a string
- * - a random integer between 0 and the integer parameter
- *
- * @param Twig_Environment             $env    A Twig_Environment instance
- * @param Traversable|array|int|string $values The values to pick a random item from
- *
- * @throws Twig_Error_Runtime When $values is an empty array (does not apply to an empty string which is returned as is).
- *
- * @return mixed A random value from the given sequence
- */
-function twig_random(Twig_Environment $env, $values = null)
-{
-    if (null === $values) {
-        return mt_rand();
-    }
-
-    if (is_int($values) || is_float($values)) {
-        return $values < 0 ? mt_rand($values, 0) : mt_rand(0, $values);
-    }
-
-    if ($values instanceof Traversable) {
-        $values = iterator_to_array($values);
-    } elseif (is_string($values)) {
-        if ('' === $values) {
-            return '';
-        }
-        if (null !== $charset = $env->getCharset()) {
-            if ('UTF-8' != $charset) {
-                $values = twig_convert_encoding($values, 'UTF-8', $charset);
-            }
-
-            // unicode version of str_split()
-            // split at all positions, but not after the start and not before the end
-            $values = preg_split('/(? $value) {
-                    $values[$i] = twig_convert_encoding($value, $charset, 'UTF-8');
-                }
-            }
-        } else {
-            return $values[mt_rand(0, strlen($values) - 1)];
-        }
-    }
-
-    if (!is_array($values)) {
-        return $values;
-    }
-
-    if (0 === count($values)) {
-        throw new Twig_Error_Runtime('The random function cannot pick from an empty array.');
-    }
-
-    return $values[array_rand($values, 1)];
-}
-
-/**
- * Converts a date to the given format.
- *
- * 
- *   {{ post.published_at|date("m/d/Y") }}
- * 

- *
- * @param Twig_Environment             $env      A Twig_Environment instance
- * @param DateTime|DateInterval|string $date     A date
- * @param string                       $format   A format
- * @param DateTimeZone|string          $timezone A timezone
- *
- * @return string The formatter date
- */
-function twig_date_format_filter(Twig_Environment $env, $date, $format = null, $timezone = null)
-{
-    if (null === $format) {
-        $formats = $env->getExtension('core')->getDateFormat();
-        $format = $date instanceof DateInterval ? $formats[1] : $formats[0];
-    }
-
-    if ($date instanceof DateInterval || $date instanceof DateTime) {
-        if (null !== $timezone) {
-            $date = clone $date;
-            $date->setTimezone($timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone));
-        }
-
-        return $date->format($format);
-    }
-
-    return twig_date_converter($env, $date, $timezone)->format($format);
-}
-
-/**
- * Converts an input to a DateTime instance.
- *
- * 
- *    {% if date(user.created_at) < date('+2days') %}
- *      {# do something #}
- *    {% endif %}
- * 

- *
- * @param Twig_Environment    $env      A Twig_Environment instance
- * @param DateTime|string     $date     A date
- * @param DateTimeZone|string $timezone A timezone
- *
- * @return DateTime A DateTime instance
- */
-function twig_date_converter(Twig_Environment $env, $date = null, $timezone = null)
-{
-    if ($date instanceof DateTime) {
-        return $date;
-    }
-
-    $asString = (string) $date;
-
-    if (ctype_digit($asString) || (!empty($asString) && '-' === $asString[0] && ctype_digit(substr($asString, 1)))) {
-        $date = new DateTime('@'.$date);
-        $date->setTimezone(new DateTimeZone(date_default_timezone_get()));
-    } else {
-        $date = new DateTime($date);
-    }
-
-    // set Timezone
-    if (null !== $timezone) {
-        if (!$timezone instanceof DateTimeZone) {
-            $timezone = new DateTimeZone($timezone);
-        }
-
-        $date->setTimezone($timezone);
-    } elseif (($timezone = $env->getExtension('core')->getTimezone()) instanceof DateTimeZone) {
-        $date->setTimezone($timezone);
-    }
-
-    return $date;
-}
-
-/**
- * Number format filter.
- *
- * All of the formatting options can be left null, in that case the defaults will
- * be used.  Supplying any of the parameters will override the defaults set in the
- * environment object.
- *
- * @param Twig_Environment    $env          A Twig_Environment instance
- * @param mixed               $number       A float/int/string of the number to format
- * @param int                 $decimal      The number of decimal points to display.
- * @param string              $decimalPoint The character(s) to use for the decimal point.
- * @param string              $thousandSep  The character(s) to use for the thousands separator.
- *
- * @return string The formatted number
- */
-function twig_number_format_filter(Twig_Environment $env, $number, $decimal = null, $decimalPoint = null, $thousandSep = null)
-{
-    $defaults = $env->getExtension('core')->getNumberFormat();
-    if (null === $decimal) {
-        $decimal = $defaults[0];
-    }
-
-    if (null === $decimalPoint) {
-        $decimalPoint = $defaults[1];
-    }
-
-    if (null === $thousandSep) {
-        $thousandSep = $defaults[2];
-    }
-
-    return number_format((float) $number, $decimal, $decimalPoint, $thousandSep);
-}
-
-/**
- * URL encodes a string.
- *
- * @param string $url A URL
- * @param bool   $raw true to use rawurlencode() instead of urlencode
- *
- * @return string The URL encoded value
- */
-function twig_urlencode_filter($url, $raw = false)
-{
-    if ($raw) {
-        return rawurlencode($url);
-    }
-
-    return urlencode($url);
-}
-
-if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-    /**
-     * JSON encodes a variable.
-     *
-     * @param mixed   $value   The value to encode.
-     * @param integer $options Not used on PHP 5.2.x
-     *
-     * @return mixed The JSON encoded value
-     */
-    function twig_jsonencode_filter($value, $options = 0)
-    {
-        if ($value instanceof Twig_Markup) {
-            $value = (string) $value;
-        } elseif (is_array($value)) {
-            array_walk_recursive($value, '_twig_markup2string');
-        }
-
-        return json_encode($value);
-    }
-} else {
-    /**
-     * JSON encodes a variable.
-     *
-     * @param mixed   $value   The value to encode.
-     * @param integer $options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT
-     *
-     * @return mixed The JSON encoded value
-     */
-    function twig_jsonencode_filter($value, $options = 0)
-    {
-        if ($value instanceof Twig_Markup) {
-            $value = (string) $value;
-        } elseif (is_array($value)) {
-            array_walk_recursive($value, '_twig_markup2string');
-        }
-
-        return json_encode($value, $options);
-    }
-}
-
-function _twig_markup2string(&$value)
-{
-    if ($value instanceof Twig_Markup) {
-        $value = (string) $value;
-    }
-}
-
-/**
- * Merges an array with another one.
- *
- * 
- *  {% set items = { 'apple': 'fruit', 'orange': 'fruit' } %}
- *
- *  {% set items = items|merge({ 'peugeot': 'car' }) %}
- *
- *  {# items now contains { 'apple': 'fruit', 'orange': 'fruit', 'peugeot': 'car' } #}
- * 

- *
- * @param array $arr1 An array
- * @param array $arr2 An array
- *
- * @return array The merged array
- */
-function twig_array_merge($arr1, $arr2)
-{
-    if (!is_array($arr1) || !is_array($arr2)) {
-        throw new Twig_Error_Runtime('The merge filter only works with arrays or hashes.');
-    }
-
-    return array_merge($arr1, $arr2);
-}
-
-/**
- * Slices a variable.
- *
- * @param Twig_Environment $env          A Twig_Environment instance
- * @param mixed            $item         A variable
- * @param integer          $start        Start of the slice
- * @param integer          $length       Size of the slice
- * @param Boolean          $preserveKeys Whether to preserve key or not (when the input is an array)
- *
- * @return mixed The sliced variable
- */
-function twig_slice(Twig_Environment $env, $item, $start, $length = null, $preserveKeys = false)
-{
-    if ($item instanceof Traversable) {
-        $item = iterator_to_array($item, false);
-    }
-
-    if (is_array($item)) {
-        return array_slice($item, $start, $length, $preserveKeys);
-    }
-
-    $item = (string) $item;
-
-    if (function_exists('mb_get_info') && null !== $charset = $env->getCharset()) {
-        return mb_substr($item, $start, null === $length ? mb_strlen($item, $charset) - $start : $length, $charset);
-    }
-
-    return null === $length ? substr($item, $start) : substr($item, $start, $length);
-}
-
-/**
- * Joins the values to a string.
- *
- * The separator between elements is an empty string per default, you can define it with the optional parameter.
- *
- * 
- *  {{ [1, 2, 3]|join('|') }}
- *  {# returns 1|2|3 #}
- *
- *  {{ [1, 2, 3]|join }}
- *  {# returns 123 #}
- * 

- *
- * @param array  $value An array
- * @param string $glue  The separator
- *
- * @return string The concatenated string
- */
-function twig_join_filter($value, $glue = '')
-{
-    if ($value instanceof Traversable) {
-        $value = iterator_to_array($value, false);
-    }
-
-    return implode($glue, (array) $value);
-}
-
-// The '_default' filter is used internally to avoid using the ternary operator
-// which costs a lot for big contexts (before PHP 5.4). So, on average,
-// a function call is cheaper.
-function _twig_default_filter($value, $default = '')
-{
-    if (twig_test_empty($value)) {
-        return $default;
-    }
-
-    return $value;
-}
-
-/**
- * Returns the keys for the given array.
- *
- * It is useful when you want to iterate over the keys of an array:
- *
- * 
- *  {% for key in array|keys %}
- *      {# ... #}
- *  {% endfor %}
- * 

- *
- * @param array $array An array
- *
- * @return array The keys
- */
-function twig_get_array_keys_filter($array)
-{
-    if (is_object($array) && $array instanceof Traversable) {
-        return array_keys(iterator_to_array($array));
-    }
-
-    if (!is_array($array)) {
-        return array();
-    }
-
-    return array_keys($array);
-}
-
-/**
- * Reverses a variable.
- *
- * @param Twig_Environment         $env          A Twig_Environment instance
- * @param array|Traversable|string $item         An array, a Traversable instance, or a string
- * @param Boolean                  $preserveKeys Whether to preserve key or not
- *
- * @return mixed The reversed input
- */
-function twig_reverse_filter(Twig_Environment $env, $item, $preserveKeys = false)
-{
-    if (is_object($item) && $item instanceof Traversable) {
-        return array_reverse(iterator_to_array($item), $preserveKeys);
-    }
-
-    if (is_array($item)) {
-        return array_reverse($item, $preserveKeys);
-    }
-
-    if (null !== $charset = $env->getCharset()) {
-        $string = (string) $item;
-
-        if ('UTF-8' != $charset) {
-            $item = twig_convert_encoding($string, 'UTF-8', $charset);
-        }
-
-        preg_match_all('/./us', $item, $matches);
-
-        $string = implode('', array_reverse($matches[0]));
-
-        if ('UTF-8' != $charset) {
-            $string = twig_convert_encoding($string, $charset, 'UTF-8');
-        }
-
-        return $string;
-    }
-
-    return strrev((string) $item);
-}
-
-/**
- * Sorts an array.
- *
- * @param array $array An array
- */
-function twig_sort_filter($array)
-{
-    asort($array);
-
-    return $array;
-}
-
-/* used internally */
-function twig_in_filter($value, $compare)
-{
-    if (is_array($compare)) {
-        return in_array($value, $compare);
-    } elseif (is_string($compare)) {
-        if (!strlen((string) $value)) {
-            return empty($compare);
-        }
-
-        return false !== strpos($compare, (string) $value);
-    } elseif (is_object($compare) && $compare instanceof Traversable) {
-        return in_array($value, iterator_to_array($compare, false));
-    }
-
-    return false;
-}
-
-/**
- * Escapes a string.
- *
- * @param Twig_Environment $env        A Twig_Environment instance
- * @param string           $string     The value to be escaped
- * @param string           $strategy   The escaping strategy
- * @param string           $charset    The charset
- * @param Boolean          $autoescape Whether the function is called by the auto-escaping feature (true) or by the developer (false)
- */
-function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html', $charset = null, $autoescape = false)
-{
-    if ($autoescape && is_object($string) && $string instanceof Twig_Markup) {
-        return $string;
-    }
-
-    if (!is_string($string) && !(is_object($string) && method_exists($string, '__toString'))) {
-        return $string;
-    }
-
-    if (null === $charset) {
-        $charset = $env->getCharset();
-    }
-
-    $string = (string) $string;
-
-    switch ($strategy) {
-        case 'js':
-            // escape all non-alphanumeric characters
-            // into their \xHH or \uHHHH representations
-            if ('UTF-8' != $charset) {
-                $string = twig_convert_encoding($string, 'UTF-8', $charset);
-            }
-
-            if (null === $string = preg_replace_callback('#[^\p{L}\p{N} ]#u', '_twig_escape_js_callback', $string)) {
-                throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
-            }
-
-            if ('UTF-8' != $charset) {
-                $string = twig_convert_encoding($string, $charset, 'UTF-8');
-            }
-
-            return $string;
-
-        case 'html':
-            // see http://php.net/htmlspecialchars
-
-            // Using a static variable to avoid initializing the array
-            // each time the function is called. Moving the declaration on the
-            // top of the function slow downs other escaping strategies.
-            static $htmlspecialcharsCharsets = array(
-                'iso-8859-1' => true, 'iso8859-1' => true,
-                'iso-8859-15' => true, 'iso8859-15' => true,
-                'utf-8' => true,
-                'cp866' => true, 'ibm866' => true, '866' => true,
-                'cp1251' => true, 'windows-1251' => true, 'win-1251' => true,
-                '1251' => true,
-                'cp1252' => true, 'windows-1252' => true, '1252' => true,
-                'koi8-r' => true, 'koi8-ru' => true, 'koi8r' => true,
-                'big5' => true, '950' => true,
-                'gb2312' => true, '936' => true,
-                'big5-hkscs' => true,
-                'shift_jis' => true, 'sjis' => true, '932' => true,
-                'euc-jp' => true, 'eucjp' => true,
-                'iso8859-5' => true, 'iso-8859-5' => true, 'macroman' => true,
-            );
-
-            if (isset($htmlspecialcharsCharsets[strtolower($charset)])) {
-                return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, $charset);
-            }
-
-            $string = twig_convert_encoding($string, 'UTF-8', $charset);
-            $string = htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
-
-            return twig_convert_encoding($string, $charset, 'UTF-8');
-
-        default:
-            throw new Twig_Error_Runtime(sprintf('Invalid escaping strategy "%s" (valid ones: html, js).', $strategy));
-    }
-}
-
-/* used internally */
-function twig_escape_filter_is_safe(Twig_Node $filterArgs)
-{
-    foreach ($filterArgs as $arg) {
-        if ($arg instanceof Twig_Node_Expression_Constant) {
-            return array($arg->getAttribute('value'));
-        }
-
-        return array();
-    }
-
-    return array('html');
-}
-
-if (function_exists('iconv')) {
-    function twig_convert_encoding($string, $to, $from)
-    {
-        return iconv($from, $to, $string);
-    }
-} elseif (function_exists('mb_convert_encoding')) {
-    function twig_convert_encoding($string, $to, $from)
-    {
-        return mb_convert_encoding($string, $to, $from);
-    }
-} else {
-    function twig_convert_encoding($string, $to, $from)
-    {
-        throw new Twig_Error_Runtime('No suitable convert encoding function (use UTF-8 as your encoding or install the iconv or mbstring extension).');
-    }
-}
-
-function _twig_escape_js_callback($matches)
-{
-    $char = $matches[0];
-
-    // \xHH
-    if (!isset($char[1])) {
-        return '\\x'.substr('00'.bin2hex($char), -2);
-    }
-
-    // \uHHHH
-    $char = twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
-
-    return '\\u'.substr('0000'.bin2hex($char), -4);
-}
-
-// add multibyte extensions if possible
-if (function_exists('mb_get_info')) {
-    /**
-     * Returns the length of a variable.
-     *
-     * @param Twig_Environment $env   A Twig_Environment instance
-     * @param mixed            $thing A variable
-     *
-     * @return integer The length of the value
-     */
-    function twig_length_filter(Twig_Environment $env, $thing)
-    {
-        return is_scalar($thing) ? mb_strlen($thing, $env->getCharset()) : count($thing);
-    }
-
-    /**
-     * Converts a string to uppercase.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The uppercased string
-     */
-    function twig_upper_filter(Twig_Environment $env, $string)
-    {
-        if (null !== ($charset = $env->getCharset())) {
-            return mb_strtoupper($string, $charset);
-        }
-
-        return strtoupper($string);
-    }
-
-    /**
-     * Converts a string to lowercase.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The lowercased string
-     */
-    function twig_lower_filter(Twig_Environment $env, $string)
-    {
-        if (null !== ($charset = $env->getCharset())) {
-            return mb_strtolower($string, $charset);
-        }
-
-        return strtolower($string);
-    }
-
-    /**
-     * Returns a titlecased string.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The titlecased string
-     */
-    function twig_title_string_filter(Twig_Environment $env, $string)
-    {
-        if (null !== ($charset = $env->getCharset())) {
-            return mb_convert_case($string, MB_CASE_TITLE, $charset);
-        }
-
-        return ucwords(strtolower($string));
-    }
-
-    /**
-     * Returns a capitalized string.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The capitalized string
-     */
-    function twig_capitalize_string_filter(Twig_Environment $env, $string)
-    {
-        if (null !== ($charset = $env->getCharset())) {
-            return mb_strtoupper(mb_substr($string, 0, 1, $charset), $charset).
-                         mb_strtolower(mb_substr($string, 1, mb_strlen($string, $charset), $charset), $charset);
-        }
-
-        return ucfirst(strtolower($string));
-    }
-}
-// and byte fallback
-else
-{
-    /**
-     * Returns the length of a variable.
-     *
-     * @param Twig_Environment $env   A Twig_Environment instance
-     * @param mixed            $thing A variable
-     *
-     * @return integer The length of the value
-     */
-    function twig_length_filter(Twig_Environment $env, $thing)
-    {
-        return is_scalar($thing) ? strlen($thing) : count($thing);
-    }
-
-    /**
-     * Returns a titlecased string.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The titlecased string
-     */
-    function twig_title_string_filter(Twig_Environment $env, $string)
-    {
-        return ucwords(strtolower($string));
-    }
-
-    /**
-     * Returns a capitalized string.
-     *
-     * @param Twig_Environment $env    A Twig_Environment instance
-     * @param string           $string A string
-     *
-     * @return string The capitalized string
-     */
-    function twig_capitalize_string_filter(Twig_Environment $env, $string)
-    {
-        return ucfirst(strtolower($string));
-    }
-}
-
-/* used internally */
-function twig_ensure_traversable($seq)
-{
-    if ($seq instanceof Traversable || is_array($seq)) {
-        return $seq;
-    }
-
-    return array();
-}
-
-/**
- * Checks if a variable is empty.
- *
- * 
- * {# evaluates to true if the foo variable is null, false, or the empty string #}
- * {% if foo is empty %}
- *     {# ... #}
- * {% endif %}
- * 

- *
- * @param mixed $value A variable
- *
- * @return Boolean true if the value is empty, false otherwise
- */
-function twig_test_empty($value)
-{
-    if ($value instanceof Countable) {
-        return 0 == count($value);
-    }
-
-    return false === $value || (empty($value) && '0' != $value);
-}
-
-/**
- * Checks if a variable is traversable.
- *
- * 
- * {# evaluates to true if the foo variable is an array or a traversable object #}
- * {% if foo is traversable %}
- *     {# ... #}
- * {% endif %}
- * 

- *
- * @param mixed $value A variable
- *
- * @return Boolean true if the value is traversable
- */
-function twig_test_iterable($value)
-{
-    return $value instanceof Traversable || is_array($value);
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension/Debug.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension/Debug.php
deleted file mode 100644
index aab7093..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension/Debug.php
+++ /dev/null
@@ -1,64 +0,0 @@
- new Twig_Function_Function('twig_var_dump', array('is_safe' => $isDumpOutputHtmlSafe ? array('html') : array(), 'needs_context' => true, 'needs_environment' => true)),
-        );
-    }
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    public function getName()
-    {
-        return 'debug';
-    }
-}
-
-function twig_var_dump(Twig_Environment $env, $context)
-{
-    if (!$env->isDebug()) {
-        return;
-    }
-
-    ob_start();
-
-    $count = func_num_args();
-    if (2 === $count) {
-        $vars = array();
-        foreach ($context as $key => $value) {
-            if (!$value instanceof Twig_Template) {
-                $vars[$key] = $value;
-            }
-        }
-
-        var_dump($vars);
-    } else {
-        for ($i = 2; $i < $count; $i++) {
-            var_dump(func_get_arg($i));
-        }
-    }
-
-    return ob_get_clean();
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension/Escaper.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension/Escaper.php
deleted file mode 100644
index b0aa8b1..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension/Escaper.php
+++ /dev/null
@@ -1,106 +0,0 @@
-setDefaultStrategy($defaultStrategy);
-    }
-
-    /**
-     * Returns the token parser instances to add to the existing list.
-     *
-     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
-     */
-    public function getTokenParsers()
-    {
-        return array(new Twig_TokenParser_AutoEscape());
-    }
-
-    /**
-     * Returns the node visitor instances to add to the existing list.
-     *
-     * @return array An array of Twig_NodeVisitorInterface instances
-     */
-    public function getNodeVisitors()
-    {
-        return array(new Twig_NodeVisitor_Escaper());
-    }
-
-    /**
-     * Returns a list of filters to add to the existing list.
-     *
-     * @return array An array of filters
-     */
-    public function getFilters()
-    {
-        return array(
-            'raw' => new Twig_Filter_Function('twig_raw_filter', array('is_safe' => array('all'))),
-        );
-    }
-
-    /**
-     * Sets the default strategy to use when not defined by the user.
-     *
-     * The strategy can be a valid PHP callback that takes the template
-     * "filename" as an argument and returns the strategy to use.
-     *
-     * @param mixed $defaultStrategy An escaping strategy
-     */
-    public function setDefaultStrategy($defaultStrategy)
-    {
-        // for BC
-        if (true === $defaultStrategy) {
-            $defaultStrategy = 'html';
-        }
-
-        $this->defaultStrategy = $defaultStrategy;
-    }
-
-    /**
-     * Gets the default strategy to use when not defined by the user.
-     *
-     * @param string $filename The template "filename"
-     *
-     * @return string The default strategy to use for the template
-     */
-    public function getDefaultStrategy($filename)
-    {
-        if (is_callable($this->defaultStrategy)) {
-            return call_user_func($this->defaultStrategy, $filename);
-        }
-
-        return $this->defaultStrategy;
-    }
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    public function getName()
-    {
-        return 'escaper';
-    }
-}
-
-/**
- * Marks a variable as being safe.
- *
- * @param string $string A PHP variable
- */
-function twig_raw_filter($string)
-{
-    return $string;
-}
-
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension/Optimizer.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension/Optimizer.php
deleted file mode 100644
index 013fcb6..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension/Optimizer.php
+++ /dev/null
@@ -1,35 +0,0 @@
-optimizers = $optimizers;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getNodeVisitors()
-    {
-        return array(new Twig_NodeVisitor_Optimizer($this->optimizers));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'optimizer';
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension/Sandbox.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension/Sandbox.php
deleted file mode 100644
index bf76c11..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Extension/Sandbox.php
+++ /dev/null
@@ -1,112 +0,0 @@
-policy            = $policy;
-        $this->sandboxedGlobally = $sandboxed;
-    }
-
-    /**
-     * Returns the token parser instances to add to the existing list.
-     *
-     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
-     */
-    public function getTokenParsers()
-    {
-        return array(new Twig_TokenParser_Sandbox());
-    }
-
-    /**
-     * Returns the node visitor instances to add to the existing list.
-     *
-     * @return array An array of Twig_NodeVisitorInterface instances
-     */
-    public function getNodeVisitors()
-    {
-        return array(new Twig_NodeVisitor_Sandbox());
-    }
-
-    public function enableSandbox()
-    {
-        $this->sandboxed = true;
-    }
-
-    public function disableSandbox()
-    {
-        $this->sandboxed = false;
-    }
-
-    public function isSandboxed()
-    {
-        return $this->sandboxedGlobally || $this->sandboxed;
-    }
-
-    public function isSandboxedGlobally()
-    {
-        return $this->sandboxedGlobally;
-    }
-
-    public function setSecurityPolicy(Twig_Sandbox_SecurityPolicyInterface $policy)
-    {
-        $this->policy = $policy;
-    }
-
-    public function getSecurityPolicy()
-    {
-        return $this->policy;
-    }
-
-    public function checkSecurity($tags, $filters, $functions)
-    {
-        if ($this->isSandboxed()) {
-            $this->policy->checkSecurity($tags, $filters, $functions);
-        }
-    }
-
-    public function checkMethodAllowed($obj, $method)
-    {
-        if ($this->isSandboxed()) {
-            $this->policy->checkMethodAllowed($obj, $method);
-        }
-    }
-
-    public function checkPropertyAllowed($obj, $method)
-    {
-        if ($this->isSandboxed()) {
-            $this->policy->checkPropertyAllowed($obj, $method);
-        }
-    }
-
-    public function ensureToStringAllowed($obj)
-    {
-        if (is_object($obj)) {
-            $this->policy->checkMethodAllowed($obj, '__toString');
-        }
-
-        return $obj;
-    }
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    public function getName()
-    {
-        return 'sandbox';
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/ExtensionInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/ExtensionInterface.php
deleted file mode 100644
index 0bfed88..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/ExtensionInterface.php
+++ /dev/null
@@ -1,84 +0,0 @@
-
- */
-interface Twig_ExtensionInterface
-{
-    /**
-     * Initializes the runtime environment.
-     *
-     * This is where you can load some file that contains filter functions for instance.
-     *
-     * @param Twig_Environment $environment The current Twig_Environment instance
-     */
-    function initRuntime(Twig_Environment $environment);
-
-    /**
-     * Returns the token parser instances to add to the existing list.
-     *
-     * @return array An array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances
-     */
-    function getTokenParsers();
-
-    /**
-     * Returns the node visitor instances to add to the existing list.
-     *
-     * @return array An array of Twig_NodeVisitorInterface instances
-     */
-    function getNodeVisitors();
-
-    /**
-     * Returns a list of filters to add to the existing list.
-     *
-     * @return array An array of filters
-     */
-    function getFilters();
-
-    /**
-     * Returns a list of tests to add to the existing list.
-     *
-     * @return array An array of tests
-     */
-    function getTests();
-
-    /**
-     * Returns a list of functions to add to the existing list.
-     *
-     * @return array An array of functions
-     */
-    function getFunctions();
-
-    /**
-     * Returns a list of operators to add to the existing list.
-     *
-     * @return array An array of operators
-     */
-    function getOperators();
-
-    /**
-     * Returns a list of global variables to add to the existing list.
-     *
-     * @return array An array of global variables
-     */
-    function getGlobals();
-
-    /**
-     * Returns the name of the extension.
-     *
-     * @return string The extension name
-     */
-    function getName();
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Filter.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Filter.php
deleted file mode 100644
index 1a4806c..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Filter.php
+++ /dev/null
@@ -1,75 +0,0 @@
-
- */
-abstract class Twig_Filter implements Twig_FilterInterface
-{
-    protected $options;
-    protected $arguments = array();
-
-    public function __construct(array $options = array())
-    {
-        $this->options = array_merge(array(
-            'needs_environment' => false,
-            'needs_context'     => false,
-            'pre_escape'        => null,
-            'preserves_safety'  => null,
-        ), $options);
-    }
-
-    public function setArguments($arguments)
-    {
-        $this->arguments = $arguments;
-    }
-
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    public function needsEnvironment()
-    {
-        return $this->options['needs_environment'];
-    }
-
-    public function needsContext()
-    {
-        return $this->options['needs_context'];
-    }
-
-    public function getSafe(Twig_Node $filterArgs)
-    {
-        if (isset($this->options['is_safe'])) {
-            return $this->options['is_safe'];
-        }
-
-        if (isset($this->options['is_safe_callback'])) {
-            return call_user_func($this->options['is_safe_callback'], $filterArgs);
-        }
-
-        return null;
-    }
-
-    public function getPreservesSafety()
-    {
-        return $this->options['preserves_safety'];
-    }
-
-    public function getPreEscape()
-    {
-        return $this->options['pre_escape'];
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Filter/Function.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Filter/Function.php
deleted file mode 100644
index 1de078b..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Filter/Function.php
+++ /dev/null
@@ -1,33 +0,0 @@
-
- */
-class Twig_Filter_Function extends Twig_Filter
-{
-    protected $function;
-
-    public function __construct($function, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->function = $function;
-    }
-
-    public function compile()
-    {
-        return $this->function;
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Filter/Method.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Filter/Method.php
deleted file mode 100644
index d831e0f..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Filter/Method.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
- */
-class Twig_Filter_Method extends Twig_Filter
-{
-    protected $extension, $method;
-
-    public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->extension = $extension;
-        $this->method = $method;
-    }
-
-    public function compile()
-    {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Filter/Node.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Filter/Node.php
deleted file mode 100644
index 7481c05..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Filter/Node.php
+++ /dev/null
@@ -1,37 +0,0 @@
-
- */
-class Twig_Filter_Node extends Twig_Filter
-{
-    protected $class;
-
-    public function __construct($class, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->class = $class;
-    }
-
-    public function getClass()
-    {
-        return $this->class;
-    }
-
-    public function compile()
-    {
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/FilterInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/FilterInterface.php
deleted file mode 100644
index f398026..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/FilterInterface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- */
-interface Twig_FilterInterface
-{
-    /**
-     * Compiles a filter.
-     *
-     * @return string The PHP code for the filter
-     */
-    function compile();
-
-    function needsEnvironment();
-
-    function needsContext();
-
-    function getSafe(Twig_Node $filterArgs);
-
-    function getPreservesSafety();
-
-    function getPreEscape();
-
-    function setArguments($arguments);
-
-    function getArguments();
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Function.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Function.php
deleted file mode 100644
index cd7643f..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Function.php
+++ /dev/null
@@ -1,63 +0,0 @@
-
- */
-abstract class Twig_Function implements Twig_FunctionInterface
-{
-    protected $options;
-    protected $arguments = array();
-
-    public function __construct(array $options = array())
-    {
-        $this->options = array_merge(array(
-            'needs_environment' => false,
-            'needs_context'     => false,
-        ), $options);
-    }
-
-    public function setArguments($arguments)
-    {
-        $this->arguments = $arguments;
-    }
-
-    public function getArguments()
-    {
-        return $this->arguments;
-    }
-
-    public function needsEnvironment()
-    {
-        return $this->options['needs_environment'];
-    }
-
-    public function needsContext()
-    {
-        return $this->options['needs_context'];
-    }
-
-    public function getSafe(Twig_Node $functionArgs)
-    {
-        if (isset($this->options['is_safe'])) {
-            return $this->options['is_safe'];
-        }
-
-        if (isset($this->options['is_safe_callback'])) {
-            return call_user_func($this->options['is_safe_callback'], $functionArgs);
-        }
-
-        return array();
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Function/Function.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Function/Function.php
deleted file mode 100644
index 3237d8c..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Function/Function.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
- */
-class Twig_Function_Function extends Twig_Function
-{
-    protected $function;
-
-    public function __construct($function, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->function = $function;
-    }
-
-    public function compile()
-    {
-        return $this->function;
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Function/Method.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Function/Method.php
deleted file mode 100644
index 7328566..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Function/Method.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- */
-class Twig_Function_Method extends Twig_Function
-{
-    protected $extension, $method;
-
-    public function __construct(Twig_ExtensionInterface $extension, $method, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->extension = $extension;
-        $this->method = $method;
-    }
-
-    public function compile()
-    {
-        return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method);
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Function/Node.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Function/Node.php
deleted file mode 100644
index a687a84..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Function/Node.php
+++ /dev/null
@@ -1,37 +0,0 @@
-
- */
-class Twig_Function_Node extends Twig_Filter
-{
-    protected $class;
-
-    public function __construct($class, array $options = array())
-    {
-        parent::__construct($options);
-
-        $this->class = $class;
-    }
-
-    public function getClass()
-    {
-        return $this->class;
-    }
-
-    public function compile()
-    {
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/FunctionInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/FunctionInterface.php
deleted file mode 100644
index d402d17..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/FunctionInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-
- */
-interface Twig_FunctionInterface
-{
-    /**
-     * Compiles a function.
-     *
-     * @return string The PHP code for the function
-     */
-    function compile();
-
-    function needsEnvironment();
-
-    function needsContext();
-
-    function getSafe(Twig_Node $filterArgs);
-
-    function setArguments($arguments);
-
-    function getArguments();
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Lexer.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Lexer.php
deleted file mode 100644
index 4d0ba9f..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Lexer.php
+++ /dev/null
@@ -1,406 +0,0 @@
-
- */
-class Twig_Lexer implements Twig_LexerInterface
-{
-    protected $tokens;
-    protected $code;
-    protected $cursor;
-    protected $lineno;
-    protected $end;
-    protected $state;
-    protected $states;
-    protected $brackets;
-    protected $env;
-    protected $filename;
-    protected $options;
-    protected $regexes;
-
-    const STATE_DATA            = 0;
-    const STATE_BLOCK           = 1;
-    const STATE_VAR             = 2;
-    const STATE_STRING          = 3;
-    const STATE_INTERPOLATION   = 4;
-
-    const REGEX_NAME            = '/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A';
-    const REGEX_NUMBER          = '/[0-9]+(?:\.[0-9]+)?/A';
-    const REGEX_STRING          = '/"([^#"\\\\]*(?:\\\\.[^#"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As';
-    const REGEX_DQ_STRING_DELIM = '/"/A';
-    const REGEX_DQ_STRING_PART  = '/[^#"\\\\]*(?:(?:\\\\.|#(?!\{))[^#"\\\\]*)*/As';
-    const PUNCTUATION           = '()[]{}?:.,|';
-
-    public function __construct(Twig_Environment $env, array $options = array())
-    {
-        $this->env = $env;
-
-        $this->options = array_merge(array(
-            'tag_comment'     => array('{#', '#}'),
-            'tag_block'       => array('{%', '%}'),
-            'tag_variable'    => array('{{', '}}'),
-            'whitespace_trim' => '-',
-            'interpolation'   => array('#{', '}'),
-        ), $options);
-
-        $this->regexes = array(
-            'lex_var'             => '/\s*'.preg_quote($this->options['whitespace_trim'].$this->options['tag_variable'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_variable'][1], '/').'/A',
-            'lex_block'           => '/\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')\n?/A',
-            'lex_raw_data'        => '/('.preg_quote($this->options['tag_block'][0].$this->options['whitespace_trim'], '/').'|'.preg_quote($this->options['tag_block'][0], '/').')\s*endraw\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/s',
-            'operator'            => $this->getOperatorRegex(),
-            'lex_comment'         => '/(?:'.preg_quote($this->options['whitespace_trim'], '/').preg_quote($this->options['tag_comment'][1], '/').'\s*|'.preg_quote($this->options['tag_comment'][1], '/').')\n?/s',
-            'lex_block_raw'       => '/\s*raw\s*(?:'.preg_quote($this->options['whitespace_trim'].$this->options['tag_block'][1], '/').'\s*|\s*'.preg_quote($this->options['tag_block'][1], '/').')/As',
-            'lex_block_line'      => '/\s*line\s+(\d+)\s*'.preg_quote($this->options['tag_block'][1], '/').'/As',
-            'lex_tokens_start'    => '/('.preg_quote($this->options['tag_variable'][0], '/').'|'.preg_quote($this->options['tag_block'][0], '/').'|'.preg_quote($this->options['tag_comment'][0], '/').')('.preg_quote($this->options['whitespace_trim'], '/').')?/s',
-            'interpolation_start' => '/'.preg_quote($this->options['interpolation'][0], '/').'\s*/A',
-            'interpolation_end'   => '/\s*'.preg_quote($this->options['interpolation'][1], '/').'/A',
-        );
-    }
-
-    /**
-     * Tokenizes a source code.
-     *
-     * @param  string $code     The source code
-     * @param  string $filename A unique identifier for the source code
-     *
-     * @return Twig_TokenStream A token stream instance
-     */
-    public function tokenize($code, $filename = null)
-    {
-        if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2) {
-            $mbEncoding = mb_internal_encoding();
-            mb_internal_encoding('ASCII');
-        }
-
-        $this->code = str_replace(array("\r\n", "\r"), "\n", $code);
-        $this->filename = $filename;
-        $this->cursor = 0;
-        $this->lineno = 1;
-        $this->end = strlen($this->code);
-        $this->tokens = array();
-        $this->state = self::STATE_DATA;
-        $this->states = array();
-        $this->brackets = array();
-        $this->position = -1;
-
-        // find all token starts in one go
-        preg_match_all($this->regexes['lex_tokens_start'], $this->code, $matches, PREG_OFFSET_CAPTURE);
-        $this->positions = $matches;
-
-        while ($this->cursor < $this->end) {
-            // dispatch to the lexing functions depending
-            // on the current state
-            switch ($this->state) {
-                case self::STATE_DATA:
-                    $this->lexData();
-                    break;
-
-                case self::STATE_BLOCK:
-                    $this->lexBlock();
-                    break;
-
-                case self::STATE_VAR:
-                    $this->lexVar();
-                    break;
-
-                case self::STATE_STRING:
-                    $this->lexString();
-                    break;
-
-                case self::STATE_INTERPOLATION:
-                    $this->lexInterpolation();
-                    break;
-            }
-        }
-
-        $this->pushToken(Twig_Token::EOF_TYPE);
-
-        if (!empty($this->brackets)) {
-            list($expect, $lineno) = array_pop($this->brackets);
-            throw new Twig_Error_Syntax(sprintf('Unclosed "%s"', $expect), $lineno, $this->filename);
-        }
-
-        if (isset($mbEncoding)) {
-            mb_internal_encoding($mbEncoding);
-        }
-
-        return new Twig_TokenStream($this->tokens, $this->filename);
-    }
-
-    protected function lexData()
-    {
-        // if no matches are left we return the rest of the template as simple text token
-        if ($this->position == count($this->positions[0]) - 1) {
-            $this->pushToken(Twig_Token::TEXT_TYPE, substr($this->code, $this->cursor));
-            $this->cursor = $this->end;
-
-            return;
-        }
-
-        // Find the first token after the current cursor
-        $position = $this->positions[0][++$this->position];
-        while ($position[1] < $this->cursor) {
-            if ($this->position == count($this->positions[0]) - 1) {
-                return;
-            }
-            $position = $this->positions[0][++$this->position];
-        }
-
-        // push the template text first
-        $text = $textContent = substr($this->code, $this->cursor, $position[1] - $this->cursor);
-        if (isset($this->positions[2][$this->position][0])) {
-            $text = rtrim($text);
-        }
-        $this->pushToken(Twig_Token::TEXT_TYPE, $text);
-        $this->moveCursor($textContent.$position[0]);
-
-        switch ($this->positions[1][$this->position][0]) {
-            case $this->options['tag_comment'][0]:
-                $this->lexComment();
-                break;
-
-            case $this->options['tag_block'][0]:
-                // raw data?
-                if (preg_match($this->regexes['lex_block_raw'], $this->code, $match, null, $this->cursor)) {
-                    $this->moveCursor($match[0]);
-                    $this->lexRawData();
-                // {% line \d+ %}
-                } elseif (preg_match($this->regexes['lex_block_line'], $this->code, $match, null, $this->cursor)) {
-                    $this->moveCursor($match[0]);
-                    $this->lineno = (int) $match[1];
-                } else {
-                    $this->pushToken(Twig_Token::BLOCK_START_TYPE);
-                    $this->pushState(self::STATE_BLOCK);
-                }
-                break;
-
-            case $this->options['tag_variable'][0]:
-                $this->pushToken(Twig_Token::VAR_START_TYPE);
-                $this->pushState(self::STATE_VAR);
-                break;
-        }
-    }
-
-    protected function lexBlock()
-    {
-        if (empty($this->brackets) && preg_match($this->regexes['lex_block'], $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::BLOCK_END_TYPE);
-            $this->moveCursor($match[0]);
-            $this->popState();
-        } else {
-            $this->lexExpression();
-        }
-    }
-
-    protected function lexVar()
-    {
-        if (empty($this->brackets) && preg_match($this->regexes['lex_var'], $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::VAR_END_TYPE);
-            $this->moveCursor($match[0]);
-            $this->popState();
-        } else {
-            $this->lexExpression();
-        }
-    }
-
-    protected function lexExpression()
-    {
-        // whitespace
-        if (preg_match('/\s+/A', $this->code, $match, null, $this->cursor)) {
-            $this->moveCursor($match[0]);
-
-            if ($this->cursor >= $this->end) {
-                throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "%s"', $this->state === self::STATE_BLOCK ? 'block' : 'variable'), $this->lineno, $this->filename);
-            }
-        }
-
-        // operators
-        if (preg_match($this->regexes['operator'], $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::OPERATOR_TYPE, $match[0]);
-            $this->moveCursor($match[0]);
-        }
-        // names
-        elseif (preg_match(self::REGEX_NAME, $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::NAME_TYPE, $match[0]);
-            $this->moveCursor($match[0]);
-        }
-        // numbers
-        elseif (preg_match(self::REGEX_NUMBER, $this->code, $match, null, $this->cursor)) {
-            $number = (float) $match[0];  // floats
-            if (ctype_digit($match[0]) && $number <= PHP_INT_MAX) {
-                $number = (int) $match[0]; // integers lower than the maximum
-            }
-            $this->pushToken(Twig_Token::NUMBER_TYPE, $number);
-            $this->moveCursor($match[0]);
-        }
-        // punctuation
-        elseif (false !== strpos(self::PUNCTUATION, $this->code[$this->cursor])) {
-            // opening bracket
-            if (false !== strpos('([{', $this->code[$this->cursor])) {
-                $this->brackets[] = array($this->code[$this->cursor], $this->lineno);
-            }
-            // closing bracket
-            elseif (false !== strpos(')]}', $this->code[$this->cursor])) {
-                if (empty($this->brackets)) {
-                    throw new Twig_Error_Syntax(sprintf('Unexpected "%s"', $this->code[$this->cursor]), $this->lineno, $this->filename);
-                }
-
-                list($expect, $lineno) = array_pop($this->brackets);
-                if ($this->code[$this->cursor] != strtr($expect, '([{', ')]}')) {
-                    throw new Twig_Error_Syntax(sprintf('Unclosed "%s"', $expect), $lineno, $this->filename);
-                }
-            }
-
-            $this->pushToken(Twig_Token::PUNCTUATION_TYPE, $this->code[$this->cursor]);
-            ++$this->cursor;
-        }
-        // strings
-        elseif (preg_match(self::REGEX_STRING, $this->code, $match, null, $this->cursor)) {
-            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes(substr($match[0], 1, -1)));
-            $this->moveCursor($match[0]);
-        }
-        // opening double quoted string
-        elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, null, $this->cursor)) {
-            $this->brackets[] = array('"', $this->lineno);
-            $this->pushState(self::STATE_STRING);
-            $this->moveCursor($match[0]);
-        }
-        // unlexable
-        else {
-            throw new Twig_Error_Syntax(sprintf('Unexpected character "%s"', $this->code[$this->cursor]), $this->lineno, $this->filename);
-        }
-    }
-
-    protected function lexRawData()
-    {
-        if (!preg_match($this->regexes['lex_raw_data'], $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
-            throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "block"'), $this->lineno, $this->filename);
-        }
-
-        $text = substr($this->code, $this->cursor, $match[0][1] - $this->cursor);
-        $this->moveCursor($text.$match[0][0]);
-
-        if (false !== strpos($match[1][0], $this->options['whitespace_trim'])) {
-            $text = rtrim($text);
-        }
-
-        $this->pushToken(Twig_Token::TEXT_TYPE, $text);
-    }
-
-    protected function lexComment()
-    {
-        if (!preg_match($this->regexes['lex_comment'], $this->code, $match, PREG_OFFSET_CAPTURE, $this->cursor)) {
-            throw new Twig_Error_Syntax('Unclosed comment', $this->lineno, $this->filename);
-        }
-
-        $this->moveCursor(substr($this->code, $this->cursor, $match[0][1] - $this->cursor).$match[0][0]);
-    }
-
-    protected function lexString()
-    {
-        if (preg_match($this->regexes['interpolation_start'], $this->code, $match, null, $this->cursor)) {
-            $this->brackets[] = array($this->options['interpolation'][0], $this->lineno);
-            $this->pushToken(Twig_Token::INTERPOLATION_START_TYPE);
-            $this->moveCursor($match[0]);
-            $this->pushState(self::STATE_INTERPOLATION);
-
-        } elseif (preg_match(self::REGEX_DQ_STRING_PART, $this->code, $match, null, $this->cursor) && strlen($match[0]) > 0) {
-            $this->pushToken(Twig_Token::STRING_TYPE, stripcslashes($match[0]));
-            $this->moveCursor($match[0]);
-
-        } elseif (preg_match(self::REGEX_DQ_STRING_DELIM, $this->code, $match, null, $this->cursor)) {
-
-            list($expect, $lineno) = array_pop($this->brackets);
-            if ($this->code[$this->cursor] != '"') {
-                throw new Twig_Error_Syntax(sprintf('Unclosed "%s"', $expect), $lineno, $this->filename);
-            }
-
-            $this->popState();
-            ++$this->cursor;
-
-            return;
-        }
-    }
-
-    protected function lexInterpolation()
-    {
-        $bracket = end($this->brackets);
-        if ($this->options['interpolation'][0] === $bracket[0] && preg_match($this->regexes['interpolation_end'], $this->code, $match, null, $this->cursor)) {
-            array_pop($this->brackets);
-            $this->pushToken(Twig_Token::INTERPOLATION_END_TYPE);
-            $this->moveCursor($match[0]);
-            $this->popState();
-        } else {
-            $this->lexExpression();
-        }
-    }
-
-    protected function pushToken($type, $value = '')
-    {
-        // do not push empty text tokens
-        if (Twig_Token::TEXT_TYPE === $type && '' === $value) {
-            return;
-        }
-
-        $this->tokens[] = new Twig_Token($type, $value, $this->lineno);
-    }
-
-    protected function moveCursor($text)
-    {
-        $this->cursor += strlen($text);
-        $this->lineno += substr_count($text, "\n");
-    }
-
-    protected function getOperatorRegex()
-    {
-        $operators = array_merge(
-            array('='),
-            array_keys($this->env->getUnaryOperators()),
-            array_keys($this->env->getBinaryOperators())
-        );
-
-        $operators = array_combine($operators, array_map('strlen', $operators));
-        arsort($operators);
-
-        $regex = array();
-        foreach ($operators as $operator => $length) {
-            // an operator that ends with a character must be followed by
-            // a whitespace or a parenthesis
-            if (ctype_alpha($operator[$length - 1])) {
-                $regex[] = preg_quote($operator, '/').'(?=[\s()])';
-            } else {
-                $regex[] = preg_quote($operator, '/');
-            }
-        }
-
-        return '/'.implode('|', $regex).'/A';
-    }
-
-    protected function pushState($state)
-    {
-        $this->states[] = $this->state;
-        $this->state = $state;
-    }
-
-    protected function popState()
-    {
-        if (0 === count($this->states)) {
-            throw new Exception('Cannot pop state without a previous state');
-        }
-
-        $this->state = array_pop($this->states);
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/LexerInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/LexerInterface.php
deleted file mode 100644
index 0223384..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/LexerInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-
- */
-interface Twig_LexerInterface
-{
-    /**
-     * Tokenizes a source code.
-     *
-     * @param  string $code     The source code
-     * @param  string $filename A unique identifier for the source code
-     *
-     * @return Twig_TokenStream A token stream instance
-     */
-    function tokenize($code, $filename = null);
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Loader/Array.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Loader/Array.php
deleted file mode 100644
index 32bb7e4..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Loader/Array.php
+++ /dev/null
@@ -1,102 +0,0 @@
-
- */
-class Twig_Loader_Array implements Twig_LoaderInterface
-{
-    protected $templates;
-
-    /**
-     * Constructor.
-     *
-     * @param array $templates An array of templates (keys are the names, and values are the source code)
-     *
-     * @see Twig_Loader
-     */
-    public function __construct(array $templates)
-    {
-        $this->templates = array();
-        foreach ($templates as $name => $template) {
-            $this->templates[$name] = $template;
-        }
-    }
-
-    /**
-     * Adds or overrides a template.
-     *
-     * @param string $name     The template name
-     * @param string $template The template source
-     */
-    public function setTemplate($name, $template)
-    {
-        $this->templates[(string) $name] = $template;
-    }
-
-    /**
-     * Gets the source code of a template, given its name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The template source code
-     */
-    public function getSource($name)
-    {
-        $name = (string) $name;
-        if (!isset($this->templates[$name])) {
-            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-        }
-
-        return $this->templates[$name];
-    }
-
-    /**
-     * Gets the cache key to use for the cache for a given template name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The cache key
-     */
-    public function getCacheKey($name)
-    {
-        $name = (string) $name;
-        if (!isset($this->templates[$name])) {
-            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-        }
-
-        return $this->templates[$name];
-    }
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * @param string    $name The template name
-     * @param timestamp $time The last modification time of the cached template
-     */
-    public function isFresh($name, $time)
-    {
-        $name = (string) $name;
-        if (!isset($this->templates[$name])) {
-            throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-        }
-
-        return true;
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Loader/Chain.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Loader/Chain.php
deleted file mode 100644
index 48dd8b8..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Loader/Chain.php
+++ /dev/null
@@ -1,100 +0,0 @@
-
- */
-class Twig_Loader_Chain implements Twig_LoaderInterface
-{
-    protected $loaders;
-
-    /**
-     * Constructor.
-     *
-     * @param Twig_LoaderInterface[] $loaders An array of loader instances
-     */
-    public function __construct(array $loaders = array())
-    {
-        $this->loaders = array();
-        foreach ($loaders as $loader) {
-            $this->addLoader($loader);
-        }
-    }
-
-    /**
-     * Adds a loader instance.
-     *
-     * @param Twig_LoaderInterface $loader A Loader instance
-     */
-    public function addLoader(Twig_LoaderInterface $loader)
-    {
-        $this->loaders[] = $loader;
-    }
-
-    /**
-     * Gets the source code of a template, given its name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The template source code
-     */
-    public function getSource($name)
-    {
-        foreach ($this->loaders as $loader) {
-            try {
-                return $loader->getSource($name);
-            } catch (Twig_Error_Loader $e) {
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-    }
-
-    /**
-     * Gets the cache key to use for the cache for a given template name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The cache key
-     */
-    public function getCacheKey($name)
-    {
-        foreach ($this->loaders as $loader) {
-            try {
-                return $loader->getCacheKey($name);
-            } catch (Twig_Error_Loader $e) {
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-    }
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * @param string    $name The template name
-     * @param timestamp $time The last modification time of the cached template
-     */
-    public function isFresh($name, $time)
-    {
-        foreach ($this->loaders as $loader) {
-            try {
-                return $loader->isFresh($name, $time);
-            } catch (Twig_Error_Loader $e) {
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Template "%s" is not defined.', $name));
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Loader/Filesystem.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Loader/Filesystem.php
deleted file mode 100644
index 5cd40f9..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Loader/Filesystem.php
+++ /dev/null
@@ -1,152 +0,0 @@
-
- */
-class Twig_Loader_Filesystem implements Twig_LoaderInterface
-{
-    protected $paths;
-    protected $cache;
-
-    /**
-     * Constructor.
-     *
-     * @param string|array $paths A path or an array of paths where to look for templates
-     */
-    public function __construct($paths)
-    {
-        $this->setPaths($paths);
-    }
-
-    /**
-     * Returns the paths to the templates.
-     *
-     * @return array The array of paths where to look for templates
-     */
-    public function getPaths()
-    {
-        return $this->paths;
-    }
-
-    /**
-     * Sets the paths where templates are stored.
-     *
-     * @param string|array $paths A path or an array of paths where to look for templates
-     */
-    public function setPaths($paths)
-    {
-        if (!is_array($paths)) {
-            $paths = array($paths);
-        }
-
-        $this->paths = array();
-        foreach ($paths as $path) {
-            $this->addPath($path);
-        }
-    }
-
-    /**
-     * Adds a path where templates are stored.
-     *
-     * @param string $path A path where to look for templates
-     */
-    public function addPath($path)
-    {
-        // invalidate the cache
-        $this->cache = array();
-
-        if (!is_dir($path)) {
-            throw new Twig_Error_Loader(sprintf('The "%s" directory does not exist.', $path));
-        }
-
-        $this->paths[] = $path;
-    }
-
-    /**
-     * Gets the source code of a template, given its name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The template source code
-     */
-    public function getSource($name)
-    {
-        return file_get_contents($this->findTemplate($name));
-    }
-
-    /**
-     * Gets the cache key to use for the cache for a given template name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The cache key
-     */
-    public function getCacheKey($name)
-    {
-        return $this->findTemplate($name);
-    }
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * @param string    $name The template name
-     * @param timestamp $time The last modification time of the cached template
-     */
-    public function isFresh($name, $time)
-    {
-        return filemtime($this->findTemplate($name)) <= $time;
-    }
-
-    protected function findTemplate($name)
-    {
-        // normalize name
-        $name = preg_replace('#/{2,}#', '/', strtr($name, '\\', '/'));
-
-        if (isset($this->cache[$name])) {
-            return $this->cache[$name];
-        }
-
-        $this->validateName($name);
-
-        foreach ($this->paths as $path) {
-            if (is_file($path.'/'.$name)) {
-                return $this->cache[$name] = $path.'/'.$name;
-            }
-        }
-
-        throw new Twig_Error_Loader(sprintf('Unable to find template "%s" (looked into: %s).', $name, implode(', ', $this->paths)));
-    }
-
-    protected function validateName($name)
-    {
-        if (false !== strpos($name, "\0")) {
-            throw new Twig_Error_Loader('A template name cannot contain NUL bytes.');
-        }
-
-        $parts = explode('/', $name);
-        $level = 0;
-        foreach ($parts as $part) {
-            if ('..' === $part) {
-                --$level;
-            } elseif ('.' !== $part) {
-                ++$level;
-            }
-
-            if ($level < 0) {
-                throw new Twig_Error_Loader(sprintf('Looks like you try to load a template outside configured directories (%s).', $name));
-            }
-        }
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Loader/String.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Loader/String.php
deleted file mode 100644
index 26eb009..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Loader/String.php
+++ /dev/null
@@ -1,59 +0,0 @@
-
- */
-class Twig_Loader_String implements Twig_LoaderInterface
-{
-    /**
-     * Gets the source code of a template, given its name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The template source code
-     */
-    public function getSource($name)
-    {
-        return $name;
-    }
-
-    /**
-     * Gets the cache key to use for the cache for a given template name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The cache key
-     */
-    public function getCacheKey($name)
-    {
-        return $name;
-    }
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * @param string    $name The template name
-     * @param timestamp $time The last modification time of the cached template
-     */
-    public function isFresh($name, $time)
-    {
-        return true;
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/LoaderInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/LoaderInterface.php
deleted file mode 100644
index d8ae444..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/LoaderInterface.php
+++ /dev/null
@@ -1,53 +0,0 @@
-
- */
-interface Twig_LoaderInterface
-{
-    /**
-     * Gets the source code of a template, given its name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The template source code
-     *
-     * @throws Twig_Error_Loader When $name is not found
-     */
-    function getSource($name);
-
-    /**
-     * Gets the cache key to use for the cache for a given template name.
-     *
-     * @param  string $name The name of the template to load
-     *
-     * @return string The cache key
-     *
-     * @throws Twig_Error_Loader When $name is not found
-     */
-    function getCacheKey($name);
-
-    /**
-     * Returns true if the template is still fresh.
-     *
-     * @param string    $name The template name
-     * @param timestamp $time The last modification time of the cached template
-     *
-     * @return Boolean true if the template is fresh, false otherwise
-     *
-     * @throws Twig_Error_Loader When $name is not found
-     */
-    function isFresh($name, $time);
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Markup.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Markup.php
deleted file mode 100644
index 7099b29..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Markup.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
- */
-class Twig_Markup implements Countable
-{
-    protected $content;
-    protected $charset;
-
-    public function __construct($content, $charset)
-    {
-        $this->content = (string) $content;
-        $this->charset = $charset;
-    }
-
-    public function __toString()
-    {
-        return $this->content;
-    }
-
-    public function count()
-    {
-        return function_exists('mb_get_info') ? mb_strlen($this->content, $this->charset) : strlen($this->content);
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node.php
deleted file mode 100644
index 651ffc4..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node.php
+++ /dev/null
@@ -1,227 +0,0 @@
-
- */
-class Twig_Node implements Twig_NodeInterface
-{
-    protected $nodes;
-    protected $attributes;
-    protected $lineno;
-    protected $tag;
-
-    /**
-     * Constructor.
-     *
-     * The nodes are automatically made available as properties ($this->node).
-     * The attributes are automatically made available as array items ($this['name']).
-     *
-     * @param array   $nodes      An array of named nodes
-     * @param array   $attributes An array of attributes (should not be nodes)
-     * @param integer $lineno     The line number
-     * @param string  $tag        The tag name associated with the Node
-     */
-    public function __construct(array $nodes = array(), array $attributes = array(), $lineno = 0, $tag = null)
-    {
-        $this->nodes = $nodes;
-        $this->attributes = $attributes;
-        $this->lineno = $lineno;
-        $this->tag = $tag;
-    }
-
-    public function __toString()
-    {
-        $attributes = array();
-        foreach ($this->attributes as $name => $value) {
-            $attributes[] = sprintf('%s: %s', $name, str_replace("\n", '', var_export($value, true)));
-        }
-
-        $repr = array(get_class($this).'('.implode(', ', $attributes));
-
-        if (count($this->nodes)) {
-            foreach ($this->nodes as $name => $node) {
-                $len = strlen($name) + 4;
-                $noderepr = array();
-                foreach (explode("\n", (string) $node) as $line) {
-                    $noderepr[] = str_repeat(' ', $len).$line;
-                }
-
-                $repr[] = sprintf('  %s: %s', $name, ltrim(implode("\n", $noderepr)));
-            }
-
-            $repr[] = ')';
-        } else {
-            $repr[0] .= ')';
-        }
-
-        return implode("\n", $repr);
-    }
-
-    public function toXml($asDom = false)
-    {
-        $dom = new DOMDocument('1.0', 'UTF-8');
-        $dom->formatOutput = true;
-        $dom->appendChild($xml = $dom->createElement('twig'));
-
-        $xml->appendChild($node = $dom->createElement('node'));
-        $node->setAttribute('class', get_class($this));
-
-        foreach ($this->attributes as $name => $value) {
-            $node->appendChild($attribute = $dom->createElement('attribute'));
-            $attribute->setAttribute('name', $name);
-            $attribute->appendChild($dom->createTextNode($value));
-        }
-
-        foreach ($this->nodes as $name => $n) {
-            if (null === $n) {
-                continue;
-            }
-
-            $child = $n->toXml(true)->getElementsByTagName('node')->item(0);
-            $child = $dom->importNode($child, true);
-            $child->setAttribute('name', $name);
-
-            $node->appendChild($child);
-        }
-
-        return $asDom ? $dom : $dom->saveXml();
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        foreach ($this->nodes as $node) {
-            $node->compile($compiler);
-        }
-    }
-
-    public function getLine()
-    {
-        return $this->lineno;
-    }
-
-    public function getNodeTag()
-    {
-        return $this->tag;
-    }
-
-    /**
-     * Returns true if the attribute is defined.
-     *
-     * @param  string  The attribute name
-     *
-     * @return Boolean true if the attribute is defined, false otherwise
-     */
-    public function hasAttribute($name)
-    {
-        return array_key_exists($name, $this->attributes);
-    }
-
-    /**
-     * Gets an attribute.
-     *
-     * @param  string The attribute name
-     *
-     * @return mixed  The attribute value
-     */
-    public function getAttribute($name)
-    {
-        if (!array_key_exists($name, $this->attributes)) {
-            throw new Twig_Error_Runtime(sprintf('Attribute "%s" does not exist for Node "%s".', $name, get_class($this)));
-        }
-
-        return $this->attributes[$name];
-    }
-
-    /**
-     * Sets an attribute.
-     *
-     * @param string The attribute name
-     * @param mixed  The attribute value
-     */
-    public function setAttribute($name, $value)
-    {
-        $this->attributes[$name] = $value;
-    }
-
-    /**
-     * Removes an attribute.
-     *
-     * @param string The attribute name
-     */
-    public function removeAttribute($name)
-    {
-        unset($this->attributes[$name]);
-    }
-
-    /**
-     * Returns true if the node with the given identifier exists.
-     *
-     * @param  string  The node name
-     *
-     * @return Boolean true if the node with the given name exists, false otherwise
-     */
-    public function hasNode($name)
-    {
-        return array_key_exists($name, $this->nodes);
-    }
-
-    /**
-     * Gets a node by name.
-     *
-     * @param  string The node name
-     *
-     * @return Twig_Node A Twig_Node instance
-     */
-    public function getNode($name)
-    {
-        if (!array_key_exists($name, $this->nodes)) {
-            throw new Twig_Error_Runtime(sprintf('Node "%s" does not exist for Node "%s".', $name, get_class($this)));
-        }
-
-        return $this->nodes[$name];
-    }
-
-    /**
-     * Sets a node.
-     *
-     * @param string    The node name
-     * @param Twig_Node A Twig_Node instance
-     */
-    public function setNode($name, $node = null)
-    {
-        $this->nodes[$name] = $node;
-    }
-
-    /**
-     * Removes a node by name.
-     *
-     * @param string The node name
-     */
-    public function removeNode($name)
-    {
-        unset($this->nodes[$name]);
-    }
-
-    public function count()
-    {
-        return count($this->nodes);
-    }
-
-    public function getIterator()
-    {
-        return new ArrayIterator($this->nodes);
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/AutoEscape.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/AutoEscape.php
deleted file mode 100644
index a0c2ee6..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/AutoEscape.php
+++ /dev/null
@@ -1,40 +0,0 @@
-
- */
-class Twig_Node_AutoEscape extends Twig_Node
-{
-    public function __construct($value, Twig_NodeInterface $body, $lineno, $tag = 'autoescape')
-    {
-        parent::__construct(array('body' => $body), array('value' => $value), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->subcompile($this->getNode('body'));
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Block.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Block.php
deleted file mode 100644
index 5548ad0..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Block.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
- */
-class Twig_Node_Block extends Twig_Node
-{
-    public function __construct($name, Twig_NodeInterface $body, $lineno, $tag = null)
-    {
-        parent::__construct(array('body' => $body), array('name' => $name), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write(sprintf("public function block_%s(\$context, array \$blocks = array())\n", $this->getAttribute('name')), "{\n")
-            ->indent()
-        ;
-
-        $compiler
-            ->subcompile($this->getNode('body'))
-            ->outdent()
-            ->write("}\n\n")
-        ;
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/BlockReference.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/BlockReference.php
deleted file mode 100644
index 53f6287..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/BlockReference.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
- */
-class Twig_Node_BlockReference extends Twig_Node implements Twig_NodeOutputInterface
-{
-    public function __construct($name, $lineno, $tag = null)
-    {
-        parent::__construct(array(), array('name' => $name), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write(sprintf("\$this->displayBlock('%s', \$context, \$blocks);\n", $this->getAttribute('name')))
-        ;
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Body.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Body.php
deleted file mode 100644
index f72bf50..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Body.php
+++ /dev/null
@@ -1,20 +0,0 @@
-
- */
-class Twig_Node_Body extends Twig_Node
-{
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Do.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Do.php
deleted file mode 100644
index aa419d9..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Do.php
+++ /dev/null
@@ -1,39 +0,0 @@
-
- */
-class Twig_Node_Do extends Twig_Node
-{
-    public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null)
-    {
-        parent::__construct(array('expr' => $expr), array(), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->addDebugInfo($this)
-            ->write('')
-            ->subcompile($this->getNode('expr'))
-            ->raw(";\n")
-        ;
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Embed.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Embed.php
deleted file mode 100644
index 7daffe4..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Embed.php
+++ /dev/null
@@ -1,39 +0,0 @@
-
- */
-class Twig_Node_Embed extends Twig_Node_Include
-{
-    // we don't inject the module to avoid node visitors to traverse it twice (as it will be already visited in the main module)
-    public function __construct($filename, $index, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null)
-    {
-        parent::__construct(new Twig_Node_Expression_Constant('not_used', $lineno), $variables, $only, $ignoreMissing, $lineno, $tag);
-
-        $this->setAttribute('filename', $filename);
-        $this->setAttribute('index', $index);
-    }
-
-    protected function addGetTemplate(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->write("\$this->env->loadTemplate(")
-            ->string($this->getAttribute('filename'))
-            ->raw(', ')
-            ->string($this->getAttribute('index'))
-            ->raw(")")
-        ;
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression.php
deleted file mode 100644
index 13b170e..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression.php
+++ /dev/null
@@ -1,21 +0,0 @@
-
- */
-abstract class Twig_Node_Expression extends Twig_Node
-{
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Array.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Array.php
deleted file mode 100644
index 1da785f..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Array.php
+++ /dev/null
@@ -1,86 +0,0 @@
-index = -1;
-        foreach ($this->getKeyValuePairs() as $pair) {
-            if ($pair['key'] instanceof Twig_Node_Expression_Constant && ctype_digit((string) $pair['key']->getAttribute('value')) && $pair['key']->getAttribute('value') > $this->index) {
-                $this->index = $pair['key']->getAttribute('value');
-            }
-        }
-    }
-
-    public function getKeyValuePairs()
-    {
-        $pairs = array();
-
-        foreach (array_chunk($this->nodes, 2) as $pair) {
-            $pairs[] = array(
-                'key' => $pair[0],
-                'value' => $pair[1],
-            );
-        }
-
-        return $pairs;
-    }
-
-    public function hasElement(Twig_Node_Expression $key)
-    {
-        foreach ($this->getKeyValuePairs() as $pair) {
-            // we compare the string representation of the keys
-            // to avoid comparing the line numbers which are not relevant here.
-            if ((string) $key == (string) $pair['key']) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public function addElement(Twig_Node_Expression $value, Twig_Node_Expression $key = null)
-    {
-        if (null === $key) {
-            $key = new Twig_Node_Expression_Constant(++$this->index, $value->getLine());
-        }
-
-        array_push($this->nodes, $key, $value);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw('array(');
-        $first = true;
-        foreach ($this->getKeyValuePairs() as $pair) {
-            if (!$first) {
-                $compiler->raw(', ');
-            }
-            $first = false;
-
-            $compiler
-                ->subcompile($pair['key'])
-                ->raw(' => ')
-                ->subcompile($pair['value'])
-            ;
-        }
-        $compiler->raw(')');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/AssignName.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/AssignName.php
deleted file mode 100644
index 2ddea78..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/AssignName.php
+++ /dev/null
@@ -1,28 +0,0 @@
-raw('$context[')
-            ->string($this->getAttribute('name'))
-            ->raw(']')
-        ;
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary.php
deleted file mode 100644
index 9dd5de2..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary.php
+++ /dev/null
@@ -1,40 +0,0 @@
- $left, 'right' => $right), array(), $lineno);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('(')
-            ->subcompile($this->getNode('left'))
-            ->raw(' ')
-        ;
-        $this->operator($compiler);
-        $compiler
-            ->raw(' ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    abstract public function operator(Twig_Compiler $compiler);
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Add.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Add.php
deleted file mode 100644
index 0ef8e11..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Add.php
+++ /dev/null
@@ -1,18 +0,0 @@
-raw('+');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/And.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/And.php
deleted file mode 100644
index d5752eb..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/And.php
+++ /dev/null
@@ -1,18 +0,0 @@
-raw('&&');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
deleted file mode 100644
index 9a46d84..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
+++ /dev/null
@@ -1,18 +0,0 @@
-raw('&');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
deleted file mode 100644
index 058a20b..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
+++ /dev/null
@@ -1,18 +0,0 @@
-raw('|');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
deleted file mode 100644
index f4da73d..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
+++ /dev/null
@@ -1,18 +0,0 @@
-raw('^');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Concat.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Concat.php
deleted file mode 100644
index f9a6462..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Concat.php
+++ /dev/null
@@ -1,18 +0,0 @@
-raw('.');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Div.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Div.php
deleted file mode 100644
index e0797a6..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Div.php
+++ /dev/null
@@ -1,18 +0,0 @@
-raw('/');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Equal.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Equal.php
deleted file mode 100644
index 7b1236d..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Equal.php
+++ /dev/null
@@ -1,17 +0,0 @@
-raw('==');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/FloorDiv.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
deleted file mode 100644
index 7fbd055..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
+++ /dev/null
@@ -1,29 +0,0 @@
-raw('intval(floor(');
-        parent::compile($compiler);
-        $compiler->raw('))');
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('/');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Greater.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Greater.php
deleted file mode 100644
index a110bd9..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Greater.php
+++ /dev/null
@@ -1,17 +0,0 @@
-raw('>');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
deleted file mode 100644
index 3754fed..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
+++ /dev/null
@@ -1,17 +0,0 @@
-raw('>=');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/In.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/In.php
deleted file mode 100644
index 788f937..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/In.php
+++ /dev/null
@@ -1,33 +0,0 @@
-raw('twig_in_filter(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('in');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Less.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Less.php
deleted file mode 100644
index 45fd300..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Less.php
+++ /dev/null
@@ -1,17 +0,0 @@
-raw('<');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/LessEqual.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/LessEqual.php
deleted file mode 100644
index e38e257..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/LessEqual.php
+++ /dev/null
@@ -1,17 +0,0 @@
-raw('<=');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Mod.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Mod.php
deleted file mode 100644
index 9924114..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Mod.php
+++ /dev/null
@@ -1,18 +0,0 @@
-raw('%');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Mul.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Mul.php
deleted file mode 100644
index c91529c..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Mul.php
+++ /dev/null
@@ -1,18 +0,0 @@
-raw('*');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/NotEqual.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/NotEqual.php
deleted file mode 100644
index 26867ba..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/NotEqual.php
+++ /dev/null
@@ -1,17 +0,0 @@
-raw('!=');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/NotIn.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/NotIn.php
deleted file mode 100644
index f347b7b..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/NotIn.php
+++ /dev/null
@@ -1,33 +0,0 @@
-raw('!twig_in_filter(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('not in');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Or.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Or.php
deleted file mode 100644
index adba49c..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Or.php
+++ /dev/null
@@ -1,18 +0,0 @@
-raw('||');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Power.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Power.php
deleted file mode 100644
index b2c5904..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Power.php
+++ /dev/null
@@ -1,33 +0,0 @@
-raw('pow(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('**');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Range.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Range.php
deleted file mode 100644
index bea4f2a..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Range.php
+++ /dev/null
@@ -1,33 +0,0 @@
-raw('range(')
-            ->subcompile($this->getNode('left'))
-            ->raw(', ')
-            ->subcompile($this->getNode('right'))
-            ->raw(')')
-        ;
-    }
-
-    public function operator(Twig_Compiler $compiler)
-    {
-        return $compiler->raw('..');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Sub.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Sub.php
deleted file mode 100644
index d446399..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Binary/Sub.php
+++ /dev/null
@@ -1,18 +0,0 @@
-raw('-');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/BlockReference.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/BlockReference.php
deleted file mode 100644
index 174d909..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/BlockReference.php
+++ /dev/null
@@ -1,52 +0,0 @@
-
- */
-class Twig_Node_Expression_BlockReference extends Twig_Node_Expression
-{
-    public function __construct(Twig_NodeInterface $name, $asString = false, $lineno, $tag = null)
-    {
-        parent::__construct(array('name' => $name), array('as_string' => $asString, 'output' => false), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        if ($this->getAttribute('as_string')) {
-            $compiler->raw('(string) ');
-        }
-
-        if ($this->getAttribute('output')) {
-            $compiler
-                ->addDebugInfo($this)
-                ->write("\$this->displayBlock(")
-                ->subcompile($this->getNode('name'))
-                ->raw(", \$context, \$blocks);\n")
-            ;
-        } else {
-            $compiler
-                ->raw("\$this->renderBlock(")
-                ->subcompile($this->getNode('name'))
-                ->raw(", \$context, \$blocks)")
-            ;
-        }
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Conditional.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Conditional.php
deleted file mode 100644
index edcb1e2..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Conditional.php
+++ /dev/null
@@ -1,31 +0,0 @@
- $expr1, 'expr2' => $expr2, 'expr3' => $expr3), array(), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->raw('((')
-            ->subcompile($this->getNode('expr1'))
-            ->raw(') ? (')
-            ->subcompile($this->getNode('expr2'))
-            ->raw(') : (')
-            ->subcompile($this->getNode('expr3'))
-            ->raw('))')
-        ;
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Constant.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Constant.php
deleted file mode 100644
index a91dc69..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Constant.php
+++ /dev/null
@@ -1,23 +0,0 @@
- $value), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->repr($this->getAttribute('value'));
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/ExtensionReference.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/ExtensionReference.php
deleted file mode 100644
index cb4efad..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/ExtensionReference.php
+++ /dev/null
@@ -1,34 +0,0 @@
-
- */
-class Twig_Node_Expression_ExtensionReference extends Twig_Node_Expression
-{
-    public function __construct($name, $lineno, $tag = null)
-    {
-        parent::__construct(array(), array('name' => $name), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw(sprintf("\$this->env->getExtension('%s')", $this->getAttribute('name')));
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Filter.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Filter.php
deleted file mode 100644
index 8a0903a..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Filter.php
+++ /dev/null
@@ -1,61 +0,0 @@
- $node, 'filter' => $filterName, 'arguments' => $arguments), array(), $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getNode('filter')->getAttribute('value');
-
-        if (false === $filter = $compiler->getEnvironment()->getFilter($name)) {
-            $message = sprintf('The filter "%s" does not exist', $name);
-            if ($alternatives = $compiler->getEnvironment()->computeAlternatives($name, array_keys($compiler->getEnvironment()->getFilters()))) {
-                $message = sprintf('%s. Did you mean "%s"', $message, implode('", "', $alternatives));
-            }
-
-            throw new Twig_Error_Syntax($message, $this->getLine());
-        }
-
-        $this->compileFilter($compiler, $filter);
-    }
-
-    protected function compileFilter(Twig_Compiler $compiler, Twig_FilterInterface $filter)
-    {
-        $compiler
-            ->raw($filter->compile().'(')
-            ->raw($filter->needsEnvironment() ? '$this->env, ' : '')
-            ->raw($filter->needsContext() ? '$context, ' : '')
-        ;
-
-        foreach ($filter->getArguments() as $argument) {
-            $compiler
-                ->string($argument)
-                ->raw(', ')
-            ;
-        }
-
-        $compiler->subcompile($this->getNode('node'));
-
-        foreach ($this->getNode('arguments') as $node) {
-            $compiler
-                ->raw(', ')
-                ->subcompile($node)
-            ;
-        }
-
-        $compiler->raw(')');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Filter/Default.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Filter/Default.php
deleted file mode 100644
index 1cb3342..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Filter/Default.php
+++ /dev/null
@@ -1,44 +0,0 @@
-
- *  {{ var.foo|default('foo item on var is not defined') }}
- * 

- *
- * @package twig
- * @author  Fabien Potencier 
- */
-class Twig_Node_Expression_Filter_Default extends Twig_Node_Expression_Filter
-{
-    public function __construct(Twig_NodeInterface $node, Twig_Node_Expression_Constant $filterName, Twig_NodeInterface $arguments, $lineno, $tag = null)
-    {
-        $default = new Twig_Node_Expression_Filter($node, new Twig_Node_Expression_Constant('_default', $node->getLine()), $arguments, $node->getLine());
-
-        if ('default' === $filterName->getAttribute('value') && ($node instanceof Twig_Node_Expression_Name || $node instanceof Twig_Node_Expression_GetAttr)) {
-            $test = new Twig_Node_Expression_Test_Defined(clone $node, 'defined', new Twig_Node(), $node->getLine());
-            $false = count($arguments) ? $arguments->getNode(0) : new Twig_Node_Expression_Constant('', $node->getLine());
-
-            $node = new Twig_Node_Expression_Conditional($test, $default, $false, $node->getLine());
-        } else {
-            $node = $default;
-        }
-
-        parent::__construct($node, $filterName, $arguments, $lineno, $tag);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->subcompile($this->getNode('node'));
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Function.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Function.php
deleted file mode 100644
index 9342bb1..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Function.php
+++ /dev/null
@@ -1,66 +0,0 @@
- $arguments), array('name' => $name), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getAttribute('name');
-
-        if (false === $function = $compiler->getEnvironment()->getFunction($name)) {
-            $message = sprintf('The function "%s" does not exist', $name);
-            if ($alternatives = $compiler->getEnvironment()->computeAlternatives($name, array_keys($compiler->getEnvironment()->getFunctions()))) {
-                $message = sprintf('%s. Did you mean "%s"', $message, implode('", "', $alternatives));
-            }
-
-            throw new Twig_Error_Syntax($message, $this->getLine());
-        }
-
-        $compiler->raw($function->compile().'(');
-
-        $first = true;
-
-        if ($function->needsEnvironment()) {
-            $compiler->raw('$this->env');
-            $first = false;
-        }
-
-        if ($function->needsContext()) {
-            if (!$first) {
-                $compiler->raw(', ');
-            }
-            $compiler->raw('$context');
-            $first = false;
-        }
-
-        foreach ($function->getArguments() as $argument) {
-            if (!$first) {
-                $compiler->raw(', ');
-            }
-            $compiler->string($argument);
-            $first = false;
-        }
-
-        foreach ($this->getNode('arguments') as $node) {
-            if (!$first) {
-                $compiler->raw(', ');
-            }
-            $compiler->subcompile($node);
-            $first = false;
-        }
-
-        $compiler->raw(')');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/GetAttr.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/GetAttr.php
deleted file mode 100644
index 6498444..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/GetAttr.php
+++ /dev/null
@@ -1,53 +0,0 @@
- $node, 'attribute' => $attribute, 'arguments' => $arguments), array('type' => $type, 'is_defined_test' => false, 'ignore_strict_check' => false), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        if (function_exists('twig_template_get_attributes')) {
-            $compiler->raw('twig_template_get_attributes($this, ');
-        } else {
-            $compiler->raw('$this->getAttribute(');
-        }
-
-        if ($this->getAttribute('ignore_strict_check')) {
-            $this->getNode('node')->setAttribute('ignore_strict_check', true);
-        }
-
-        $compiler->subcompile($this->getNode('node'));
-
-        $compiler->raw(', ')->subcompile($this->getNode('attribute'));
-
-        if (count($this->getNode('arguments')) || Twig_TemplateInterface::ANY_CALL !== $this->getAttribute('type') || $this->getAttribute('is_defined_test') || $this->getAttribute('ignore_strict_check')) {
-            $compiler->raw(', ')->subcompile($this->getNode('arguments'));
-
-            if (Twig_TemplateInterface::ANY_CALL !== $this->getAttribute('type') || $this->getAttribute('is_defined_test') || $this->getAttribute('ignore_strict_check')) {
-                $compiler->raw(', ')->repr($this->getAttribute('type'));
-            }
-
-            if ($this->getAttribute('is_defined_test') || $this->getAttribute('ignore_strict_check')) {
-                $compiler->raw(', '.($this->getAttribute('is_defined_test') ? 'true' : 'false'));
-            }
-
-            if ($this->getAttribute('ignore_strict_check')) {
-                $compiler->raw(', '.($this->getAttribute('ignore_strict_check') ? 'true' : 'false'));
-            }
-        }
-
-        $compiler->raw(')');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/MethodCall.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/MethodCall.php
deleted file mode 100644
index 485813d..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/MethodCall.php
+++ /dev/null
@@ -1,37 +0,0 @@
- $node, 'arguments' => $arguments), array('method' => $method, 'safe' => false), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler
-            ->subcompile($this->getNode('node'))
-            ->raw('->')
-            ->raw($this->getAttribute('method'))
-            ->raw('(')
-        ;
-        $first = true;
-        foreach ($this->getNode('arguments')->getKeyValuePairs() as $pair) {
-            if (!$first) {
-                $compiler->raw(', ');
-            }
-            $first = false;
-
-            $compiler->subcompile($pair['value']);
-        }
-        $compiler->raw(')');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Name.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Name.php
deleted file mode 100644
index 8f5a1ea..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Name.php
+++ /dev/null
@@ -1,76 +0,0 @@
- '$this',
-        '_context' => '$context',
-        '_charset' => '$this->env->getCharset()',
-    );
-
-    public function __construct($name, $lineno)
-    {
-        parent::__construct(array(), array('name' => $name, 'is_defined_test' => false, 'ignore_strict_check' => false), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getAttribute('name');
-
-        if ($this->getAttribute('is_defined_test')) {
-            if ($this->isSpecial()) {
-                $compiler->repr(true);
-            } else {
-                $compiler->raw('array_key_exists(')->repr($name)->raw(', $context)');
-            }
-        } elseif ($this->isSpecial()) {
-            $compiler->raw($this->specialVars[$name]);
-        } else {
-            // remove the non-PHP 5.4 version when PHP 5.3 support is dropped
-            // as the non-optimized version is just a workaround for slow ternary operator
-            // when the context has a lot of variables
-            if (version_compare(phpversion(), '5.4.0RC1', '>=') && ($this->getAttribute('ignore_strict_check') || !$compiler->getEnvironment()->isStrictVariables())) {
-                // PHP 5.4 ternary operator performance was optimized
-                $compiler
-                    ->raw('(isset($context[')
-                    ->string($name)
-                    ->raw(']) ? $context[')
-                    ->string($name)
-                    ->raw('] : null)')
-                ;
-            } else {
-                $compiler
-                    ->raw('$this->getContext($context, ')
-                    ->string($name)
-                ;
-
-                if ($this->getAttribute('ignore_strict_check')) {
-                    $compiler->raw(', true');
-                }
-
-                $compiler
-                    ->raw(')')
-                ;
-            }
-        }
-    }
-
-    public function isSpecial()
-    {
-        return isset($this->specialVars[$this->getAttribute('name')]);
-    }
-
-    public function isSimple()
-    {
-        return !$this->isSpecial() && !$this->getAttribute('is_defined_test');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Parent.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Parent.php
deleted file mode 100644
index ea97349..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Parent.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
- */
-class Twig_Node_Expression_Parent extends Twig_Node_Expression
-{
-    public function __construct($name, $lineno, $tag = null)
-    {
-        parent::__construct(array(), array('output' => false, 'name' => $name), $lineno, $tag);
-    }
-
-    /**
-     * Compiles the node to PHP.
-     *
-     * @param Twig_Compiler A Twig_Compiler instance
-     */
-    public function compile(Twig_Compiler $compiler)
-    {
-        if ($this->getAttribute('output')) {
-            $compiler
-                ->addDebugInfo($this)
-                ->write("\$this->displayParentBlock(")
-                ->string($this->getAttribute('name'))
-                ->raw(", \$context, \$blocks);\n")
-            ;
-        } else {
-            $compiler
-                ->raw("\$this->renderParentBlock(")
-                ->string($this->getAttribute('name'))
-                ->raw(", \$context, \$blocks)")
-            ;
-        }
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/TempName.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/TempName.php
deleted file mode 100644
index eea9d47..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/TempName.php
+++ /dev/null
@@ -1,22 +0,0 @@
- $name), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $compiler->raw('$_')->raw($this->getAttribute('name'))->raw('_');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test.php
deleted file mode 100644
index 4e0b25e..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test.php
+++ /dev/null
@@ -1,54 +0,0 @@
- $node, 'arguments' => $arguments), array('name' => $name), $lineno);
-    }
-
-    public function compile(Twig_Compiler $compiler)
-    {
-        $name = $this->getAttribute('name');
-        $testMap = $compiler->getEnvironment()->getTests();
-        if (!isset($testMap[$name])) {
-            $message = sprintf('The test "%s" does not exist', $name);
-            if ($alternatives = $compiler->getEnvironment()->computeAlternatives($name, array_keys($compiler->getEnvironment()->getTests()))) {
-                $message = sprintf('%s. Did you mean "%s"', $message, implode('", "', $alternatives));
-            }
-
-            throw new Twig_Error_Syntax($message, $this->getLine());
-        }
-
-        $name = $this->getAttribute('name');
-        $node = $this->getNode('node');
-
-        $compiler
-            ->raw($testMap[$name]->compile().'(')
-            ->subcompile($node)
-        ;
-
-        if (null !== $this->getNode('arguments')) {
-            $compiler->raw(', ');
-
-            $max = count($this->getNode('arguments')) - 1;
-            foreach ($this->getNode('arguments') as $i => $arg) {
-                $compiler->subcompile($arg);
-
-                if ($i != $max) {
-                    $compiler->raw(', ');
-                }
-            }
-        }
-
-        $compiler->raw(')');
-    }
-}
diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Constant.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Constant.php
deleted file mode 100644
index 6e6b6fd..0000000
--- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Constant.php
+++ /dev/null
@@ -1,36 +0,0 @@
-
- *  {% if post.status is constant('Post::PUBLISHED') %}
- *    the status attribute is exactly the same as Post::PUBLISHED
- *  {% endif %}
- *
- * - * @package twig - * @author Fabien Potencier - */ -class Twig_Node_Expression_Test_Constant extends Twig_Node_Expression_Test -{ - public function compile(Twig_Compiler $compiler) - { - $compiler - ->raw('(') - ->subcompile($this->getNode('node')) - ->raw(' === constant(') - ->subcompile($this->getNode('arguments')->getNode(0)) - ->raw('))') - ; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Defined.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Defined.php deleted file mode 100644 index e7c6828..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Defined.php +++ /dev/null @@ -1,55 +0,0 @@ - - * {# defined works with variable names and variable attributes #} - * {% if foo is defined %} - * {# ... #} - * {% endif %} - * - * - * @package twig - * @author Fabien Potencier - */ -class Twig_Node_Expression_Test_Defined extends Twig_Node_Expression_Test -{ - public function __construct(Twig_NodeInterface $node, $name, Twig_NodeInterface $arguments = null, $lineno) - { - parent::__construct($node, $name, $arguments, $lineno); - - if ($node instanceof Twig_Node_Expression_Name) { - $node->setAttribute('is_defined_test', true); - } elseif ($node instanceof Twig_Node_Expression_GetAttr) { - $node->setAttribute('is_defined_test', true); - - $this->changeIgnoreStrictCheck($node); - } else { - throw new Twig_Error_Syntax('The "defined" test only works with simple variables', $this->getLine()); - } - } - - protected function changeIgnoreStrictCheck(Twig_Node_Expression_GetAttr $node) - { - $node->setAttribute('ignore_strict_check', true); - - if ($node->getNode('node') instanceof Twig_Node_Expression_GetAttr) { - $this->changeIgnoreStrictCheck($node->getNode('node')); - } - } - - public function compile(Twig_Compiler $compiler) - { - $compiler->subcompile($this->getNode('node')); - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Divisibleby.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Divisibleby.php deleted file mode 100644 index 05563d5..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Divisibleby.php +++ /dev/null @@ -1,34 +0,0 @@ - - * {% if loop.index is divisibleby(3) %} - * - * - * @package twig - * @author Fabien Potencier - */ -class Twig_Node_Expression_Test_Divisibleby extends Twig_Node_Expression_Test -{ - public function compile(Twig_Compiler $compiler) - { - $compiler - ->raw('(0 == ') - ->subcompile($this->getNode('node')) - ->raw(' % ') - ->subcompile($this->getNode('arguments')->getNode(0)) - ->raw(')') - ; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Even.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Even.php deleted file mode 100644 index 08e6d82..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Even.php +++ /dev/null @@ -1,33 +0,0 @@ - - * {{ var is even }} - * - * - * @package twig - * @author Fabien Potencier - */ -class Twig_Node_Expression_Test_Even extends Twig_Node_Expression_Test -{ - public function compile(Twig_Compiler $compiler) - { - $compiler - ->raw('(') - ->subcompile($this->getNode('node')) - ->raw(' % 2 == 0') - ->raw(')') - ; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Null.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Null.php deleted file mode 100644 index 55061db..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Null.php +++ /dev/null @@ -1,32 +0,0 @@ - - * {{ var is none }} - * - * - * @package twig - * @author Fabien Potencier - */ -class Twig_Node_Expression_Test_Null extends Twig_Node_Expression_Test -{ - public function compile(Twig_Compiler $compiler) - { - $compiler - ->raw('(null === ') - ->subcompile($this->getNode('node')) - ->raw(')') - ; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Odd.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Odd.php deleted file mode 100644 index 5fecebc..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Odd.php +++ /dev/null @@ -1,33 +0,0 @@ - - * {{ var is odd }} - * - * - * @package twig - * @author Fabien Potencier - */ -class Twig_Node_Expression_Test_Odd extends Twig_Node_Expression_Test -{ - public function compile(Twig_Compiler $compiler) - { - $compiler - ->raw('(') - ->subcompile($this->getNode('node')) - ->raw(' % 2 == 1') - ->raw(')') - ; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Sameas.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Sameas.php deleted file mode 100644 index 8639b96..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Test/Sameas.php +++ /dev/null @@ -1,30 +0,0 @@ - - */ -class Twig_Node_Expression_Test_Sameas extends Twig_Node_Expression_Test -{ - public function compile(Twig_Compiler $compiler) - { - $compiler - ->raw('(') - ->subcompile($this->getNode('node')) - ->raw(' === ') - ->subcompile($this->getNode('arguments')->getNode(0)) - ->raw(')') - ; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Unary.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Unary.php deleted file mode 100644 index c514388..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Unary.php +++ /dev/null @@ -1,30 +0,0 @@ - $node), array(), $lineno); - } - - public function compile(Twig_Compiler $compiler) - { - $compiler->raw('('); - $this->operator($compiler); - $compiler - ->subcompile($this->getNode('node')) - ->raw(')') - ; - } - - abstract public function operator(Twig_Compiler $compiler); -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Unary/Neg.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Unary/Neg.php deleted file mode 100644 index 2a3937e..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Unary/Neg.php +++ /dev/null @@ -1,18 +0,0 @@ -raw('-'); - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Unary/Not.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Unary/Not.php deleted file mode 100644 index f94073c..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Unary/Not.php +++ /dev/null @@ -1,18 +0,0 @@ -raw('!'); - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Unary/Pos.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Unary/Pos.php deleted file mode 100644 index 04edb52..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Expression/Unary/Pos.php +++ /dev/null @@ -1,18 +0,0 @@ -raw('+'); - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Flush.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Flush.php deleted file mode 100644 index 8f2ab9d..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Flush.php +++ /dev/null @@ -1,37 +0,0 @@ - - */ -class Twig_Node_Flush extends Twig_Node -{ - public function __construct($lineno, $tag) - { - parent::__construct(array(), array(), $lineno, $tag); - } - - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - public function compile(Twig_Compiler $compiler) - { - $compiler - ->addDebugInfo($this) - ->write("flush();\n") - ; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/For.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/For.php deleted file mode 100644 index d9d25b3..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/For.php +++ /dev/null @@ -1,113 +0,0 @@ - - */ -class Twig_Node_For extends Twig_Node -{ - protected $loop; - - public function __construct(Twig_Node_Expression_AssignName $keyTarget, Twig_Node_Expression_AssignName $valueTarget, Twig_Node_Expression $seq, Twig_Node_Expression $ifexpr = null, Twig_NodeInterface $body, Twig_NodeInterface $else = null, $lineno, $tag = null) - { - $body = new Twig_Node(array($body, $this->loop = new Twig_Node_ForLoop($lineno, $tag))); - - if (null !== $ifexpr) { - $body = new Twig_Node_If(new Twig_Node(array($ifexpr, $body)), null, $lineno, $tag); - } - - parent::__construct(array('key_target' => $keyTarget, 'value_target' => $valueTarget, 'seq' => $seq, 'body' => $body, 'else' => $else), array('with_loop' => true, 'ifexpr' => null !== $ifexpr), $lineno, $tag); - } - - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - public function compile(Twig_Compiler $compiler) - { - $compiler - ->addDebugInfo($this) - // the (array) cast bypasses a PHP 5.2.6 bug - ->write("\$context['_parent'] = (array) \$context;\n") - ->write("\$context['_seq'] = twig_ensure_traversable(") - ->subcompile($this->getNode('seq')) - ->raw(");\n") - ; - - if (null !== $this->getNode('else')) { - $compiler->write("\$context['_iterated'] = false;\n"); - } - - if ($this->getAttribute('with_loop')) { - $compiler - ->write("\$context['loop'] = array(\n") - ->write(" 'parent' => \$context['_parent'],\n") - ->write(" 'index0' => 0,\n") - ->write(" 'index' => 1,\n") - ->write(" 'first' => true,\n") - ->write(");\n") - ; - - if (!$this->getAttribute('ifexpr')) { - $compiler - ->write("if (is_array(\$context['_seq']) || (is_object(\$context['_seq']) && \$context['_seq'] instanceof Countable)) {\n") - ->indent() - ->write("\$length = count(\$context['_seq']);\n") - ->write("\$context['loop']['revindex0'] = \$length - 1;\n") - ->write("\$context['loop']['revindex'] = \$length;\n") - ->write("\$context['loop']['length'] = \$length;\n") - ->write("\$context['loop']['last'] = 1 === \$length;\n") - ->outdent() - ->write("}\n") - ; - } - } - - $this->loop->setAttribute('else', null !== $this->getNode('else')); - $this->loop->setAttribute('with_loop', $this->getAttribute('with_loop')); - $this->loop->setAttribute('ifexpr', $this->getAttribute('ifexpr')); - - $compiler - ->write("foreach (\$context['_seq'] as ") - ->subcompile($this->getNode('key_target')) - ->raw(" => ") - ->subcompile($this->getNode('value_target')) - ->raw(") {\n") - ->indent() - ->subcompile($this->getNode('body')) - ->outdent() - ->write("}\n") - ; - - if (null !== $this->getNode('else')) { - $compiler - ->write("if (!\$context['_iterated']) {\n") - ->indent() - ->subcompile($this->getNode('else')) - ->outdent() - ->write("}\n") - ; - } - - $compiler->write("\$_parent = \$context['_parent'];\n"); - - // remove some "private" loop variables (needed for nested loops) - $compiler->write('unset($context[\'_seq\'], $context[\'_iterated\'], $context[\''.$this->getNode('key_target')->getAttribute('name').'\'], $context[\''.$this->getNode('value_target')->getAttribute('name').'\'], $context[\'_parent\'], $context[\'loop\']);'."\n"); - - // keep the values set in the inner context for variables defined in the outer context - $compiler->write("\$context = array_merge(\$_parent, array_intersect_key(\$context, \$_parent));\n"); - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/ForLoop.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/ForLoop.php deleted file mode 100644 index 38f2e85..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/ForLoop.php +++ /dev/null @@ -1,56 +0,0 @@ - - */ -class Twig_Node_ForLoop extends Twig_Node -{ - public function __construct($lineno, $tag = null) - { - parent::__construct(array(), array('with_loop' => false, 'ifexpr' => false, 'else' => false), $lineno, $tag); - } - - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - public function compile(Twig_Compiler $compiler) - { - if ($this->getAttribute('else')) { - $compiler->write("\$context['_iterated'] = true;\n"); - } - - if ($this->getAttribute('with_loop')) { - $compiler - ->write("++\$context['loop']['index0'];\n") - ->write("++\$context['loop']['index'];\n") - ->write("\$context['loop']['first'] = false;\n") - ; - - if (!$this->getAttribute('ifexpr')) { - $compiler - ->write("if (isset(\$context['loop']['length'])) {\n") - ->indent() - ->write("--\$context['loop']['revindex0'];\n") - ->write("--\$context['loop']['revindex'];\n") - ->write("\$context['loop']['last'] = 0 === \$context['loop']['revindex0'];\n") - ->outdent() - ->write("}\n") - ; - } - } - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/If.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/If.php deleted file mode 100644 index aa12efb..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/If.php +++ /dev/null @@ -1,67 +0,0 @@ - - */ -class Twig_Node_If extends Twig_Node -{ - public function __construct(Twig_NodeInterface $tests, Twig_NodeInterface $else = null, $lineno, $tag = null) - { - parent::__construct(array('tests' => $tests, 'else' => $else), array(), $lineno, $tag); - } - - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - public function compile(Twig_Compiler $compiler) - { - $compiler->addDebugInfo($this); - for ($i = 0; $i < count($this->getNode('tests')); $i += 2) { - if ($i > 0) { - $compiler - ->outdent() - ->write("} elseif (") - ; - } else { - $compiler - ->write('if (') - ; - } - - $compiler - ->subcompile($this->getNode('tests')->getNode($i)) - ->raw(") {\n") - ->indent() - ->subcompile($this->getNode('tests')->getNode($i + 1)) - ; - } - - if ($this->hasNode('else') && null !== $this->getNode('else')) { - $compiler - ->outdent() - ->write("} else {\n") - ->indent() - ->subcompile($this->getNode('else')) - ; - } - - $compiler - ->outdent() - ->write("}\n"); - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Import.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Import.php deleted file mode 100644 index a327411..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Import.php +++ /dev/null @@ -1,51 +0,0 @@ - - */ -class Twig_Node_Import extends Twig_Node -{ - public function __construct(Twig_Node_Expression $expr, Twig_Node_Expression $var, $lineno, $tag = null) - { - parent::__construct(array('expr' => $expr, 'var' => $var), array(), $lineno, $tag); - } - - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - public function compile(Twig_Compiler $compiler) - { - $compiler - ->addDebugInfo($this) - ->write('') - ->subcompile($this->getNode('var')) - ->raw(' = ') - ; - - if ($this->getNode('expr') instanceof Twig_Node_Expression_Name && '_self' === $this->getNode('expr')->getAttribute('name')) { - $compiler->raw("\$this"); - } else { - $compiler - ->raw('$this->env->loadTemplate(') - ->subcompile($this->getNode('expr')) - ->raw(")") - ; - } - - $compiler->raw(";\n"); - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Include.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Include.php deleted file mode 100644 index 5b6be7a..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Include.php +++ /dev/null @@ -1,100 +0,0 @@ - - */ -class Twig_Node_Include extends Twig_Node implements Twig_NodeOutputInterface -{ - public function __construct(Twig_Node_Expression $expr, Twig_Node_Expression $variables = null, $only = false, $ignoreMissing = false, $lineno, $tag = null) - { - parent::__construct(array('expr' => $expr, 'variables' => $variables), array('only' => (Boolean) $only, 'ignore_missing' => (Boolean) $ignoreMissing), $lineno, $tag); - } - - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - public function compile(Twig_Compiler $compiler) - { - $compiler->addDebugInfo($this); - - if ($this->getAttribute('ignore_missing')) { - $compiler - ->write("try {\n") - ->indent() - ; - } - - $this->addGetTemplate($compiler); - - $compiler->raw('->display('); - - $this->addTemplateArguments($compiler); - - $compiler->raw(");\n"); - - if ($this->getAttribute('ignore_missing')) { - $compiler - ->outdent() - ->write("} catch (Twig_Error_Loader \$e) {\n") - ->indent() - ->write("// ignore missing template\n") - ->outdent() - ->write("}\n\n") - ; - } - } - - protected function addGetTemplate(Twig_Compiler $compiler) - { - if ($this->getNode('expr') instanceof Twig_Node_Expression_Constant) { - $compiler - ->write("\$this->env->loadTemplate(") - ->subcompile($this->getNode('expr')) - ->raw(")") - ; - } else { - $compiler - ->write("\$template = \$this->env->resolveTemplate(") - ->subcompile($this->getNode('expr')) - ->raw(");\n") - ->write('$template') - ; - } - } - - protected function addTemplateArguments(Twig_Compiler $compiler) - { - if (false === $this->getAttribute('only')) { - if (null === $this->getNode('variables')) { - $compiler->raw('$context'); - } else { - $compiler - ->raw('array_merge($context, ') - ->subcompile($this->getNode('variables')) - ->raw(')') - ; - } - } else { - if (null === $this->getNode('variables')) { - $compiler->raw('array()'); - } else { - $compiler->subcompile($this->getNode('variables')); - } - } - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Macro.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Macro.php deleted file mode 100644 index e0c3dca..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Macro.php +++ /dev/null @@ -1,84 +0,0 @@ - - */ -class Twig_Node_Macro extends Twig_Node -{ - public function __construct($name, Twig_NodeInterface $body, Twig_NodeInterface $arguments, $lineno, $tag = null) - { - parent::__construct(array('body' => $body, 'arguments' => $arguments), array('name' => $name), $lineno, $tag); - } - - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - public function compile(Twig_Compiler $compiler) - { - $arguments = array(); - foreach ($this->getNode('arguments') as $argument) { - $arguments[] = '$'.$argument->getAttribute('name').' = null'; - } - - $compiler - ->addDebugInfo($this) - ->write(sprintf("public function get%s(%s)\n", $this->getAttribute('name'), implode(', ', $arguments)), "{\n") - ->indent() - ; - - if (!count($this->getNode('arguments'))) { - $compiler->write("\$context = \$this->env->getGlobals();\n\n"); - } else { - $compiler - ->write("\$context = \$this->env->mergeGlobals(array(\n") - ->indent() - ; - - foreach ($this->getNode('arguments') as $argument) { - $compiler - ->write('') - ->string($argument->getAttribute('name')) - ->raw(' => $'.$argument->getAttribute('name')) - ->raw(",\n") - ; - } - - $compiler - ->outdent() - ->write("));\n\n") - ; - } - - $compiler - ->write("\$blocks = array();\n\n") - ->write("ob_start();\n") - ->write("try {\n") - ->indent() - ->subcompile($this->getNode('body')) - ->outdent() - ->write("} catch(Exception \$e) {\n") - ->indent() - ->write("ob_end_clean();\n\n") - ->write("throw \$e;\n") - ->outdent() - ->write("}\n\n") - ->write("return ob_get_clean();\n") - ->outdent() - ->write("}\n\n") - ; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Module.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Module.php deleted file mode 100644 index 4c7a107..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Module.php +++ /dev/null @@ -1,372 +0,0 @@ - - */ -class Twig_Node_Module extends Twig_Node -{ - public function __construct(Twig_NodeInterface $body, Twig_Node_Expression $parent = null, Twig_NodeInterface $blocks, Twig_NodeInterface $macros, Twig_NodeInterface $traits, $embeddedTemplates, $filename) - { - // embedded templates are set as attributes so that they are only visited once by the visitors - parent::__construct(array('parent' => $parent, 'body' => $body, 'blocks' => $blocks, 'macros' => $macros, 'traits' => $traits), array('filename' => $filename, 'index' => null, 'embedded_templates' => $embeddedTemplates), 1); - } - - public function setIndex($index) - { - $this->setAttribute('index', $index); - } - - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - public function compile(Twig_Compiler $compiler) - { - $this->compileTemplate($compiler); - - foreach ($this->getAttribute('embedded_templates') as $template) { - $compiler->subcompile($template); - } - } - - protected function compileTemplate(Twig_Compiler $compiler) - { - if (!$this->getAttribute('index')) { - $compiler->write('compileClassHeader($compiler); - - if (count($this->getNode('blocks')) || count($this->getNode('traits')) || null === $this->getNode('parent') || $this->getNode('parent') instanceof Twig_Node_Expression_Constant) { - $this->compileConstructor($compiler); - } - - $this->compileGetParent($compiler); - - $this->compileDisplayHeader($compiler); - - $this->compileDisplayBody($compiler); - - $this->compileDisplayFooter($compiler); - - $compiler->subcompile($this->getNode('blocks')); - - $this->compileMacros($compiler); - - $this->compileGetTemplateName($compiler); - - $this->compileIsTraitable($compiler); - - $this->compileDebugInfo($compiler); - - $this->compileClassFooter($compiler); - } - - protected function compileGetParent(Twig_Compiler $compiler) - { - if (null === $this->getNode('parent')) { - return; - } - - $compiler - ->write("protected function doGetParent(array \$context)\n", "{\n") - ->indent() - ->write("return ") - ; - - if ($this->getNode('parent') instanceof Twig_Node_Expression_Constant) { - $compiler->subcompile($this->getNode('parent')); - } else { - $compiler - ->raw("\$this->env->resolveTemplate(") - ->subcompile($this->getNode('parent')) - ->raw(")") - ; - } - - $compiler - ->raw(";\n") - ->outdent() - ->write("}\n\n") - ; - } - - protected function compileDisplayBody(Twig_Compiler $compiler) - { - $compiler->subcompile($this->getNode('body')); - - if (null !== $this->getNode('parent')) { - if ($this->getNode('parent') instanceof Twig_Node_Expression_Constant) { - $compiler->write("\$this->parent"); - } else { - $compiler->write("\$this->getParent(\$context)"); - } - $compiler->raw("->display(\$context, array_merge(\$this->blocks, \$blocks));\n"); - } - } - - protected function compileClassHeader(Twig_Compiler $compiler) - { - $compiler - ->write("\n\n") - // if the filename contains */, add a blank to avoid a PHP parse error - ->write("/* ".str_replace('*/', '* /', $this->getAttribute('filename'))." */\n") - ->write('class '.$compiler->getEnvironment()->getTemplateClass($this->getAttribute('filename'), $this->getAttribute('index'))) - ->raw(sprintf(" extends %s\n", $compiler->getEnvironment()->getBaseTemplateClass())) - ->write("{\n") - ->indent() - ; - } - - protected function compileConstructor(Twig_Compiler $compiler) - { - $compiler - ->write("public function __construct(Twig_Environment \$env)\n", "{\n") - ->indent() - ->write("parent::__construct(\$env);\n\n") - ; - - // parent - if (null === $this->getNode('parent')) { - $compiler->write("\$this->parent = false;\n\n"); - } elseif ($this->getNode('parent') instanceof Twig_Node_Expression_Constant) { - $compiler - ->write("\$this->parent = \$this->env->loadTemplate(") - ->subcompile($this->getNode('parent')) - ->raw(");\n\n") - ; - } - - $countTraits = count($this->getNode('traits')); - if ($countTraits) { - // traits - foreach ($this->getNode('traits') as $i => $trait) { - $this->compileLoadTemplate($compiler, $trait->getNode('template'), sprintf('$_trait_%s', $i)); - - $compiler - ->addDebugInfo($trait->getNode('template')) - ->write(sprintf("if (!\$_trait_%s->isTraitable()) {\n", $i)) - ->indent() - ->write("throw new Twig_Error_Runtime('Template \"'.") - ->subcompile($trait->getNode('template')) - ->raw(".'\" cannot be used as a trait.');\n") - ->outdent() - ->write("}\n") - ->write(sprintf("\$_trait_%s_blocks = \$_trait_%s->getBlocks();\n\n", $i, $i)) - ; - - foreach ($trait->getNode('targets') as $key => $value) { - $compiler - ->write(sprintf("\$_trait_%s_blocks[", $i)) - ->subcompile($value) - ->raw(sprintf("] = \$_trait_%s_blocks[", $i)) - ->string($key) - ->raw(sprintf("]; unset(\$_trait_%s_blocks[", $i)) - ->string($key) - ->raw("]);\n\n") - ; - } - } - - if ($countTraits > 1) { - $compiler - ->write("\$this->traits = array_merge(\n") - ->indent() - ; - - for ($i = 0; $i < $countTraits; $i++) { - $compiler - ->write(sprintf("\$_trait_%s_blocks".($i == $countTraits - 1 ? '' : ',')."\n", $i)) - ; - } - - $compiler - ->outdent() - ->write(");\n\n") - ; - } else { - $compiler - ->write("\$this->traits = \$_trait_0_blocks;\n\n") - ; - } - - $compiler - ->write("\$this->blocks = array_merge(\n") - ->indent() - ->write("\$this->traits,\n") - ->write("array(\n") - ; - } else { - $compiler - ->write("\$this->blocks = array(\n") - ; - } - - // blocks - $compiler - ->indent() - ; - - foreach ($this->getNode('blocks') as $name => $node) { - $compiler - ->write(sprintf("'%s' => array(\$this, 'block_%s'),\n", $name, $name)) - ; - } - - if ($countTraits) { - $compiler - ->outdent() - ->write(")\n") - ; - } - - $compiler - ->outdent() - ->write(");\n") - ->outdent() - ->write("}\n\n"); - ; - } - - protected function compileDisplayHeader(Twig_Compiler $compiler) - { - $compiler - ->write("protected function doDisplay(array \$context, array \$blocks = array())\n", "{\n") - ->indent() - ; - } - - protected function compileDisplayFooter(Twig_Compiler $compiler) - { - $compiler - ->outdent() - ->write("}\n\n") - ; - } - - protected function compileClassFooter(Twig_Compiler $compiler) - { - $compiler - ->outdent() - ->write("}\n") - ; - } - - protected function compileMacros(Twig_Compiler $compiler) - { - $compiler->subcompile($this->getNode('macros')); - } - - protected function compileGetTemplateName(Twig_Compiler $compiler) - { - $compiler - ->write("public function getTemplateName()\n", "{\n") - ->indent() - ->write('return ') - ->repr($this->getAttribute('filename')) - ->raw(";\n") - ->outdent() - ->write("}\n\n") - ; - } - - protected function compileIsTraitable(Twig_Compiler $compiler) - { - // A template can be used as a trait if: - // * it has no parent - // * it has no macros - // * it has no body - // - // Put another way, a template can be used as a trait if it - // only contains blocks and use statements. - $traitable = null === $this->getNode('parent') && 0 === count($this->getNode('macros')); - if ($traitable) { - if ($this->getNode('body') instanceof Twig_Node_Body) { - $nodes = $this->getNode('body')->getNode(0); - } else { - $nodes = $this->getNode('body'); - } - - if (!count($nodes)) { - $nodes = new Twig_Node(array($nodes)); - } - - foreach ($nodes as $node) { - if (!count($node)) { - continue; - } - - if ($node instanceof Twig_Node_Text && ctype_space($node->getAttribute('data'))) { - continue; - } - - if ($node instanceof Twig_Node_BlockReference) { - continue; - } - - $traitable = false; - break; - } - } - - if ($traitable) { - return; - } - - $compiler - ->write("public function isTraitable()\n", "{\n") - ->indent() - ->write(sprintf("return %s;\n", $traitable ? 'true' : 'false')) - ->outdent() - ->write("}\n\n") - ; - } - - protected function compileDebugInfo(Twig_Compiler $compiler) - { - $compiler - ->write("public function getDebugInfo()\n", "{\n") - ->indent() - ->write(sprintf("return %s;\n", str_replace("\n", '', var_export(array_reverse($compiler->getDebugInfo(), true), true)))) - ->outdent() - ->write("}\n") - ; - } - - protected function compileLoadTemplate(Twig_Compiler $compiler, $node, $var) - { - if ($node instanceof Twig_Node_Expression_Constant) { - $compiler - ->write(sprintf("%s = \$this->env->loadTemplate(", $var)) - ->subcompile($node) - ->raw(");\n") - ; - } else { - $compiler - ->write(sprintf("%s = ", $var)) - ->subcompile($node) - ->raw(";\n") - ->write(sprintf("if (!%s", $var)) - ->raw(" instanceof Twig_Template) {\n") - ->indent() - ->write(sprintf("%s = \$this->env->loadTemplate(%s);\n", $var, $var)) - ->outdent() - ->write("}\n") - ; - } - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Print.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Print.php deleted file mode 100644 index 766725f..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Print.php +++ /dev/null @@ -1,40 +0,0 @@ - - */ -class Twig_Node_Print extends Twig_Node implements Twig_NodeOutputInterface -{ - public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null) - { - parent::__construct(array('expr' => $expr), array(), $lineno, $tag); - } - - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - public function compile(Twig_Compiler $compiler) - { - $compiler - ->addDebugInfo($this) - ->write('echo ') - ->subcompile($this->getNode('expr')) - ->raw(";\n") - ; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Sandbox.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Sandbox.php deleted file mode 100644 index cbfcb41..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Sandbox.php +++ /dev/null @@ -1,48 +0,0 @@ - - */ -class Twig_Node_Sandbox extends Twig_Node -{ - public function __construct(Twig_NodeInterface $body, $lineno, $tag = null) - { - parent::__construct(array('body' => $body), array(), $lineno, $tag); - } - - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - public function compile(Twig_Compiler $compiler) - { - $compiler - ->addDebugInfo($this) - ->write("\$sandbox = \$this->env->getExtension('sandbox');\n") - ->write("if (!\$alreadySandboxed = \$sandbox->isSandboxed()) {\n") - ->indent() - ->write("\$sandbox->enableSandbox();\n") - ->outdent() - ->write("}\n") - ->subcompile($this->getNode('body')) - ->write("if (!\$alreadySandboxed) {\n") - ->indent() - ->write("\$sandbox->disableSandbox();\n") - ->outdent() - ->write("}\n") - ; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/SandboxedModule.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/SandboxedModule.php deleted file mode 100644 index 6dd63e5..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/SandboxedModule.php +++ /dev/null @@ -1,61 +0,0 @@ - - */ -class Twig_Node_SandboxedModule extends Twig_Node_Module -{ - protected $usedFilters; - protected $usedTags; - protected $usedFunctions; - - public function __construct(Twig_Node_Module $node, array $usedFilters, array $usedTags, array $usedFunctions) - { - parent::__construct($node->getNode('body'), $node->getNode('parent'), $node->getNode('blocks'), $node->getNode('macros'), $node->getNode('traits'), $node->getAttribute('embedded_templates'), $node->getAttribute('filename'), $node->getLine(), $node->getNodeTag()); - - $this->setAttribute('index', $node->getAttribute('index')); - - $this->usedFilters = $usedFilters; - $this->usedTags = $usedTags; - $this->usedFunctions = $usedFunctions; - } - - protected function compileDisplayBody(Twig_Compiler $compiler) - { - $compiler->write("\$this->checkSecurity();\n"); - - parent::compileDisplayBody($compiler); - } - - protected function compileDisplayFooter(Twig_Compiler $compiler) - { - parent::compileDisplayFooter($compiler); - - $compiler - ->write("protected function checkSecurity() {\n") - ->indent() - ->write("\$this->env->getExtension('sandbox')->checkSecurity(\n") - ->indent() - ->write(!$this->usedTags ? "array(),\n" : "array('".implode('\', \'', $this->usedTags)."'),\n") - ->write(!$this->usedFilters ? "array(),\n" : "array('".implode('\', \'', $this->usedFilters)."'),\n") - ->write(!$this->usedFunctions ? "array()\n" : "array('".implode('\', \'', $this->usedFunctions)."')\n") - ->outdent() - ->write(");\n") - ->outdent() - ->write("}\n\n") - ; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/SandboxedPrint.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/SandboxedPrint.php deleted file mode 100644 index 77730d8..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/SandboxedPrint.php +++ /dev/null @@ -1,60 +0,0 @@ - - */ -class Twig_Node_SandboxedPrint extends Twig_Node_Print -{ - public function __construct(Twig_Node_Expression $expr, $lineno, $tag = null) - { - parent::__construct($expr, $lineno, $tag); - } - - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - public function compile(Twig_Compiler $compiler) - { - $compiler - ->addDebugInfo($this) - ->write('echo $this->env->getExtension(\'sandbox\')->ensureToStringAllowed(') - ->subcompile($this->getNode('expr')) - ->raw(");\n") - ; - } - - /** - * Removes node filters. - * - * This is mostly needed when another visitor adds filters (like the escaper one). - * - * @param Twig_Node $node A Node - */ - protected function removeNodeFilter($node) - { - if ($node instanceof Twig_Node_Expression_Filter) { - return $this->removeNodeFilter($node->getNode('node')); - } - - return $node; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Set.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Set.php deleted file mode 100644 index 70bb519..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Set.php +++ /dev/null @@ -1,102 +0,0 @@ - - */ -class Twig_Node_Set extends Twig_Node -{ - public function __construct($capture, Twig_NodeInterface $names, Twig_NodeInterface $values, $lineno, $tag = null) - { - parent::__construct(array('names' => $names, 'values' => $values), array('capture' => $capture, 'safe' => false), $lineno, $tag); - - /* - * Optimizes the node when capture is used for a large block of text. - * - * {% set foo %}foo{% endset %} is compiled to $context['foo'] = new Twig_Markup("foo"); - */ - if ($this->getAttribute('capture')) { - $this->setAttribute('safe', true); - - $values = $this->getNode('values'); - if ($values instanceof Twig_Node_Text) { - $this->setNode('values', new Twig_Node_Expression_Constant($values->getAttribute('data'), $values->getLine())); - $this->setAttribute('capture', false); - } - } - } - - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - public function compile(Twig_Compiler $compiler) - { - $compiler->addDebugInfo($this); - - if (count($this->getNode('names')) > 1) { - $compiler->write('list('); - foreach ($this->getNode('names') as $idx => $node) { - if ($idx) { - $compiler->raw(', '); - } - - $compiler->subcompile($node); - } - $compiler->raw(')'); - } else { - if ($this->getAttribute('capture')) { - $compiler - ->write("ob_start();\n") - ->subcompile($this->getNode('values')) - ; - } - - $compiler->subcompile($this->getNode('names'), false); - - if ($this->getAttribute('capture')) { - $compiler->raw(" = ('' === \$tmp = ob_get_clean()) ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset())"); - } - } - - if (!$this->getAttribute('capture')) { - $compiler->raw(' = '); - - if (count($this->getNode('names')) > 1) { - $compiler->write('array('); - foreach ($this->getNode('values') as $idx => $value) { - if ($idx) { - $compiler->raw(', '); - } - - $compiler->subcompile($value); - } - $compiler->raw(')'); - } else { - if ($this->getAttribute('safe')) { - $compiler - ->raw("('' === \$tmp = ") - ->subcompile($this->getNode('values')) - ->raw(") ? '' : new Twig_Markup(\$tmp, \$this->env->getCharset())") - ; - } else { - $compiler->subcompile($this->getNode('values')); - } - } - } - - $compiler->raw(";\n"); - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/SetTemp.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/SetTemp.php deleted file mode 100644 index 3bdd1cb..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/SetTemp.php +++ /dev/null @@ -1,35 +0,0 @@ - $name), $lineno); - } - - public function compile(Twig_Compiler $compiler) - { - $name = $this->getAttribute('name'); - $compiler - ->addDebugInfo($this) - ->write('if (isset($context[') - ->string($name) - ->raw('])) { $_') - ->raw($name) - ->raw('_ = $context[') - ->repr($name) - ->raw(']; } else { $_') - ->raw($name) - ->raw("_ = null; }\n") - ; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Spaceless.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Spaceless.php deleted file mode 100644 index 4601346..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Spaceless.php +++ /dev/null @@ -1,41 +0,0 @@ - - */ -class Twig_Node_Spaceless extends Twig_Node -{ - public function __construct(Twig_NodeInterface $body, $lineno, $tag = 'spaceless') - { - parent::__construct(array('body' => $body), array(), $lineno, $tag); - } - - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - public function compile(Twig_Compiler $compiler) - { - $compiler - ->addDebugInfo($this) - ->write("ob_start();\n") - ->subcompile($this->getNode('body')) - ->write("echo trim(preg_replace('/>\s+<', ob_get_clean()));\n") - ; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Text.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Text.php deleted file mode 100644 index 0c1c092..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Node/Text.php +++ /dev/null @@ -1,40 +0,0 @@ - - */ -class Twig_Node_Text extends Twig_Node implements Twig_NodeOutputInterface -{ - public function __construct($data, $lineno) - { - parent::__construct(array(), array('data' => $data), $lineno); - } - - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - public function compile(Twig_Compiler $compiler) - { - $compiler - ->addDebugInfo($this) - ->write('echo ') - ->string($this->getAttribute('data')) - ->raw(";\n") - ; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeInterface.php deleted file mode 100644 index 29a84b0..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeInterface.php +++ /dev/null @@ -1,30 +0,0 @@ - - */ -interface Twig_NodeInterface extends Countable, IteratorAggregate -{ - /** - * Compiles the node to PHP. - * - * @param Twig_Compiler A Twig_Compiler instance - */ - function compile(Twig_Compiler $compiler); - - function getLine(); - - function getNodeTag(); -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeOutputInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeOutputInterface.php deleted file mode 100644 index 7183956..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeOutputInterface.php +++ /dev/null @@ -1,20 +0,0 @@ - - */ -interface Twig_NodeOutputInterface -{ -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeTraverser.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeTraverser.php deleted file mode 100644 index 1e82b03..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeTraverser.php +++ /dev/null @@ -1,89 +0,0 @@ - - */ -class Twig_NodeTraverser -{ - protected $env; - protected $visitors; - - /** - * Constructor. - * - * @param Twig_Environment $env A Twig_Environment instance - * @param array $visitors An array of Twig_NodeVisitorInterface instances - */ - public function __construct(Twig_Environment $env, array $visitors = array()) - { - $this->env = $env; - $this->visitors = array(); - foreach ($visitors as $visitor) { - $this->addVisitor($visitor); - } - } - - /** - * Adds a visitor. - * - * @param Twig_NodeVisitorInterface $visitor A Twig_NodeVisitorInterface instance - */ - public function addVisitor(Twig_NodeVisitorInterface $visitor) - { - if (!isset($this->visitors[$visitor->getPriority()])) { - $this->visitors[$visitor->getPriority()] = array(); - } - - $this->visitors[$visitor->getPriority()][] = $visitor; - } - - /** - * Traverses a node and calls the registered visitors. - * - * @param Twig_NodeInterface $node A Twig_NodeInterface instance - */ - public function traverse(Twig_NodeInterface $node) - { - ksort($this->visitors); - foreach ($this->visitors as $visitors) { - foreach ($visitors as $visitor) { - $node = $this->traverseForVisitor($visitor, $node); - } - } - - return $node; - } - - protected function traverseForVisitor(Twig_NodeVisitorInterface $visitor, Twig_NodeInterface $node = null) - { - if (null === $node) { - return null; - } - - $node = $visitor->enterNode($node, $this->env); - - foreach ($node as $k => $n) { - if (false !== $n = $this->traverseForVisitor($visitor, $n)) { - $node->setNode($k, $n); - } else { - $node->removeNode($k); - } - } - - return $visitor->leaveNode($node, $this->env); - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitor/Escaper.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitor/Escaper.php deleted file mode 100644 index 5b1249d..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitor/Escaper.php +++ /dev/null @@ -1,164 +0,0 @@ - - */ -class Twig_NodeVisitor_Escaper implements Twig_NodeVisitorInterface -{ - protected $statusStack = array(); - protected $blocks = array(); - protected $safeAnalysis; - protected $traverser; - protected $defaultStrategy = false; - - public function __construct() - { - $this->safeAnalysis = new Twig_NodeVisitor_SafeAnalysis(); - } - - /** - * Called before child nodes are visited. - * - * @param Twig_NodeInterface $node The node to visit - * @param Twig_Environment $env The Twig environment instance - * - * @return Twig_NodeInterface The modified node - */ - public function enterNode(Twig_NodeInterface $node, Twig_Environment $env) - { - if ($node instanceof Twig_Node_Module) { - if ($env->hasExtension('escaper') && $defaultStrategy = $env->getExtension('escaper')->getDefaultStrategy($node->getAttribute('filename'))) { - $this->defaultStrategy = $defaultStrategy; - } - } elseif ($node instanceof Twig_Node_AutoEscape) { - $this->statusStack[] = $node->getAttribute('value'); - } elseif ($node instanceof Twig_Node_Block) { - $this->statusStack[] = isset($this->blocks[$node->getAttribute('name')]) ? $this->blocks[$node->getAttribute('name')] : $this->needEscaping($env); - } - - return $node; - } - - /** - * Called after child nodes are visited. - * - * @param Twig_NodeInterface $node The node to visit - * @param Twig_Environment $env The Twig environment instance - * - * @return Twig_NodeInterface The modified node - */ - public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env) - { - if ($node instanceof Twig_Node_Module) { - $this->defaultStrategy = false; - } elseif ($node instanceof Twig_Node_Expression_Filter) { - return $this->preEscapeFilterNode($node, $env); - } elseif ($node instanceof Twig_Node_Print) { - return $this->escapePrintNode($node, $env, $this->needEscaping($env)); - } - - if ($node instanceof Twig_Node_AutoEscape || $node instanceof Twig_Node_Block) { - array_pop($this->statusStack); - } elseif ($node instanceof Twig_Node_BlockReference) { - $this->blocks[$node->getAttribute('name')] = $this->needEscaping($env); - } - - return $node; - } - - protected function escapePrintNode(Twig_Node_Print $node, Twig_Environment $env, $type) - { - if (false === $type) { - return $node; - } - - $expression = $node->getNode('expr'); - - if ($this->isSafeFor($type, $expression, $env)) { - return $node; - } - - $class = get_class($node); - - return new $class( - $this->getEscaperFilter($type, $expression), - $node->getLine() - ); - } - - protected function preEscapeFilterNode(Twig_Node_Expression_Filter $filter, Twig_Environment $env) - { - $name = $filter->getNode('filter')->getAttribute('value'); - - if (false !== $f = $env->getFilter($name)) { - $type = $f->getPreEscape(); - if (null === $type) { - return $filter; - } - - $node = $filter->getNode('node'); - if ($this->isSafeFor($type, $node, $env)) { - return $filter; - } - - $filter->setNode('node', $this->getEscaperFilter($type, $node)); - - return $filter; - } - - return $filter; - } - - protected function isSafeFor($type, Twig_NodeInterface $expression, $env) - { - $safe = $this->safeAnalysis->getSafe($expression); - - if (null === $safe) { - if (null === $this->traverser) { - $this->traverser = new Twig_NodeTraverser($env, array($this->safeAnalysis)); - } - $this->traverser->traverse($expression); - $safe = $this->safeAnalysis->getSafe($expression); - } - - return in_array($type, $safe) || in_array('all', $safe); - } - - protected function needEscaping(Twig_Environment $env) - { - if (count($this->statusStack)) { - return $this->statusStack[count($this->statusStack) - 1]; - } - - return $this->defaultStrategy ? $this->defaultStrategy : false; - } - - protected function getEscaperFilter($type, Twig_NodeInterface $node) - { - $line = $node->getLine(); - $name = new Twig_Node_Expression_Constant('escape', $line); - $args = new Twig_Node(array(new Twig_Node_Expression_Constant((string) $type, $line), new Twig_Node_Expression_Constant(null, $line), new Twig_Node_Expression_Constant(true, $line))); - - return new Twig_Node_Expression_Filter($node, $name, $args, $line); - } - - /** - * {@inheritdoc} - */ - public function getPriority() - { - return 0; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitor/Optimizer.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitor/Optimizer.php deleted file mode 100644 index cbc61fc..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitor/Optimizer.php +++ /dev/null @@ -1,247 +0,0 @@ - - */ -class Twig_NodeVisitor_Optimizer implements Twig_NodeVisitorInterface -{ - const OPTIMIZE_ALL = -1; - const OPTIMIZE_NONE = 0; - const OPTIMIZE_FOR = 2; - const OPTIMIZE_RAW_FILTER = 4; - const OPTIMIZE_VAR_ACCESS = 8; - - protected $loops = array(); - protected $optimizers; - protected $prependedNodes = array(); - protected $inABody = false; - - /** - * Constructor. - * - * @param integer $optimizers The optimizer mode - */ - public function __construct($optimizers = -1) - { - if (!is_int($optimizers) || $optimizers > 2) { - throw new InvalidArgumentException(sprintf('Optimizer mode "%s" is not valid.', $optimizers)); - } - - $this->optimizers = $optimizers; - } - - /** - * {@inheritdoc} - */ - public function enterNode(Twig_NodeInterface $node, Twig_Environment $env) - { - if (self::OPTIMIZE_FOR === (self::OPTIMIZE_FOR & $this->optimizers)) { - $this->enterOptimizeFor($node, $env); - } - - if (!version_compare(phpversion(), '5.4.0RC1', '>=') && self::OPTIMIZE_VAR_ACCESS === (self::OPTIMIZE_VAR_ACCESS & $this->optimizers) && !$env->isStrictVariables() && !$env->hasExtension('sandbox')) { - if ($this->inABody) { - if (!$node instanceof Twig_Node_Expression) { - if (get_class($node) !== 'Twig_Node') { - array_unshift($this->prependedNodes, array()); - } - } else { - $node = $this->optimizeVariables($node, $env); - } - } elseif ($node instanceof Twig_Node_Body) { - $this->inABody = true; - } - } - - return $node; - } - - /** - * {@inheritdoc} - */ - public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env) - { - $expression = $node instanceof Twig_Node_Expression; - - if (self::OPTIMIZE_FOR === (self::OPTIMIZE_FOR & $this->optimizers)) { - $this->leaveOptimizeFor($node, $env); - } - - if (self::OPTIMIZE_RAW_FILTER === (self::OPTIMIZE_RAW_FILTER & $this->optimizers)) { - $node = $this->optimizeRawFilter($node, $env); - } - - $node = $this->optimizePrintNode($node, $env); - - if (self::OPTIMIZE_VAR_ACCESS === (self::OPTIMIZE_VAR_ACCESS & $this->optimizers) && !$env->isStrictVariables() && !$env->hasExtension('sandbox')) { - if ($node instanceof Twig_Node_Body) { - $this->inABody = false; - } elseif ($this->inABody) { - if (!$expression && get_class($node) !== 'Twig_Node' && $prependedNodes = array_shift($this->prependedNodes)) { - $nodes = array(); - foreach (array_unique($prependedNodes) as $name) { - $nodes[] = new Twig_Node_SetTemp($name, $node->getLine()); - } - - $nodes[] = $node; - $node = new Twig_Node($nodes); - } - } - } - - return $node; - } - - protected function optimizeVariables($node, $env) - { - if ('Twig_Node_Expression_Name' === get_class($node) && $node->isSimple()) { - $this->prependedNodes[0][] = $node->getAttribute('name'); - - return new Twig_Node_Expression_TempName($node->getAttribute('name'), $node->getLine()); - } - - return $node; - } - - /** - * Optimizes print nodes. - * - * It replaces: - * - * * "echo $this->render(Parent)Block()" with "$this->display(Parent)Block()" - * - * @param Twig_NodeInterface $node A Node - * @param Twig_Environment $env The current Twig environment - */ - protected function optimizePrintNode($node, $env) - { - if (!$node instanceof Twig_Node_Print) { - return $node; - } - - if ( - $node->getNode('expr') instanceof Twig_Node_Expression_BlockReference || - $node->getNode('expr') instanceof Twig_Node_Expression_Parent - ) { - $node->getNode('expr')->setAttribute('output', true); - - return $node->getNode('expr'); - } - - return $node; - } - - /** - * Removes "raw" filters. - * - * @param Twig_NodeInterface $node A Node - * @param Twig_Environment $env The current Twig environment - */ - protected function optimizeRawFilter($node, $env) - { - if ($node instanceof Twig_Node_Expression_Filter && 'raw' == $node->getNode('filter')->getAttribute('value')) { - return $node->getNode('node'); - } - - return $node; - } - - /** - * Optimizes "for" tag by removing the "loop" variable creation whenever possible. - * - * @param Twig_NodeInterface $node A Node - * @param Twig_Environment $env The current Twig environment - */ - protected function enterOptimizeFor($node, $env) - { - if ($node instanceof Twig_Node_For) { - // disable the loop variable by default - $node->setAttribute('with_loop', false); - array_unshift($this->loops, $node); - } elseif (!$this->loops) { - // we are outside a loop - return; - } - - // when do we need to add the loop variable back? - - // the loop variable is referenced for the current loop - elseif ($node instanceof Twig_Node_Expression_Name && 'loop' === $node->getAttribute('name')) { - $this->addLoopToCurrent(); - } - - // block reference - elseif ($node instanceof Twig_Node_BlockReference || $node instanceof Twig_Node_Expression_BlockReference) { - $this->addLoopToCurrent(); - } - - // include without the only attribute - elseif ($node instanceof Twig_Node_Include && !$node->getAttribute('only')) { - $this->addLoopToAll(); - } - - // the loop variable is referenced via an attribute - elseif ($node instanceof Twig_Node_Expression_GetAttr - && (!$node->getNode('attribute') instanceof Twig_Node_Expression_Constant - || 'parent' === $node->getNode('attribute')->getAttribute('value') - ) - && (true === $this->loops[0]->getAttribute('with_loop') - || ($node->getNode('node') instanceof Twig_Node_Expression_Name - && 'loop' === $node->getNode('node')->getAttribute('name') - ) - ) - ) { - $this->addLoopToAll(); - } - } - - /** - * Optimizes "for" tag by removing the "loop" variable creation whenever possible. - * - * @param Twig_NodeInterface $node A Node - * @param Twig_Environment $env The current Twig environment - */ - protected function leaveOptimizeFor($node, $env) - { - if ($node instanceof Twig_Node_For) { - array_shift($this->loops); - } - } - - protected function addLoopToCurrent() - { - $this->loops[0]->setAttribute('with_loop', true); - } - - protected function addLoopToAll() - { - foreach ($this->loops as $loop) { - $loop->setAttribute('with_loop', true); - } - } - - /** - * {@inheritdoc} - */ - public function getPriority() - { - return 255; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitor/SafeAnalysis.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitor/SafeAnalysis.php deleted file mode 100644 index 9f511b5..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitor/SafeAnalysis.php +++ /dev/null @@ -1,119 +0,0 @@ -data[$hash])) { - foreach($this->data[$hash] as $bucket) { - if ($bucket['key'] === $node) { - return $bucket['value']; - } - } - } - - return null; - } - - protected function setSafe(Twig_NodeInterface $node, array $safe) - { - $hash = spl_object_hash($node); - if (isset($this->data[$hash])) { - foreach($this->data[$hash] as &$bucket) { - if ($bucket['key'] === $node) { - $bucket['value'] = $safe; - - return; - } - } - } - $this->data[$hash][] = array( - 'key' => $node, - 'value' => $safe, - ); - } - - public function enterNode(Twig_NodeInterface $node, Twig_Environment $env) - { - return $node; - } - - public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env) - { - if ($node instanceof Twig_Node_Expression_Constant) { - // constants are marked safe for all - $this->setSafe($node, array('all')); - } elseif ($node instanceof Twig_Node_Expression_BlockReference) { - // blocks are safe by definition - $this->setSafe($node, array('all')); - } elseif ($node instanceof Twig_Node_Expression_Parent) { - // parent block is safe by definition - $this->setSafe($node, array('all')); - } elseif ($node instanceof Twig_Node_Expression_Conditional) { - // intersect safeness of both operands - $safe = $this->intersectSafe($this->getSafe($node->getNode('expr2')), $this->getSafe($node->getNode('expr3'))); - $this->setSafe($node, $safe); - } elseif ($node instanceof Twig_Node_Expression_Filter) { - // filter expression is safe when the filter is safe - $name = $node->getNode('filter')->getAttribute('value'); - $args = $node->getNode('arguments'); - if (false !== $filter = $env->getFilter($name)) { - $safe = $filter->getSafe($args); - if (null === $safe) { - $safe = $this->intersectSafe($this->getSafe($node->getNode('node')), $filter->getPreservesSafety()); - } - $this->setSafe($node, $safe); - } else { - $this->setSafe($node, array()); - } - } elseif ($node instanceof Twig_Node_Expression_Function) { - // function expression is safe when the function is safe - $name = $node->getAttribute('name'); - $args = $node->getNode('arguments'); - $function = $env->getFunction($name); - if (false !== $function) { - $this->setSafe($node, $function->getSafe($args)); - } else { - $this->setSafe($node, array()); - } - } elseif ($node instanceof Twig_Node_Expression_MethodCall) { - if ($node->getAttribute('safe')) { - $this->setSafe($node, array('all')); - } else { - $this->setSafe($node, array()); - } - } else { - $this->setSafe($node, array()); - } - - return $node; - } - - protected function intersectSafe(array $a = null, array $b = null) - { - if (null === $a || null === $b) { - return array(); - } - - if (in_array('all', $a)) { - return $b; - } - - if (in_array('all', $b)) { - return $a; - } - - return array_intersect($a, $b); - } - - /** - * {@inheritdoc} - */ - public function getPriority() - { - return 0; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitor/Sandbox.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitor/Sandbox.php deleted file mode 100644 index 61ef0c6..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitor/Sandbox.php +++ /dev/null @@ -1,106 +0,0 @@ - - */ -class Twig_NodeVisitor_Sandbox implements Twig_NodeVisitorInterface -{ - protected $inAModule = false; - protected $tags; - protected $filters; - protected $functions; - - /** - * Called before child nodes are visited. - * - * @param Twig_NodeInterface $node The node to visit - * @param Twig_Environment $env The Twig environment instance - * - * @return Twig_NodeInterface The modified node - */ - public function enterNode(Twig_NodeInterface $node, Twig_Environment $env) - { - // in a sandbox tag, only include tags are allowed - if ($node instanceof Twig_Node_Sandbox && !$node->getNode('body') instanceof Twig_Node_Include) { - foreach ($node->getNode('body') as $n) { - if ($n instanceof Twig_Node_Text && ctype_space($n->getAttribute('data'))) { - continue; - } - - if (!$n instanceof Twig_Node_Include) { - throw new Twig_Error_Syntax('Only "include" tags are allowed within a "sandbox" section', $n->getLine()); - } - } - } - - if ($node instanceof Twig_Node_Module) { - $this->inAModule = true; - $this->tags = array(); - $this->filters = array(); - $this->functions = array(); - - return $node; - } elseif ($this->inAModule) { - // look for tags - if ($node->getNodeTag()) { - $this->tags[] = $node->getNodeTag(); - } - - // look for filters - if ($node instanceof Twig_Node_Expression_Filter) { - $this->filters[] = $node->getNode('filter')->getAttribute('value'); - } - - // look for functions - if ($node instanceof Twig_Node_Expression_Function) { - $this->functions[] = $node->getAttribute('name'); - } - - // wrap print to check __toString() calls - if ($node instanceof Twig_Node_Print) { - return new Twig_Node_SandboxedPrint($node->getNode('expr'), $node->getLine(), $node->getNodeTag()); - } - } - - return $node; - } - - /** - * Called after child nodes are visited. - * - * @param Twig_NodeInterface $node The node to visit - * @param Twig_Environment $env The Twig environment instance - * - * @return Twig_NodeInterface The modified node - */ - public function leaveNode(Twig_NodeInterface $node, Twig_Environment $env) - { - if ($node instanceof Twig_Node_Module) { - $this->inAModule = false; - - return new Twig_Node_SandboxedModule($node, array_unique($this->filters), array_unique($this->tags), array_unique($this->functions)); - } - - return $node; - } - - /** - * {@inheritdoc} - */ - public function getPriority() - { - return 0; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitorInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitorInterface.php deleted file mode 100644 index e0123b5..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/NodeVisitorInterface.php +++ /dev/null @@ -1,48 +0,0 @@ - - */ -interface Twig_NodeVisitorInterface -{ - /** - * Called before child nodes are visited. - * - * @param Twig_NodeInterface $node The node to visit - * @param Twig_Environment $env The Twig environment instance - * - * @return Twig_NodeInterface The modified node - */ - function enterNode(Twig_NodeInterface $node, Twig_Environment $env); - - /** - * Called after child nodes are visited. - * - * @param Twig_NodeInterface $node The node to visit - * @param Twig_Environment $env The Twig environment instance - * - * @return Twig_NodeInterface The modified node - */ - function leaveNode(Twig_NodeInterface $node, Twig_Environment $env); - - /** - * Returns the priority for this visitor. - * - * Priority should be between -10 and 10 (0 is the default). - * - * @return integer The priority level - */ - function getPriority(); -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Parser.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Parser.php deleted file mode 100644 index 0bfcec7..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Parser.php +++ /dev/null @@ -1,384 +0,0 @@ - - */ -class Twig_Parser implements Twig_ParserInterface -{ - protected $stack = array(); - protected $stream; - protected $parent; - protected $handlers; - protected $visitors; - protected $expressionParser; - protected $blocks; - protected $blockStack; - protected $macros; - protected $env; - protected $reservedMacroNames; - protected $importedFunctions; - protected $tmpVarCount; - protected $traits; - protected $embeddedTemplates = array(); - - /** - * Constructor. - * - * @param Twig_Environment $env A Twig_Environment instance - */ - public function __construct(Twig_Environment $env) - { - $this->env = $env; - } - - public function getEnvironment() - { - return $this->env; - } - - public function getVarName() - { - return sprintf('__internal_%s_%d', substr($this->env->getTemplateClass($this->stream->getFilename()), strlen($this->env->getTemplateClassPrefix())), ++$this->tmpVarCount); - } - - /** - * Converts a token stream to a node tree. - * - * @param Twig_TokenStream $stream A token stream instance - * - * @return Twig_Node_Module A node tree - */ - public function parse(Twig_TokenStream $stream, $test = null, $dropNeedle = false) - { - // push all variables into the stack to keep the current state of the parser - $vars = get_object_vars($this); - unset($vars['stack'], $vars['env'], $vars['handlers'], $vars['visitors'], $vars['expressionParser']); - $this->stack[] = $vars; - - $this->tmpVarCount = 0; - - // tag handlers - if (null === $this->handlers) { - $this->handlers = $this->env->getTokenParsers(); - $this->handlers->setParser($this); - } - - // node visitors - if (null === $this->visitors) { - $this->visitors = $this->env->getNodeVisitors(); - } - - if (null === $this->expressionParser) { - $this->expressionParser = new Twig_ExpressionParser($this, $this->env->getUnaryOperators(), $this->env->getBinaryOperators()); - } - - $this->stream = $stream; - $this->parent = null; - $this->blocks = array(); - $this->macros = array(); - $this->traits = array(); - $this->blockStack = array(); - $this->importedFunctions = array(array()); - $this->embeddedTemplates = array(); - - try { - $body = $this->subparse($test, $dropNeedle); - - if (null !== $this->parent) { - if (null === $body = $this->filterBodyNodes($body)) { - $body = new Twig_Node(); - } - } - } catch (Twig_Error_Syntax $e) { - if (null === $e->getTemplateFile()) { - $e->setTemplateFile($this->stream->getFilename()); - } - - throw $e; - } - - $node = new Twig_Node_Module(new Twig_Node_Body(array($body)), $this->parent, new Twig_Node($this->blocks), new Twig_Node($this->macros), new Twig_Node($this->traits), $this->embeddedTemplates, $this->stream->getFilename()); - - $traverser = new Twig_NodeTraverser($this->env, $this->visitors); - - $node = $traverser->traverse($node); - - // restore previous stack so previous parse() call can resume working - foreach (array_pop($this->stack) as $key => $val) { - $this->$key = $val; - } - - return $node; - } - - public function subparse($test, $dropNeedle = false) - { - $lineno = $this->getCurrentToken()->getLine(); - $rv = array(); - while (!$this->stream->isEOF()) { - switch ($this->getCurrentToken()->getType()) { - case Twig_Token::TEXT_TYPE: - $token = $this->stream->next(); - $rv[] = new Twig_Node_Text($token->getValue(), $token->getLine()); - break; - - case Twig_Token::VAR_START_TYPE: - $token = $this->stream->next(); - $expr = $this->expressionParser->parseExpression(); - $this->stream->expect(Twig_Token::VAR_END_TYPE); - $rv[] = new Twig_Node_Print($expr, $token->getLine()); - break; - - case Twig_Token::BLOCK_START_TYPE: - $this->stream->next(); - $token = $this->getCurrentToken(); - - if ($token->getType() !== Twig_Token::NAME_TYPE) { - throw new Twig_Error_Syntax('A block must start with a tag name', $token->getLine(), $this->stream->getFilename()); - } - - if (null !== $test && call_user_func($test, $token)) { - if ($dropNeedle) { - $this->stream->next(); - } - - if (1 === count($rv)) { - return $rv[0]; - } - - return new Twig_Node($rv, array(), $lineno); - } - - $subparser = $this->handlers->getTokenParser($token->getValue()); - if (null === $subparser) { - if (null !== $test) { - throw new Twig_Error_Syntax(sprintf('Unexpected tag name "%s" (expecting closing tag for the "%s" tag defined near line %s)', $token->getValue(), $test[0]->getTag(), $lineno), $token->getLine(), $this->stream->getFilename()); - } - - $message = sprintf('Unknown tag name "%s"', $token->getValue()); - if ($alternatives = $this->env->computeAlternatives($token->getValue(), array_keys($this->env->getTags()))) { - $message = sprintf('%s. Did you mean "%s"', $message, implode('", "', $alternatives)); - } - - throw new Twig_Error_Syntax($message, $token->getLine(), $this->stream->getFilename()); - } - - $this->stream->next(); - - $node = $subparser->parse($token); - if (null !== $node) { - $rv[] = $node; - } - break; - - default: - throw new Twig_Error_Syntax('Lexer or parser ended up in unsupported state.', -1, $this->stream->getFilename()); - } - } - - if (1 === count($rv)) { - return $rv[0]; - } - - return new Twig_Node($rv, array(), $lineno); - } - - public function addHandler($name, $class) - { - $this->handlers[$name] = $class; - } - - public function addNodeVisitor(Twig_NodeVisitorInterface $visitor) - { - $this->visitors[] = $visitor; - } - - public function getBlockStack() - { - return $this->blockStack; - } - - public function peekBlockStack() - { - return $this->blockStack[count($this->blockStack) - 1]; - } - - public function popBlockStack() - { - array_pop($this->blockStack); - } - - public function pushBlockStack($name) - { - $this->blockStack[] = $name; - } - - public function hasBlock($name) - { - return isset($this->blocks[$name]); - } - - public function getBlock($name) - { - return $this->blocks[$name]; - } - - public function setBlock($name, $value) - { - $this->blocks[$name] = new Twig_Node_Body(array($value), array(), $value->getLine()); - } - - public function hasMacro($name) - { - return isset($this->macros[$name]); - } - - public function setMacro($name, Twig_Node_Macro $node) - { - if (null === $this->reservedMacroNames) { - $this->reservedMacroNames = array(); - $r = new ReflectionClass($this->env->getBaseTemplateClass()); - foreach ($r->getMethods() as $method) { - $this->reservedMacroNames[] = $method->getName(); - } - } - - if (in_array($name, $this->reservedMacroNames)) { - throw new Twig_Error_Syntax(sprintf('"%s" cannot be used as a macro name as it is a reserved keyword', $name), $node->getLine()); - } - - $this->macros[$name] = $node; - } - - public function addTrait($trait) - { - $this->traits[] = $trait; - } - - public function hasTraits() - { - return count($this->traits) > 0; - } - - public function embedTemplate(Twig_Node_Module $template) - { - $template->setIndex(count($this->embeddedTemplates) + 1); - - $this->embeddedTemplates[] = $template; - } - - public function addImportedFunction($alias, $name, Twig_Node_Expression $node) - { - $this->importedFunctions[0][$alias] = array('name' => $name, 'node' => $node); - } - - public function getImportedFunction($alias) - { - foreach ($this->importedFunctions as $functions) { - if (isset($functions[$alias])) { - return $functions[$alias]; - } - } - } - - public function isMainScope() - { - return 1 === count($this->importedFunctions); - } - - public function pushLocalScope() - { - array_unshift($this->importedFunctions, array()); - } - - public function popLocalScope() - { - array_shift($this->importedFunctions); - } - - /** - * Gets the expression parser. - * - * @return Twig_ExpressionParser The expression parser - */ - public function getExpressionParser() - { - return $this->expressionParser; - } - - public function getParent() - { - return $this->parent; - } - - public function setParent($parent) - { - $this->parent = $parent; - } - - /** - * Gets the token stream. - * - * @return Twig_TokenStream The token stream - */ - public function getStream() - { - return $this->stream; - } - - /** - * Gets the current token. - * - * @return Twig_Token The current token - */ - public function getCurrentToken() - { - return $this->stream->getCurrent(); - } - - protected function filterBodyNodes(Twig_NodeInterface $node) - { - // check that the body does not contain non-empty output nodes - if ( - ($node instanceof Twig_Node_Text && !ctype_space($node->getAttribute('data'))) - || - (!$node instanceof Twig_Node_Text && !$node instanceof Twig_Node_BlockReference && $node instanceof Twig_NodeOutputInterface) - ) { - if (false !== strpos((string) $node, chr(0xEF).chr(0xBB).chr(0xBF))) { - throw new Twig_Error_Syntax('A template that extends another one cannot have a body but a byte order mark (BOM) has been detected; it must be removed.', $node->getLine(), $this->stream->getFilename()); - } - - throw new Twig_Error_Syntax('A template that extends another one cannot have a body.', $node->getLine(), $this->stream->getFilename()); - } - - // bypass "set" nodes as they "capture" the output - if ($node instanceof Twig_Node_Set) { - return $node; - } - - if ($node instanceof Twig_NodeOutputInterface) { - return; - } - - foreach ($node as $k => $n) { - if (null !== $n && null === $n = $this->filterBodyNodes($n)) { - $node->removeNode($k); - } - } - - return $node; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/ParserInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/ParserInterface.php deleted file mode 100644 index 4cb6d28..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/ParserInterface.php +++ /dev/null @@ -1,28 +0,0 @@ - - */ -interface Twig_ParserInterface -{ - /** - * Converts a token stream to a node tree. - * - * @param Twig_TokenStream $stream A token stream instance - * - * @return Twig_Node_Module A node tree - */ - function parse(Twig_TokenStream $stream); -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Sandbox/SecurityError.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Sandbox/SecurityError.php deleted file mode 100644 index debabb7..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Sandbox/SecurityError.php +++ /dev/null @@ -1,20 +0,0 @@ - - */ -class Twig_Sandbox_SecurityError extends Twig_Error -{ -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Sandbox/SecurityPolicy.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Sandbox/SecurityPolicy.php deleted file mode 100644 index ba912ef..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Sandbox/SecurityPolicy.php +++ /dev/null @@ -1,120 +0,0 @@ - - */ -class Twig_Sandbox_SecurityPolicy implements Twig_Sandbox_SecurityPolicyInterface -{ - protected $allowedTags; - protected $allowedFilters; - protected $allowedMethods; - protected $allowedProperties; - protected $allowedFunctions; - - public function __construct(array $allowedTags = array(), array $allowedFilters = array(), array $allowedMethods = array(), array $allowedProperties = array(), array $allowedFunctions = array()) - { - $this->allowedTags = $allowedTags; - $this->allowedFilters = $allowedFilters; - $this->setAllowedMethods($allowedMethods); - $this->allowedProperties = $allowedProperties; - $this->allowedFunctions = $allowedFunctions; - } - - public function setAllowedTags(array $tags) - { - $this->allowedTags = $tags; - } - - public function setAllowedFilters(array $filters) - { - $this->allowedFilters = $filters; - } - - public function setAllowedMethods(array $methods) - { - $this->allowedMethods = array(); - foreach ($methods as $class => $m) { - $this->allowedMethods[$class] = array_map('strtolower', is_array($m) ? $m : array($m)); - } - } - - public function setAllowedProperties(array $properties) - { - $this->allowedProperties = $properties; - } - - public function setAllowedFunctions(array $functions) - { - $this->allowedFunctions = $functions; - } - - public function checkSecurity($tags, $filters, $functions) - { - foreach ($tags as $tag) { - if (!in_array($tag, $this->allowedTags)) { - throw new Twig_Sandbox_SecurityError(sprintf('Tag "%s" is not allowed.', $tag)); - } - } - - foreach ($filters as $filter) { - if (!in_array($filter, $this->allowedFilters)) { - throw new Twig_Sandbox_SecurityError(sprintf('Filter "%s" is not allowed.', $filter)); - } - } - - foreach ($functions as $function) { - if (!in_array($function, $this->allowedFunctions)) { - throw new Twig_Sandbox_SecurityError(sprintf('Function "%s" is not allowed.', $function)); - } - } - } - - public function checkMethodAllowed($obj, $method) - { - if ($obj instanceof Twig_TemplateInterface || $obj instanceof Twig_Markup) { - return true; - } - - $allowed = false; - $method = strtolower($method); - foreach ($this->allowedMethods as $class => $methods) { - if ($obj instanceof $class) { - $allowed = in_array($method, $methods); - - break; - } - } - - if (!$allowed) { - throw new Twig_Sandbox_SecurityError(sprintf('Calling "%s" method on a "%s" object is not allowed.', $method, get_class($obj))); - } - } - - public function checkPropertyAllowed($obj, $property) - { - $allowed = false; - foreach ($this->allowedProperties as $class => $properties) { - if ($obj instanceof $class) { - $allowed = in_array($property, is_array($properties) ? $properties : array($properties)); - - break; - } - } - - if (!$allowed) { - throw new Twig_Sandbox_SecurityError(sprintf('Calling "%s" property on a "%s" object is not allowed.', $property, get_class($obj))); - } - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Sandbox/SecurityPolicyInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Sandbox/SecurityPolicyInterface.php deleted file mode 100644 index d5015af..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Sandbox/SecurityPolicyInterface.php +++ /dev/null @@ -1,25 +0,0 @@ - - */ -interface Twig_Sandbox_SecurityPolicyInterface -{ - function checkSecurity($tags, $filters, $functions); - - function checkMethodAllowed($obj, $method); - - function checkPropertyAllowed($obj, $method); -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Template.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Template.php deleted file mode 100644 index 9357781..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Template.php +++ /dev/null @@ -1,450 +0,0 @@ - - */ -abstract class Twig_Template implements Twig_TemplateInterface -{ - static protected $cache = array(); - - protected $parent; - protected $parents; - protected $env; - protected $blocks; - protected $traits; - - /** - * Constructor. - * - * @param Twig_Environment $env A Twig_Environment instance - */ - public function __construct(Twig_Environment $env) - { - $this->env = $env; - $this->blocks = array(); - $this->traits = array(); - } - - /** - * Returns the template name. - * - * @return string The template name - */ - abstract public function getTemplateName(); - - /** - * {@inheritdoc} - */ - public function getEnvironment() - { - return $this->env; - } - - /** - * Returns the parent template. - * - * This method is for internal use only and should never be called - * directly. - * - * @return Twig_TemplateInterface|false The parent template or false if there is no parent - */ - public function getParent(array $context) - { - if (null !== $this->parent) { - return $this->parent; - } - - $parent = $this->doGetParent($context); - if (false === $parent) { - return false; - } elseif ($parent instanceof Twig_Template) { - $name = $parent->getTemplateName(); - $this->parents[$name] = $parent; - $parent = $name; - } elseif (!isset($this->parents[$parent])) { - $this->parents[$parent] = $this->env->loadTemplate($parent); - } - - return $this->parents[$parent]; - } - - protected function doGetParent(array $context) - { - return false; - } - - public function isTraitable() - { - return true; - } - - /** - * Displays a parent block. - * - * This method is for internal use only and should never be called - * directly. - * - * @param string $name The block name to display from the parent - * @param array $context The context - * @param array $blocks The current set of blocks - */ - public function displayParentBlock($name, array $context, array $blocks = array()) - { - $name = (string) $name; - - if (isset($this->traits[$name])) { - $this->traits[$name][0]->displayBlock($name, $context, $blocks); - } elseif (false !== $parent = $this->getParent($context)) { - $parent->displayBlock($name, $context, $blocks); - } else { - throw new Twig_Error_Runtime(sprintf('The template has no parent and no traits defining the "%s" block', $name), -1, $this->getTemplateName()); - } - } - - /** - * Displays a block. - * - * This method is for internal use only and should never be called - * directly. - * - * @param string $name The block name to display - * @param array $context The context - * @param array $blocks The current set of blocks - */ - public function displayBlock($name, array $context, array $blocks = array()) - { - $name = (string) $name; - - if (isset($blocks[$name])) { - $b = $blocks; - unset($b[$name]); - call_user_func($blocks[$name], $context, $b); - } elseif (isset($this->blocks[$name])) { - call_user_func($this->blocks[$name], $context, $blocks); - } elseif (false !== $parent = $this->getParent($context)) { - $parent->displayBlock($name, $context, array_merge($this->blocks, $blocks)); - } - } - - /** - * Renders a parent block. - * - * This method is for internal use only and should never be called - * directly. - * - * @param string $name The block name to render from the parent - * @param array $context The context - * @param array $blocks The current set of blocks - * - * @return string The rendered block - */ - public function renderParentBlock($name, array $context, array $blocks = array()) - { - ob_start(); - $this->displayParentBlock($name, $context, $blocks); - - return ob_get_clean(); - } - - /** - * Renders a block. - * - * This method is for internal use only and should never be called - * directly. - * - * @param string $name The block name to render - * @param array $context The context - * @param array $blocks The current set of blocks - * - * @return string The rendered block - */ - public function renderBlock($name, array $context, array $blocks = array()) - { - ob_start(); - $this->displayBlock($name, $context, $blocks); - - return ob_get_clean(); - } - - /** - * Returns whether a block exists or not. - * - * This method is for internal use only and should never be called - * directly. - * - * This method does only return blocks defined in the current template - * or defined in "used" traits. - * - * It does not return blocks from parent templates as the parent - * template name can be dynamic, which is only known based on the - * current context. - * - * @param string $name The block name - * - * @return Boolean true if the block exists, false otherwise - */ - public function hasBlock($name) - { - return isset($this->blocks[(string) $name]); - } - - /** - * Returns all block names. - * - * This method is for internal use only and should never be called - * directly. - * - * @return array An array of block names - * - * @see hasBlock - */ - public function getBlockNames() - { - return array_keys($this->blocks); - } - - /** - * Returns all blocks. - * - * This method is for internal use only and should never be called - * directly. - * - * @return array An array of blocks - * - * @see hasBlock - */ - public function getBlocks() - { - return $this->blocks; - } - - /** - * {@inheritdoc} - */ - public function display(array $context, array $blocks = array()) - { - $this->displayWithErrorHandling($this->env->mergeGlobals($context), $blocks); - } - - /** - * {@inheritdoc} - */ - public function render(array $context) - { - $level = ob_get_level(); - ob_start(); - try { - $this->display($context); - } catch (Exception $e) { - while (ob_get_level() > $level) { - ob_end_clean(); - } - - throw $e; - } - - return ob_get_clean(); - } - - protected function displayWithErrorHandling(array $context, array $blocks = array()) - { - try { - $this->doDisplay($context, $blocks); - } catch (Twig_Error $e) { - throw $e; - } catch (Exception $e) { - throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, null, $e); - } - } - - /** - * Auto-generated method to display the template with the given context. - * - * @param array $context An array of parameters to pass to the template - * @param array $blocks An array of blocks to pass to the template - */ - abstract protected function doDisplay(array $context, array $blocks = array()); - - /** - * Returns a variable from the context. - * - * This method is for internal use only and should never be called - * directly. - * - * This method should not be overriden in a sub-class as this is an - * implementation detail that has been introduced to optimize variable - * access for versions of PHP before 5.4. This is not a way to override - * the way to get a variable value. - * - * @param array $context The context - * @param string $item The variable to return from the context - * @param Boolean $ignoreStrictCheck Whether to ignore the strict variable check or not - * - * @return The content of the context variable - * - * @throws Twig_Error_Runtime if the variable does not exist and Twig is running in strict mode - */ - final protected function getContext($context, $item, $ignoreStrictCheck = false) - { - if (!array_key_exists($item, $context)) { - if ($ignoreStrictCheck || !$this->env->isStrictVariables()) { - return null; - } - - throw new Twig_Error_Runtime(sprintf('Variable "%s" does not exist', $item)); - } - - return $context[$item]; - } - - /** - * Returns the attribute value for a given array/object. - * - * @param mixed $object The object or array from where to get the item - * @param mixed $item The item to get from the array or object - * @param array $arguments An array of arguments to pass if the item is an object method - * @param string $type The type of attribute (@see Twig_TemplateInterface) - * @param Boolean $isDefinedTest Whether this is only a defined check - * @param Boolean $ignoreStrictCheck Whether to ignore the strict attribute check or not - * - * @return mixed The attribute value, or a Boolean when $isDefinedTest is true, or null when the attribute is not set and $ignoreStrictCheck is true - * - * @throws Twig_Error_Runtime if the attribute does not exist and Twig is running in strict mode and $isDefinedTest is false - */ - protected function getAttribute($object, $item, array $arguments = array(), $type = Twig_TemplateInterface::ANY_CALL, $isDefinedTest = false, $ignoreStrictCheck = false) - { - $item = (string) $item; - - // array - if (Twig_TemplateInterface::METHOD_CALL !== $type) { - if ((is_array($object) && array_key_exists($item, $object)) - || ($object instanceof ArrayAccess && isset($object[$item])) - ) { - if ($isDefinedTest) { - return true; - } - - return $object[$item]; - } - - if (Twig_TemplateInterface::ARRAY_CALL === $type) { - if ($isDefinedTest) { - return false; - } - - if ($ignoreStrictCheck || !$this->env->isStrictVariables()) { - return null; - } - - if (is_object($object)) { - throw new Twig_Error_Runtime(sprintf('Key "%s" in object (with ArrayAccess) of type "%s" does not exist', $item, get_class($object))); - } elseif (is_array($object)) { - throw new Twig_Error_Runtime(sprintf('Key "%s" for array with keys "%s" does not exist', $item, implode(', ', array_keys($object)))); - } else { - throw new Twig_Error_Runtime(sprintf('Impossible to access a key ("%s") on a "%s" variable', $item, gettype($object))); - } - } - } - - if (!is_object($object)) { - if ($isDefinedTest) { - return false; - } - - if ($ignoreStrictCheck || !$this->env->isStrictVariables()) { - return null; - } - - throw new Twig_Error_Runtime(sprintf('Item "%s" for "%s" does not exist', $item, is_array($object) ? 'Array' : $object)); - } - - $class = get_class($object); - - // object property - if (Twig_TemplateInterface::METHOD_CALL !== $type) { - /* apparently, this is not needed as this is already covered by the array_key_exists() call below - if (!isset(self::$cache[$class]['properties'])) { - foreach (get_object_vars($object) as $k => $v) { - self::$cache[$class]['properties'][$k] = true; - } - } - */ - - if (isset($object->$item) || array_key_exists($item, $object)) { - if ($isDefinedTest) { - return true; - } - - if ($this->env->hasExtension('sandbox')) { - $this->env->getExtension('sandbox')->checkPropertyAllowed($object, $item); - } - - return $object->$item; - } - } - - // object method - if (!isset(self::$cache[$class]['methods'])) { - self::$cache[$class]['methods'] = array_change_key_case(array_flip(get_class_methods($object))); - } - - $lcItem = strtolower($item); - if (isset(self::$cache[$class]['methods'][$lcItem])) { - $method = $item; - } elseif (isset(self::$cache[$class]['methods']['get'.$lcItem])) { - $method = 'get'.$item; - } elseif (isset(self::$cache[$class]['methods']['is'.$lcItem])) { - $method = 'is'.$item; - } elseif (isset(self::$cache[$class]['methods']['__call'])) { - $method = $item; - } else { - if ($isDefinedTest) { - return false; - } - - if ($ignoreStrictCheck || !$this->env->isStrictVariables()) { - return null; - } - - throw new Twig_Error_Runtime(sprintf('Method "%s" for object "%s" does not exist', $item, get_class($object))); - } - - if ($isDefinedTest) { - return true; - } - - if ($this->env->hasExtension('sandbox')) { - $this->env->getExtension('sandbox')->checkMethodAllowed($object, $method); - } - - $ret = call_user_func_array(array($object, $method), $arguments); - - // hack to be removed when macro calls are refactored - if ($object instanceof Twig_TemplateInterface) { - return $ret === '' ? '' : new Twig_Markup($ret, $this->env->getCharset()); - } - - return $ret; - } - - /** - * This method is only useful when testing Twig. Do not use it. - */ - static public function clearCache() - { - self::$cache = array(); - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TemplateInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TemplateInterface.php deleted file mode 100644 index 08da116..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TemplateInterface.php +++ /dev/null @@ -1,47 +0,0 @@ - - */ -interface Twig_TemplateInterface -{ - const ANY_CALL = 'any'; - const ARRAY_CALL = 'array'; - const METHOD_CALL = 'method'; - - /** - * Renders the template with the given context and returns it as string. - * - * @param array $context An array of parameters to pass to the template - * - * @return string The rendered template - */ - function render(array $context); - - /** - * Displays the template with the given context. - * - * @param array $context An array of parameters to pass to the template - * @param array $blocks An array of blocks to pass to the template - */ - function display(array $context, array $blocks = array()); - - /** - * Returns the bound environment for this template. - * - * @return Twig_Environment The current environment - */ - function getEnvironment(); -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Test/Function.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Test/Function.php deleted file mode 100644 index 1240a0f..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Test/Function.php +++ /dev/null @@ -1,31 +0,0 @@ - - */ -class Twig_Test_Function implements Twig_TestInterface -{ - protected $function; - - public function __construct($function) - { - $this->function = $function; - } - - public function compile() - { - return $this->function; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Test/Method.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Test/Method.php deleted file mode 100644 index a3b3948..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Test/Method.php +++ /dev/null @@ -1,32 +0,0 @@ - - */ -class Twig_Test_Method implements Twig_TestInterface -{ - protected $extension, $method; - - public function __construct(Twig_ExtensionInterface $extension, $method) - { - $this->extension = $extension; - $this->method = $method; - } - - public function compile() - { - return sprintf('$this->env->getExtension(\'%s\')->%s', $this->extension->getName(), $this->method); - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Test/Node.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Test/Node.php deleted file mode 100644 index 47a978e..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Test/Node.php +++ /dev/null @@ -1,35 +0,0 @@ - - */ -class Twig_Test_Node implements Twig_TestInterface -{ - protected $class; - - public function __construct($class) - { - $this->class = $class; - } - - public function getClass() - { - return $this->class; - } - - public function compile() - { - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TestInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TestInterface.php deleted file mode 100644 index c2ff725..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TestInterface.php +++ /dev/null @@ -1,26 +0,0 @@ - - */ -interface Twig_TestInterface -{ - /** - * Compiles a test. - * - * @return string The PHP code for the test - */ - function compile(); -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Token.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Token.php deleted file mode 100644 index 918bb91..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/Token.php +++ /dev/null @@ -1,219 +0,0 @@ - - */ -class Twig_Token -{ - protected $value; - protected $type; - protected $lineno; - - const EOF_TYPE = -1; - const TEXT_TYPE = 0; - const BLOCK_START_TYPE = 1; - const VAR_START_TYPE = 2; - const BLOCK_END_TYPE = 3; - const VAR_END_TYPE = 4; - const NAME_TYPE = 5; - const NUMBER_TYPE = 6; - const STRING_TYPE = 7; - const OPERATOR_TYPE = 8; - const PUNCTUATION_TYPE = 9; - const INTERPOLATION_START_TYPE = 10; - const INTERPOLATION_END_TYPE = 11; - - /** - * Constructor. - * - * @param integer $type The type of the token - * @param string $value The token value - * @param integer $lineno The line position in the source - */ - public function __construct($type, $value, $lineno) - { - $this->type = $type; - $this->value = $value; - $this->lineno = $lineno; - } - - /** - * Returns a string representation of the token. - * - * @return string A string representation of the token - */ - public function __toString() - { - return sprintf('%s(%s)', self::typeToString($this->type, true, $this->lineno), $this->value); - } - - /** - * Tests the current token for a type and/or a value. - * - * Parameters may be: - * * just type - * * type and value (or array of possible values) - * * just value (or array of possible values) (NAME_TYPE is used as type) - * - * @param array|integer $type The type to test - * @param array|string|null $values The token value - * - * @return Boolean - */ - public function test($type, $values = null) - { - if (null === $values && !is_int($type)) { - $values = $type; - $type = self::NAME_TYPE; - } - - return ($this->type === $type) && ( - null === $values || - (is_array($values) && in_array($this->value, $values)) || - $this->value == $values - ); - } - - /** - * Gets the line. - * - * @return integer The source line - */ - public function getLine() - { - return $this->lineno; - } - - /** - * Gets the token type. - * - * @return integer The token type - */ - public function getType() - { - return $this->type; - } - - /** - * Gets the token value. - * - * @return string The token value - */ - public function getValue() - { - return $this->value; - } - - /** - * Returns the constant representation (internal) of a given type. - * - * @param integer $type The type as an integer - * @param Boolean $short Whether to return a short representation or not - * @param integer $line The code line - * - * @return string The string representation - */ - static public function typeToString($type, $short = false, $line = -1) - { - switch ($type) { - case self::EOF_TYPE: - $name = 'EOF_TYPE'; - break; - case self::TEXT_TYPE: - $name = 'TEXT_TYPE'; - break; - case self::BLOCK_START_TYPE: - $name = 'BLOCK_START_TYPE'; - break; - case self::VAR_START_TYPE: - $name = 'VAR_START_TYPE'; - break; - case self::BLOCK_END_TYPE: - $name = 'BLOCK_END_TYPE'; - break; - case self::VAR_END_TYPE: - $name = 'VAR_END_TYPE'; - break; - case self::NAME_TYPE: - $name = 'NAME_TYPE'; - break; - case self::NUMBER_TYPE: - $name = 'NUMBER_TYPE'; - break; - case self::STRING_TYPE: - $name = 'STRING_TYPE'; - break; - case self::OPERATOR_TYPE: - $name = 'OPERATOR_TYPE'; - break; - case self::PUNCTUATION_TYPE: - $name = 'PUNCTUATION_TYPE'; - break; - case self::INTERPOLATION_START_TYPE: - $name = 'INTERPOLATION_START_TYPE'; - break; - case self::INTERPOLATION_END_TYPE: - $name = 'INTERPOLATION_END_TYPE'; - break; - default: - throw new Twig_Error_Syntax(sprintf('Token of type "%s" does not exist.', $type), $line); - } - - return $short ? $name : 'Twig_Token::'.$name; - } - - /** - * Returns the english representation of a given type. - * - * @param integer $type The type as an integer - * @param integer $line The code line - * - * @return string The string representation - */ - static public function typeToEnglish($type, $line = -1) - { - switch ($type) { - case self::EOF_TYPE: - return 'end of template'; - case self::TEXT_TYPE: - return 'text'; - case self::BLOCK_START_TYPE: - return 'begin of statement block'; - case self::VAR_START_TYPE: - return 'begin of print statement'; - case self::BLOCK_END_TYPE: - return 'end of statement block'; - case self::VAR_END_TYPE: - return 'end of print statement'; - case self::NAME_TYPE: - return 'name'; - case self::NUMBER_TYPE: - return 'number'; - case self::STRING_TYPE: - return 'string'; - case self::OPERATOR_TYPE: - return 'operator'; - case self::PUNCTUATION_TYPE: - return 'punctuation'; - case self::INTERPOLATION_START_TYPE: - return 'begin of string interpolation'; - case self::INTERPOLATION_END_TYPE: - return 'end of string interpolation'; - default: - throw new Twig_Error_Syntax(sprintf('Token of type "%s" does not exist.', $type), $line); - } - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser.php deleted file mode 100644 index ab18bfa..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser.php +++ /dev/null @@ -1,34 +0,0 @@ - - */ -abstract class Twig_TokenParser implements Twig_TokenParserInterface -{ - /** - * @var Twig_Parser - */ - protected $parser; - - /** - * Sets the parser associated with this token parser - * - * @param $parser A Twig_Parser instance - */ - public function setParser(Twig_Parser $parser) - { - $this->parser = $parser; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/AutoEscape.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/AutoEscape.php deleted file mode 100644 index 0040845..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/AutoEscape.php +++ /dev/null @@ -1,88 +0,0 @@ - - * {% autoescape true %} - * Everything will be automatically escaped in this block - * {% endautoescape %} - * - * {% autoescape false %} - * Everything will be outputed as is in this block - * {% endautoescape %} - * - * {% autoescape true js %} - * Everything will be automatically escaped in this block - * using the js escaping strategy - * {% endautoescape %} - * - */ -class Twig_TokenParser_AutoEscape extends Twig_TokenParser -{ - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - public function parse(Twig_Token $token) - { - $lineno = $token->getLine(); - - if ($this->parser->getStream()->test(Twig_Token::BLOCK_END_TYPE)) { - $value = 'html'; - } else { - $expr = $this->parser->getExpressionParser()->parseExpression(); - if (!$expr instanceof Twig_Node_Expression_Constant) { - throw new Twig_Error_Syntax('An escaping strategy must be a string or a Boolean.', $lineno); - } - $value = $expr->getAttribute('value'); - - $compat = true === $value || false === $value; - - if (true === $value) { - $value = 'html'; - } - - if ($compat && $this->parser->getStream()->test(Twig_Token::NAME_TYPE)) { - if (false === $value) { - throw new Twig_Error_Syntax('Unexpected escaping strategy as you set autoescaping to false.', $lineno); - } - - $value = $this->parser->getStream()->next()->getValue(); - } - } - - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true); - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - - return new Twig_Node_AutoEscape($value, $body, $lineno, $this->getTag()); - } - - public function decideBlockEnd(Twig_Token $token) - { - return $token->test('endautoescape'); - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'autoescape'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Block.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Block.php deleted file mode 100644 index 994078e..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Block.php +++ /dev/null @@ -1,83 +0,0 @@ - - * {% block head %} - * - * {% block title %}{% endblock %} - My Webpage - * {% endblock %} - * - */ -class Twig_TokenParser_Block extends Twig_TokenParser -{ - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - public function parse(Twig_Token $token) - { - $lineno = $token->getLine(); - $stream = $this->parser->getStream(); - $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue(); - if ($this->parser->hasBlock($name)) { - throw new Twig_Error_Syntax(sprintf("The block '$name' has already been defined line %d", $this->parser->getBlock($name)->getLine()), $lineno); - } - $this->parser->setBlock($name, $block = new Twig_Node_Block($name, new Twig_Node(array()), $lineno)); - $this->parser->pushLocalScope(); - $this->parser->pushBlockStack($name); - - if ($stream->test(Twig_Token::BLOCK_END_TYPE)) { - $stream->next(); - - $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true); - if ($stream->test(Twig_Token::NAME_TYPE)) { - $value = $stream->next()->getValue(); - - if ($value != $name) { - throw new Twig_Error_Syntax(sprintf("Expected endblock for block '$name' (but %s given)", $value), $lineno); - } - } - } else { - $body = new Twig_Node(array( - new Twig_Node_Print($this->parser->getExpressionParser()->parseExpression(), $lineno), - )); - } - $stream->expect(Twig_Token::BLOCK_END_TYPE); - - $block->setNode('body', $body); - $this->parser->popBlockStack(); - $this->parser->popLocalScope(); - - return new Twig_Node_BlockReference($name, $lineno, $this->getTag()); - } - - public function decideBlockEnd(Twig_Token $token) - { - return $token->test('endblock'); - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'block'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Do.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Do.php deleted file mode 100644 index 593d1c6..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Do.php +++ /dev/null @@ -1,42 +0,0 @@ -parser->getExpressionParser()->parseExpression(); - - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - - return new Twig_Node_Do($expr, $token->getLine(), $this->getTag()); - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'do'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Embed.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Embed.php deleted file mode 100644 index fb38b8e..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Embed.php +++ /dev/null @@ -1,66 +0,0 @@ -parser->getStream(); - - $parent = $this->parser->getExpressionParser()->parseExpression(); - - list($variables, $only, $ignoreMissing) = $this->parseArguments(); - - // inject a fake parent to make the parent() function work - $stream->injectTokens(array( - new Twig_Token(Twig_Token::BLOCK_START_TYPE, '', $token->getLine()), - new Twig_Token(Twig_Token::NAME_TYPE, 'extends', $token->getLine()), - new Twig_Token(Twig_Token::STRING_TYPE, '__parent__', $token->getLine()), - new Twig_Token(Twig_Token::BLOCK_END_TYPE, '', $token->getLine()), - )); - - $module = $this->parser->parse($stream, array($this, 'decideBlockEnd'), true); - - // override the parent with the correct one - $module->setNode('parent', $parent); - - $this->parser->embedTemplate($module); - - $stream->expect(Twig_Token::BLOCK_END_TYPE); - - return new Twig_Node_Embed($module->getAttribute('filename'), $module->getAttribute('index'), $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag()); - } - - public function decideBlockEnd(Twig_Token $token) - { - return $token->test('endembed'); - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'embed'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Extends.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Extends.php deleted file mode 100644 index 54f49ad..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Extends.php +++ /dev/null @@ -1,54 +0,0 @@ - - * {% extends "base.html" %} - * - */ -class Twig_TokenParser_Extends extends Twig_TokenParser -{ - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - public function parse(Twig_Token $token) - { - if (!$this->parser->isMainScope()) { - throw new Twig_Error_Syntax('Cannot extend from a block', $token->getLine()); - } - - if (null !== $this->parser->getParent()) { - throw new Twig_Error_Syntax('Multiple extends tags are forbidden', $token->getLine()); - } - $this->parser->setParent($this->parser->getExpressionParser()->parseExpression()); - - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - - return null; - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'extends'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Filter.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Filter.php deleted file mode 100644 index 2b97475..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Filter.php +++ /dev/null @@ -1,61 +0,0 @@ - - * {% filter upper %} - * This text becomes uppercase - * {% endfilter %} - * - */ -class Twig_TokenParser_Filter extends Twig_TokenParser -{ - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - public function parse(Twig_Token $token) - { - $name = $this->parser->getVarName(); - $ref = new Twig_Node_Expression_BlockReference(new Twig_Node_Expression_Constant($name, $token->getLine()), true, $token->getLine(), $this->getTag()); - - $filter = $this->parser->getExpressionParser()->parseFilterExpressionRaw($ref, $this->getTag()); - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - - $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true); - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - - $block = new Twig_Node_Block($name, $body, $token->getLine()); - $this->parser->setBlock($name, $block); - - return new Twig_Node_Print($filter, $token->getLine(), $this->getTag()); - } - - public function decideBlockEnd(Twig_Token $token) - { - return $token->test('endfilter'); - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'filter'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Flush.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Flush.php deleted file mode 100644 index 4e15e78..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Flush.php +++ /dev/null @@ -1,42 +0,0 @@ -parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - - return new Twig_Node_Flush($token->getLine(), $this->getTag()); - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'flush'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/For.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/For.php deleted file mode 100644 index 2cbb580..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/For.php +++ /dev/null @@ -1,89 +0,0 @@ - - *
    - * {% for user in users %} - *
  • {{ user.username|e }}
    • - * {% endfor %} - *
- * - */ -class Twig_TokenParser_For extends Twig_TokenParser -{ - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - public function parse(Twig_Token $token) - { - $lineno = $token->getLine(); - $targets = $this->parser->getExpressionParser()->parseAssignmentExpression(); - $this->parser->getStream()->expect(Twig_Token::OPERATOR_TYPE, 'in'); - $seq = $this->parser->getExpressionParser()->parseExpression(); - - $ifexpr = null; - if ($this->parser->getStream()->test(Twig_Token::NAME_TYPE, 'if')) { - $this->parser->getStream()->next(); - $ifexpr = $this->parser->getExpressionParser()->parseExpression(); - } - - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - $body = $this->parser->subparse(array($this, 'decideForFork')); - if ($this->parser->getStream()->next()->getValue() == 'else') { - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - $else = $this->parser->subparse(array($this, 'decideForEnd'), true); - } else { - $else = null; - } - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - - if (count($targets) > 1) { - $keyTarget = $targets->getNode(0); - $keyTarget = new Twig_Node_Expression_AssignName($keyTarget->getAttribute('name'), $keyTarget->getLine()); - $valueTarget = $targets->getNode(1); - $valueTarget = new Twig_Node_Expression_AssignName($valueTarget->getAttribute('name'), $valueTarget->getLine()); - } else { - $keyTarget = new Twig_Node_Expression_AssignName('_key', $lineno); - $valueTarget = $targets->getNode(0); - $valueTarget = new Twig_Node_Expression_AssignName($valueTarget->getAttribute('name'), $valueTarget->getLine()); - } - - return new Twig_Node_For($keyTarget, $valueTarget, $seq, $ifexpr, $body, $else, $lineno, $this->getTag()); - } - - public function decideForFork(Twig_Token $token) - { - return $token->test(array('else', 'endfor')); - } - - public function decideForEnd(Twig_Token $token) - { - return $token->test('endfor'); - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'for'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/From.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/From.php deleted file mode 100644 index 4e20f5c..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/From.php +++ /dev/null @@ -1,74 +0,0 @@ - - * {% from 'forms.html' import forms %} - * - */ -class Twig_TokenParser_From extends Twig_TokenParser -{ - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - public function parse(Twig_Token $token) - { - $macro = $this->parser->getExpressionParser()->parseExpression(); - $stream = $this->parser->getStream(); - $stream->expect('import'); - - $targets = array(); - do { - $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue(); - - $alias = $name; - if ($stream->test('as')) { - $stream->next(); - - $alias = $stream->expect(Twig_Token::NAME_TYPE)->getValue(); - } - - $targets[$name] = $alias; - - if (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ',')) { - break; - } - - $stream->next(); - } while (true); - - $stream->expect(Twig_Token::BLOCK_END_TYPE); - - $node = new Twig_Node_Import($macro, new Twig_Node_Expression_AssignName($this->parser->getVarName(), $token->getLine()), $token->getLine(), $this->getTag()); - - foreach($targets as $name => $alias) { - $this->parser->addImportedFunction($alias, 'get'.$name, $node->getNode('var')); - } - - return $node; - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'from'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/If.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/If.php deleted file mode 100644 index 1a694af..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/If.php +++ /dev/null @@ -1,93 +0,0 @@ - - * {% if users %} - *
    - * {% for user in users %} - *
  • {{ user.username|e }}
    • - * {% endfor %} - *
- * {% endif %} - * - */ -class Twig_TokenParser_If extends Twig_TokenParser -{ - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - public function parse(Twig_Token $token) - { - $lineno = $token->getLine(); - $expr = $this->parser->getExpressionParser()->parseExpression(); - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - $body = $this->parser->subparse(array($this, 'decideIfFork')); - $tests = array($expr, $body); - $else = null; - - $end = false; - while (!$end) { - switch ($this->parser->getStream()->next()->getValue()) { - case 'else': - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - $else = $this->parser->subparse(array($this, 'decideIfEnd')); - break; - - case 'elseif': - $expr = $this->parser->getExpressionParser()->parseExpression(); - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - $body = $this->parser->subparse(array($this, 'decideIfFork')); - $tests[] = $expr; - $tests[] = $body; - break; - - case 'endif': - $end = true; - break; - - default: - throw new Twig_Error_Syntax(sprintf('Unexpected end of template. Twig was looking for the following tags "else", "elseif", or "endif" to close the "if" block started at line %d)', $lineno), -1); - } - } - - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - - return new Twig_Node_If(new Twig_Node($tests), $else, $lineno, $this->getTag()); - } - - public function decideIfFork(Twig_Token $token) - { - return $token->test(array('elseif', 'else', 'endif')); - } - - public function decideIfEnd(Twig_Token $token) - { - return $token->test(array('endif')); - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'if'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Import.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Import.php deleted file mode 100644 index 5219289..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Import.php +++ /dev/null @@ -1,47 +0,0 @@ - - * {% import 'forms.html' as forms %} - * - */ -class Twig_TokenParser_Import extends Twig_TokenParser -{ - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - public function parse(Twig_Token $token) - { - $macro = $this->parser->getExpressionParser()->parseExpression(); - $this->parser->getStream()->expect('as'); - $var = new Twig_Node_Expression_AssignName($this->parser->getStream()->expect(Twig_Token::NAME_TYPE)->getValue(), $token->getLine()); - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - - return new Twig_Node_Import($macro, $var, $token->getLine(), $this->getTag()); - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'import'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Include.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Include.php deleted file mode 100644 index 4a31786..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Include.php +++ /dev/null @@ -1,80 +0,0 @@ - - * {% include 'header.html' %} - * Body - * {% include 'footer.html' %} - * - */ -class Twig_TokenParser_Include extends Twig_TokenParser -{ - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - public function parse(Twig_Token $token) - { - $expr = $this->parser->getExpressionParser()->parseExpression(); - - list($variables, $only, $ignoreMissing) = $this->parseArguments(); - - return new Twig_Node_Include($expr, $variables, $only, $ignoreMissing, $token->getLine(), $this->getTag()); - } - - protected function parseArguments() - { - $stream = $this->parser->getStream(); - - $ignoreMissing = false; - if ($stream->test(Twig_Token::NAME_TYPE, 'ignore')) { - $stream->next(); - $stream->expect(Twig_Token::NAME_TYPE, 'missing'); - - $ignoreMissing = true; - } - - $variables = null; - if ($stream->test(Twig_Token::NAME_TYPE, 'with')) { - $stream->next(); - - $variables = $this->parser->getExpressionParser()->parseExpression(); - } - - $only = false; - if ($stream->test(Twig_Token::NAME_TYPE, 'only')) { - $stream->next(); - - $only = true; - } - - $stream->expect(Twig_Token::BLOCK_END_TYPE); - - return array($variables, $only, $ignoreMissing); - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'include'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Macro.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Macro.php deleted file mode 100644 index ffd5848..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Macro.php +++ /dev/null @@ -1,69 +0,0 @@ - - * {% macro input(name, value, type, size) %} - * - * {% endmacro %} - * - */ -class Twig_TokenParser_Macro extends Twig_TokenParser -{ - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - public function parse(Twig_Token $token) - { - $lineno = $token->getLine(); - $name = $this->parser->getStream()->expect(Twig_Token::NAME_TYPE)->getValue(); - - $arguments = $this->parser->getExpressionParser()->parseArguments(); - - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - $this->parser->pushLocalScope(); - $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true); - if ($this->parser->getStream()->test(Twig_Token::NAME_TYPE)) { - $value = $this->parser->getStream()->next()->getValue(); - - if ($value != $name) { - throw new Twig_Error_Syntax(sprintf("Expected endmacro for macro '$name' (but %s given)", $value), $lineno); - } - } - $this->parser->popLocalScope(); - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - - $this->parser->setMacro($name, new Twig_Node_Macro($name, new Twig_Node_Body(array($body)), $arguments, $lineno, $this->getTag())); - - return null; - } - - public function decideBlockEnd(Twig_Token $token) - { - return $token->test('endmacro'); - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'macro'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Sandbox.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Sandbox.php deleted file mode 100644 index 0277c70..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Sandbox.php +++ /dev/null @@ -1,55 +0,0 @@ - - * {% sandbox %} - * {% include 'user.html' %} - * {% endsandbox %} - * - * - * @see http://www.twig-project.org/doc/api.html#sandbox-extension for details - */ -class Twig_TokenParser_Sandbox extends Twig_TokenParser -{ - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - public function parse(Twig_Token $token) - { - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - $body = $this->parser->subparse(array($this, 'decideBlockEnd'), true); - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - - return new Twig_Node_Sandbox($body, $token->getLine(), $this->getTag()); - } - - public function decideBlockEnd(Twig_Token $token) - { - return $token->test('endsandbox'); - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'sandbox'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Set.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Set.php deleted file mode 100644 index 3b4479c..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Set.php +++ /dev/null @@ -1,84 +0,0 @@ - - * {% set foo = 'foo' %} - * - * {% set foo = [1, 2] %} - * - * {% set foo = {'foo': 'bar'} %} - * - * {% set foo = 'foo' ~ 'bar' %} - * - * {% set foo, bar = 'foo', 'bar' %} - * - * {% set foo %}Some content{% endset %} - * - */ -class Twig_TokenParser_Set extends Twig_TokenParser -{ - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - public function parse(Twig_Token $token) - { - $lineno = $token->getLine(); - $stream = $this->parser->getStream(); - $names = $this->parser->getExpressionParser()->parseAssignmentExpression(); - - $capture = false; - if ($stream->test(Twig_Token::OPERATOR_TYPE, '=')) { - $stream->next(); - $values = $this->parser->getExpressionParser()->parseMultitargetExpression(); - - $stream->expect(Twig_Token::BLOCK_END_TYPE); - - if (count($names) !== count($values)) { - throw new Twig_Error_Syntax("When using set, you must have the same number of variables and assignements.", $lineno); - } - } else { - $capture = true; - - if (count($names) > 1) { - throw new Twig_Error_Syntax("When using set with a block, you cannot have a multi-target.", $lineno); - } - - $stream->expect(Twig_Token::BLOCK_END_TYPE); - - $values = $this->parser->subparse(array($this, 'decideBlockEnd'), true); - $stream->expect(Twig_Token::BLOCK_END_TYPE); - } - - return new Twig_Node_Set($capture, $names, $values, $lineno, $this->getTag()); - } - - public function decideBlockEnd(Twig_Token $token) - { - return $token->test('endset'); - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'set'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Spaceless.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Spaceless.php deleted file mode 100644 index 1e3fa8f..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Spaceless.php +++ /dev/null @@ -1,59 +0,0 @@ - - * {% spaceless %} - *
- * foo - *
- * {% endspaceless %} - * - * {# output will be
foo
#} - * - */ -class Twig_TokenParser_Spaceless extends Twig_TokenParser -{ - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - public function parse(Twig_Token $token) - { - $lineno = $token->getLine(); - - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - $body = $this->parser->subparse(array($this, 'decideSpacelessEnd'), true); - $this->parser->getStream()->expect(Twig_Token::BLOCK_END_TYPE); - - return new Twig_Node_Spaceless($body, $lineno, $this->getTag()); - } - - public function decideSpacelessEnd(Twig_Token $token) - { - return $token->test('endspaceless'); - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'spaceless'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Use.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Use.php deleted file mode 100644 index beafc80..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParser/Use.php +++ /dev/null @@ -1,85 +0,0 @@ - - * {% extends "base.html" %} - * - * {% use "blocks.html" %} - * - * {% block title %}{% endblock %} - * {% block content %}{% endblock %} - * - * - * @see http://www.twig-project.org/doc/templates.html#horizontal-reuse for details. - */ -class Twig_TokenParser_Use extends Twig_TokenParser -{ - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - public function parse(Twig_Token $token) - { - $template = $this->parser->getExpressionParser()->parseExpression(); - - if (!$template instanceof Twig_Node_Expression_Constant) { - throw new Twig_Error_Syntax('The template references in a "use" statement must be a string.', $token->getLine()); - } - - $stream = $this->parser->getStream(); - - $targets = array(); - if ($stream->test('with')) { - $stream->next(); - - do { - $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue(); - - $alias = $name; - if ($stream->test('as')) { - $stream->next(); - - $alias = $stream->expect(Twig_Token::NAME_TYPE)->getValue(); - } - - $targets[$name] = new Twig_Node_Expression_Constant($alias, -1); - - if (!$stream->test(Twig_Token::PUNCTUATION_TYPE, ',')) { - break; - } - - $stream->next(); - } while (true); - } - - $stream->expect(Twig_Token::BLOCK_END_TYPE); - - $this->parser->addTrait(new Twig_Node(array('template' => $template, 'targets' => new Twig_Node($targets)))); - - return null; - } - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - public function getTag() - { - return 'use'; - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParserBroker.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParserBroker.php deleted file mode 100644 index b214e99..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParserBroker.php +++ /dev/null @@ -1,113 +0,0 @@ - - */ -class Twig_TokenParserBroker implements Twig_TokenParserBrokerInterface -{ - protected $parser; - protected $parsers = array(); - protected $brokers = array(); - - /** - * Constructor. - * - * @param array|Traversable $parsers A Traversable of Twig_TokenParserInterface instances - * @param array|Traversable $brokers A Traversable of Twig_TokenParserBrokerInterface instances - */ - public function __construct($parsers = array(), $brokers = array()) - { - foreach ($parsers as $parser) { - if (!$parser instanceof Twig_TokenParserInterface) { - throw new Twig_Error('$parsers must a an array of Twig_TokenParserInterface'); - } - $this->parsers[$parser->getTag()] = $parser; - } - foreach ($brokers as $broker) { - if (!$broker instanceof Twig_TokenParserBrokerInterface) { - throw new Twig_Error('$brokers must a an array of Twig_TokenParserBrokerInterface'); - } - $this->brokers[] = $broker; - } - } - - /** - * Adds a TokenParser. - * - * @param Twig_TokenParserInterface $parser A Twig_TokenParserInterface instance - */ - public function addTokenParser(Twig_TokenParserInterface $parser) - { - $this->parsers[$parser->getTag()] = $parser; - } - - /** - * Adds a TokenParserBroker. - * - * @param Twig_TokenParserBroker $broker A Twig_TokenParserBroker instance - */ - public function addTokenParserBroker(Twig_TokenParserBroker $broker) - { - $this->brokers[] = $broker; - } - - /** - * Gets a suitable TokenParser for a tag. - * - * First looks in parsers, then in brokers. - * - * @param string $tag A tag name - * - * @return null|Twig_TokenParserInterface A Twig_TokenParserInterface or null if no suitable TokenParser was found - */ - public function getTokenParser($tag) - { - if (isset($this->parsers[$tag])) { - return $this->parsers[$tag]; - } - $broker = end($this->brokers); - while (false !== $broker) { - $parser = $broker->getTokenParser($tag); - if (null !== $parser) { - return $parser; - } - $broker = prev($this->brokers); - } - - return null; - } - - public function getParsers() - { - return $this->parsers; - } - - public function getParser() - { - return $this->parser; - } - - public function setParser(Twig_ParserInterface $parser) - { - $this->parser = $parser; - foreach ($this->parsers as $tokenParser) { - $tokenParser->setParser($parser); - } - foreach ($this->brokers as $broker) { - $broker->setParser($parser); - } - } -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParserBrokerInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParserBrokerInterface.php deleted file mode 100644 index 3ce8ca2..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParserBrokerInterface.php +++ /dev/null @@ -1,45 +0,0 @@ - - */ -interface Twig_TokenParserBrokerInterface -{ - /** - * Gets a TokenParser suitable for a tag. - * - * @param string $tag A tag name - * - * @return null|Twig_TokenParserInterface A Twig_TokenParserInterface or null if no suitable TokenParser was found - */ - function getTokenParser($tag); - - /** - * Calls Twig_TokenParserInterface::setParser on all parsers the implementation knows of. - * - * @param Twig_ParserInterface $parser A Twig_ParserInterface interface - */ - function setParser(Twig_ParserInterface $parser); - - /** - * Gets the Twig_ParserInterface. - * - * @return null|Twig_ParserInterface A Twig_ParserInterface instance of null - */ - function getParser(); -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParserInterface.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParserInterface.php deleted file mode 100644 index 192c018..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenParserInterface.php +++ /dev/null @@ -1,42 +0,0 @@ - - */ -interface Twig_TokenParserInterface -{ - /** - * Sets the parser associated with this token parser - * - * @param $parser A Twig_Parser instance - */ - function setParser(Twig_Parser $parser); - - /** - * Parses a token and returns a node. - * - * @param Twig_Token $token A Twig_Token instance - * - * @return Twig_NodeInterface A Twig_NodeInterface instance - */ - function parse(Twig_Token $token); - - /** - * Gets the tag name associated with this token parser. - * - * @return string The tag name - */ - function getTag(); -} diff --git a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenStream.php b/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenStream.php deleted file mode 100644 index 5708091..0000000 --- a/sources/Core/Frameworks/Flake/Util/Twig/lib/Twig/TokenStream.php +++ /dev/null @@ -1,145 +0,0 @@ - - */ -class Twig_TokenStream -{ - protected $tokens; - protected $current; - protected $filename; - - /** - * Constructor. - * - * @param array $tokens An array of tokens - * @param string $filename The name of the filename which tokens are associated with - */ - public function __construct(array $tokens, $filename = null) - { - $this->tokens = $tokens; - $this->current = 0; - $this->filename = $filename; - } - - /** - * Returns a string representation of the token stream. - * - * @return string - */ - public function __toString() - { - return implode("\n", $this->tokens); - } - - public function injectTokens(array $tokens) - { - $this->tokens = array_merge(array_slice($this->tokens, 0, $this->current), $tokens, array_slice($this->tokens, $this->current)); - } - - /** - * Sets the pointer to the next token and returns the old one. - * - * @return Twig_Token - */ - public function next() - { - if (!isset($this->tokens[++$this->current])) { - throw new Twig_Error_Syntax('Unexpected end of template', -1, $this->filename); - } - - return $this->tokens[$this->current - 1]; - } - - /** - * Tests a token and returns it or throws a syntax error. - * - * @return Twig_Token - */ - public function expect($type, $value = null, $message = null) - { - $token = $this->tokens[$this->current]; - if (!$token->test($type, $value)) { - $line = $token->getLine(); - throw new Twig_Error_Syntax(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s)', - $message ? $message.'. ' : '', - Twig_Token::typeToEnglish($token->getType(), $line), $token->getValue(), - Twig_Token::typeToEnglish($type, $line), $value ? sprintf(' with value "%s"', $value) : ''), - $line, - $this->filename - ); - } - $this->next(); - - return $token; - } - - /** - * Looks at the next token. - * - * @param integer $number - * - * @return Twig_Token - */ - public function look($number = 1) - { - if (!isset($this->tokens[$this->current + $number])) { - throw new Twig_Error_Syntax('Unexpected end of template', -1, $this->filename); - } - - return $this->tokens[$this->current + $number]; - } - - /** - * Tests the current token - * - * @return bool - */ - public function test($primary, $secondary = null) - { - return $this->tokens[$this->current]->test($primary, $secondary); - } - - /** - * Checks if end of stream was reached - * - * @return bool - */ - public function isEOF() - { - return $this->tokens[$this->current]->getType() === Twig_Token::EOF_TYPE; - } - - /** - * Gets the current token - * - * @return Twig_Token - */ - public function getCurrent() - { - return $this->tokens[$this->current]; - } - - /** - * Gets the filename associated with this stream - * - * @return string - */ - public function getFilename() - { - return $this->filename; - } -} diff --git a/sources/Core/Frameworks/Flake/config.php b/sources/Core/Frameworks/Flake/config.php deleted file mode 100644 index 8851944..0000000 --- a/sources/Core/Frameworks/Flake/config.php +++ /dev/null @@ -1,37 +0,0 @@ - -# All rights reserved -# -# http://flake.codr.fr -# -# This script is part of the Flake project. The Flake -# 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! -################################################################# - -if(defined("PROJECT_LOCALE")) { - define("FLAKE_LOCALE", PROJECT_LOCALE); -} else { - define("FLAKE_LOCALE", "fr_FR.UTF-8"); -} - -if(defined("PROJECT_TIMEZONE")) { - define("FLAKE_TIMEZONE", PROJECT_TIMEZONE); -} else { - define("FLAKE_TIMEZONE", "Europe/Paris"); -} \ No newline at end of file diff --git a/sources/Core/Frameworks/Formal/Core/Message.php b/sources/Core/Frameworks/Formal/Core/Message.php deleted file mode 100644 index 9620915..0000000 --- a/sources/Core/Frameworks/Formal/Core/Message.php +++ /dev/null @@ -1,81 +0,0 @@ - -# All rights reserved -# -# http://formal.codr.fr -# -# This script is part of the Formal project. The Formal -# 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\Core; - -class Message { - private function __construct() { - } - - public static function error($sMessage, $sTitle = "") { - if($sTitle !== "") { - $sTitle = '

' . $sTitle . '

'; - } - - $sHtml =<< - {$sTitle} - {$sMessage} - -HTML; - return $sHtml; - } - - public static function notice($sMessage, $sTitle = "", $bClose = TRUE) { - $sClose = ""; - - if($sTitle !== "") { - $sTitle = '

' . $sTitle . '

'; - } - - if($bClose === TRUE) { - $sClose = '×'; - } - - $sHtml =<< - {$sClose} - {$sTitle} - {$sMessage} - -HTML; - return $sHtml; - } - - public static function warningConfirmMessage($sHeader, $sDescription, $sActionUrl, $sActionLabel, $sCancelUrl, $sCancelLabel="Cancel") { - $sHtml =<< - -

{$sHeader}

- {$sDescription} -

- {$sActionLabel} Cancel -

- -HTML; - return $sHtml; - } -} \ No newline at end of file diff --git a/sources/Core/Frameworks/Formal/Element.php b/sources/Core/Frameworks/Formal/Element.php deleted file mode 100644 index b1df30d..0000000 --- a/sources/Core/Frameworks/Formal/Element.php +++ /dev/null @@ -1,100 +0,0 @@ - -# All rights reserved -# -# http://formal.codr.fr -# -# This script is part of the Formal project. The Formal -# 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; - -abstract class Element { - - protected $aOptions = array( - "class" => "", - "inputclass" => "input-xlarge", - "readonly" => FALSE, - "validation" => "", - "error" => FALSE, - "placeholder" => "", - "help" => "", - "popover" => "", - "refreshonchange" => FALSE, - ); - - protected $sValue = ""; - - public function __construct($aOptions) { - $this->aOptions = array_merge($this->aOptions, $aOptions); - } - - public function option($sName) { - if(array_key_exists($sName, $this->aOptions)) { - return $this->aOptions[$sName]; - } - - throw new \Exception("\Formal\Element->option(): Option '" . htmlspecialchars($sName) . "' not found."); - } - - public function optionArray($sOptionName) { - $sOption = trim($this->option($sOptionName)); - if($sOption !== "") { - $aOptions = explode(",", $sOption); - } else { - $aOptions = array(); - } - - reset($aOptions); - return $aOptions; - } - - public function setOption($sOptionName, $sOptionValue) { - $this->aOptions[$sOptionName] = $sOptionValue; - } - - public function value() { - return $this->sValue; - } - - public function setValue($sValue) { - $this->sValue = $sValue; - } - - public function __toString() { - return get_class($this) . "<" . $this->option("label") . ">"; - } - - public function renderWitness() { - return ''; - } - - public function posted() { - $aPost = \Flake\Util\Tools::POST("witness"); - if(is_array($aPost)) { - $sProp = $this->option("prop"); - return (array_key_exists($sProp, $aPost)) && (intval($aPost[$sProp]) === 1); - } - - return FALSE; - } - - public abstract function render(); -} \ No newline at end of file diff --git a/sources/Core/Frameworks/Formal/Element/Checkbox.php b/sources/Core/Frameworks/Formal/Element/Checkbox.php deleted file mode 100644 index b05ae9a..0000000 --- a/sources/Core/Frameworks/Formal/Element/Checkbox.php +++ /dev/null @@ -1,88 +0,0 @@ - -# All rights reserved -# -# http://formal.codr.fr -# -# This script is part of the Formal project. The Formal -# 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 Checkbox extends \Formal\Element { - - public function setValue($sValue) { - # Boolean - $this->sValue = ((intval($sValue) === 1)); - } - - public function render() { - $disabled = ""; - $inputclass = ""; - $groupclass = ""; - $onchange = ""; - $helpblock = ""; - $popover = ""; - - $value = $this->value(); - - $checked = ($value === TRUE ? " checked=\"checked\" " : ""); - $label = $this->option("label"); - $prop = $this->option("prop"); - - if($this->option("readonly") === TRUE) { - $inputclass .= " disabled"; - $disabled = " disabled"; - } - - if($this->option("error") === TRUE) { - $groupclass .= " error"; - } - - if(trim($this->option("class")) !== "") { - $groupclass .= " " . $this->option("class"); - } - - if(($sHelp = trim($this->option("help"))) !== "") { - $helpblock = "

" . $sHelp . "

"; - } - - if(($aPopover = $this->option("popover")) !== "") { - $inputclass .= " popover-hover "; - $popover = " title=\"" . htmlspecialchars($aPopover["title"]) . "\" "; - $popover .= " data-content=\"" . htmlspecialchars($aPopover["content"]) . "\" "; - } - - if($this->option("refreshonchange") === TRUE) { - $onchange = " onchange=\"document.getElementsByTagName('form')[0].elements['refreshed'].value=1;document.getElementsByTagName('form')[0].submit();\" "; - } - - $sHtml =<< - -
- - {$helpblock} -
- -HTML; - return $sHtml . $this->renderWitness(); - } -} \ No newline at end of file diff --git a/sources/Core/Frameworks/Formal/Element/Listbox.php b/sources/Core/Frameworks/Formal/Element/Listbox.php deleted file mode 100644 index 88dddad..0000000 --- a/sources/Core/Frameworks/Formal/Element/Listbox.php +++ /dev/null @@ -1,108 +0,0 @@ - -# All rights reserved -# -# http://formal.codr.fr -# -# This script is part of the Formal project. The Formal -# 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"); - $helpblock = ""; - $popover = ""; - - if($this->option("readonly") === TRUE) { - $inputclass .= " disabled"; - $disabled = " disabled"; - } - - if($this->option("error") === TRUE) { - $groupclass .= " error"; - } - - if(trim($this->option("class")) !== "") { - $groupclass .= " " . $this->option("class"); - } - - $aOptions = $this->option("options"); - if(!is_array($aOptions)) { - throw new \Exception("\Formal\Element\Listbox->render(): 'options' has to be an array."); - } - - if(($sHelp = trim($this->option("help"))) !== "") { - $helpblock = "

" . $sHelp . "

"; - } - - if(($aPopover = $this->option("popover")) !== "") { - $inputclass .= " popover-focus "; - $popover = " title=\"" . htmlspecialchars($aPopover["title"]) . "\" "; - $popover .= " data-content=\"" . htmlspecialchars($aPopover["content"]) . "\" "; - } - - $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 =<< - -
- - {$helpblock} -
- -HTML; - return $sHtml . $this->renderWitness(); - } -} \ No newline at end of file diff --git a/sources/Core/Frameworks/Formal/Element/Password.php b/sources/Core/Frameworks/Formal/Element/Password.php deleted file mode 100644 index f536e65..0000000 --- a/sources/Core/Frameworks/Formal/Element/Password.php +++ /dev/null @@ -1,34 +0,0 @@ - -# All rights reserved -# -# http://formal.codr.fr -# -# This script is part of the Formal project. The Formal -# 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 Password extends \Formal\Element\Text { - - protected function inputtype() { - return "password"; - } -} \ No newline at end of file diff --git a/sources/Core/Frameworks/Formal/Element/Text.php b/sources/Core/Frameworks/Formal/Element/Text.php deleted file mode 100644 index 7950875..0000000 --- a/sources/Core/Frameworks/Formal/Element/Text.php +++ /dev/null @@ -1,101 +0,0 @@ - -# All rights reserved -# -# http://formal.codr.fr -# -# This script is part of the Formal project. The Formal -# 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 Text extends \Formal\Element { - - protected function inputtype() { - return "text"; - } - - public function render() { - $disabled = ""; - $inputclass = ""; - $groupclass = ""; - $placeholder = ""; - - $value = $this->value(); - $label = $this->option("label"); - $prop = $this->option("prop"); - $placeholder = ""; - $helpblock = ""; - $popover = ""; - - if($this->option("readonly") === TRUE) { - $inputclass .= " disabled"; - $disabled = " disabled"; - } - - if($this->option("error") === TRUE) { - $groupclass .= " error"; - } - - if(trim($this->option("class")) !== "") { - $groupclass .= " " . $this->option("class"); - } - - if(trim($this->option("inputclass")) !== "") { - $inputclass = $this->option("inputclass"); - } - - if(($sPlaceHolder = trim($this->option("placeholder"))) !== "") { - $placeholder = " placeholder=\"" . htmlspecialchars($sPlaceHolder) . "\" "; - } - - $clientvalue = htmlspecialchars($value); - - $sInputType = $this->inputtype(); - - if(($sHelp = trim($this->option("help"))) !== "") { - $helpblock = "

" . $sHelp . "

"; - } - - if(($aPopover = $this->option("popover")) !== "") { - - if(array_key_exists("position", $aPopover)) { - $sPosition = $aPopover["position"]; - $inputclass .= " popover-focus-" . $sPosition; - } else { - $inputclass .= " popover-focus "; - } - - $popover = " title=\"" . htmlspecialchars($aPopover["title"]) . "\" "; - $popover .= " data-content=\"" . htmlspecialchars($aPopover["content"]) . "\" "; - } - - $sHtml =<< - -
- - {$helpblock} -
- -HTML; - return $sHtml . $this->renderWitness(); - } -} \ No newline at end of file diff --git a/sources/Core/Frameworks/Formal/Form.php b/sources/Core/Frameworks/Formal/Form.php deleted file mode 100644 index d9ff63a..0000000 --- a/sources/Core/Frameworks/Formal/Form.php +++ /dev/null @@ -1,420 +0,0 @@ - -# All rights reserved -# -# http://formal.codr.fr -# -# This script is part of the Formal project. The Formal -# 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; - -class Form { - - protected $sModelClass = ""; - protected $aOptions = array( - "action" => "", - "close" => TRUE, - "closeurl" => "", - "hook.validation" => FALSE, - "hook.morphology" => FALSE, - ); - protected $oModelInstance = null; - protected $oElements = null; - protected $aErrors = array(); - protected $bPersisted = null; # TRUE when form has persisted; available only after execute - - protected $sDisplayTitle = ""; # Displayed form title; generated in setModelInstance() - protected $sDisplayMessage = ""; # Displayed confirm message; generated in execute() - - protected $oMorpho = null; - - public function __construct($sModelClass, $aOptions = array()) { - $this->sModelClass = $sModelClass; - $this->aOptions = array_merge($this->aOptions, $aOptions); - $this->oElements = new \Flake\Core\CollectionTyped("\Formal\Element"); - } - - public function option($sName) { - if(array_key_exists($sName, $this->aOptions)) { - return $this->aOptions[$sName]; - } - - throw new \Exception("\Formal\Form->option(): Option '" . htmlspecialchars($sName) . "' not found."); - } - - public function setOption($sName, $sValue) { - $this->aOptions[$sName] = $sValue; - return $this; - } - - public function options() { - $aOptions = $this->aOptions; - return $aOptions; - } - - public function getMorpho() { - if(!is_null($this->oMorpho)) { - return $this->oMorpho; - } - - $this->oMorpho = $this->modelInstance()->formMorphologyForThisModelInstance(); - - # Calling validation hook if defined - if(($aHook = $this->option("hook.morphology")) !== FALSE) { - call_user_func($aHook, $this, $this->oMorpho); - } - - return $this->oMorpho; - } - - public function setModelInstance($oModelInstance) { - if(!\Flake\Util\Tools::is_a($oModelInstance, $this->sModelClass)) { - throw new \Exception("\Formal\Core->setModelInstance(): Given instance is not of class '" . $this->sModelClass . "'"); - } - - $this->oModelInstance = $oModelInstance; - - $this->oElements->reset(); - foreach($this->oElements as $oElement) { - $oElement->setValue( - $this->modelInstance()->get( - $oElement->option("prop") - ) - ); - } - - # Displayed form title is generated depending on modelInstance floatingness - - if($this->floatingModelInstance()) { - $this->sDisplayTitle = "Creating new" . $this->modelInstance()->humanName() . ""; - } else { - # This is changed if form is persisted, after persistance, to reflect possible change in model instance label - $this->sDisplayTitle = "Editing " . $this->modelInstance()->humanName() . "" . $this->modelInstance()->label() . ""; - } - - return $this; - } - - public function modelInstance() { - return $this->oModelInstance; - } - - public function floatingModelInstance() { - return $this->modelInstance()->floating(); - } - - public function execute() { - # Obtaining morphology from model object - $oMorpho = $this->getMorpho(); - - $this->aErrors = array(); - $oMorpho->elements()->reset(); - foreach($oMorpho->elements() as $oElement) { - # If element is readonly, skip process - if($oElement->option("readonly")) { - continue; - } - - $sPropName = $oElement->option("prop"); - - # posted value is fetched, then passes to element before persistance - if($oElement->posted()) { - - $sPostValue = $this->postValue($sPropName); - $oElement->setValue($sPostValue); - - $sValue = $oElement->value(); - - $this->modelInstance()->set( - $sPropName, - $sValue - ); - } else { - $oElement->setValue( - $this->modelInstance()->get( - $sPropName - ) - ); - } - } - - $oMorpho->elements()->reset(); - foreach($oMorpho->elements() as $oElement) { - $aValidation = $oElement->optionArray("validation"); - if(empty($aValidation)) { - continue; - } - - $sValue = $oElement->value(); - - foreach($aValidation as $sValidation) { - - # If element is readonly, skip process - if($oElement->option("readonly")) { - continue; - } - - $sParam = FALSE; - if(strpos($sValidation, ":") !== FALSE) { - $sValidation = strtok($sValidation, ":"); - $sParam = strtok(":"); - } - - $sMethod = "validate" . ucfirst(strtolower($sValidation)); - if(!method_exists($this, $sMethod)) { - throw new \Exception("\Formal\Form::execute(): no validation method for '" . htmlspecialchars($sValidation) . "'"); - } - - if($sParam === FALSE) { - $mValid = $this->$sMethod($sValue, $oMorpho, $oElement); - } else { - $mValid = $this->$sMethod($sValue, $oMorpho, $oElement, $sParam); - } - - if($mValid !== TRUE) { - $this->declareError($oElement, $mValid); - break; # one error per element per submit - } - } - } - - # Calling validation hook if defined - if(($aHook = $this->option("hook.validation")) !== FALSE) { - call_user_func($aHook, $this, $oMorpho); - } - - if(!$this->refreshed() && empty($this->aErrors)) { - - # Model object is persisted - # Last chance to generate a confirm message corresponding to what *was* submitted ("Creating", instead of "Editing") - - if($this->floatingModelInstance()) { - $this->sDisplayMessage = \Formal\Core\Message::notice( - $this->modelInstance()->humanName() . " " . $this->modelInstance()->label() . " has been created.", - "", - FALSE - ); - $bWasFloating = TRUE; - } else { - $bWasFloating = FALSE; - $this->sDisplayMessage = \Formal\Core\Message::notice( - "Changes on " . $this->modelInstance()->label() . " have been saved.", - FALSE, # No title - FALSE # No close button - ); - } - - $this->modelInstance()->persist(); - if($bWasFloating === FALSE) { - # Title is generated now, as submitted data might have changed the model instance label - $this->sDisplayTitle = "Editing " . $this->modelInstance()->humanName() . "" . $this->modelInstance()->label() . ""; - } - $this->bPersisted = TRUE; - } else { - $this->bPersisted = FALSE; - } - } - - # public, as it may be called from a hook - public function declareError(\Formal\Element $oElement, $sMessage = "") { - $this->aErrors[] = array( - "element" => $oElement, - "message" => $sMessage, - ); - - $oElement->setOption("error", TRUE); - } - - public function persisted() { - if($this->submitted()) { - if(is_null($this->bPersisted)) { - throw new \Exception("\Formal\Form->persisted(): information is not available yet. This method may only be called after execute()"); - } - - return $this->bPersisted; - } - - return FALSE; - } - - public function validateRequired($sValue, \Formal\Form\Morphology $oMorpho, \Formal\Element $oElement) { - if(trim($sValue) !== "") { - return TRUE; - } - - return "" . $oElement->option("label") . " is required."; - } - - public function validateEmail($sValue, \Formal\Form\Morphology $oMorpho, \Formal\Element $oElement) { - if(\Flake\Util\Tools::validEmail($sValue)) { - return TRUE; - } - - return "" . $oElement->option("label") . " should be an email."; - } - - public function validateSameas($sValue, \Formal\Form\Morphology $oMorpho, \Formal\Element $oElement, $sReferencePropName) { - $sReferenceValue = $oMorpho->element($sReferencePropName)->value(); - if($sValue === $sReferenceValue) { - return TRUE; - } - - return "" . $oElement->option("label") . " does not match " . $oMorpho->element($sReferencePropName)->option("label") . "."; - } - - public function validateUnique($sValue, \Formal\Form\Morphology $oMorpho, \Formal\Element $oElement) { - $oModelInstance = $this->modelInstance(); - - $oRequest = $oModelInstance->getBaseRequester()->addClauseEquals( - $oElement->option("prop"), - $sValue - ); - - if(!$oModelInstance->floating()) { - # checking id only if model instance is not floating - $oRequest->addClauseNotEquals( - $oModelInstance::PRIMARYKEY, - $oModelInstance->get( - $oModelInstance::PRIMARYKEY - ) - ); - } - - $oColl = $oRequest->execute(); - - if($oColl->count() > 0) { - return "" . $oElement->option("label") . " has to be unique. Given value is not available."; - } - - return TRUE; - } - - public function validateTokenid($sValue, \Formal\Form\Morphology $oMorpho, \Formal\Element $oElement) { - if(!preg_match("/^[a-z0-9\-]+$/", $sValue)) { - return "" . $oElement->option("label") . " is not valid. Allowed characters are digits, lowercase letters and the dash symbol '-'."; - } - - return TRUE; - } - - public function postValue($sPropName) { - $aData = \Flake\Util\Tools::POST("data"); - - if(is_array($aData) && array_key_exists($sPropName, $aData)) { - return $aData[$sPropName]; - } - - return ""; - } - - public function render() { - $aHtml = array(); - - $oMorpho = $this->getMorpho(); - - $oMorpho->elements()->reset(); - foreach($oMorpho->elements() as $oElement) { - - # Setting current prop value for element - # Set on empty (just created) FormMorphology - # And obtained from Model instance - - $oElement->setValue( - $this->modelInstance()->get( - $oElement->option("prop") - ) - ); - - $aHtml[] = $oElement->render(); - } - - $elements = implode("\n", $aHtml); - $sModelClass = $this->sModelClass; - - ###################################################### - # Displaying messages - ###################################################### - - if($this->submitted()) { - - # There were errors detected during execute() - # Error messages are displayed - - if(!empty($this->aErrors)) { - $this->sDisplayMessage = ""; - $aMessages = array(); - reset($this->aErrors); - foreach($this->aErrors as $aError) { - if(trim($aError["message"]) === "") { - continue; - } - - $aMessages[] = $aError["message"]; - } - - $this->sDisplayMessage = \Formal\Core\Message::error( - implode("
", $aMessages), - "Validation error" - ); - } - } - - $sSubmittedFlagName = $this->submitSignatureName(); - if($this->option("close") === TRUE) { - $sCloseUrl = $this->option("closeurl"); - $sCloseButton = 'Close'; - } else { - $sCloseButton = ""; - } - - $sActionUrl = $this->option("action"); - - $sHtml =<< - - -
- {$this->sDisplayTitle} - {$this->sDisplayMessage} - {$elements} -
- - {$sCloseButton} -
-
- -HTML; - - return $sHtml; - } - - protected function submitSignatureName() { - return str_replace('\\', '_', $this->sModelClass . "::submitted"); - } - - public function submitted() { - return intval(\Flake\Util\Tools::POST($this->submitSignatureName())) === 1; - } - - public function refreshed() { - return intval(\Flake\Util\Tools::POST("refreshed")) === 1; - } -} \ No newline at end of file diff --git a/sources/Core/Frameworks/Formal/Form/Morphology.php b/sources/Core/Frameworks/Formal/Form/Morphology.php deleted file mode 100644 index d37289c..0000000 --- a/sources/Core/Frameworks/Formal/Form/Morphology.php +++ /dev/null @@ -1,75 +0,0 @@ - -# All rights reserved -# -# http://formal.codr.fr -# -# This script is part of the Formal project. The Formal -# 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\Form; - -class Morphology { - - protected $oElements = null; - - public function __construct() { - $this->oElements = new \Flake\Core\CollectionTyped("\Formal\Element"); - } - - public function add(\Formal\Element $oElement) { - $this->oElements->push($oElement); - } - - protected function keyForPropName($sPropName) { - $aKeys = $this->oElements->keys(); - reset($aKeys); - foreach($aKeys as $sKey) { - $oElement = $this->oElements->getForKey($sKey); - - if($oElement->option("prop") === $sPropName) { - return $sKey; - } - } - - return FALSE; - } - - public function &element($sPropName) { - if(($sKey = $this->keyForPropName($sPropName)) === FALSE) { - throw new \Exception("\Formal\Form\Morphology->element(): Element prop='" . $sPropName . "' not found"); - } - - $oElement = $this->oElements->getForKey($sKey); - return $oElement; - } - - public function remove($sPropName) { - if(($sKey = $this->keyForPropName($sPropName)) === FALSE) { - throw new \Exception("\Formal\Form\Morphology->element(): Element prop='" . $sPropName . "' not found"); - } - - $this->oElements->remove($sKey); - } - - public function elements() { - return $this->oElements; - } -} \ No newline at end of file diff --git a/sources/Core/Frameworks/Formal/Framework.php b/sources/Core/Frameworks/Formal/Framework.php deleted file mode 100644 index 518972a..0000000 --- a/sources/Core/Frameworks/Formal/Framework.php +++ /dev/null @@ -1,35 +0,0 @@ - -# All rights reserved -# -# http://formal.codr.fr -# -# This script is part of the Formal project. The Formal -# 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; - -class Framework extends \Flake\Core\Framework { - - public static function bootstrap() { - define("FORMAL_PATH_ROOT", PROJECT_PATH_ROOT . "Core/Frameworks/Formal/"); - - } -} diff --git a/sources/Core/Frameworks/TwitterBootstrap/css/bootstrap-responsive.css b/sources/Core/Frameworks/TwitterBootstrap/css/bootstrap-responsive.css deleted file mode 100644 index 7ff4506..0000000 --- a/sources/Core/Frameworks/TwitterBootstrap/css/bootstrap-responsive.css +++ /dev/null @@ -1,690 +0,0 @@ -/*! - * Bootstrap Responsive v2.0.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ -.clearfix { - *zoom: 1; -} -.clearfix:before, -.clearfix:after { - display: table; - content: ""; -} -.clearfix:after { - clear: both; -} -.hide-text { - overflow: hidden; - text-indent: 100%; - white-space: nowrap; -} -.input-block-level { - display: block; - width: 100%; - min-height: 28px; - /* Make inputs at least the height of their button counterpart */ - - /* Makes inputs behave like true block-level elements */ - - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; -} -.hidden { - display: none; - visibility: hidden; -} -.visible-phone { - display: none; -} -.visible-tablet { - display: none; -} -.visible-desktop { - display: block; -} -.hidden-phone { - display: block; -} -.hidden-tablet { - display: block; -} -.hidden-desktop { - display: none; -} -@media (max-width: 767px) { - .visible-phone { - display: block; - } - .hidden-phone { - display: none; - } - .hidden-desktop { - display: block; - } - .visible-desktop { - display: none; - } -} -@media (min-width: 768px) and (max-width: 979px) { - .visible-tablet { - display: block; - } - .hidden-tablet { - display: none; - } - .hidden-desktop { - display: block; - } - .visible-desktop { - display: none; - } -} -@media (max-width: 480px) { - .nav-collapse { - -webkit-transform: translate3d(0, 0, 0); - } - .page-header h1 small { - display: block; - line-height: 18px; - } - input[type="checkbox"], - input[type="radio"] { - border: 1px solid #ccc; - } - .form-horizontal .control-group > label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - .form-horizontal .controls { - margin-left: 0; - } - .form-horizontal .control-list { - padding-top: 0; - } - .form-horizontal .form-actions { - padding-left: 10px; - padding-right: 10px; - } - .modal { - position: absolute; - top: 10px; - left: 10px; - right: 10px; - width: auto; - margin: 0; - } - .modal.fade.in { - top: auto; - } - .modal-header .close { - padding: 10px; - margin: -10px; - } - .carousel-caption { - position: static; - } -} -@media (max-width: 767px) { - body { - padding-left: 20px; - padding-right: 20px; - } -/* .navbar-fixed-top { - margin-left: -20px; - margin-right: -20px; - }*/ - .container { - width: auto; - } - .row-fluid { - width: 100%; - } - .row { - margin-left: 0; - } - .row > [class*="span"], - .row-fluid > [class*="span"] { - float: none; - display: block; - width: auto; - margin: 0; - } - .thumbnails [class*="span"] { - width: auto; - } - input[class*="span"], - select[class*="span"], - textarea[class*="span"], - .uneditable-input { - display: block; - width: 100%; - min-height: 28px; - /* Make inputs at least the height of their button counterpart */ - - /* Makes inputs behave like true block-level elements */ - - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - } - .input-prepend input[class*="span"], - .input-append input[class*="span"] { - width: auto; - } -} -@media (min-width: 768px) and (max-width: 979px) { - .row { - margin-left: -20px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - margin-left: 20px; - } - .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 724px; - } - .span12 { - width: 724px; - } - .span11 { - width: 662px; - } - .span10 { - width: 600px; - } - .span9 { - width: 538px; - } - .span8 { - width: 476px; - } - .span7 { - width: 414px; - } - .span6 { - width: 352px; - } - .span5 { - width: 290px; - } - .span4 { - width: 228px; - } - .span3 { - width: 166px; - } - .span2 { - width: 104px; - } - .span1 { - width: 42px; - } - .offset12 { - margin-left: 764px; - } - .offset11 { - margin-left: 702px; - } - .offset10 { - margin-left: 640px; - } - .offset9 { - margin-left: 578px; - } - .offset8 { - margin-left: 516px; - } - .offset7 { - margin-left: 454px; - } - .offset6 { - margin-left: 392px; - } - .offset5 { - margin-left: 330px; - } - .offset4 { - margin-left: 268px; - } - .offset3 { - margin-left: 206px; - } - .offset2 { - margin-left: 144px; - } - .offset1 { - margin-left: 82px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid > [class*="span"] { - float: left; - margin-left: 2.762430939%; - } - .row-fluid > [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid > .span12 { - width: 99.999999993%; - } - .row-fluid > .span11 { - width: 91.436464082%; - } - .row-fluid > .span10 { - width: 82.87292817100001%; - } - .row-fluid > .span9 { - width: 74.30939226%; - } - .row-fluid > .span8 { - width: 65.74585634900001%; - } - .row-fluid > .span7 { - width: 57.182320438000005%; - } - .row-fluid > .span6 { - width: 48.618784527%; - } - .row-fluid > .span5 { - width: 40.055248616%; - } - .row-fluid > .span4 { - width: 31.491712705%; - } - .row-fluid > .span3 { - width: 22.928176794%; - } - .row-fluid > .span2 { - width: 14.364640883%; - } - .row-fluid > .span1 { - width: 5.801104972%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - input.span12, textarea.span12, .uneditable-input.span12 { - width: 714px; - } - input.span11, textarea.span11, .uneditable-input.span11 { - width: 652px; - } - input.span10, textarea.span10, .uneditable-input.span10 { - width: 590px; - } - input.span9, textarea.span9, .uneditable-input.span9 { - width: 528px; - } - input.span8, textarea.span8, .uneditable-input.span8 { - width: 466px; - } - input.span7, textarea.span7, .uneditable-input.span7 { - width: 404px; - } - input.span6, textarea.span6, .uneditable-input.span6 { - width: 342px; - } - input.span5, textarea.span5, .uneditable-input.span5 { - width: 280px; - } - input.span4, textarea.span4, .uneditable-input.span4 { - width: 218px; - } - input.span3, textarea.span3, .uneditable-input.span3 { - width: 156px; - } - input.span2, textarea.span2, .uneditable-input.span2 { - width: 94px; - } - input.span1, textarea.span1, .uneditable-input.span1 { - width: 32px; - } -} -@media (max-width: 550px) { - body { - padding-top: 0; - } - .navbar-fixed-top { - margin-left: -20px; - margin-right: -20px; - } - .navbar-fixed-top { - position: static; - margin-bottom: 18px; - } - .navbar-fixed-top .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - .navbar .brand { - padding-left: 10px; - padding-right: 10px; - margin: 0 0 0 -5px; - } - .navbar .nav-collapse { - clear: left; - } - .navbar .nav { - float: none; - margin: 0 0 9px; - } - .navbar .nav > li { - float: none; - } - .navbar .nav > li > a { - margin-bottom: 2px; - } - .navbar .nav > .divider-vertical { - display: none; - } - .navbar .nav .nav-header { - color: #999999; - text-shadow: none; - } - .navbar .nav > li > a, - .navbar .dropdown-menu a { - padding: 6px 15px; - font-weight: bold; - color: #999999; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - } - .navbar .dropdown-menu li + li a { - margin-bottom: 2px; - } - .navbar .nav > li > a:hover, - .navbar .dropdown-menu a:hover { - background-color: #222222; - } - .navbar .dropdown-menu { - position: static; - top: auto; - left: auto; - float: none; - display: block; - max-width: none; - margin: 0 15px; - padding: 0; - background-color: transparent; - border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .navbar .dropdown-menu:before, - .navbar .dropdown-menu:after { - display: none; - } - .navbar .dropdown-menu .divider { - display: none; - } - .navbar-form, - .navbar-search { - float: none; - padding: 9px 15px; - margin: 9px 0; - border-top: 1px solid #222222; - border-bottom: 1px solid #222222; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - } - .navbar .nav.pull-right { - float: none; - margin-left: 0; - } - .navbar-static .navbar-inner { - padding-left: 10px; - padding-right: 10px; - } - .btn-navbar { - display: block; - } - .nav-collapse { - overflow: hidden; - height: 0; - } -} -@media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - overflow: visible !important; - } -} -@media (min-width: 1200px) { - .row { - margin-left: -30px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - margin-left: 30px; - } - .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 1170px; - } - .span12 { - width: 1170px; - } - .span11 { - width: 1070px; - } - .span10 { - width: 970px; - } - .span9 { - width: 870px; - } - .span8 { - width: 770px; - } - .span7 { - width: 670px; - } - .span6 { - width: 570px; - } - .span5 { - width: 470px; - } - .span4 { - width: 370px; - } - .span3 { - width: 270px; - } - .span2 { - width: 170px; - } - .span1 { - width: 70px; - } - .offset12 { - margin-left: 1230px; - } - .offset11 { - margin-left: 1130px; - } - .offset10 { - margin-left: 1030px; - } - .offset9 { - margin-left: 930px; - } - .offset8 { - margin-left: 830px; - } - .offset7 { - margin-left: 730px; - } - .offset6 { - margin-left: 630px; - } - .offset5 { - margin-left: 530px; - } - .offset4 { - margin-left: 430px; - } - .offset3 { - margin-left: 330px; - } - .offset2 { - margin-left: 230px; - } - .offset1 { - margin-left: 130px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid > [class*="span"] { - float: left; - margin-left: 2.564102564%; - } - .row-fluid > [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid > .span12 { - width: 100%; - } - .row-fluid > .span11 { - width: 91.45299145300001%; - } - .row-fluid > .span10 { - width: 82.905982906%; - } - .row-fluid > .span9 { - width: 74.358974359%; - } - .row-fluid > .span8 { - width: 65.81196581200001%; - } - .row-fluid > .span7 { - width: 57.264957265%; - } - .row-fluid > .span6 { - width: 48.717948718%; - } - .row-fluid > .span5 { - width: 40.170940171000005%; - } - .row-fluid > .span4 { - width: 31.623931624%; - } - .row-fluid > .span3 { - width: 23.076923077%; - } - .row-fluid > .span2 { - width: 14.529914530000001%; - } - .row-fluid > .span1 { - width: 5.982905983%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - input.span12, textarea.span12, .uneditable-input.span12 { - width: 1160px; - } - input.span11, textarea.span11, .uneditable-input.span11 { - width: 1060px; - } - input.span10, textarea.span10, .uneditable-input.span10 { - width: 960px; - } - input.span9, textarea.span9, .uneditable-input.span9 { - width: 860px; - } - input.span8, textarea.span8, .uneditable-input.span8 { - width: 760px; - } - input.span7, textarea.span7, .uneditable-input.span7 { - width: 660px; - } - input.span6, textarea.span6, .uneditable-input.span6 { - width: 560px; - } - input.span5, textarea.span5, .uneditable-input.span5 { - width: 460px; - } - input.span4, textarea.span4, .uneditable-input.span4 { - width: 360px; - } - input.span3, textarea.span3, .uneditable-input.span3 { - width: 260px; - } - input.span2, textarea.span2, .uneditable-input.span2 { - width: 160px; - } - input.span1, textarea.span1, .uneditable-input.span1 { - width: 60px; - } - .thumbnails { - margin-left: -30px; - } - .thumbnails > li { - margin-left: 30px; - } -} diff --git a/sources/Core/Frameworks/TwitterBootstrap/css/bootstrap-responsive.min.css b/sources/Core/Frameworks/TwitterBootstrap/css/bootstrap-responsive.min.css deleted file mode 100644 index 60a47c9..0000000 --- a/sources/Core/Frameworks/TwitterBootstrap/css/bootstrap-responsive.min.css +++ /dev/null @@ -1,12 +0,0 @@ -.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";} -.clearfix:after{clear:both;} -.hide-text{overflow:hidden;text-indent:100%;white-space:nowrap;} -.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;} -.hidden{display:none;visibility:hidden;} -.visible-phone{display:none;} -.visible-tablet{display:none;} -.visible-desktop{display:block;} -.hidden-phone{display:block;} -.hidden-tablet{display:block;} -.hidden-desktop{display:none;} -@media (max-width:767px){.visible-phone{display:block;} .hidden-phone{display:none;} .hidden-desktop{display:block;} .visible-desktop{display:none;}}@media (min-width:768px) and (max-width:979px){.visible-tablet{display:block;} .hidden-tablet{display:none;} .hidden-desktop{display:block;} .visible-desktop{display:none;}}@media (max-width:480px){.nav-collapse{-webkit-transform:translate3d(0, 0, 0);} .page-header h1 small{display:block;line-height:18px;} input[type="checkbox"],input[type="radio"]{border:1px solid #ccc;} .form-horizontal .control-group>label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:10px;padding-right:10px;} .modal{position:absolute;top:10px;left:10px;right:10px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;margin:-10px;} .carousel-caption{position:static;}}@media (max-width:767px){body{padding-left:20px;padding-right:20px;} .navbar-fixed-top{margin-left:-20px;margin-right:-20px;} .container{width:auto;} .row-fluid{width:100%;} .row{margin-left:0;} .row>[class*="span"],.row-fluid>[class*="span"]{float:none;display:block;width:auto;margin:0;} .thumbnails [class*="span"]{width:auto;} input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;} .input-prepend input[class*="span"],.input-append input[class*="span"]{width:auto;}}@media (min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:20px;} .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px;} .span12{width:724px;} .span11{width:662px;} .span10{width:600px;} .span9{width:538px;} .span8{width:476px;} .span7{width:414px;} .span6{width:352px;} .span5{width:290px;} .span4{width:228px;} .span3{width:166px;} .span2{width:104px;} .span1{width:42px;} .offset12{margin-left:764px;} .offset11{margin-left:702px;} .offset10{margin-left:640px;} .offset9{margin-left:578px;} .offset8{margin-left:516px;} .offset7{margin-left:454px;} .offset6{margin-left:392px;} .offset5{margin-left:330px;} .offset4{margin-left:268px;} .offset3{margin-left:206px;} .offset2{margin-left:144px;} .offset1{margin-left:82px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";} .row-fluid:after{clear:both;} .row-fluid>[class*="span"]{float:left;margin-left:2.762430939%;} .row-fluid>[class*="span"]:first-child{margin-left:0;} .row-fluid > .span12{width:99.999999993%;} .row-fluid > .span11{width:91.436464082%;} .row-fluid > .span10{width:82.87292817100001%;} .row-fluid > .span9{width:74.30939226%;} .row-fluid > .span8{width:65.74585634900001%;} .row-fluid > .span7{width:57.182320438000005%;} .row-fluid > .span6{width:48.618784527%;} .row-fluid > .span5{width:40.055248616%;} .row-fluid > .span4{width:31.491712705%;} .row-fluid > .span3{width:22.928176794%;} .row-fluid > .span2{width:14.364640883%;} .row-fluid > .span1{width:5.801104972%;} input,textarea,.uneditable-input{margin-left:0;} input.span12, textarea.span12, .uneditable-input.span12{width:714px;} input.span11, textarea.span11, .uneditable-input.span11{width:652px;} input.span10, textarea.span10, .uneditable-input.span10{width:590px;} input.span9, textarea.span9, .uneditable-input.span9{width:528px;} input.span8, textarea.span8, .uneditable-input.span8{width:466px;} input.span7, textarea.span7, .uneditable-input.span7{width:404px;} input.span6, textarea.span6, .uneditable-input.span6{width:342px;} input.span5, textarea.span5, .uneditable-input.span5{width:280px;} input.span4, textarea.span4, .uneditable-input.span4{width:218px;} input.span3, textarea.span3, .uneditable-input.span3{width:156px;} input.span2, textarea.span2, .uneditable-input.span2{width:94px;} input.span1, textarea.span1, .uneditable-input.span1{width:32px;}}@media (max-width:979px){body{padding-top:0;} .navbar-fixed-top{position:static;margin-bottom:18px;} .navbar-fixed-top .navbar-inner{padding:5px;} .navbar .container{width:auto;padding:0;} .navbar .brand{padding-left:10px;padding-right:10px;margin:0 0 0 -5px;} .navbar .nav-collapse{clear:left;} .navbar .nav{float:none;margin:0 0 9px;} .navbar .nav>li{float:none;} .navbar .nav>li>a{margin-bottom:2px;} .navbar .nav>.divider-vertical{display:none;} .navbar .nav .nav-header{color:#999999;text-shadow:none;} .navbar .nav>li>a,.navbar .dropdown-menu a{padding:6px 15px;font-weight:bold;color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .navbar .dropdown-menu li+li a{margin-bottom:2px;} .navbar .nav>li>a:hover,.navbar .dropdown-menu a:hover{background-color:#222222;} .navbar .dropdown-menu{position:static;top:auto;left:auto;float:none;display:block;max-width:none;margin:0 15px;padding:0;background-color:transparent;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .navbar .dropdown-menu:before,.navbar .dropdown-menu:after{display:none;} .navbar .dropdown-menu .divider{display:none;} .navbar-form,.navbar-search{float:none;padding:9px 15px;margin:9px 0;border-top:1px solid #222222;border-bottom:1px solid #222222;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.1);} .navbar .nav.pull-right{float:none;margin-left:0;} .navbar-static .navbar-inner{padding-left:10px;padding-right:10px;} .btn-navbar{display:block;} .nav-collapse{overflow:hidden;height:0;}}@media (min-width:980px){.nav-collapse.collapse{height:auto !important;overflow:visible !important;}}@media (min-width:1200px){.row{margin-left:-30px;*zoom:1;}.row:before,.row:after{display:table;content:"";} .row:after{clear:both;} [class*="span"]{float:left;margin-left:30px;} .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px;} .span12{width:1170px;} .span11{width:1070px;} .span10{width:970px;} .span9{width:870px;} .span8{width:770px;} .span7{width:670px;} .span6{width:570px;} .span5{width:470px;} .span4{width:370px;} .span3{width:270px;} .span2{width:170px;} .span1{width:70px;} .offset12{margin-left:1230px;} .offset11{margin-left:1130px;} .offset10{margin-left:1030px;} .offset9{margin-left:930px;} .offset8{margin-left:830px;} .offset7{margin-left:730px;} .offset6{margin-left:630px;} .offset5{margin-left:530px;} .offset4{margin-left:430px;} .offset3{margin-left:330px;} .offset2{margin-left:230px;} .offset1{margin-left:130px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";} .row-fluid:after{clear:both;} .row-fluid>[class*="span"]{float:left;margin-left:2.564102564%;} .row-fluid>[class*="span"]:first-child{margin-left:0;} .row-fluid > .span12{width:100%;} .row-fluid > .span11{width:91.45299145300001%;} .row-fluid > .span10{width:82.905982906%;} .row-fluid > .span9{width:74.358974359%;} .row-fluid > .span8{width:65.81196581200001%;} .row-fluid > .span7{width:57.264957265%;} .row-fluid > .span6{width:48.717948718%;} .row-fluid > .span5{width:40.170940171000005%;} .row-fluid > .span4{width:31.623931624%;} .row-fluid > .span3{width:23.076923077%;} .row-fluid > .span2{width:14.529914530000001%;} .row-fluid > .span1{width:5.982905983%;} input,textarea,.uneditable-input{margin-left:0;} input.span12, textarea.span12, .uneditable-input.span12{width:1160px;} input.span11, textarea.span11, .uneditable-input.span11{width:1060px;} input.span10, textarea.span10, .uneditable-input.span10{width:960px;} input.span9, textarea.span9, .uneditable-input.span9{width:860px;} input.span8, textarea.span8, .uneditable-input.span8{width:760px;} input.span7, textarea.span7, .uneditable-input.span7{width:660px;} input.span6, textarea.span6, .uneditable-input.span6{width:560px;} input.span5, textarea.span5, .uneditable-input.span5{width:460px;} input.span4, textarea.span4, .uneditable-input.span4{width:360px;} input.span3, textarea.span3, .uneditable-input.span3{width:260px;} input.span2, textarea.span2, .uneditable-input.span2{width:160px;} input.span1, textarea.span1, .uneditable-input.span1{width:60px;} .thumbnails{margin-left:-30px;} .thumbnails>li{margin-left:30px;}} diff --git a/sources/Core/Frameworks/TwitterBootstrap/css/bootstrap.css b/sources/Core/Frameworks/TwitterBootstrap/css/bootstrap.css deleted file mode 100644 index 495188a..0000000 --- a/sources/Core/Frameworks/TwitterBootstrap/css/bootstrap.css +++ /dev/null @@ -1,3990 +0,0 @@ -/*! - * Bootstrap v2.0.2 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} -audio, -canvas, -video { - display: inline-block; - *display: inline; - *zoom: 1; -} -audio:not([controls]) { - display: none; -} -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} -a:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} -a:hover, -a:active { - outline: 0; -} -sub, -sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} -sup { - top: -0.5em; -} -sub { - bottom: -0.25em; -} -img { - height: auto; - border: 0; - -ms-interpolation-mode: bicubic; - vertical-align: middle; -} -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} -button, -input { - *overflow: visible; - line-height: normal; -} -button::-moz-focus-inner, -input::-moz-focus-inner { - padding: 0; - border: 0; -} -button, -input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; -} -input[type="search"] { - -webkit-appearance: textfield; - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; -} -textarea { - overflow: auto; - vertical-align: top; -} -.clearfix { - *zoom: 1; -} -.clearfix:before, -.clearfix:after { - display: table; - content: ""; -} -.clearfix:after { - clear: both; -} -.hide-text { - overflow: hidden; - text-indent: 100%; - white-space: nowrap; -} -.input-block-level { - display: block; - width: 100%; - min-height: 28px; - /* Make inputs at least the height of their button counterpart */ - - /* Makes inputs behave like true block-level elements */ - - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; -} -body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #333333; - background-color: #ffffff; -} -a { - color: #0088cc; - text-decoration: none; -} -a:hover { - color: #005580; - text-decoration: underline; -} -.row { - margin-left: -20px; - *zoom: 1; -} -.row:before, -.row:after { - display: table; - content: ""; -} -.row:after { - clear: both; -} -[class*="span"] { - float: left; - margin-left: 20px; -} -.container, -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} -.span12 { - width: 940px; -} -.span11 { - width: 860px; -} -.span10 { - width: 780px; -} -.span9 { - width: 700px; -} -.span8 { - width: 620px; -} -.span7 { - width: 540px; -} -.span6 { - width: 460px; -} -.span5 { - width: 380px; -} -.span4 { - width: 300px; -} -.span3 { - width: 220px; -} -.span2 { - width: 140px; -} -.span1 { - width: 60px; -} -.offset12 { - margin-left: 980px; -} -.offset11 { - margin-left: 900px; -} -.offset10 { - margin-left: 820px; -} -.offset9 { - margin-left: 740px; -} -.offset8 { - margin-left: 660px; -} -.offset7 { - margin-left: 580px; -} -.offset6 { - margin-left: 500px; -} -.offset5 { - margin-left: 420px; -} -.offset4 { - margin-left: 340px; -} -.offset3 { - margin-left: 260px; -} -.offset2 { - margin-left: 180px; -} -.offset1 { - margin-left: 100px; -} -.row-fluid { - width: 100%; - *zoom: 1; -} -.row-fluid:before, -.row-fluid:after { - display: table; - content: ""; -} -.row-fluid:after { - clear: both; -} -.row-fluid > [class*="span"] { - float: left; - margin-left: 2.127659574%; -} -.row-fluid > [class*="span"]:first-child { - margin-left: 0; -} -.row-fluid > .span12 { - width: 99.99999998999999%; -} -.row-fluid > .span11 { - width: 91.489361693%; -} -.row-fluid > .span10 { - width: 82.97872339599999%; -} -.row-fluid > .span9 { - width: 74.468085099%; -} -.row-fluid > .span8 { - width: 65.95744680199999%; -} -.row-fluid > .span7 { - width: 57.446808505%; -} -.row-fluid > .span6 { - width: 48.93617020799999%; -} -.row-fluid > .span5 { - width: 40.425531911%; -} -.row-fluid > .span4 { - width: 31.914893614%; -} -.row-fluid > .span3 { - width: 23.404255317%; -} -.row-fluid > .span2 { - width: 14.89361702%; -} -.row-fluid > .span1 { - width: 6.382978723%; -} -.container { - margin-left: auto; - margin-right: auto; - *zoom: 1; -} -.container:before, -.container:after { - display: table; - content: ""; -} -.container:after { - clear: both; -} -.container-fluid { - padding-left: 20px; - padding-right: 20px; - *zoom: 1; -} -.container-fluid:before, -.container-fluid:after { - display: table; - content: ""; -} -.container-fluid:after { - clear: both; -} -p { - margin: 0 0 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; -} -p small { - font-size: 11px; - color: #999999; -} -.lead { - margin-bottom: 18px; - font-size: 20px; - font-weight: 200; - line-height: 27px; -} -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 0; - font-family: inherit; - font-weight: bold; - color: inherit; - text-rendering: optimizelegibility; -} -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - font-weight: normal; - color: #999999; -} -h1 { - font-size: 30px; - line-height: 36px; -} -h1 small { - font-size: 18px; -} -h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; -} -h3 { - line-height: 27px; - font-size: 18px; -} -h3 small { - font-size: 14px; -} -h4, -h5, -h6 { - line-height: 18px; -} -h4 { - font-size: 14px; -} -h4 small { - font-size: 12px; -} -h5 { - font-size: 12px; -} -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; -} -.page-header { - padding-bottom: 17px; - margin: 18px 0; - border-bottom: 1px solid #eeeeee; -} -.page-header h1 { - line-height: 1; -} -ul, -ol { - padding: 0; - margin: 0 0 9px 25px; -} -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} -ul { - list-style: disc; -} -ol { - list-style: decimal; -} -li { - line-height: 18px; -} -ul.unstyled, -ol.unstyled { - margin-left: 0; - list-style: none; -} -dl { - margin-bottom: 18px; -} -dt, -dd { - line-height: 18px; -} -dt { - font-weight: bold; - line-height: 17px; -} -dd { - margin-left: 9px; -} -.dl-horizontal dt { - float: left; - clear: left; - width: 120px; - text-align: right; -} -.dl-horizontal dd { - margin-left: 130px; -} -hr { - margin: 18px 0; - border: 0; - border-top: 1px solid #eeeeee; - border-bottom: 1px solid #ffffff; -} -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: #999999; -} -abbr[title] { - border-bottom: 1px dotted #ddd; - cursor: help; -} -abbr.initialism { - font-size: 90%; - text-transform: uppercase; -} -blockquote { - padding: 0 0 0 15px; - margin: 0 0 18px; - border-left: 5px solid #eeeeee; -} -blockquote p { - margin-bottom: 0; - font-size: 16px; - font-weight: 300; - line-height: 22.5px; -} -blockquote small { - display: block; - line-height: 18px; - color: #999999; -} -blockquote small:before { - content: '\2014 \00A0'; -} -blockquote.pull-right { - float: right; - padding-left: 0; - padding-right: 15px; - border-left: 0; - border-right: 5px solid #eeeeee; -} -blockquote.pull-right p, -blockquote.pull-right small { - text-align: right; -} -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} -address { - display: block; - margin-bottom: 18px; - line-height: 18px; - font-style: normal; -} -small { - font-size: 100%; -} -cite { - font-style: normal; -} -code, -pre { - padding: 0 3px 2px; - font-family: Menlo, Monaco, "Courier New", monospace; - font-size: 12px; - color: #333333; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -code { - padding: 2px 4px; - color: #d14; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} -pre { - display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12.025px; - line-height: 18px; - background-color: #f5f5f5; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - white-space: pre; - white-space: pre-wrap; - word-break: break-all; - word-wrap: break-word; -} -pre.prettyprint { - margin-bottom: 18px; -} -pre code { - padding: 0; - color: inherit; - background-color: transparent; - border: 0; -} -.pre-scrollable { - max-height: 340px; - overflow-y: scroll; -} -form { - margin: 0 0 18px; -} -fieldset { - padding: 0; - margin: 0; - border: 0; -} -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; - color: #333333; - border: 0; - border-bottom: 1px solid #eee; -} -legend small { - font-size: 13.5px; - color: #999999; -} -label, -input, -button, -select, -textarea { - font-size: 13px; - font-weight: normal; - line-height: 18px; -} -input, -button, -select, -textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} -label { - display: block; - margin-bottom: 5px; - color: #333333; -} -input, -textarea, -select, -.uneditable-input { - display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; - color: #555555; - border: 1px solid #cccccc; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.uneditable-textarea { - width: auto; - height: auto; -} -label input, -label textarea, -label select { - display: block; -} -input[type="image"], -input[type="checkbox"], -input[type="radio"] { - width: auto; - height: auto; - padding: 0; - margin: 3px 0; - *margin-top: 0; - /* IE7 */ - - line-height: normal; - cursor: pointer; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - border: 0 \9; - /* IE9 and down */ - -} -input[type="image"] { - border: 0; -} -input[type="file"] { - width: auto; - padding: initial; - line-height: initial; - border: initial; - background-color: #ffffff; - background-color: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -input[type="button"], -input[type="reset"], -input[type="submit"] { - width: auto; - height: auto; -} -select, -input[type="file"] { - height: 28px; - /* In IE7, the height of the select element cannot be changed by height, only font-size */ - - *margin-top: 4px; - /* For IE7, add top margin to align select with labels */ - - line-height: 28px; -} -input[type="file"] { - line-height: 18px \9; -} -select { - width: 220px; - background-color: #ffffff; -} -select[multiple], -select[size] { - height: auto; -} -input[type="image"] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -textarea { - height: auto; -} -input[type="hidden"] { - display: none; -} -.radio, -.checkbox { - padding-left: 18px; -} -.radio input[type="radio"], -.checkbox input[type="checkbox"] { - float: left; - margin-left: -18px; -} -.controls > .radio:first-child, -.controls > .checkbox:first-child { - padding-top: 5px; -} -.radio.inline, -.checkbox.inline { - display: inline-block; - padding-top: 5px; - margin-bottom: 0; - vertical-align: middle; -} -.radio.inline + .radio.inline, -.checkbox.inline + .checkbox.inline { - margin-left: 10px; -} -input, -textarea { - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} -input:focus, -textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - outline: 0; - outline: thin dotted \9; - /* IE6-9 */ - -} -input[type="file"]:focus, -input[type="radio"]:focus, -input[type="checkbox"]:focus, -select:focus { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} -.input-mini { - width: 60px; -} -.input-small { - width: 90px; -} -.input-medium { - width: 150px; -} -.input-large { - width: 210px; -} -.input-xlarge { - width: 270px; -} -.input-xxlarge { - width: 530px; -} -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input { - float: none; - margin-left: 0; -} -input, -textarea, -.uneditable-input { - margin-left: 0; -} -input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; -} -input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; -} -input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; -} -input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; -} -input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; -} -input.span7, textarea.span7, .uneditable-input.span7 { - width: 530px; -} -input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; -} -input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; -} -input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; -} -input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; -} -input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; -} -input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; -} -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - background-color: #eeeeee; - border-color: #ddd; - cursor: not-allowed; -} -.control-group.warning > label, -.control-group.warning .help-block, -.control-group.warning .help-inline { - color: #c09853; -} -.control-group.warning input, -.control-group.warning select, -.control-group.warning textarea { - color: #c09853; - border-color: #c09853; -} -.control-group.warning input:focus, -.control-group.warning select:focus, -.control-group.warning textarea:focus { - border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; -} -.control-group.warning .input-prepend .add-on, -.control-group.warning .input-append .add-on { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; -} -.control-group.error > label, -.control-group.error .help-block, -.control-group.error .help-inline { - color: #b94a48; -} -.control-group.error input, -.control-group.error select, -.control-group.error textarea { - color: #b94a48; - border-color: #b94a48; -} -.control-group.error input:focus, -.control-group.error select:focus, -.control-group.error textarea:focus { - border-color: #953b39; - -webkit-box-shadow: 0 0 6px #d59392; - -moz-box-shadow: 0 0 6px #d59392; - box-shadow: 0 0 6px #d59392; -} -.control-group.error .input-prepend .add-on, -.control-group.error .input-append .add-on { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; -} -.control-group.success > label, -.control-group.success .help-block, -.control-group.success .help-inline { - color: #468847; -} -.control-group.success input, -.control-group.success select, -.control-group.success textarea { - color: #468847; - border-color: #468847; -} -.control-group.success input:focus, -.control-group.success select:focus, -.control-group.success textarea:focus { - border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; -} -.control-group.success .input-prepend .add-on, -.control-group.success .input-append .add-on { - color: #468847; - background-color: #dff0d8; - border-color: #468847; -} -input:focus:required:invalid, -textarea:focus:required:invalid, -select:focus:required:invalid { - color: #b94a48; - border-color: #ee5f5b; -} -input:focus:required:invalid:focus, -textarea:focus:required:invalid:focus, -select:focus:required:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} -.form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; - background-color: #eeeeee; - border-top: 1px solid #ddd; - *zoom: 1; -} -.form-actions:before, -.form-actions:after { - display: table; - content: ""; -} -.form-actions:after { - clear: both; -} -.uneditable-input { - display: block; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - cursor: not-allowed; -} -:-moz-placeholder { - color: #999999; -} -::-webkit-input-placeholder { - color: #999999; -} -.help-block, -.help-inline { - color: #555555; -} -.help-block { - display: block; - margin-bottom: 9px; -} -.help-inline { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - vertical-align: middle; - padding-left: 5px; -} -.input-prepend, -.input-append { - margin-bottom: 5px; -} -.input-prepend input, -.input-append input, -.input-prepend select, -.input-append select, -.input-prepend .uneditable-input, -.input-append .uneditable-input { - *margin-left: 0; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.input-prepend input:focus, -.input-append input:focus, -.input-prepend select:focus, -.input-append select:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { - position: relative; - z-index: 2; -} -.input-prepend .uneditable-input, -.input-append .uneditable-input { - border-left-color: #ccc; -} -.input-prepend .add-on, -.input-append .add-on { - display: inline-block; - width: auto; - min-width: 16px; - height: 18px; - padding: 4px 5px; - font-weight: normal; - line-height: 18px; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - vertical-align: middle; - background-color: #eeeeee; - border: 1px solid #ccc; -} -.input-prepend .add-on, -.input-append .add-on, -.input-prepend .btn, -.input-append .btn { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-prepend .active, -.input-append .active { - background-color: #a9dba9; - border-color: #46a546; -} -.input-prepend .add-on, -.input-prepend .btn { - margin-right: -1px; -} -.input-append input, -.input-append select .uneditable-input { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-append .uneditable-input { - border-left-color: #eee; - border-right-color: #ccc; -} -.input-append .add-on, -.input-append .btn { - margin-left: -1px; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.input-prepend.input-append input, -.input-prepend.input-append select, -.input-prepend.input-append .uneditable-input { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.input-prepend.input-append .add-on:first-child, -.input-prepend.input-append .btn:first-child { - margin-right: -1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-prepend.input-append .add-on:last-child, -.input-prepend.input-append .btn:last-child { - margin-left: -1px; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.search-query { - padding-left: 14px; - padding-right: 14px; - margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; -} -.form-search input, -.form-inline input, -.form-horizontal input, -.form-search textarea, -.form-inline textarea, -.form-horizontal textarea, -.form-search select, -.form-inline select, -.form-horizontal select, -.form-search .help-inline, -.form-inline .help-inline, -.form-horizontal .help-inline, -.form-search .uneditable-input, -.form-inline .uneditable-input, -.form-horizontal .uneditable-input, -.form-search .input-prepend, -.form-inline .input-prepend, -.form-horizontal .input-prepend, -.form-search .input-append, -.form-inline .input-append, -.form-horizontal .input-append { - display: inline-block; - margin-bottom: 0; -} -.form-search .hide, -.form-inline .hide, -.form-horizontal .hide { - display: none; -} -.form-search label, -.form-inline label { - display: inline-block; -} -.form-search .input-append, -.form-inline .input-append, -.form-search .input-prepend, -.form-inline .input-prepend { - margin-bottom: 0; -} -.form-search .radio, -.form-search .checkbox, -.form-inline .radio, -.form-inline .checkbox { - padding-left: 0; - margin-bottom: 0; - vertical-align: middle; -} -.form-search .radio input[type="radio"], -.form-search .checkbox input[type="checkbox"], -.form-inline .radio input[type="radio"], -.form-inline .checkbox input[type="checkbox"] { - float: left; - margin-left: 0; - margin-right: 3px; -} -.control-group { - margin-bottom: 9px; -} -legend + .control-group { - margin-top: 18px; - -webkit-margin-top-collapse: separate; -} -.form-horizontal .control-group { - margin-bottom: 18px; - *zoom: 1; -} -.form-horizontal .control-group:before, -.form-horizontal .control-group:after { - display: table; - content: ""; -} -.form-horizontal .control-group:after { - clear: both; -} -.form-horizontal .control-label { - float: left; - width: 140px; - padding-top: 5px; - text-align: right; -} -.form-horizontal .controls { - margin-left: 160px; - /* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */ - - *display: inline-block; - *margin-left: 0; - *padding-left: 20px; -} -.form-horizontal .help-block { - margin-top: 9px; - margin-bottom: 0; -} -.form-horizontal .form-actions { - padding-left: 160px; -} -table { - max-width: 100%; - border-collapse: collapse; - border-spacing: 0; - background-color: transparent; -} -.table { - width: 100%; - margin-bottom: 18px; -} -.table th, -.table td { - padding: 8px; - line-height: 18px; - text-align: left; - vertical-align: top; - border-top: 1px solid #dddddd; -} -.table th { - font-weight: bold; -} -.table thead th { - vertical-align: bottom; -} -.table colgroup + thead tr:first-child th, -.table colgroup + thead tr:first-child td, -.table thead:first-child tr:first-child th, -.table thead:first-child tr:first-child td { - border-top: 0; -} -.table tbody + tbody { - border-top: 2px solid #dddddd; -} -.table-condensed th, -.table-condensed td { - padding: 4px 5px; -} -.table-bordered { - border: 1px solid #dddddd; - border-left: 0; - border-collapse: separate; - *border-collapse: collapsed; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.table-bordered th, -.table-bordered td { - border-left: 1px solid #dddddd; -} -.table-bordered thead:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child th, -.table-bordered tbody:first-child tr:first-child td { - border-top: 0; -} -.table-bordered thead:first-child tr:first-child th:first-child, -.table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-radius: 4px 0 0 0; - -moz-border-radius: 4px 0 0 0; - border-radius: 4px 0 0 0; -} -.table-bordered thead:first-child tr:first-child th:last-child, -.table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-radius: 0 4px 0 0; - -moz-border-radius: 0 4px 0 0; - border-radius: 0 4px 0 0; -} -.table-bordered thead:last-child tr:last-child th:first-child, -.table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 4px; - -moz-border-radius: 0 0 0 4px; - border-radius: 0 0 0 4px; -} -.table-bordered thead:last-child tr:last-child th:last-child, -.table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-radius: 0 0 4px 0; - -moz-border-radius: 0 0 4px 0; - border-radius: 0 0 4px 0; -} -.table-striped tbody tr:nth-child(odd) td, -.table-striped tbody tr:nth-child(odd) th { - background-color: #f9f9f9; -} -.table tbody tr:hover td, -.table tbody tr:hover th { - background-color: #f5f5f5; -} -table .span1 { - float: none; - width: 44px; - margin-left: 0; -} -table .span2 { - float: none; - width: 124px; - margin-left: 0; -} -table .span3 { - float: none; - width: 204px; - margin-left: 0; -} -table .span4 { - float: none; - width: 284px; - margin-left: 0; -} -table .span5 { - float: none; - width: 364px; - margin-left: 0; -} -table .span6 { - float: none; - width: 444px; - margin-left: 0; -} -table .span7 { - float: none; - width: 524px; - margin-left: 0; -} -table .span8 { - float: none; - width: 604px; - margin-left: 0; -} -table .span9 { - float: none; - width: 684px; - margin-left: 0; -} -table .span10 { - float: none; - width: 764px; - margin-left: 0; -} -table .span11 { - float: none; - width: 844px; - margin-left: 0; -} -table .span12 { - float: none; - width: 924px; - margin-left: 0; -} -table .span13 { - float: none; - width: 1004px; - margin-left: 0; -} -table .span14 { - float: none; - width: 1084px; - margin-left: 0; -} -table .span15 { - float: none; - width: 1164px; - margin-left: 0; -} -table .span16 { - float: none; - width: 1244px; - margin-left: 0; -} -table .span17 { - float: none; - width: 1324px; - margin-left: 0; -} -table .span18 { - float: none; - width: 1404px; - margin-left: 0; -} -table .span19 { - float: none; - width: 1484px; - margin-left: 0; -} -table .span20 { - float: none; - width: 1564px; - margin-left: 0; -} -table .span21 { - float: none; - width: 1644px; - margin-left: 0; -} -table .span22 { - float: none; - width: 1724px; - margin-left: 0; -} -table .span23 { - float: none; - width: 1804px; - margin-left: 0; -} -table .span24 { - float: none; - width: 1884px; - margin-left: 0; -} -[class^="icon-"], -[class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - line-height: 14px; - vertical-align: text-top; - background-image: url("../img/glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; - *margin-right: .3em; -} -[class^="icon-"]:last-child, -[class*=" icon-"]:last-child { - *margin-left: 0; -} -.icon-white { - background-image: url("../img/glyphicons-halflings-white.png"); -} -.icon-glass { - background-position: 0 0; -} -.icon-music { - background-position: -24px 0; -} -.icon-search { - background-position: -48px 0; -} -.icon-envelope { - background-position: -72px 0; -} -.icon-heart { - background-position: -96px 0; -} -.icon-star { - background-position: -120px 0; -} -.icon-star-empty { - background-position: -144px 0; -} -.icon-user { - background-position: -168px 0; -} -.icon-film { - background-position: -192px 0; -} -.icon-th-large { - background-position: -216px 0; -} -.icon-th { - background-position: -240px 0; -} -.icon-th-list { - background-position: -264px 0; -} -.icon-ok { - background-position: -288px 0; -} -.icon-remove { - background-position: -312px 0; -} -.icon-zoom-in { - background-position: -336px 0; -} -.icon-zoom-out { - background-position: -360px 0; -} -.icon-off { - background-position: -384px 0; -} -.icon-signal { - background-position: -408px 0; -} -.icon-cog { - background-position: -432px 0; -} -.icon-trash { - background-position: -456px 0; -} -.icon-home { - background-position: 0 -24px; -} -.icon-file { - background-position: -24px -24px; -} -.icon-time { - background-position: -48px -24px; -} -.icon-road { - background-position: -72px -24px; -} -.icon-download-alt { - background-position: -96px -24px; -} -.icon-download { - background-position: -120px -24px; -} -.icon-upload { - background-position: -144px -24px; -} -.icon-inbox { - background-position: -168px -24px; -} -.icon-play-circle { - background-position: -192px -24px; -} -.icon-repeat { - background-position: -216px -24px; -} -.icon-refresh { - background-position: -240px -24px; -} -.icon-list-alt { - background-position: -264px -24px; -} -.icon-lock { - background-position: -287px -24px; -} -.icon-flag { - background-position: -312px -24px; -} -.icon-headphones { - background-position: -336px -24px; -} -.icon-volume-off { - background-position: -360px -24px; -} -.icon-volume-down { - background-position: -384px -24px; -} -.icon-volume-up { - background-position: -408px -24px; -} -.icon-qrcode { - background-position: -432px -24px; -} -.icon-barcode { - background-position: -456px -24px; -} -.icon-tag { - background-position: 0 -48px; -} -.icon-tags { - background-position: -25px -48px; -} -.icon-book { - background-position: -48px -48px; -} -.icon-bookmark { - background-position: -72px -48px; -} -.icon-print { - background-position: -96px -48px; -} -.icon-camera { - background-position: -120px -48px; -} -.icon-font { - background-position: -144px -48px; -} -.icon-bold { - background-position: -167px -48px; -} -.icon-italic { - background-position: -192px -48px; -} -.icon-text-height { - background-position: -216px -48px; -} -.icon-text-width { - background-position: -240px -48px; -} -.icon-align-left { - background-position: -264px -48px; -} -.icon-align-center { - background-position: -288px -48px; -} -.icon-align-right { - background-position: -312px -48px; -} -.icon-align-justify { - background-position: -336px -48px; -} -.icon-list { - background-position: -360px -48px; -} -.icon-indent-left { - background-position: -384px -48px; -} -.icon-indent-right { - background-position: -408px -48px; -} -.icon-facetime-video { - background-position: -432px -48px; -} -.icon-picture { - background-position: -456px -48px; -} -.icon-pencil { - background-position: 0 -72px; -} -.icon-map-marker { - background-position: -24px -72px; -} -.icon-adjust { - background-position: -48px -72px; -} -.icon-tint { - background-position: -72px -72px; -} -.icon-edit { - background-position: -96px -72px; -} -.icon-share { - background-position: -120px -72px; -} -.icon-check { - background-position: -144px -72px; -} -.icon-move { - background-position: -168px -72px; -} -.icon-step-backward { - background-position: -192px -72px; -} -.icon-fast-backward { - background-position: -216px -72px; -} -.icon-backward { - background-position: -240px -72px; -} -.icon-play { - background-position: -264px -72px; -} -.icon-pause { - background-position: -288px -72px; -} -.icon-stop { - background-position: -312px -72px; -} -.icon-forward { - background-position: -336px -72px; -} -.icon-fast-forward { - background-position: -360px -72px; -} -.icon-step-forward { - background-position: -384px -72px; -} -.icon-eject { - background-position: -408px -72px; -} -.icon-chevron-left { - background-position: -432px -72px; -} -.icon-chevron-right { - background-position: -456px -72px; -} -.icon-plus-sign { - background-position: 0 -96px; -} -.icon-minus-sign { - background-position: -24px -96px; -} -.icon-remove-sign { - background-position: -48px -96px; -} -.icon-ok-sign { - background-position: -72px -96px; -} -.icon-question-sign { - background-position: -96px -96px; -} -.icon-info-sign { - background-position: -120px -96px; -} -.icon-screenshot { - background-position: -144px -96px; -} -.icon-remove-circle { - background-position: -168px -96px; -} -.icon-ok-circle { - background-position: -192px -96px; -} -.icon-ban-circle { - background-position: -216px -96px; -} -.icon-arrow-left { - background-position: -240px -96px; -} -.icon-arrow-right { - background-position: -264px -96px; -} -.icon-arrow-up { - background-position: -289px -96px; -} -.icon-arrow-down { - background-position: -312px -96px; -} -.icon-share-alt { - background-position: -336px -96px; -} -.icon-resize-full { - background-position: -360px -96px; -} -.icon-resize-small { - background-position: -384px -96px; -} -.icon-plus { - background-position: -408px -96px; -} -.icon-minus { - background-position: -433px -96px; -} -.icon-asterisk { - background-position: -456px -96px; -} -.icon-exclamation-sign { - background-position: 0 -120px; -} -.icon-gift { - background-position: -24px -120px; -} -.icon-leaf { - background-position: -48px -120px; -} -.icon-fire { - background-position: -72px -120px; -} -.icon-eye-open { - background-position: -96px -120px; -} -.icon-eye-close { - background-position: -120px -120px; -} -.icon-warning-sign { - background-position: -144px -120px; -} -.icon-plane { - background-position: -168px -120px; -} -.icon-calendar { - background-position: -192px -120px; -} -.icon-random { - background-position: -216px -120px; -} -.icon-comment { - background-position: -240px -120px; -} -.icon-magnet { - background-position: -264px -120px; -} -.icon-chevron-up { - background-position: -288px -120px; -} -.icon-chevron-down { - background-position: -313px -119px; -} -.icon-retweet { - background-position: -336px -120px; -} -.icon-shopping-cart { - background-position: -360px -120px; -} -.icon-folder-close { - background-position: -384px -120px; -} -.icon-folder-open { - background-position: -408px -120px; -} -.icon-resize-vertical { - background-position: -432px -119px; -} -.icon-resize-horizontal { - background-position: -456px -118px; -} -.dropdown { - position: relative; -} -.dropdown-toggle { - *margin-bottom: -3px; -} -.dropdown-toggle:active, -.open .dropdown-toggle { - outline: 0; -} -.caret { - display: inline-block; - width: 0; - height: 0; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #000000; - opacity: 0.3; - filter: alpha(opacity=30); - content: ""; -} -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} -.dropdown:hover .caret, -.open.dropdown .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - float: left; - display: none; - min-width: 160px; - padding: 4px 0; - margin: 0; - list-style: none; - background-color: #ffffff; - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 1px; - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - *border-right-width: 2px; - *border-bottom-width: 2px; -} -.dropdown-menu.pull-right { - right: 0; - left: auto; -} -.dropdown-menu .divider { - height: 1px; - margin: 8px 1px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; - *width: 100%; - *margin: -5px 0 5px; -} -.dropdown-menu a { - display: block; - padding: 3px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #333333; - white-space: nowrap; -} -.dropdown-menu li > a:hover, -.dropdown-menu .active > a, -.dropdown-menu .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #0088cc; -} -.dropdown.open { - *z-index: 1000; -} -.dropdown.open .dropdown-toggle { - color: #ffffff; - background: #ccc; - background: rgba(0, 0, 0, 0.3); -} -.dropdown.open .dropdown-menu { - display: block; -} -.pull-right .dropdown-menu { - left: auto; - right: 0; -} -.dropup .caret, -.navbar-fixed-bottom .dropdown .caret { - border-top: 0; - border-bottom: 4px solid #000000; - content: "\2191"; -} -.dropup .dropdown-menu, -.navbar-fixed-bottom .dropdown .dropdown-menu { - top: auto; - bottom: 100%; - margin-bottom: 1px; -} -.typeahead { - margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -} -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} -.well-large { - padding: 24px; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.well-small { - padding: 9px; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.fade { - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; - opacity: 0; -} -.fade.in { - opacity: 1; -} -.collapse { - -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; - position: relative; - overflow: hidden; - height: 0; -} -.collapse.in { - height: auto; -} -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 18px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); -} -.close:hover { - color: #000000; - text-decoration: none; - opacity: 0.4; - filter: alpha(opacity=40); - cursor: pointer; -} -.btn { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - padding: 4px 10px 4px; - margin-bottom: 0; - font-size: 13px; - line-height: 18px; - color: #333333; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - vertical-align: middle; - background-color: #f5f5f5; - background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6); - background-image: -o-linear-gradient(top, #ffffff, #e6e6e6); - background-image: linear-gradient(top, #ffffff, #e6e6e6); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); - border-color: #e6e6e6 #e6e6e6 #bfbfbf; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); - border: 1px solid #cccccc; - border-bottom-color: #b3b3b3; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - cursor: pointer; - *margin-left: .3em; -} -.btn:hover, -.btn:active, -.btn.active, -.btn.disabled, -.btn[disabled] { - background-color: #e6e6e6; -} -.btn:active, -.btn.active { - background-color: #cccccc \9; -} -.btn:first-child { - *margin-left: 0; -} -.btn:hover { - color: #333333; - text-decoration: none; - background-color: #e6e6e6; - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -ms-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} -.btn:focus { - outline: thin dotted #333; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} -.btn.active, -.btn:active { - background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - background-color: #e6e6e6; - background-color: #d9d9d9 \9; - outline: 0; -} -.btn.disabled, -.btn[disabled] { - cursor: default; - background-image: none; - background-color: #e6e6e6; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.btn-large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.btn-large [class^="icon-"] { - margin-top: 1px; -} -.btn-small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; -} -.btn-small [class^="icon-"] { - margin-top: -1px; -} -.btn-mini { - padding: 2px 6px; - font-size: 11px; - line-height: 14px; -} -.btn-primary, -.btn-primary:hover, -.btn-warning, -.btn-warning:hover, -.btn-danger, -.btn-danger:hover, -.btn-success, -.btn-success:hover, -.btn-info, -.btn-info:hover, -.btn-inverse, -.btn-inverse:hover { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - color: #ffffff; -} -.btn-primary.active, -.btn-warning.active, -.btn-danger.active, -.btn-success.active, -.btn-info.active, -.btn-inverse.active { - color: rgba(255, 255, 255, 0.75); -} -.btn-primary { - background-color: #0074cc; - background-image: -moz-linear-gradient(top, #0088cc, #0055cc); - background-image: -ms-linear-gradient(top, #0088cc, #0055cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0055cc); - background-image: -o-linear-gradient(top, #0088cc, #0055cc); - background-image: linear-gradient(top, #0088cc, #0055cc); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0); - border-color: #0055cc #0055cc #003580; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} -.btn-primary:hover, -.btn-primary:active, -.btn-primary.active, -.btn-primary.disabled, -.btn-primary[disabled] { - background-color: #0055cc; -} -.btn-primary:active, -.btn-primary.active { - background-color: #004099 \9; -} -.btn-warning { - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); - border-color: #f89406 #f89406 #ad6704; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} -.btn-warning:hover, -.btn-warning:active, -.btn-warning.active, -.btn-warning.disabled, -.btn-warning[disabled] { - background-color: #f89406; -} -.btn-warning:active, -.btn-warning.active { - background-color: #c67605 \9; -} -.btn-danger { - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} -.btn-danger:hover, -.btn-danger:active, -.btn-danger.active, -.btn-danger.disabled, -.btn-danger[disabled] { - background-color: #bd362f; -} -.btn-danger:active, -.btn-danger.active { - background-color: #942a25 \9; -} -.btn-success { - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} -.btn-success:hover, -.btn-success:active, -.btn-success.active, -.btn-success.disabled, -.btn-success[disabled] { - background-color: #51a351; -} -.btn-success:active, -.btn-success.active { - background-color: #408140 \9; -} -.btn-info { - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} -.btn-info:hover, -.btn-info:active, -.btn-info.active, -.btn-info.disabled, -.btn-info[disabled] { - background-color: #2f96b4; -} -.btn-info:active, -.btn-info.active { - background-color: #24748c \9; -} -.btn-inverse { - background-color: #414141; - background-image: -moz-linear-gradient(top, #555555, #222222); - background-image: -ms-linear-gradient(top, #555555, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222)); - background-image: -webkit-linear-gradient(top, #555555, #222222); - background-image: -o-linear-gradient(top, #555555, #222222); - background-image: linear-gradient(top, #555555, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); -} -.btn-inverse:hover, -.btn-inverse:active, -.btn-inverse.active, -.btn-inverse.disabled, -.btn-inverse[disabled] { - background-color: #222222; -} -.btn-inverse:active, -.btn-inverse.active { - background-color: #080808 \9; -} -button.btn, -input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; -} -button.btn::-moz-focus-inner, -input[type="submit"].btn::-moz-focus-inner { - padding: 0; - border: 0; -} -button.btn.btn-large, -input[type="submit"].btn.btn-large { - *padding-top: 7px; - *padding-bottom: 7px; -} -button.btn.btn-small, -input[type="submit"].btn.btn-small { - *padding-top: 3px; - *padding-bottom: 3px; -} -button.btn.btn-mini, -input[type="submit"].btn.btn-mini { - *padding-top: 1px; - *padding-bottom: 1px; -} -.btn-group { - position: relative; - *zoom: 1; - *margin-left: .3em; -} -.btn-group:before, -.btn-group:after { - display: table; - content: ""; -} -.btn-group:after { - clear: both; -} -.btn-group:first-child { - *margin-left: 0; -} -.btn-group + .btn-group { - margin-left: 5px; -} -.btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; -} -.btn-toolbar .btn-group { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; -} -.btn-group .btn { - position: relative; - float: left; - margin-left: -1px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.btn-group .btn:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; -} -.btn-group .btn:last-child, -.btn-group .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; -} -.btn-group .btn.large:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 6px; - -moz-border-radius-topleft: 6px; - border-top-left-radius: 6px; - -webkit-border-bottom-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - border-bottom-left-radius: 6px; -} -.btn-group .btn.large:last-child, -.btn-group .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - -moz-border-radius-topright: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - -moz-border-radius-bottomright: 6px; - border-bottom-right-radius: 6px; -} -.btn-group .btn:hover, -.btn-group .btn:focus, -.btn-group .btn:active, -.btn-group .btn.active { - z-index: 2; -} -.btn-group .dropdown-toggle:active, -.btn-group.open .dropdown-toggle { - outline: 0; -} -.btn-group .dropdown-toggle { - padding-left: 8px; - padding-right: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - *padding-top: 3px; - *padding-bottom: 3px; -} -.btn-group .btn-mini.dropdown-toggle { - padding-left: 5px; - padding-right: 5px; - *padding-top: 1px; - *padding-bottom: 1px; -} -.btn-group .btn-small.dropdown-toggle { - *padding-top: 4px; - *padding-bottom: 4px; -} -.btn-group .btn-large.dropdown-toggle { - padding-left: 12px; - padding-right: 12px; -} -.btn-group.open { - *z-index: 1000; -} -.btn-group.open .dropdown-menu { - display: block; - margin-top: 1px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.btn-group.open .dropdown-toggle { - background-image: none; - -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} -.btn .caret { - margin-top: 7px; - margin-left: 0; -} -.btn:hover .caret, -.open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.btn-mini .caret { - margin-top: 5px; -} -.btn-small .caret { - margin-top: 6px; -} -.btn-large .caret { - margin-top: 6px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.btn-primary .caret, -.btn-warning .caret, -.btn-danger .caret, -.btn-info .caret, -.btn-success .caret, -.btn-inverse .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); -} -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: 18px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #fbeed5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - color: #c09853; -} -.alert-heading { - color: inherit; -} -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: 18px; -} -.alert-success { - background-color: #dff0d8; - border-color: #d6e9c6; - color: #468847; -} -.alert-danger, -.alert-error { - background-color: #f2dede; - border-color: #eed3d7; - color: #b94a48; -} -.alert-info { - background-color: #d9edf7; - border-color: #bce8f1; - color: #3a87ad; -} -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} -.alert-block > p, -.alert-block > ul { - margin-bottom: 0; -} -.alert-block p + p { - margin-top: 5px; -} -.nav { - margin-left: 0; - margin-bottom: 18px; - list-style: none; -} -.nav > li > a { - display: block; -} -.nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; -} -.nav .nav-header { - display: block; - padding: 3px 15px; - font-size: 11px; - font-weight: bold; - line-height: 18px; - color: #999999; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - text-transform: uppercase; -} -.nav li + .nav-header { - margin-top: 9px; -} -.nav-list { - padding-left: 15px; - padding-right: 15px; - margin-bottom: 0; -} -.nav-list > li > a, -.nav-list .nav-header { - margin-left: -15px; - margin-right: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} -.nav-list > li > a { - padding: 3px 15px; -} -.nav-list > .active > a, -.nav-list > .active > a:hover { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} -.nav-list [class^="icon-"] { - margin-right: 2px; -} -.nav-list .divider { - height: 1px; - margin: 8px 1px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; - *width: 100%; - *margin: -5px 0 5px; -} -.nav-tabs, -.nav-pills { - *zoom: 1; -} -.nav-tabs:before, -.nav-pills:before, -.nav-tabs:after, -.nav-pills:after { - display: table; - content: ""; -} -.nav-tabs:after, -.nav-pills:after { - clear: both; -} -.nav-tabs > li, -.nav-pills > li { - float: left; -} -.nav-tabs > li > a, -.nav-pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; -} -.nav-tabs { - border-bottom: 1px solid #ddd; -} -.nav-tabs > li { - margin-bottom: -1px; -} -.nav-tabs > li > a { - padding-top: 8px; - padding-bottom: 8px; - line-height: 18px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; -} -.nav-tabs > .active > a, -.nav-tabs > .active > a:hover { - color: #555555; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; - cursor: default; -} -.nav-pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.nav-pills > .active > a, -.nav-pills > .active > a:hover { - color: #ffffff; - background-color: #0088cc; -} -.nav-stacked > li { - float: none; -} -.nav-stacked > li > a { - margin-right: 0; -} -.nav-tabs.nav-stacked { - border-bottom: 0; -} -.nav-tabs.nav-stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.nav-tabs.nav-stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.nav-tabs.nav-stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} -.nav-tabs.nav-stacked > li > a:hover { - border-color: #ddd; - z-index: 2; -} -.nav-pills.nav-stacked > li > a { - margin-bottom: 3px; -} -.nav-pills.nav-stacked > li:last-child > a { - margin-bottom: 1px; -} -.nav-tabs .dropdown-menu, -.nav-pills .dropdown-menu { - margin-top: 1px; - border-width: 1px; -} -.nav-pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.nav-tabs .dropdown-toggle .caret, -.nav-pills .dropdown-toggle .caret { - border-top-color: #0088cc; - border-bottom-color: #0088cc; - margin-top: 6px; -} -.nav-tabs .dropdown-toggle:hover .caret, -.nav-pills .dropdown-toggle:hover .caret { - border-top-color: #005580; - border-bottom-color: #005580; -} -.nav-tabs .active .dropdown-toggle .caret, -.nav-pills .active .dropdown-toggle .caret { - border-top-color: #333333; - border-bottom-color: #333333; -} -.nav > .dropdown.active > a:hover { - color: #000000; - cursor: pointer; -} -.nav-tabs .open .dropdown-toggle, -.nav-pills .open .dropdown-toggle, -.nav > .open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; -} -.nav .open .caret, -.nav .open.active .caret, -.nav .open a:hover .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); -} -.tabs-stacked .open > a:hover { - border-color: #999999; -} -.tabbable { - *zoom: 1; -} -.tabbable:before, -.tabbable:after { - display: table; - content: ""; -} -.tabbable:after { - clear: both; -} -.tab-content { - display: table; - width: 100%; -} -.tabs-below .nav-tabs, -.tabs-right .nav-tabs, -.tabs-left .nav-tabs { - border-bottom: 0; -} -.tab-content > .tab-pane, -.pill-content > .pill-pane { - display: none; -} -.tab-content > .active, -.pill-content > .active { - display: block; -} -.tabs-below .nav-tabs { - border-top: 1px solid #ddd; -} -.tabs-below .nav-tabs > li { - margin-top: -1px; - margin-bottom: 0; -} -.tabs-below .nav-tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} -.tabs-below .nav-tabs > li > a:hover { - border-bottom-color: transparent; - border-top-color: #ddd; -} -.tabs-below .nav-tabs .active > a, -.tabs-below .nav-tabs .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} -.tabs-left .nav-tabs > li, -.tabs-right .nav-tabs > li { - float: none; -} -.tabs-left .nav-tabs > li > a, -.tabs-right .nav-tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} -.tabs-left .nav-tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} -.tabs-left .nav-tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} -.tabs-left .nav-tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; -} -.tabs-left .nav-tabs .active > a, -.tabs-left .nav-tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; -} -.tabs-right .nav-tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} -.tabs-right .nav-tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} -.tabs-right .nav-tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; -} -.tabs-right .nav-tabs .active > a, -.tabs-right .nav-tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: #ffffff; -} -.navbar { - *position: relative; - *z-index: 2; - overflow: visible; - margin-bottom: 18px; -} -.navbar-inner { - padding-left: 20px; - padding-right: 20px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -} -.navbar .container { - width: auto; -} -.btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-left: 5px; - margin-right: 5px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -} -.btn-navbar:hover, -.btn-navbar:active, -.btn-navbar.active, -.btn-navbar.disabled, -.btn-navbar[disabled] { - background-color: #222222; -} -.btn-navbar:active, -.btn-navbar.active { - background-color: #080808 \9; -} -.btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -} -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} -.nav-collapse.collapse { - height: auto; -} -.navbar { - color: #999999; -} -.navbar .brand:hover { - text-decoration: none; -} -.navbar .brand { - float: left; - display: block; - padding: 8px 20px 12px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - line-height: 1; - color: #ffffff; -} -.navbar .navbar-text { - margin-bottom: 0; - line-height: 40px; -} -.navbar .btn, -.navbar .btn-group { - margin-top: 5px; -} -.navbar .btn-group .btn { - margin-top: 0; -} -.navbar-form { - margin-bottom: 0; - *zoom: 1; -} -.navbar-form:before, -.navbar-form:after { - display: table; - content: ""; -} -.navbar-form:after { - clear: both; -} -.navbar-form input, -.navbar-form select, -.navbar-form .radio, -.navbar-form .checkbox { - margin-top: 5px; -} -.navbar-form input, -.navbar-form select { - display: inline-block; - margin-bottom: 0; -} -.navbar-form input[type="image"], -.navbar-form input[type="checkbox"], -.navbar-form input[type="radio"] { - margin-top: 3px; -} -.navbar-form .input-append, -.navbar-form .input-prepend { - margin-top: 6px; - white-space: nowrap; -} -.navbar-form .input-append input, -.navbar-form .input-prepend input { - margin-top: 0; -} -.navbar-search { - position: relative; - float: left; - margin-top: 6px; - margin-bottom: 0; -} -.navbar-search .search-query { - padding: 4px 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - color: #ffffff; - background-color: #626262; - border: 1px solid #151515; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} -.navbar-search .search-query:-moz-placeholder { - color: #cccccc; -} -.navbar-search .search-query::-webkit-input-placeholder { - color: #cccccc; -} -.navbar-search .search-query:focus, -.navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; -} -.navbar-fixed-top, -.navbar-fixed-bottom { - position: fixed; - right: 0; - left: 0; - z-index: 1030; - margin-bottom: 0; -} -.navbar-fixed-top .navbar-inner, -.navbar-fixed-bottom .navbar-inner { - padding-left: 0; - padding-right: 0; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.navbar-fixed-top .container, -.navbar-fixed-bottom .container { - width: 940px; -} -.navbar-fixed-top { - top: 0; -} -.navbar-fixed-bottom { - bottom: 0; -} -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} -.navbar .nav.pull-right { - float: right; -} -.navbar .nav > li { - display: block; - float: left; -} -.navbar .nav > li > a { - float: none; - padding: 10px 10px 11px; - line-height: 19px; - color: #999999; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .nav > li > a:hover { - background-color: transparent; - color: #ffffff; - text-decoration: none; -} -.navbar .nav .active > a, -.navbar .nav .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #222222; -} -.navbar .divider-vertical { - height: 40px; - width: 1px; - margin: 0 9px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; -} -.navbar .dropdown-menu { - margin-top: 1px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.navbar .dropdown-menu:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.2); - position: absolute; - top: -7px; - left: 9px; -} -.navbar .dropdown-menu:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - position: absolute; - top: -6px; - left: 10px; -} -.navbar-fixed-bottom .dropdown-menu:before { - border-top: 7px solid #ccc; - border-top-color: rgba(0, 0, 0, 0.2); - border-bottom: 0; - bottom: -7px; - top: auto; -} -.navbar-fixed-bottom .dropdown-menu:after { - border-top: 6px solid #ffffff; - border-bottom: 0; - bottom: -6px; - top: auto; -} -.navbar .nav .dropdown-toggle .caret, -.navbar .nav .open.dropdown .caret { - border-top-color: #ffffff; - border-bottom-color: #ffffff; -} -.navbar .nav .active .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.navbar .nav .open > .dropdown-toggle, -.navbar .nav .active > .dropdown-toggle, -.navbar .nav .open.active > .dropdown-toggle { - background-color: transparent; -} -.navbar .nav .active > .dropdown-toggle:hover { - color: #ffffff; -} -.navbar .nav.pull-right .dropdown-menu, -.navbar .nav .dropdown-menu.pull-right { - left: auto; - right: 0; -} -.navbar .nav.pull-right .dropdown-menu:before, -.navbar .nav .dropdown-menu.pull-right:before { - left: auto; - right: 12px; -} -.navbar .nav.pull-right .dropdown-menu:after, -.navbar .nav .dropdown-menu.pull-right:after { - left: auto; - right: 13px; -} -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - list-style: none; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} -.breadcrumb li { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - text-shadow: 0 1px 0 #ffffff; -} -.breadcrumb .divider { - padding: 0 5px; - color: #999999; -} -.breadcrumb .active a { - color: #333333; -} -.pagination { - height: 36px; - margin: 18px 0; -} -.pagination ul { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-left: 0; - margin-bottom: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -} -.pagination li { - display: inline; -} -.pagination a { - float: left; - padding: 0 14px; - line-height: 34px; - text-decoration: none; - border: 1px solid #ddd; - border-left-width: 0; -} -.pagination a:hover, -.pagination .active a { - background-color: #f5f5f5; -} -.pagination .active a { - color: #999999; - cursor: default; -} -.pagination .disabled span, -.pagination .disabled a, -.pagination .disabled a:hover { - color: #999999; - background-color: transparent; - cursor: default; -} -.pagination li:first-child a { - border-left-width: 1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.pagination li:last-child a { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.pagination-centered { - text-align: center; -} -.pagination-right { - text-align: right; -} -.pager { - margin-left: 0; - margin-bottom: 18px; - list-style: none; - text-align: center; - *zoom: 1; -} -.pager:before, -.pager:after { - display: table; - content: ""; -} -.pager:after { - clear: both; -} -.pager li { - display: inline; -} -.pager a { - display: inline-block; - padding: 5px 14px; - background-color: #fff; - border: 1px solid #ddd; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} -.pager a:hover { - text-decoration: none; - background-color: #f5f5f5; -} -.pager .next a { - float: right; -} -.pager .previous a { - float: left; -} -.pager .disabled a, -.pager .disabled a:hover { - color: #999999; - background-color: #fff; - cursor: default; -} -.modal-open .dropdown-menu { - z-index: 2050; -} -.modal-open .dropdown.open { - *z-index: 2050; -} -.modal-open .popover { - z-index: 2060; -} -.modal-open .tooltip { - z-index: 2070; -} -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; -} -.modal-backdrop.fade { - opacity: 0; -} -.modal-backdrop, -.modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); -} -.modal { - position: fixed; - top: 50%; - left: 50%; - z-index: 1050; - overflow: auto; - width: 560px; - margin: -250px 0 0 -280px; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - /* IE6-7 */ - - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.modal.fade { - -webkit-transition: opacity .3s linear, top .3s ease-out; - -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; - -o-transition: opacity .3s linear, top .3s ease-out; - transition: opacity .3s linear, top .3s ease-out; - top: -25%; -} -.modal.fade.in { - top: 50%; -} -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; -} -.modal-header .close { - margin-top: 2px; -} -.modal-body { - overflow-y: auto; - max-height: 400px; - padding: 15px; -} -.modal-form { - margin-bottom: 0; -} -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - text-align: right; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; - *zoom: 1; -} -.modal-footer:before, -.modal-footer:after { - display: table; - content: ""; -} -.modal-footer:after { - clear: both; -} -.modal-footer .btn + .btn { - margin-left: 5px; - margin-bottom: 0; -} -.modal-footer .btn-group .btn + .btn { - margin-left: -1px; -} -.tooltip { - position: absolute; - z-index: 1020; - display: block; - visibility: visible; - padding: 5px; - font-size: 11px; - opacity: 0; - filter: alpha(opacity=0); -} -.tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); -} -.tooltip.top { - margin-top: -2px; -} -.tooltip.right { - margin-left: 2px; -} -.tooltip.bottom { - margin-top: 2px; -} -.tooltip.left { - margin-left: -2px; -} -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; -} -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} -.popover.top { - margin-top: -5px; -} -.popover.right { - margin-left: 5px; -} -.popover.bottom { - margin-top: 5px; -} -.popover.left { - margin-left: -5px; -} -.popover.top .arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.popover.right .arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.popover.left .arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover-inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -} -.popover-title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -.popover-content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.popover-content p, -.popover-content ul, -.popover-content ol { - margin-bottom: 0; -} -.thumbnails { - margin-left: -20px; - list-style: none; - *zoom: 1; -} -.thumbnails:before, -.thumbnails:after { - display: table; - content: ""; -} -.thumbnails:after { - clear: both; -} -.thumbnails > li { - float: left; - margin: 0 0 18px 20px; -} -.thumbnail { - display: block; - padding: 4px; - line-height: 1; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -} -a.thumbnail:hover { - border-color: #0088cc; - -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -} -.thumbnail > img { - display: block; - max-width: 100%; - margin-left: auto; - margin-right: auto; -} -.thumbnail .caption { - padding: 9px; -} -.label { - padding: 1px 4px 2px; - font-size: 10.998px; - font-weight: bold; - line-height: 13px; - color: #ffffff; - vertical-align: middle; - white-space: nowrap; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #999999; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.label:hover { - color: #ffffff; - text-decoration: none; -} -.label-important { - background-color: #b94a48; -} -.label-important:hover { - background-color: #953b39; -} -.label-warning { - background-color: #f89406; -} -.label-warning:hover { - background-color: #c67605; -} -.label-success { - background-color: #468847; -} -.label-success:hover { - background-color: #356635; -} -.label-info { - background-color: #3a87ad; -} -.label-info:hover { - background-color: #2d6987; -} -.label-inverse { - background-color: #333333; -} -.label-inverse:hover { - background-color: #1a1a1a; -} -.badge { - padding: 1px 9px 2px; - font-size: 12.025px; - font-weight: bold; - white-space: nowrap; - color: #ffffff; - background-color: #999999; - -webkit-border-radius: 9px; - -moz-border-radius: 9px; - border-radius: 9px; -} -.badge:hover { - color: #ffffff; - text-decoration: none; - cursor: pointer; -} -.badge-error { - background-color: #b94a48; -} -.badge-error:hover { - background-color: #953b39; -} -.badge-warning { - background-color: #f89406; -} -.badge-warning:hover { - background-color: #c67605; -} -.badge-success { - background-color: #468847; -} -.badge-success:hover { - background-color: #356635; -} -.badge-info { - background-color: #3a87ad; -} -.badge-info:hover { - background-color: #2d6987; -} -.badge-inverse { - background-color: #333333; -} -.badge-inverse:hover { - background-color: #1a1a1a; -} -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -@-moz-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -@-ms-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -@keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -.progress { - overflow: hidden; - height: 18px; - margin-bottom: 18px; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.progress .bar { - width: 0%; - height: 18px; - color: #ffffff; - font-size: 12px; - text-align: center; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} -.progress-striped .bar { - background-color: #149bdf; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} -.progress-danger .bar { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); -} -.progress-danger.progress-striped .bar { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress-success .bar { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); -} -.progress-success.progress-striped .bar { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress-info .bar { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); -} -.progress-info.progress-striped .bar { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress-warning .bar { - background-color: #faa732; - background-image: -moz-linear-gradient(top, #fbb450, #f89406); - background-image: -ms-linear-gradient(top, #fbb450, #f89406); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); - background-image: -webkit-linear-gradient(top, #fbb450, #f89406); - background-image: -o-linear-gradient(top, #fbb450, #f89406); - background-image: linear-gradient(top, #fbb450, #f89406); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); -} -.progress-warning.progress-striped .bar { - background-color: #fbb450; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.accordion { - margin-bottom: 18px; -} -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.accordion-heading { - border-bottom: 0; -} -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} -.carousel { - position: relative; - margin-bottom: 18px; - line-height: 1; -} -.carousel-inner { - overflow: hidden; - width: 100%; - position: relative; -} -.carousel .item { - display: none; - position: relative; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} -.carousel .item > img { - display: block; - line-height: 1; -} -.carousel .active, -.carousel .next, -.carousel .prev { - display: block; -} -.carousel .active { - left: 0; -} -.carousel .next, -.carousel .prev { - position: absolute; - top: 0; - width: 100%; -} -.carousel .next { - left: 100%; -} -.carousel .prev { - left: -100%; -} -.carousel .next.left, -.carousel .prev.right { - left: 0; -} -.carousel .active.left { - left: -100%; -} -.carousel .active.right { - left: 100%; -} -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: #ffffff; - text-align: center; - background: #222222; - border: 3px solid #ffffff; - -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; - opacity: 0.5; - filter: alpha(opacity=50); -} -.carousel-control.right { - left: auto; - right: 15px; -} -.carousel-control:hover { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); -} -.carousel-caption { - position: absolute; - left: 0; - right: 0; - bottom: 0; - padding: 10px 15px 5px; - background: #333333; - background: rgba(0, 0, 0, 0.75); -} -.carousel-caption h4, -.carousel-caption p { - color: #ffffff; -} -.hero-unit { - padding: 60px; - margin-bottom: 30px; - background-color: #eeeeee; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - color: inherit; - letter-spacing: -1px; -} -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; - color: inherit; -} -.pull-right { - float: right; -} -.pull-left { - float: left; -} -.hide { - display: none; -} -.show { - display: block; -} -.invisible { - visibility: hidden; -} diff --git a/sources/Core/Frameworks/TwitterBootstrap/css/bootstrap.min.css b/sources/Core/Frameworks/TwitterBootstrap/css/bootstrap.min.css deleted file mode 100644 index c951467..0000000 --- a/sources/Core/Frameworks/TwitterBootstrap/css/bootstrap.min.css +++ /dev/null @@ -1,689 +0,0 @@ -article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;} -audio,canvas,video{display:inline-block;*display:inline;*zoom:1;} -audio:not([controls]){display:none;} -html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;} -a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -a:hover,a:active{outline:0;} -sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;} -sup{top:-0.5em;} -sub{bottom:-0.25em;} -img{height:auto;border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;} -button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;} -button,input{*overflow:visible;line-height:normal;} -button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;} -button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;} -input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;} -input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;} -textarea{overflow:auto;vertical-align:top;} -.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";} -.clearfix:after{clear:both;} -.hide-text{overflow:hidden;text-indent:100%;white-space:nowrap;} -.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;} -body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#333333;background-color:#ffffff;} -a{color:#0088cc;text-decoration:none;} -a:hover{color:#005580;text-decoration:underline;} -.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";} -.row:after{clear:both;} -[class*="span"]{float:left;margin-left:20px;} -.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;} -.span12{width:940px;} -.span11{width:860px;} -.span10{width:780px;} -.span9{width:700px;} -.span8{width:620px;} -.span7{width:540px;} -.span6{width:460px;} -.span5{width:380px;} -.span4{width:300px;} -.span3{width:220px;} -.span2{width:140px;} -.span1{width:60px;} -.offset12{margin-left:980px;} -.offset11{margin-left:900px;} -.offset10{margin-left:820px;} -.offset9{margin-left:740px;} -.offset8{margin-left:660px;} -.offset7{margin-left:580px;} -.offset6{margin-left:500px;} -.offset5{margin-left:420px;} -.offset4{margin-left:340px;} -.offset3{margin-left:260px;} -.offset2{margin-left:180px;} -.offset1{margin-left:100px;} -.row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";} -.row-fluid:after{clear:both;} -.row-fluid>[class*="span"]{float:left;margin-left:2.127659574%;} -.row-fluid>[class*="span"]:first-child{margin-left:0;} -.row-fluid > .span12{width:99.99999998999999%;} -.row-fluid > .span11{width:91.489361693%;} -.row-fluid > .span10{width:82.97872339599999%;} -.row-fluid > .span9{width:74.468085099%;} -.row-fluid > .span8{width:65.95744680199999%;} -.row-fluid > .span7{width:57.446808505%;} -.row-fluid > .span6{width:48.93617020799999%;} -.row-fluid > .span5{width:40.425531911%;} -.row-fluid > .span4{width:31.914893614%;} -.row-fluid > .span3{width:23.404255317%;} -.row-fluid > .span2{width:14.89361702%;} -.row-fluid > .span1{width:6.382978723%;} -.container{margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";} -.container:after{clear:both;} -.container-fluid{padding-left:20px;padding-right:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";} -.container-fluid:after{clear:both;} -p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;} -.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;} -h1,h2,h3,h4,h5,h6{margin:0;font-family:inherit;font-weight:bold;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;} -h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;} -h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;} -h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;} -h4,h5,h6{line-height:18px;} -h4{font-size:14px;}h4 small{font-size:12px;} -h5{font-size:12px;} -h6{font-size:11px;color:#999999;text-transform:uppercase;} -.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;} -.page-header h1{line-height:1;} -ul,ol{padding:0;margin:0 0 9px 25px;} -ul ul,ul ol,ol ol,ol ul{margin-bottom:0;} -ul{list-style:disc;} -ol{list-style:decimal;} -li{line-height:18px;} -ul.unstyled,ol.unstyled{margin-left:0;list-style:none;} -dl{margin-bottom:18px;} -dt,dd{line-height:18px;} -dt{font-weight:bold;line-height:17px;} -dd{margin-left:9px;} -.dl-horizontal dt{float:left;clear:left;width:120px;text-align:right;} -.dl-horizontal dd{margin-left:130px;} -hr{margin:18px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;} -strong{font-weight:bold;} -em{font-style:italic;} -.muted{color:#999999;} -abbr[title]{border-bottom:1px dotted #ddd;cursor:help;} -abbr.initialism{font-size:90%;text-transform:uppercase;} -blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;} -blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';} -blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} -q:before,q:after,blockquote:before,blockquote:after{content:"";} -address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;} -small{font-size:100%;} -cite{font-style:normal;} -code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} -pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12.025px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;word-wrap:break-word;}pre.prettyprint{margin-bottom:18px;} -pre code{padding:0;color:inherit;background-color:transparent;border:0;} -.pre-scrollable{max-height:340px;overflow-y:scroll;} -form{margin:0 0 18px;} -fieldset{padding:0;margin:0;border:0;} -legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;}legend small{font-size:13.5px;color:#999999;} -label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:18px;} -input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;} -label{display:block;margin-bottom:5px;color:#333333;} -input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #cccccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.uneditable-textarea{width:auto;height:auto;} -label input,label textarea,label select{display:block;} -input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;border:0 \9;} -input[type="image"]{border:0;} -input[type="file"]{width:auto;padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto;} -select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;} -input[type="file"]{line-height:18px \9;} -select{width:220px;background-color:#ffffff;} -select[multiple],select[size]{height:auto;} -input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -textarea{height:auto;} -input[type="hidden"]{display:none;} -.radio,.checkbox{padding-left:18px;} -.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;} -.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;} -.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;} -.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;} -input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;} -input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;} -input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -.input-mini{width:60px;} -.input-small{width:90px;} -.input-medium{width:150px;} -.input-large{width:210px;} -.input-xlarge{width:270px;} -.input-xxlarge{width:530px;} -input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{float:none;margin-left:0;} -input,textarea,.uneditable-input{margin-left:0;} -input.span12, textarea.span12, .uneditable-input.span12{width:930px;} -input.span11, textarea.span11, .uneditable-input.span11{width:850px;} -input.span10, textarea.span10, .uneditable-input.span10{width:770px;} -input.span9, textarea.span9, .uneditable-input.span9{width:690px;} -input.span8, textarea.span8, .uneditable-input.span8{width:610px;} -input.span7, textarea.span7, .uneditable-input.span7{width:530px;} -input.span6, textarea.span6, .uneditable-input.span6{width:450px;} -input.span5, textarea.span5, .uneditable-input.span5{width:370px;} -input.span4, textarea.span4, .uneditable-input.span4{width:290px;} -input.span3, textarea.span3, .uneditable-input.span3{width:210px;} -input.span2, textarea.span2, .uneditable-input.span2{width:130px;} -input.span1, textarea.span1, .uneditable-input.span1{width:50px;} -input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#eeeeee;border-color:#ddd;cursor:not-allowed;} -.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;} -.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;} -.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;} -.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;} -.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;} -.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;} -.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;} -.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;} -.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;} -input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;} -.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#eeeeee;border-top:1px solid #ddd;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";} -.form-actions:after{clear:both;} -.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;} -:-moz-placeholder{color:#999999;} -::-webkit-input-placeholder{color:#999999;} -.help-block,.help-inline{color:#555555;} -.help-block{display:block;margin-bottom:9px;} -.help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;} -.input-prepend,.input-append{margin-bottom:5px;}.input-prepend input,.input-append input,.input-prepend select,.input-append select,.input-prepend .uneditable-input,.input-append .uneditable-input{*margin-left:0;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend select:focus,.input-append select:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;} -.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;} -.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;min-width:16px;height:18px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#eeeeee;border:1px solid #ccc;} -.input-prepend .add-on,.input-append .add-on,.input-prepend .btn,.input-append .btn{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;} -.input-prepend .add-on,.input-prepend .btn{margin-right:-1px;} -.input-append input,.input-append select .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-append .uneditable-input{border-left-color:#eee;border-right-color:#ccc;} -.input-append .add-on,.input-append .btn{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;} -.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;margin-bottom:0;} -.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none;} -.form-search label,.form-inline label{display:inline-block;} -.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0;} -.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle;} -.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-left:0;margin-right:3px;} -.control-group{margin-bottom:9px;} -legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;} -.form-horizontal .control-group{margin-bottom:18px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";} -.form-horizontal .control-group:after{clear:both;} -.form-horizontal .control-label{float:left;width:140px;padding-top:5px;text-align:right;} -.form-horizontal .controls{margin-left:160px;*display:inline-block;*margin-left:0;*padding-left:20px;} -.form-horizontal .help-block{margin-top:9px;margin-bottom:0;} -.form-horizontal .form-actions{padding-left:160px;} -table{max-width:100%;border-collapse:collapse;border-spacing:0;background-color:transparent;} -.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;} -.table th{font-weight:bold;} -.table thead th{vertical-align:bottom;} -.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0;} -.table tbody+tbody{border-top:2px solid #dddddd;} -.table-condensed th,.table-condensed td{padding:4px 5px;} -.table-bordered{border:1px solid #dddddd;border-left:0;border-collapse:separate;*border-collapse:collapsed;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered td{border-left:1px solid #dddddd;} -.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;} -.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;} -.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;} -.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;} -.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} -.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;} -.table tbody tr:hover td,.table tbody tr:hover th{background-color:#f5f5f5;} -table .span1{float:none;width:44px;margin-left:0;} -table .span2{float:none;width:124px;margin-left:0;} -table .span3{float:none;width:204px;margin-left:0;} -table .span4{float:none;width:284px;margin-left:0;} -table .span5{float:none;width:364px;margin-left:0;} -table .span6{float:none;width:444px;margin-left:0;} -table .span7{float:none;width:524px;margin-left:0;} -table .span8{float:none;width:604px;margin-left:0;} -table .span9{float:none;width:684px;margin-left:0;} -table .span10{float:none;width:764px;margin-left:0;} -table .span11{float:none;width:844px;margin-left:0;} -table .span12{float:none;width:924px;margin-left:0;} -table .span13{float:none;width:1004px;margin-left:0;} -table .span14{float:none;width:1084px;margin-left:0;} -table .span15{float:none;width:1164px;margin-left:0;} -table .span16{float:none;width:1244px;margin-left:0;} -table .span17{float:none;width:1324px;margin-left:0;} -table .span18{float:none;width:1404px;margin-left:0;} -table .span19{float:none;width:1484px;margin-left:0;} -table .span20{float:none;width:1564px;margin-left:0;} -table .span21{float:none;width:1644px;margin-left:0;} -table .span22{float:none;width:1724px;margin-left:0;} -table .span23{float:none;width:1804px;margin-left:0;} -table .span24{float:none;width:1884px;margin-left:0;} -[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;*margin-right:.3em;}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0;} -.icon-white{background-image:url("../img/glyphicons-halflings-white.png");} -.icon-glass{background-position:0 0;} -.icon-music{background-position:-24px 0;} -.icon-search{background-position:-48px 0;} -.icon-envelope{background-position:-72px 0;} -.icon-heart{background-position:-96px 0;} -.icon-star{background-position:-120px 0;} -.icon-star-empty{background-position:-144px 0;} -.icon-user{background-position:-168px 0;} -.icon-film{background-position:-192px 0;} -.icon-th-large{background-position:-216px 0;} -.icon-th{background-position:-240px 0;} -.icon-th-list{background-position:-264px 0;} -.icon-ok{background-position:-288px 0;} -.icon-remove{background-position:-312px 0;} -.icon-zoom-in{background-position:-336px 0;} -.icon-zoom-out{background-position:-360px 0;} -.icon-off{background-position:-384px 0;} -.icon-signal{background-position:-408px 0;} -.icon-cog{background-position:-432px 0;} -.icon-trash{background-position:-456px 0;} -.icon-home{background-position:0 -24px;} -.icon-file{background-position:-24px -24px;} -.icon-time{background-position:-48px -24px;} -.icon-road{background-position:-72px -24px;} -.icon-download-alt{background-position:-96px -24px;} -.icon-download{background-position:-120px -24px;} -.icon-upload{background-position:-144px -24px;} -.icon-inbox{background-position:-168px -24px;} -.icon-play-circle{background-position:-192px -24px;} -.icon-repeat{background-position:-216px -24px;} -.icon-refresh{background-position:-240px -24px;} -.icon-list-alt{background-position:-264px -24px;} -.icon-lock{background-position:-287px -24px;} -.icon-flag{background-position:-312px -24px;} -.icon-headphones{background-position:-336px -24px;} -.icon-volume-off{background-position:-360px -24px;} -.icon-volume-down{background-position:-384px -24px;} -.icon-volume-up{background-position:-408px -24px;} -.icon-qrcode{background-position:-432px -24px;} -.icon-barcode{background-position:-456px -24px;} -.icon-tag{background-position:0 -48px;} -.icon-tags{background-position:-25px -48px;} -.icon-book{background-position:-48px -48px;} -.icon-bookmark{background-position:-72px -48px;} -.icon-print{background-position:-96px -48px;} -.icon-camera{background-position:-120px -48px;} -.icon-font{background-position:-144px -48px;} -.icon-bold{background-position:-167px -48px;} -.icon-italic{background-position:-192px -48px;} -.icon-text-height{background-position:-216px -48px;} -.icon-text-width{background-position:-240px -48px;} -.icon-align-left{background-position:-264px -48px;} -.icon-align-center{background-position:-288px -48px;} -.icon-align-right{background-position:-312px -48px;} -.icon-align-justify{background-position:-336px -48px;} -.icon-list{background-position:-360px -48px;} -.icon-indent-left{background-position:-384px -48px;} -.icon-indent-right{background-position:-408px -48px;} -.icon-facetime-video{background-position:-432px -48px;} -.icon-picture{background-position:-456px -48px;} -.icon-pencil{background-position:0 -72px;} -.icon-map-marker{background-position:-24px -72px;} -.icon-adjust{background-position:-48px -72px;} -.icon-tint{background-position:-72px -72px;} -.icon-edit{background-position:-96px -72px;} -.icon-share{background-position:-120px -72px;} -.icon-check{background-position:-144px -72px;} -.icon-move{background-position:-168px -72px;} -.icon-step-backward{background-position:-192px -72px;} -.icon-fast-backward{background-position:-216px -72px;} -.icon-backward{background-position:-240px -72px;} -.icon-play{background-position:-264px -72px;} -.icon-pause{background-position:-288px -72px;} -.icon-stop{background-position:-312px -72px;} -.icon-forward{background-position:-336px -72px;} -.icon-fast-forward{background-position:-360px -72px;} -.icon-step-forward{background-position:-384px -72px;} -.icon-eject{background-position:-408px -72px;} -.icon-chevron-left{background-position:-432px -72px;} -.icon-chevron-right{background-position:-456px -72px;} -.icon-plus-sign{background-position:0 -96px;} -.icon-minus-sign{background-position:-24px -96px;} -.icon-remove-sign{background-position:-48px -96px;} -.icon-ok-sign{background-position:-72px -96px;} -.icon-question-sign{background-position:-96px -96px;} -.icon-info-sign{background-position:-120px -96px;} -.icon-screenshot{background-position:-144px -96px;} -.icon-remove-circle{background-position:-168px -96px;} -.icon-ok-circle{background-position:-192px -96px;} -.icon-ban-circle{background-position:-216px -96px;} -.icon-arrow-left{background-position:-240px -96px;} -.icon-arrow-right{background-position:-264px -96px;} -.icon-arrow-up{background-position:-289px -96px;} -.icon-arrow-down{background-position:-312px -96px;} -.icon-share-alt{background-position:-336px -96px;} -.icon-resize-full{background-position:-360px -96px;} -.icon-resize-small{background-position:-384px -96px;} -.icon-plus{background-position:-408px -96px;} -.icon-minus{background-position:-433px -96px;} -.icon-asterisk{background-position:-456px -96px;} -.icon-exclamation-sign{background-position:0 -120px;} -.icon-gift{background-position:-24px -120px;} -.icon-leaf{background-position:-48px -120px;} -.icon-fire{background-position:-72px -120px;} -.icon-eye-open{background-position:-96px -120px;} -.icon-eye-close{background-position:-120px -120px;} -.icon-warning-sign{background-position:-144px -120px;} -.icon-plane{background-position:-168px -120px;} -.icon-calendar{background-position:-192px -120px;} -.icon-random{background-position:-216px -120px;} -.icon-comment{background-position:-240px -120px;} -.icon-magnet{background-position:-264px -120px;} -.icon-chevron-up{background-position:-288px -120px;} -.icon-chevron-down{background-position:-313px -119px;} -.icon-retweet{background-position:-336px -120px;} -.icon-shopping-cart{background-position:-360px -120px;} -.icon-folder-close{background-position:-384px -120px;} -.icon-folder-open{background-position:-408px -120px;} -.icon-resize-vertical{background-position:-432px -119px;} -.icon-resize-horizontal{background-position:-456px -118px;} -.dropdown{position:relative;} -.dropdown-toggle{*margin-bottom:-3px;} -.dropdown-toggle:active,.open .dropdown-toggle{outline:0;} -.caret{display:inline-block;width:0;height:0;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"";} -.dropdown .caret{margin-top:8px;margin-left:2px;} -.dropdown:hover .caret,.open.dropdown .caret{opacity:1;filter:alpha(opacity=100);} -.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.pull-right{right:0;left:auto;} -.dropdown-menu .divider{height:1px;margin:8px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;} -.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#333333;white-space:nowrap;} -.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;} -.dropdown.open{*z-index:1000;}.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);} -.dropdown.open .dropdown-menu{display:block;} -.pull-right .dropdown-menu{left:auto;right:0;} -.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"\2191";} -.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px;} -.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} -.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} -.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;} -.collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;} -.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;} -.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 10px 4px;margin-bottom:0;font-size:13px;line-height:18px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:middle;background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-ms-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(top, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);border:1px solid #cccccc;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{background-color:#e6e6e6;} -.btn:active,.btn.active{background-color:#cccccc \9;} -.btn:first-child{*margin-left:0;} -.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;} -.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;} -.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;outline:0;} -.btn.disabled,.btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} -.btn-large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.btn-large [class^="icon-"]{margin-top:1px;} -.btn-small{padding:5px 9px;font-size:11px;line-height:16px;} -.btn-small [class^="icon-"]{margin-top:-1px;} -.btn-mini{padding:2px 6px;font-size:11px;line-height:14px;} -.btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover,.btn-inverse,.btn-inverse:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;} -.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);} -.btn-primary{background-color:#0074cc;background-image:-moz-linear-gradient(top, #0088cc, #0055cc);background-image:-ms-linear-gradient(top, #0088cc, #0055cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));background-image:-webkit-linear-gradient(top, #0088cc, #0055cc);background-image:-o-linear-gradient(top, #0088cc, #0055cc);background-image:linear-gradient(top, #0088cc, #0055cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);border-color:#0055cc #0055cc #003580;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#0055cc;} -.btn-primary:active,.btn-primary.active{background-color:#004099 \9;} -.btn-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;} -.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;} -.btn-danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;} -.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;} -.btn-success{background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-ms-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(top, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#51a351;} -.btn-success:active,.btn-success.active{background-color:#408140 \9;} -.btn-info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;} -.btn-info:active,.btn-info.active{background-color:#24748c \9;} -.btn-inverse{background-color:#414141;background-image:-moz-linear-gradient(top, #555555, #222222);background-image:-ms-linear-gradient(top, #555555, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222));background-image:-webkit-linear-gradient(top, #555555, #222222);background-image:-o-linear-gradient(top, #555555, #222222);background-image:linear-gradient(top, #555555, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#222222;} -.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;} -button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;} -button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;} -button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;} -button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px;} -.btn-group{position:relative;*zoom:1;*margin-left:.3em;}.btn-group:before,.btn-group:after{display:table;content:"";} -.btn-group:after{clear:both;} -.btn-group:first-child{*margin-left:0;} -.btn-group+.btn-group{margin-left:5px;} -.btn-toolbar{margin-top:9px;margin-bottom:9px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;} -.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;} -.btn-group .btn:last-child,.btn-group .dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;} -.btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;} -.btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;} -.btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active,.btn-group .btn.active{z-index:2;} -.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;} -.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);*padding-top:3px;*padding-bottom:3px;} -.btn-group .btn-mini.dropdown-toggle{padding-left:5px;padding-right:5px;*padding-top:1px;*padding-bottom:1px;} -.btn-group .btn-small.dropdown-toggle{*padding-top:4px;*padding-bottom:4px;} -.btn-group .btn-large.dropdown-toggle{padding-left:12px;padding-right:12px;} -.btn-group.open{*z-index:1000;}.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);} -.btn .caret{margin-top:7px;margin-left:0;} -.btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);} -.btn-mini .caret{margin-top:5px;} -.btn-small .caret{margin-top:6px;} -.btn-large .caret{margin-top:6px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} -.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);} -.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;} -.alert-heading{color:inherit;} -.alert .close{position:relative;top:-2px;right:-21px;line-height:18px;} -.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847;} -.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;} -.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;} -.alert-block{padding-top:14px;padding-bottom:14px;} -.alert-block>p,.alert-block>ul{margin-bottom:0;} -.alert-block p+p{margin-top:5px;} -.nav{margin-left:0;margin-bottom:18px;list-style:none;} -.nav>li>a{display:block;} -.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;} -.nav .nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;} -.nav li+.nav-header{margin-top:9px;} -.nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;} -.nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);} -.nav-list>li>a{padding:3px 15px;} -.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;} -.nav-list [class^="icon-"]{margin-right:2px;} -.nav-list .divider{height:1px;margin:8px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;} -.nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";} -.nav-tabs:after,.nav-pills:after{clear:both;} -.nav-tabs>li,.nav-pills>li{float:left;} -.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;} -.nav-tabs{border-bottom:1px solid #ddd;} -.nav-tabs>li{margin-bottom:-1px;} -.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;} -.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} -.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;} -.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#0088cc;} -.nav-stacked>li{float:none;} -.nav-stacked>li>a{margin-right:0;} -.nav-tabs.nav-stacked{border-bottom:0;} -.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;} -.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;} -.nav-tabs.nav-stacked>li>a:hover{border-color:#ddd;z-index:2;} -.nav-pills.nav-stacked>li>a{margin-bottom:3px;} -.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;} -.nav-tabs .dropdown-menu,.nav-pills .dropdown-menu{margin-top:1px;border-width:1px;} -.nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#0088cc;border-bottom-color:#0088cc;margin-top:6px;} -.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580;} -.nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;} -.nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;} -.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;} -.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:1;filter:alpha(opacity=100);} -.tabs-stacked .open>a:hover{border-color:#999999;} -.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";} -.tabbable:after{clear:both;} -.tab-content{display:table;width:100%;} -.tabs-below .nav-tabs,.tabs-right .nav-tabs,.tabs-left .nav-tabs{border-bottom:0;} -.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;} -.tab-content>.active,.pill-content>.active{display:block;} -.tabs-below .nav-tabs{border-top:1px solid #ddd;} -.tabs-below .nav-tabs>li{margin-top:-1px;margin-bottom:0;} -.tabs-below .nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .nav-tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;} -.tabs-below .nav-tabs .active>a,.tabs-below .nav-tabs .active>a:hover{border-color:transparent #ddd #ddd #ddd;} -.tabs-left .nav-tabs>li,.tabs-right .nav-tabs>li{float:none;} -.tabs-left .nav-tabs>li>a,.tabs-right .nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;} -.tabs-left .nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;} -.tabs-left .nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;} -.tabs-left .nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;} -.tabs-left .nav-tabs .active>a,.tabs-left .nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;} -.tabs-right .nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;} -.tabs-right .nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;} -.tabs-right .nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;} -.tabs-right .nav-tabs .active>a,.tabs-right .nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} -.navbar{*position:relative;*z-index:2;overflow:visible;margin-bottom:18px;} -.navbar-inner{padding-left:20px;padding-right:20px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} -.navbar .container{width:auto;} -.btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);}.btn-navbar:hover,.btn-navbar:active,.btn-navbar.active,.btn-navbar.disabled,.btn-navbar[disabled]{background-color:#222222;} -.btn-navbar:active,.btn-navbar.active{background-color:#080808 \9;} -.btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);} -.btn-navbar .icon-bar+.icon-bar{margin-top:3px;} -.nav-collapse.collapse{height:auto;} -.navbar{color:#999999;}.navbar .brand:hover{text-decoration:none;} -.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;} -.navbar .navbar-text{margin-bottom:0;line-height:40px;} -.navbar .btn,.navbar .btn-group{margin-top:5px;} -.navbar .btn-group .btn{margin-top:0;} -.navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";} -.navbar-form:after{clear:both;} -.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;} -.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;} -.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;} -.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;} -.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;background-color:#626262;border:1px solid #151515;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#cccccc;} -.navbar-search .search-query::-webkit-input-placeholder{color:#cccccc;} -.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;} -.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;} -.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;} -.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;} -.navbar-fixed-top{top:0;} -.navbar-fixed-bottom{bottom:0;} -.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;} -.navbar .nav.pull-right{float:right;} -.navbar .nav>li{display:block;float:left;} -.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} -.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;} -.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ffffff;text-decoration:none;background-color:#222222;} -.navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#222222;border-right:1px solid #333333;} -.navbar .nav.pull-right{margin-left:10px;margin-right:0;} -.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;} -.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;} -.navbar-fixed-bottom .dropdown-menu:before{border-top:7px solid #ccc;border-top-color:rgba(0, 0, 0, 0.2);border-bottom:0;bottom:-7px;top:auto;} -.navbar-fixed-bottom .dropdown-menu:after{border-top:6px solid #ffffff;border-bottom:0;bottom:-6px;top:auto;} -.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;} -.navbar .nav .active .caret{opacity:1;filter:alpha(opacity=100);} -.navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;} -.navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;} -.navbar .nav.pull-right .dropdown-menu,.navbar .nav .dropdown-menu.pull-right{left:auto;right:0;}.navbar .nav.pull-right .dropdown-menu:before,.navbar .nav .dropdown-menu.pull-right:before{left:auto;right:12px;} -.navbar .nav.pull-right .dropdown-menu:after,.navbar .nav .dropdown-menu.pull-right:after{left:auto;right:13px;} -.breadcrumb{padding:7px 14px;margin:0 0 18px;list-style:none;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;} -.breadcrumb .divider{padding:0 5px;color:#999999;} -.breadcrumb .active a{color:#333333;} -.pagination{height:36px;margin:18px 0;} -.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);} -.pagination li{display:inline;} -.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;} -.pagination a:hover,.pagination .active a{background-color:#f5f5f5;} -.pagination .active a{color:#999999;cursor:default;} -.pagination .disabled span,.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;} -.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;} -.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;} -.pagination-centered{text-align:center;} -.pagination-right{text-align:right;} -.pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";} -.pager:after{clear:both;} -.pager li{display:inline;} -.pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;} -.pager a:hover{text-decoration:none;background-color:#f5f5f5;} -.pager .next a{float:right;} -.pager .previous a{float:left;} -.pager .disabled a,.pager .disabled a:hover{color:#999999;background-color:#fff;cursor:default;} -.modal-open .dropdown-menu{z-index:2050;} -.modal-open .dropdown.open{*z-index:2050;} -.modal-open .popover{z-index:2060;} -.modal-open .tooltip{z-index:2070;} -.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;} -.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);} -.modal{position:fixed;top:50%;left:50%;z-index:1050;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} -.modal.fade.in{top:50%;} -.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;} -.modal-body{overflow-y:auto;max-height:400px;padding:15px;} -.modal-form{margin-bottom:0;} -.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";} -.modal-footer:after{clear:both;} -.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0;} -.modal-footer .btn-group .btn+.btn{margin-left:-1px;} -.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);} -.tooltip.top{margin-top:-2px;} -.tooltip.right{margin-left:2px;} -.tooltip.bottom{margin-top:2px;} -.tooltip.left{margin-left:-2px;} -.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} -.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} -.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} -.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} -.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.tooltip-arrow{position:absolute;width:0;height:0;} -.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;} -.popover.right{margin-left:5px;} -.popover.bottom{margin-top:5px;} -.popover.left{margin-left:-5px;} -.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} -.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} -.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} -.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} -.popover .arrow{position:absolute;width:0;height:0;} -.popover-inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);} -.popover-title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;} -.popover-content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0;} -.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";} -.thumbnails:after{clear:both;} -.thumbnails>li{float:left;margin:0 0 18px 20px;} -.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);} -a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);} -.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;} -.thumbnail .caption{padding:9px;} -.label{padding:1px 4px 2px;font-size:10.998px;font-weight:bold;line-height:13px;color:#ffffff;vertical-align:middle;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -.label:hover{color:#ffffff;text-decoration:none;} -.label-important{background-color:#b94a48;} -.label-important:hover{background-color:#953b39;} -.label-warning{background-color:#f89406;} -.label-warning:hover{background-color:#c67605;} -.label-success{background-color:#468847;} -.label-success:hover{background-color:#356635;} -.label-info{background-color:#3a87ad;} -.label-info:hover{background-color:#2d6987;} -.label-inverse{background-color:#333333;} -.label-inverse:hover{background-color:#1a1a1a;} -.badge{padding:1px 9px 2px;font-size:12.025px;font-weight:bold;white-space:nowrap;color:#ffffff;background-color:#999999;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px;} -.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;} -.badge-error{background-color:#b94a48;} -.badge-error:hover{background-color:#953b39;} -.badge-warning{background-color:#f89406;} -.badge-warning:hover{background-color:#c67605;} -.badge-success{background-color:#468847;} -.badge-success:hover{background-color:#356635;} -.badge-info{background-color:#3a87ad;} -.badge-info:hover{background-color:#2d6987;} -.badge-inverse{background-color:#333333;} -.badge-inverse:hover{background-color:#1a1a1a;} -@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-ms-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;} -.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;} -.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;} -.progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);} -.progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);} -.progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);} -.progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.progress-warning .bar{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);} -.progress-warning.progress-striped .bar{background-color:#fbb450;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);} -.accordion{margin-bottom:18px;} -.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} -.accordion-heading{border-bottom:0;} -.accordion-heading .accordion-toggle{display:block;padding:8px 15px;} -.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;} -.carousel{position:relative;margin-bottom:18px;line-height:1;} -.carousel-inner{overflow:hidden;width:100%;position:relative;} -.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;} -.carousel .item>img{display:block;line-height:1;} -.carousel .active,.carousel .next,.carousel .prev{display:block;} -.carousel .active{left:0;} -.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;} -.carousel .next{left:100%;} -.carousel .prev{left:-100%;} -.carousel .next.left,.carousel .prev.right{left:0;} -.carousel .active.left{left:-100%;} -.carousel .active.right{left:100%;} -.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;} -.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);} -.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);} -.carousel-caption h4,.carousel-caption p{color:#ffffff;} -.hero-unit{padding:60px;margin-bottom:30px;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;} -.hero-unit p{font-size:18px;font-weight:200;line-height:27px;color:inherit;} -.pull-right{float:right;} -.pull-left{float:left;} -.hide{display:none;} -.show{display:block;} -.invisible{visibility:hidden;} diff --git a/sources/Core/Frameworks/TwitterBootstrap/img/glyphicons-halflings-orig.png b/sources/Core/Frameworks/TwitterBootstrap/img/glyphicons-halflings-orig.png deleted file mode 100644 index 92d4445..0000000 Binary files a/sources/Core/Frameworks/TwitterBootstrap/img/glyphicons-halflings-orig.png and /dev/null differ diff --git a/sources/Core/Frameworks/TwitterBootstrap/img/glyphicons-halflings-white.png b/sources/Core/Frameworks/TwitterBootstrap/img/glyphicons-halflings-white.png deleted file mode 100644 index a20760b..0000000 Binary files a/sources/Core/Frameworks/TwitterBootstrap/img/glyphicons-halflings-white.png and /dev/null differ diff --git a/sources/Core/Frameworks/TwitterBootstrap/img/glyphicons-halflings.png b/sources/Core/Frameworks/TwitterBootstrap/img/glyphicons-halflings.png deleted file mode 100644 index 55e3410..0000000 Binary files a/sources/Core/Frameworks/TwitterBootstrap/img/glyphicons-halflings.png and /dev/null differ diff --git a/sources/Core/Frameworks/TwitterBootstrap/js/bootstrap-popover.js b/sources/Core/Frameworks/TwitterBootstrap/js/bootstrap-popover.js deleted file mode 100644 index e1aa5ac..0000000 --- a/sources/Core/Frameworks/TwitterBootstrap/js/bootstrap-popover.js +++ /dev/null @@ -1,95 +0,0 @@ -/* =========================================================== - * bootstrap-popover.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================================================== */ - - -!function( $ ) { - - "use strict" - - var Popover = function ( element, options ) { - this.init('popover', element, options) - } - - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - - constructor: Popover - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() - - $tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title) - $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content) - - $tip.removeClass('fade top bottom left right in') - } - - , hasContent: function () { - return this.getTitle() || this.getContent() - } - - , getContent: function () { - var content - , $e = this.$element - , o = this.options - - content = $e.attr('data-content') - || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - - content = content.toString().replace(/(^\s*|\s*$)/, "") - - return content - } - - , tip: function() { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } - - }) - - - /* POPOVER PLUGIN DEFINITION - * ======================= */ - - $.fn.popover = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.popover.Constructor = Popover - - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , content: '' - , template: '

' - }) - -}( window.jQuery ); \ No newline at end of file diff --git a/sources/Core/Frameworks/TwitterBootstrap/js/bootstrap-tooltip.js b/sources/Core/Frameworks/TwitterBootstrap/js/bootstrap-tooltip.js deleted file mode 100644 index 49b5f72..0000000 --- a/sources/Core/Frameworks/TwitterBootstrap/js/bootstrap-tooltip.js +++ /dev/null @@ -1,270 +0,0 @@ -/* =========================================================== - * bootstrap-tooltip.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#tooltips - * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - -!function( $ ) { - - "use strict" - - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ - - var Tooltip = function ( element, options ) { - this.init('tooltip', element, options) - } - - Tooltip.prototype = { - - constructor: Tooltip - - , init: function ( type, element, options ) { - var eventIn - , eventOut - - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true - - if (this.options.trigger != 'manual') { - eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this)) - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function ( options ) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function ( e ) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) { - self.show() - } else { - self.hoverState = 'in' - setTimeout(function() { - if (self.hoverState == 'in') { - self.show() - } - }, self.options.delay.show) - } - } - - , leave: function ( e ) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.hide) { - self.hide() - } else { - self.hoverState = 'out' - setTimeout(function() { - if (self.hoverState == 'out') { - self.hide() - } - }, self.options.delay.hide) - } - } - - , show: function () { - var $tip - , inside - , pos - , actualWidth - , actualHeight - , placement - , tp - - if (this.hasContent() && this.enabled) { - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - inside = /in/.test(placement) - - $tip - .remove() - .css({ top: 0, left: 0, display: 'block' }) - .appendTo(inside ? this.$element : document.body) - - pos = this.getPosition(inside) - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - switch (inside ? placement.split(' ')[1] : placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - $tip - .css(tp) - .addClass(placement) - .addClass('in') - } - } - - , setContent: function () { - var $tip = this.tip() - $tip.find('.tooltip-inner').html(this.getTitle()) - $tip.removeClass('fade in top bottom left right') - } - - , hide: function () { - var that = this - , $tip = this.tip() - - $tip.removeClass('in') - - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).remove() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.remove() - }) - } - - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.remove() - } - - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') - } - } - - , hasContent: function () { - return this.getTitle() - } - - , getPosition: function (inside) { - return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) - } - - , getTitle: function () { - var title - , $e = this.$element - , o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - title = (title || '').toString().replace(/(^\s*|\s*$)/, "") - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - , enable: function () { - this.enabled = true - } - - , disable: function () { - this.enabled = false - } - - , toggleEnabled: function () { - this.enabled = !this.enabled - } - - , toggle: function () { - this[this.tip().hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - $.fn.tooltip.defaults = { - animation: true - , delay: 0 - , selector: false - , placement: 'top' - , trigger: 'hover' - , title: '' - , template: '
' - } - -}( window.jQuery ); \ No newline at end of file diff --git a/sources/Core/Frameworks/TwitterBootstrap/js/bootstrap.js b/sources/Core/Frameworks/TwitterBootstrap/js/bootstrap.js deleted file mode 100644 index ca86867..0000000 --- a/sources/Core/Frameworks/TwitterBootstrap/js/bootstrap.js +++ /dev/null @@ -1,1726 +0,0 @@ -/* =================================================== - * bootstrap-transition.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#transitions - * =================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - -!function( $ ) { - - $(function () { - - "use strict" - - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) - * ======================================================= */ - - $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , thisStyle = thisBody.style - , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined - - return support && { - end: (function () { - var transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" - } - return transitionEnd - }()) - } - })() - - }) - -}( window.jQuery );/* ========================================================== - * bootstrap-alert.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function( $ ){ - - "use strict" - - /* ALERT CLASS DEFINITION - * ====================== */ - - var dismiss = '[data-dismiss="alert"]' - , Alert = function ( el ) { - $(el).on('click', dismiss, this.close) - } - - Alert.prototype = { - - constructor: Alert - - , close: function ( e ) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - $parent.trigger('close') - - e && e.preventDefault() - - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - - $parent - .trigger('close') - .removeClass('in') - - function removeElement() { - $parent - .trigger('closed') - .remove() - } - - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() - } - - } - - - /* ALERT PLUGIN DEFINITION - * ======================= */ - - $.fn.alert = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.alert.Constructor = Alert - - - /* ALERT DATA-API - * ============== */ - - $(function () { - $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) - }) - -}( window.jQuery );/* ============================================================ - * bootstrap-button.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - -!function( $ ){ - - "use strict" - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ - - var Button = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } - - Button.prototype = { - - constructor: Button - - , setState: function ( state ) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val](data[state] || this.options[state]) - - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - , toggle: function () { - var $parent = this.$element.parent('[data-toggle="buttons-radio"]') - - $parent && $parent - .find('.active') - .removeClass('active') - - this.$element.toggleClass('active') - } - - } - - - /* BUTTON PLUGIN DEFINITION - * ======================== */ - - $.fn.button = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - $.fn.button.defaults = { - loadingText: 'loading...' - } - - $.fn.button.Constructor = Button - - - /* BUTTON DATA-API - * =============== */ - - $(function () { - $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) - }) - -}( window.jQuery );/* ========================================================== - * bootstrap-carousel.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function( $ ){ - - "use strict" - - /* CAROUSEL CLASS DEFINITION - * ========================= */ - - var Carousel = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.carousel.defaults, options) - this.options.slide && this.slide(this.options.slide) - this.options.pause == 'hover' && this.$element - .on('mouseenter', $.proxy(this.pause, this)) - .on('mouseleave', $.proxy(this.cycle, this)) - } - - Carousel.prototype = { - - cycle: function () { - this.interval = setInterval($.proxy(this.next, this), this.options.interval) - return this - } - - , to: function (pos) { - var $active = this.$element.find('.active') - , children = $active.parent().children() - , activePos = children.index($active) - , that = this - - if (pos > (children.length - 1) || pos < 0) return - - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } - - if (activePos == pos) { - return this.pause().cycle() - } - - return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) - } - - , pause: function () { - clearInterval(this.interval) - this.interval = null - return this - } - - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - if ($next.hasClass('active')) return - - if (!$.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger('slide') - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } else { - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.trigger('slide') - this.$element.one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) - } - - isCycling && this.cycle() - - return this - } - - } - - - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ - - $.fn.carousel = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = typeof option == 'object' && option - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (typeof option == 'string' || (option = options.slide)) data[option]() - else data.cycle() - }) - } - - $.fn.carousel.defaults = { - interval: 5000 - , pause: 'hover' - } - - $.fn.carousel.Constructor = Carousel - - - /* CAROUSEL DATA-API - * ================= */ - - $(function () { - $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) - $target.carousel(options) - e.preventDefault() - }) - }) - -}( window.jQuery );/* ============================================================= - * bootstrap-collapse.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - -!function( $ ){ - - "use strict" - - var Collapse = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options["parent"]) { - this.$parent = $(this.options["parent"]) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension = this.dimension() - , scroll = $.camelCase(['scroll', dimension].join('-')) - , actives = this.$parent && this.$parent.find('.in') - , hasData - - if (actives && actives.length) { - hasData = actives.data('collapse') - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', 'show', 'shown') - this.$element[dimension](this.$element[0][scroll]) - - } - - , hide: function () { - var dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', 'hide', 'hidden') - this.$element[dimension](0) - } - - , reset: function ( size ) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element[size ? 'addClass' : 'removeClass']('collapse') - - return this - } - - , transition: function ( method, startEvent, completeEvent ) { - var that = this - , complete = function () { - if (startEvent == 'show') that.reset() - that.$element.trigger(completeEvent) - } - - this.$element - .trigger(startEvent) - [method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - /* COLLAPSIBLE PLUGIN DEFINITION - * ============================== */ - - $.fn.collapse = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = typeof option == 'object' && option - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSIBLE DATA-API - * ==================== */ - - $(function () { - $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $(target).collapse(option) - }) - }) - -}( window.jQuery );/* ============================================================ - * bootstrap-dropdown.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function( $ ){ - - "use strict" - - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle="dropdown"]' - , Dropdown = function ( element ) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } - - Dropdown.prototype = { - - constructor: Dropdown - - , toggle: function ( e ) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - , isActive - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - $parent.length || ($parent = $this.parent()) - - isActive = $parent.hasClass('open') - - clearMenus() - !isActive && $parent.toggleClass('open') - - return false - } - - } - - function clearMenus() { - $(toggle).parent().removeClass('open') - } - - - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ - - $.fn.dropdown = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.dropdown.Constructor = Dropdown - - - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ - - $(function () { - $('html').on('click.dropdown.data-api', clearMenus) - $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) - }) - -}( window.jQuery );/* ========================================================= - * bootstrap-modal.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================= */ - - -!function( $ ){ - - "use strict" - - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function ( content, options ) { - this.options = options - this.$element = $(content) - .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) - } - - Modal.prototype = { - - constructor: Modal - - , toggle: function () { - return this[!this.isShown ? 'show' : 'hide']() - } - - , show: function () { - var that = this - - if (this.isShown) return - - $('body').addClass('modal-open') - - this.isShown = true - this.$element.trigger('show') - - escape.call(this) - backdrop.call(this, function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position - - that.$element - .show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element.addClass('in') - - transition ? - that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : - that.$element.trigger('shown') - - }) - } - - , hide: function ( e ) { - e && e.preventDefault() - - if (!this.isShown) return - - var that = this - this.isShown = false - - $('body').removeClass('modal-open') - - escape.call(this) - - this.$element - .trigger('hide') - .removeClass('in') - - $.support.transition && this.$element.hasClass('fade') ? - hideWithTransition.call(this) : - hideModal.call(this) - } - - } - - - /* MODAL PRIVATE METHODS - * ===================== */ - - function hideWithTransition() { - var that = this - , timeout = setTimeout(function () { - that.$element.off($.support.transition.end) - hideModal.call(that) - }, 500) - - this.$element.one($.support.transition.end, function () { - clearTimeout(timeout) - hideModal.call(that) - }) - } - - function hideModal( that ) { - this.$element - .hide() - .trigger('hidden') - - backdrop.call(this) - } - - function backdrop( callback ) { - var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $('
') - .appendTo(document.body) - - if (this.options.backdrop != 'static') { - this.$backdrop.click($.proxy(this.hide, this)) - } - - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - - this.$backdrop.addClass('in') - - doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') - - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) : - removeBackdrop.call(this) - - } else if (callback) { - callback() - } - } - - function removeBackdrop() { - this.$backdrop.remove() - this.$backdrop = null - } - - function escape() { - var that = this - if (this.isShown && this.options.keyboard) { - $(document).on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!this.isShown) { - $(document).off('keyup.dismiss.modal') - } - } - - - /* MODAL PLUGIN DEFINITION - * ======================= */ - - $.fn.modal = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else if (options.show) data.show() - }) - } - - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - , show: true - } - - $.fn.modal.Constructor = Modal - - - /* MODAL DATA-API - * ============== */ - - $(function () { - $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data()) - - e.preventDefault() - $target.modal(option) - }) - }) - -}( window.jQuery );/* =========================================================== - * bootstrap-tooltip.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#tooltips - * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - -!function( $ ) { - - "use strict" - - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ - - var Tooltip = function ( element, options ) { - this.init('tooltip', element, options) - } - - Tooltip.prototype = { - - constructor: Tooltip - - , init: function ( type, element, options ) { - var eventIn - , eventOut - - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true - - if (this.options.trigger != 'manual') { - eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut, this.options.selector, $.proxy(this.leave, this)) - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function ( options ) { - options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function ( e ) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) { - self.show() - } else { - self.hoverState = 'in' - setTimeout(function() { - if (self.hoverState == 'in') { - self.show() - } - }, self.options.delay.show) - } - } - - , leave: function ( e ) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (!self.options.delay || !self.options.delay.hide) { - self.hide() - } else { - self.hoverState = 'out' - setTimeout(function() { - if (self.hoverState == 'out') { - self.hide() - } - }, self.options.delay.hide) - } - } - - , show: function () { - var $tip - , inside - , pos - , actualWidth - , actualHeight - , placement - , tp - - if (this.hasContent() && this.enabled) { - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - inside = /in/.test(placement) - - $tip - .remove() - .css({ top: 0, left: 0, display: 'block' }) - .appendTo(inside ? this.$element : document.body) - - pos = this.getPosition(inside) - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - switch (inside ? placement.split(' ')[1] : placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - $tip - .css(tp) - .addClass(placement) - .addClass('in') - } - } - - , setContent: function () { - var $tip = this.tip() - $tip.find('.tooltip-inner').html(this.getTitle()) - $tip.removeClass('fade in top bottom left right') - } - - , hide: function () { - var that = this - , $tip = this.tip() - - $tip.removeClass('in') - - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).remove() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.remove() - }) - } - - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.remove() - } - - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title') - } - } - - , hasContent: function () { - return this.getTitle() - } - - , getPosition: function (inside) { - return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), { - width: this.$element[0].offsetWidth - , height: this.$element[0].offsetHeight - }) - } - - , getTitle: function () { - var title - , $e = this.$element - , o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - title = (title || '').toString().replace(/(^\s*|\s*$)/, "") - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - , enable: function () { - this.enabled = true - } - - , disable: function () { - this.enabled = false - } - - , toggleEnabled: function () { - this.enabled = !this.enabled - } - - , toggle: function () { - this[this.tip().hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - $.fn.tooltip.defaults = { - animation: true - , delay: 0 - , selector: false - , placement: 'top' - , trigger: 'hover' - , title: '' - , template: '
' - } - -}( window.jQuery );/* =========================================================== - * bootstrap-popover.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================================================== */ - - -!function( $ ) { - - "use strict" - - var Popover = function ( element, options ) { - this.init('popover', element, options) - } - - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - - constructor: Popover - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() - - $tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title) - $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content) - - $tip.removeClass('fade top bottom left right in') - } - - , hasContent: function () { - return this.getTitle() || this.getContent() - } - - , getContent: function () { - var content - , $e = this.$element - , o = this.options - - content = $e.attr('data-content') - || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - - content = content.toString().replace(/(^\s*|\s*$)/, "") - - return content - } - - , tip: function() { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } - - }) - - - /* POPOVER PLUGIN DEFINITION - * ======================= */ - - $.fn.popover = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.popover.Constructor = Popover - - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , content: '' - , template: '

' - }) - -}( window.jQuery );/* ============================================================= - * bootstrap-scrollspy.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================== */ - -!function ( $ ) { - - "use strict" - - /* SCROLLSPY CLASS DEFINITION - * ========================== */ - - function ScrollSpy( element, options) { - var process = $.proxy(this.process, this) - , $element = $(element).is('body') ? $(window) : $(element) - , href - this.options = $.extend({}, $.fn.scrollspy.defaults, options) - this.$scrollElement = $element.on('scroll.scroll.data-api', process) - this.selector = (this.options.target - || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - || '') + ' .nav li > a' - this.$body = $('body').on('click.scroll.data-api', this.selector, process) - this.refresh() - this.process() - } - - ScrollSpy.prototype = { - - constructor: ScrollSpy - - , refresh: function () { - this.targets = this.$body - .find(this.selector) - .map(function () { - var href = $(this).attr('href') - return /^#\w/.test(href) && $(href).length ? href : null - }) - - this.offsets = $.map(this.targets, function (id) { - return $(id).position().top - }) - } - - , process: function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activate( targets[i] ) - } - } - - , activate: function (target) { - var active - - this.activeTarget = target - - this.$body - .find(this.selector).parent('.active') - .removeClass('active') - - active = this.$body - .find(this.selector + '[href="' + target + '"]') - .parent('li') - .addClass('active') - - if ( active.parent('.dropdown-menu') ) { - active.closest('li.dropdown').addClass('active') - } - } - - } - - - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - $.fn.scrollspy = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('scrollspy') - , options = typeof option == 'object' && option - if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.scrollspy.Constructor = ScrollSpy - - $.fn.scrollspy.defaults = { - offset: 10 - } - - - /* SCROLLSPY DATA-API - * ================== */ - - $(function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - $spy.scrollspy($spy.data()) - }) - }) - -}( window.jQuery );/* ======================================================== - * bootstrap-tab.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================== */ - - -!function( $ ){ - - "use strict" - - /* TAB CLASS DEFINITION - * ==================== */ - - var Tab = function ( element ) { - this.element = $(element) - } - - Tab.prototype = { - - constructor: Tab - - , show: function () { - var $this = this.element - , $ul = $this.closest('ul:not(.dropdown-menu)') - , selector = $this.attr('data-target') - , previous - , $target - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - if ( $this.parent('li').hasClass('active') ) return - - previous = $ul.find('.active a').last()[0] - - $this.trigger({ - type: 'show' - , relatedTarget: previous - }) - - $target = $(selector) - - this.activate($this.parent('li'), $ul) - this.activate($target, $target.parent(), function () { - $this.trigger({ - type: 'shown' - , relatedTarget: previous - }) - }) - } - - , activate: function ( element, container, callback) { - var $active = container.find('> .active') - , transition = callback - && $.support.transition - && $active.hasClass('fade') - - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - - callback && callback() - } - - transition ? - $active.one($.support.transition.end, next) : - next() - - $active.removeClass('in') - } - } - - - /* TAB PLUGIN DEFINITION - * ===================== */ - - $.fn.tab = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tab') - if (!data) $this.data('tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tab.Constructor = Tab - - - /* TAB DATA-API - * ============ */ - - $(function () { - $('body').on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) - }) - -}( window.jQuery );/* ============================================================= - * bootstrap-typeahead.js v2.0.2 - * http://twitter.github.com/bootstrap/javascript.html#typeahead - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - -!function( $ ){ - - "use strict" - - var Typeahead = function ( element, options ) { - this.$element = $(element) - this.options = $.extend({}, $.fn.typeahead.defaults, options) - this.matcher = this.options.matcher || this.matcher - this.sorter = this.options.sorter || this.sorter - this.highlighter = this.options.highlighter || this.highlighter - this.$menu = $(this.options.menu).appendTo('body') - this.source = this.options.source - this.shown = false - this.listen() - } - - Typeahead.prototype = { - - constructor: Typeahead - - , select: function () { - var val = this.$menu.find('.active').attr('data-value') - this.$element.val(val) - this.$element.change(); - return this.hide() - } - - , show: function () { - var pos = $.extend({}, this.$element.offset(), { - height: this.$element[0].offsetHeight - }) - - this.$menu.css({ - top: pos.top + pos.height - , left: pos.left - }) - - this.$menu.show() - this.shown = true - return this - } - - , hide: function () { - this.$menu.hide() - this.shown = false - return this - } - - , lookup: function (event) { - var that = this - , items - , q - - this.query = this.$element.val() - - if (!this.query) { - return this.shown ? this.hide() : this - } - - items = $.grep(this.source, function (item) { - if (that.matcher(item)) return item - }) - - items = this.sorter(items) - - if (!items.length) { - return this.shown ? this.hide() : this - } - - return this.render(items.slice(0, this.options.items)).show() - } - - , matcher: function (item) { - return ~item.toLowerCase().indexOf(this.query.toLowerCase()) - } - - , sorter: function (items) { - var beginswith = [] - , caseSensitive = [] - , caseInsensitive = [] - , item - - while (item = items.shift()) { - if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) - else if (~item.indexOf(this.query)) caseSensitive.push(item) - else caseInsensitive.push(item) - } - - return beginswith.concat(caseSensitive, caseInsensitive) - } - - , highlighter: function (item) { - return item.replace(new RegExp('(' + this.query + ')', 'ig'), function ($1, match) { - return '' + match + '' - }) - } - - , render: function (items) { - var that = this - - items = $(items).map(function (i, item) { - i = $(that.options.item).attr('data-value', item) - i.find('a').html(that.highlighter(item)) - return i[0] - }) - - items.first().addClass('active') - this.$menu.html(items) - return this - } - - , next: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , next = active.next() - - if (!next.length) { - next = $(this.$menu.find('li')[0]) - } - - next.addClass('active') - } - - , prev: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , prev = active.prev() - - if (!prev.length) { - prev = this.$menu.find('li').last() - } - - prev.addClass('active') - } - - , listen: function () { - this.$element - .on('blur', $.proxy(this.blur, this)) - .on('keypress', $.proxy(this.keypress, this)) - .on('keyup', $.proxy(this.keyup, this)) - - if ($.browser.webkit || $.browser.msie) { - this.$element.on('keydown', $.proxy(this.keypress, this)) - } - - this.$menu - .on('click', $.proxy(this.click, this)) - .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) - } - - , keyup: function (e) { - switch(e.keyCode) { - case 40: // down arrow - case 38: // up arrow - break - - case 9: // tab - case 13: // enter - if (!this.shown) return - this.select() - break - - case 27: // escape - if (!this.shown) return - this.hide() - break - - default: - this.lookup() - } - - e.stopPropagation() - e.preventDefault() - } - - , keypress: function (e) { - if (!this.shown) return - - switch(e.keyCode) { - case 9: // tab - case 13: // enter - case 27: // escape - e.preventDefault() - break - - case 38: // up arrow - e.preventDefault() - this.prev() - break - - case 40: // down arrow - e.preventDefault() - this.next() - break - } - - e.stopPropagation() - } - - , blur: function (e) { - var that = this - setTimeout(function () { that.hide() }, 150) - } - - , click: function (e) { - e.stopPropagation() - e.preventDefault() - this.select() - } - - , mouseenter: function (e) { - this.$menu.find('.active').removeClass('active') - $(e.currentTarget).addClass('active') - } - - } - - - /* TYPEAHEAD PLUGIN DEFINITION - * =========================== */ - - $.fn.typeahead = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('typeahead') - , options = typeof option == 'object' && option - if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.typeahead.defaults = { - source: [] - , items: 8 - , menu: '
    ' - , item: '
    • ' - } - - $.fn.typeahead.Constructor = Typeahead - - - /* TYPEAHEAD DATA-API - * ================== */ - - $(function () { - $('body').on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - e.preventDefault() - $this.typeahead($this.data()) - }) - }) - -}( window.jQuery ); \ No newline at end of file diff --git a/sources/Core/Frameworks/TwitterBootstrap/js/bootstrap.min.js b/sources/Core/Frameworks/TwitterBootstrap/js/bootstrap.min.js deleted file mode 100644 index ffaefa6..0000000 --- a/sources/Core/Frameworks/TwitterBootstrap/js/bootstrap.min.js +++ /dev/null @@ -1,6 +0,0 @@ -/** -* Bootstrap.js by @fat & @mdo -* Copyright 2012 Twitter, Inc. -* http://www.apache.org/licenses/LICENSE-2.0.txt -*/ -!function(a){a(function(){"use strict",a.support.transition=function(){var b=document.body||document.documentElement,c=b.style,d=c.transition!==undefined||c.WebkitTransition!==undefined||c.MozTransition!==undefined||c.MsTransition!==undefined||c.OTransition!==undefined;return d&&{end:function(){var b="TransitionEnd";return a.browser.webkit?b="webkitTransitionEnd":a.browser.mozilla?b="transitionend":a.browser.opera&&(b="oTransitionEnd"),b}()}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype={constructor:c,close:function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),e.trigger("close"),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger("close").removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()}},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype={constructor:b,setState:function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},toggle:function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")}},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.carousel.defaults,c),this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(){return this.interval=setInterval(a.proxy(this.next,this),this.options.interval),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(){return clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this;this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;return!a.support.transition&&this.$element.hasClass("slide")?(this.$element.trigger("slide"),d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")):(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.trigger("slide"),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})),f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=typeof c=="object"&&c;e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find(".in"),e;d&&d.length&&(e=d.data("collapse"),d.collapse("hide"),e||d.data("collapse",null)),this.$element[b](0),this.transition("addClass","show","shown"),this.$element[b](this.$element[0][c])},hide:function(){var a=this.dimension();this.reset(this.$element[a]()),this.transition("removeClass","hide","hidden"),this.$element[a](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c=="show"&&e.reset(),e.$element.trigger(d)};this.$element.trigger(c)[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e=c.attr("data-target"),f,g;return e||(e=c.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,"")),f=a(e),f.length||(f=c.parent()),g=f.hasClass("open"),d(),!g&&f.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('
    ').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this;if(this.isShown)return;a("body").addClass("modal-open"),this.isShown=!0,this.$element.trigger("show"),g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");!b.$element.parent().length&&b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();if(!this.isShown)return;var e=this;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.trigger("hide").removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=a.extend({},a.fn.modal.defaults,d.data(),typeof c=="object"&&c);e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():f.show&&e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.show?c.show():(c.hoverState="in",setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show))},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);!c.options.delay||!c.options.delay.hide?c.hide():(c.hoverState="out",setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide))},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},setContent:function(){var a=this.tip();a.find(".tooltip-inner").html(this.getTitle()),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a=(a||"").toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,delay:0,selector:!1,placement:"top",trigger:"hover",title:"",template:'
    '}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var b=this.tip(),c=this.getTitle(),d=this.getContent();b.find(".popover-title")[a.type(c)=="object"?"append":"html"](c),b.find(".popover-content > *")[a.type(d)=="object"?"append":"html"](d),b.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a=a.toString().replace(/(^\s*|\s*$)/,""),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'

    '})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body").on("click.scroll.data-api",this.selector,d),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){this.targets=this.$body.find(this.selector).map(function(){var b=a(this).attr("href");return/^#\w/.test(b)&&a(b).length?b:null}),this.offsets=a.map(this.targets,function(b){return a(b).position().top})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.offsets,c=this.targets,d=this.activeTarget,e;for(e=b.length;e--;)d!=c[e]&&a>=b[e]&&(!b[e+1]||a<=b[e+1])&&this.activate(c[e])},activate:function(a){var b;this.activeTarget=a,this.$body.find(this.selector).parent(".active").removeClass("active"),b=this.$body.find(this.selector+'[href="'+a+'"]').parent("li").addClass("active"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],b.trigger({type:"show",relatedTarget:e}),f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(a),this.$element.change(),this.hide()},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){if(c.matcher(a))return a}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){return a.replace(new RegExp("("+this.query+")","ig"),function(a,b){return""+b+""})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},keypress:function(a){if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:a.preventDefault(),this.prev();break;case 40:a.preventDefault(),this.next()}a.stopPropagation()},blur:function(a){var b=this;setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'
      ',item:'
      • '},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery); \ No newline at end of file diff --git a/sources/Core/Frameworks/TwitterBootstrap/js/jquery-1.7.1.min.js b/sources/Core/Frameworks/TwitterBootstrap/js/jquery-1.7.1.min.js deleted file mode 100644 index 198b3ff..0000000 --- a/sources/Core/Frameworks/TwitterBootstrap/js/jquery-1.7.1.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v1.7.1 jquery.com | jquery.org/license */ -(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;g=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
      a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="
      "+""+"
      ",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="
      t
      ",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="
      ",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; -f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

      ";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
      ";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
      ","
      "],thead:[1,"","
      "],tr:[2,"","
      "],td:[3,"","
      "],col:[2,"","
      "],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
      ","
      "]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() -{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
      ").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff --git a/sources/Core/Resources/Db/MySQL/db.sql b/sources/Core/Resources/Db/MySQL/db.sql deleted file mode 100644 index a79b899..0000000 --- a/sources/Core/Resources/Db/MySQL/db.sql +++ /dev/null @@ -1,89 +0,0 @@ --- --- This is the empty database schema for Baïkal --- Corresponds to the MySQL Schema definition of project SabreDAV 1.8.6 --- http://code.google.com/p/sabredav/ --- - -CREATE TABLE IF NOT EXISTS users ( - id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT, - username VARCHAR(50), - digesta1 VARCHAR(32), - UNIQUE(username) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -CREATE TABLE IF NOT EXISTS principals ( - id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT, - uri VARCHAR(200) NOT NULL, - email VARCHAR(80), - displayname VARCHAR(80), - vcardurl VARCHAR(255), - UNIQUE(uri) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -CREATE TABLE IF NOT EXISTS groupmembers ( - id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT, - principal_id INTEGER UNSIGNED NOT NULL, - member_id INTEGER UNSIGNED NOT NULL, - UNIQUE(principal_id, member_id) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -CREATE TABLE IF NOT EXISTS locks ( - id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT, - owner VARCHAR(100), - timeout INTEGER UNSIGNED, - created INTEGER, - token VARCHAR(100), - scope TINYINT, - depth TINYINT, - uri VARCHAR(1000), - INDEX(token), - INDEX(uri) -) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -CREATE TABLE IF NOT EXISTS calendarobjects ( - id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT, - calendardata MEDIUMBLOB, - uri VARCHAR(200), - calendarid INTEGER UNSIGNED NOT NULL, - lastmodified INT(11) UNSIGNED, - etag VARCHAR(32), - size INT(11) UNSIGNED NOT NULL, - componenttype VARCHAR(8), - firstoccurence INT(11) UNSIGNED, - lastoccurence INT(11) UNSIGNED, - UNIQUE(calendarid, uri) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -CREATE TABLE IF NOT EXISTS calendars ( - id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT, - principaluri VARCHAR(100), - displayname VARCHAR(100), - uri VARCHAR(200), - ctag INTEGER UNSIGNED NOT NULL DEFAULT '0', - description TEXT, - calendarorder INTEGER UNSIGNED NOT NULL DEFAULT '0', - calendarcolor VARCHAR(10), - timezone TEXT, - components VARCHAR(21), - transparent TINYINT(1) NOT NULL DEFAULT '0', - UNIQUE(principaluri, uri) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -CREATE TABLE IF NOT EXISTS addressbooks ( - id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT, - principaluri VARCHAR(255), - displayname VARCHAR(255), - uri VARCHAR(200), - description TEXT, - ctag INT(11) UNSIGNED NOT NULL DEFAULT '1', - UNIQUE(principaluri, uri) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - -CREATE TABLE IF NOT EXISTS cards ( - id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT, - addressbookid INT(11) UNSIGNED NOT NULL, - carddata MEDIUMBLOB, - uri VARCHAR(200), - lastmodified INT(11) UNSIGNED -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; - diff --git a/sources/Core/Resources/Db/SQLite/db.sql b/sources/Core/Resources/Db/SQLite/db.sql deleted file mode 100644 index ff96ef3..0000000 --- a/sources/Core/Resources/Db/SQLite/db.sql +++ /dev/null @@ -1,83 +0,0 @@ --- --- This is the empty database schema for Baïkal --- Corresponds to the MySQL Schema definition of project SabreDAV 1.8.6 --- http://code.google.com/p/sabredav/ --- - -CREATE TABLE addressbooks ( - id integer primary key asc, - principaluri text, - displayname text, - uri text, - description text, - ctag integer -); - -CREATE TABLE cards ( - id integer primary key asc, - addressbookid integer, - carddata blob, - uri text, - lastmodified integer -); - -CREATE TABLE calendarobjects ( - id integer primary key asc, - calendardata blob, - uri text, - calendarid integer, - lastmodified integer, - etag text, - size integer, - componenttype text, - firstoccurence integer, - lastoccurence integer -); - -CREATE TABLE calendars ( - id integer primary key asc, - principaluri text, - displayname text, - uri text, - ctag integer, - description text, - calendarorder integer, - calendarcolor text, - timezone text, - components text, - transparent bool -); - -CREATE TABLE locks ( - id integer primary key asc, - owner text, - timeout integer, - created integer, - token text, - scope integer, - depth integer, - uri text -); - -CREATE TABLE principals ( - id INTEGER PRIMARY KEY ASC, - uri TEXT, - email TEXT, - displayname TEXT, - vcardurl TEXT, - UNIQUE(uri) -); - -CREATE TABLE groupmembers ( - id INTEGER PRIMARY KEY ASC, - principal_id INTEGER, - member_id INTEGER, - UNIQUE(principal_id, member_id) -); - -CREATE TABLE users ( - id integer primary key asc, - username TEXT, - digesta1 TEXT, - UNIQUE(username) -); diff --git a/sources/Core/Resources/Db/SQLite/db.sqlite b/sources/Core/Resources/Db/SQLite/db.sqlite deleted file mode 100644 index 40daea7..0000000 Binary files a/sources/Core/Resources/Db/SQLite/db.sqlite and /dev/null differ diff --git a/sources/Core/Resources/System/htaccess-documentroot b/sources/Core/Resources/System/htaccess-documentroot deleted file mode 100644 index 607a52f..0000000 --- a/sources/Core/Resources/System/htaccess-documentroot +++ /dev/null @@ -1,16 +0,0 @@ -# Disabling cache management -# that could cause problems with DAV requests -# Useful only for Apache servers, with AllowOverride All -# (ie, .htaccess files enabled) - -# Allow HTTP headers with Apache/FastCGI -# See http://code.google.com/p/sabredav/wiki/Authentication#Apache_+_(Fast)CGI - - - RewriteEngine On - RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L] - - - - ExpiresActive Off - \ No newline at end of file diff --git a/sources/Core/Resources/System/htaccess-specific b/sources/Core/Resources/System/htaccess-specific deleted file mode 100644 index cb24fd7..0000000 --- a/sources/Core/Resources/System/htaccess-specific +++ /dev/null @@ -1,2 +0,0 @@ -Order allow,deny -Deny from all diff --git a/sources/Core/Resources/Web/BaikalAdmin b/sources/Core/Resources/Web/BaikalAdmin deleted file mode 120000 index dd61f23..0000000 --- a/sources/Core/Resources/Web/BaikalAdmin +++ /dev/null @@ -1 +0,0 @@ -../../Frameworks/BaikalAdmin/Resources \ No newline at end of file diff --git a/sources/Core/Resources/Web/README.md b/sources/Core/Resources/Web/README.md deleted file mode 100644 index 4c3f2f8..0000000 --- a/sources/Core/Resources/Web/README.md +++ /dev/null @@ -1 +0,0 @@ -# Resources must be symlinked relatively to this folder diff --git a/sources/Core/Resources/Web/TwitterBootstrap b/sources/Core/Resources/Web/TwitterBootstrap deleted file mode 120000 index 7f2f966..0000000 --- a/sources/Core/Resources/Web/TwitterBootstrap +++ /dev/null @@ -1 +0,0 @@ -../../Frameworks/TwitterBootstrap \ No newline at end of file diff --git a/sources/INSTALL.md b/sources/INSTALL.md deleted file mode 100644 index 85acaa6..0000000 --- a/sources/INSTALL.md +++ /dev/null @@ -1,364 +0,0 @@ -# INSTALLING Baïkal - -This document is a part of the Baïkal project. Baïkal is an open -source lightweight CalDAV and CardDAV server released under the GNU GPL. Baïkal -is copyright (c) 2013 by Jérôme Schneider. - -Baïkal homepage is http://baikal-server.com - -This document describes the system requirements for Baïkal and the -installation routine. - -# 1 - System requirements - -Baïkal is based on PHP 5.3.1+, and uses a SQLite3 or MySQL with PHP PDO. This -document does not cover the installation of these requirements. - -## 1.1 - System requirements for FTP-driven hosting - -The following configuration is the minimum required: - -- an hosted webserver running apache 2 and PHP 5.3.0 - -- PHP 5.3.1 or newer with the following extensions: - - PDO and SQLite3 or MySQL - - DOM (php-xml) - Some extensions can be optionally compiled into PHP. A list of loaded - extensions can be checked using the phpinfo() function. - -- 30 MB of disk space - -## 1.2 - System requirements for dedicated server hosting - -The following configuration is the minimum required: - -- an Apache2 web server capable of running PHP, and accessible through a - dedicated subdomain (something like "dav.mydomainname.com") - NOTE: this document only covers sub-domain based installations. Other - installations modes are possible, though not documented (yet). - -- root access to a command line on this server - NOTE: tools to create and manage users are command line only. Web-based - interfaces will be produced in the future. - -- PHP 5.3.1 or newer with the following extensions: - - PDO and SQLite3 or MySQL - - DOM (php-xml) - Some extensions can be optionally compiled into PHP. A list of loaded - extensions can be checked using the phpinfo() function. - -- 30 MB of disk space - -# 2 - Obtaining Baïkal - -To get Baïkal, navigate to the following location: - http://baikal-server.com - -# 3 - Installation - -## 3.1 - Installing Baïkal on a FTP-driven hosting - -To install Baïkal on a FTP-driven hosting: -* Download the "Baikal Flat package for FTP" -* Unzip the package on you computer -* Send the unzipped package on the remote host via FTP -* (optional) Rename the Baïkal folder to whatever you want -* Navigate to the HTTP URL where you just uploaded Baïkal -* Follow the instructions of the initialization web tool - -## 3.2 - Installing Baïkal on a dedicated host - -### 3.2.1 Using the Baïkal "regular package" - -#### 3.2.1.1 - Unpacking files - -To install Baïkal on a dedicated host, download the "Regular package". -Unpack the source package outside of the web site root -directory on your server. The location must be accessible to the web server. -Usually, it will be something like /var/www/ - -```sh -# a. Enter the directory where the websites are stored -$ root:~> cd /var/www -``` - -Unpacking will produce a directory with a name like baikal-x.y.z, where x.y.z -correspond to the Baïkal version. For example, the Baïkal 0.2.0 source package -will create a directory named baikal-0.2.0 - -```sh -# b. Unpack the package using: -$ root:/var/www> tar xzf baikal-0.2.0.tgz -``` - -Rename the untar'd directory to the name of your baikal dedicated subdomain. - -```sh -# c. Rename the directory to match your domain (good practice) -$ root:/var/www> mv baikal-0.2.0 dav.mydomain.com - -# d. Enter the new Baïkal directory -$ root:/var/www> cd dav.mydomain.com -``` - -In order to grant Apache access to the files of your Baïkal installation, -you'll have to grant the user running the apache process r+w permissions on -the Baïkal files. In our example, we will suppose the linux username/usergroup -running Apache is www-data:www-data - -```sh -# e. Change permissions on the files -$ root:/var/www/dav.mydomain.com> chown www-data:www-data Specific -Rf -``` - -#### 3.2.1.2 - Setting up a Web Server - -Baikal must be bound to a domain/subdomain in order to run properly. -This package provides default virtualhost configuration files for Apache 2 and for nginx in - Specific/virtualhosts/ - -To enable your host to run Baikal, you'll have to add the Baikal virtualhost -to your Web Server environment. - -##### Setting up the Apache virtualhost - -In our example, we will assume that the apache2 configuration directory is: `/etc/apache2` - -```sh -# a. Enter the Apache2 configuration directory -$ root:/var/www> cd /etc/apache2 - -# b. Enter the sites-available directory -$ root:/etc/apache2> cd sites-available - -# c. Symlink the Baikal virtualhost file to this directory -$ root:/etc/apache2/sites-available> ln -s /var/www/dav.mydomain.com/Specific/virtualhosts/baikal.apache2 - -# d. Customize the virtualhost config file -$ root:/etc/apache2/sites-available> nano baikal.apache2 - -# e. In baikal.apache2, replace references to dav.mydomain.com with your own domain name - -# f. Activate the new virtualhost -$ root:/etc/apache2/sites-available> cd ../sites-enabled -$ root:/etc/apache2/sites-enabled> ln -s ../sites-available/baikal.apache2 - -# h. Restart apache -$ root:/etc/apache2/sites-enabled> /etc/init.d/apache2 restart -``` - -##### Setting up the nginx virtualhost - -In our example, we will assume that the nginx configuration directory is: `/etc/nginx` - -```sh -# a. Enter the nginx configuration directory -$ root:/var/www> cd /etc/nginx - -# b. Enter the sites-available directory -$ root:/etc/nginx> cd sites-available - -# c. Symlink the Baikal virtualhost file to this directory -$ root:/etc/nginx/sites-available> ln -s /var/www/dav.mydomain.com/Specific/virtualhosts/baikal.nginx - -# d. Customize the virtualhost config file -$ root:/etc/nginx/sites-available> nano baikal.nginx - -# e. In baikal.nginx, replace references to dav.mydomain.com with your own domain name - -# f. Activate the new virtualhost -$ root:/etc/nginx/sites-available> cd ../sites-enabled -$ root:/etc/nginx/sites-enabled> ln -s ../sites-available/baikal.nginx - -# h. Restart nginx -$ root:/etc/nginx/sites-enabled> /etc/init.d/nginx restart -``` - -#### 3.2.1.3 - Setting up Baïkal - -In a web browser, navigate to http://dav.mydomain.com and follow the instructions of the initialization web tool - -### 3.2.2 Using Baïkal "Bleeding-edge" version for developers (requires git and composer) - -Baïkal "Bleeding-edge" is using composer to install its dependencies. Please check that you have git and composer installed on your system before going any further. - -```sh -# a. Checkout the Baïkal source code -$ root:/var/www> git clone https://github.com/jeromeschneider/Baikal.git dav.mydomain.com - -# b. Enter the new dav.mydomain.com directory -$ root:/var/www> cd dav.mydomain.com -``` - -In order to grant Apache access to the files of your Baïkal installation, -you'll have to grant the user running the apache process `r+w` permissions on -the Baïkal files. In our example, we will suppose the linux username/usergroup -running Apache is `www-data:www-data` - -```sh -# c. Install Baïkal dependencies using composer -$ root:/var/www/dav.mydomain.com> composer install - -# d. Change permissions on the files -$ root:/var/www/dav.mydomain.com> chown www-data:www-data . -Rf -``` - -You now have to declare Baïkal in your webserver. You may follow instructions in **"3.2.1.2 - Setting up a Web Server"** above to do so. - -# 4 - Accessing the Baïkal Web Admin - -Navigate to http://dav.mydomain.com/admin/ - -# 5 - Connecting your CalDAV / CardDAV client to Baïkal - -## 5.1 - Apple Calendar (OS X): - -Note: Calendar is called iCal on older OS X versions. - -Add a new CalDAV account: - -* In Preferences... > Accounts click the `+` button -* Follow the wizard: - * Account Type: CalDAV - * User Name: the username you just created (in our example, jerome) - * Password: the password you just defined - * Server Address: http://dav.mydomain.com/cal.php/principals/jerome (replace domain and username) -* Change the account description if you want - -## 5.2 - Apple Calendar (iOS): - -Add a new CalDAV account: - -* In Settings > Mail, Contacts, Calendar > Add Account > Other -* Tap Add CalDAV Account under CALENDARS -* Configure your account: - * Server: http://dav.mydomain.com/cal.php/principals/jerome (replace domain and username) - * User Name: the username you just created (in our example, jerome) - * Password: the password you just defined - * Description: optional, whatever you want -* Tap Next - -## 5.3 - Apple Contacts (OS X): - -Note: Contacts is called Address Book on older OS X versions. - -Add a new CardDAV account: - -* In Preferences... > Accounts click the `+` button -* Follow the wizard: - * Account Type: CardDAV - * User name: the username you just created (in our example, jerome) - * Password: the password you just defined - * Server address: http://dav.mydomain.com/card.php/addressbooks/jerome/default (replace domain and username) -* Change the account description if you want - -## 5.4 - Apple Contacts (iOS): - -Add a new CardDAV account: - -* in Settings > Mail, Contacts, Calendar > Add Account > Other -* Tap Add CardDAV Account under CONTACTS -* Configure your account: - * Server: dav.mydomain.com/card.php (note: no http:// nor https://, and no trailing slash) - * User Name: the username you just created (in our example, jerome) - * Password: the password you just defined - * Description: optional, whatever you want -* Tap Next - -It can take a little while as iOS seems to look for a secure connection first. It will show a popup when it doesn't find any certificates. Accept this when you are **not** using Baikal over SSL. - -## 5.5 - Thunderbird/SOGo connector: - -Add a new CardDAV account: - -* Install "SOGo Connector Thunderbird extension" (http://sogo.nu/downloads/frontends.html) -* Navigate to "Address book" > "New" > "Remote address book" -* paste this URL: http://dav.mydomain.com/card.php/addressbooks/username/default/ of and replace the domain name, and the username with the correct values -* When asked, provide user/password; your CardDAV account should be up and running -* **Important notes**: some users reported that, for SOGo to work, you have to host your baikal on a **https** line, and keep usernames simple (no '@' in the username or any non ascii-alphanumeric char) - -## 5.6 - Thunderbird/Lightning: - -Add a new CalDAV account: - -* Navigate to "Lightning" > "New account" > "On the network" > "URL" -* paste this URL: http://dav.mydomain.com/cal.php/calendars/username/default of and replace the domain name, and the username with the correct values -* When asked, provide user/password; your CalDAV account should be up and running - -## 5.7 BlackBerry OS10 - -Add a new CalDAV account: - -* in Settings > Accounts > Add Account > Advanced -* Select "CalDAV" -* Username: the username you just created -* Password: the password you just defined -* Server Address: `dav.mydomain.com/cal.php/calendars/username/default` and replace domain and username with the correct values - -Add a new CardDAV account: - -* in Settings > Accounts > Add Account > Advanced -* Select "CardDAV" -* Username: the username you just created -* Password: the password you just defined -* Email Address: an email address you want this CardDAV account to be assigned to -* Server Address: `dav.mydomain.com/card.php/addressbooks/username/default` and replace domain and username with the correct values - -__Important notes:__ - -* Make sure you've configured Baikal to use `basic` as authentication mechanism. -* Its required to use SSL for CardDAV! - -# 6 - You're done - -You may now create new calendars, new events, new contact (: Enjoy. - -# 7 - Troubleshooting - -Please read TROUBLESHOOTING.md in this folder. - -# 8 - User contributed quick & dirty install guides - -## Ubuntu 12.04 - James Lay & Frederic Hemberger - -```sh -cd /var/www -sudo chown -R www-data:www-data baikal -mysql -u root -p #password# -``` - -```mysql -CREATE DATABASE baikal; -GRANT DELETE, INSERT, SELECT, UPDATE ON baikal.* TO 'baikal'@'localhost' IDENTIFIED BY '#password#'; -exit -``` - -```sh -mysql -u root -p #password# -D baikal < /var/www/baikal/Core/Resources/Db/MySQL/db.sql -sudo touch /var/www/baikal/Specfic/ENABLE_INSTALL -sudo chown www-data /var/www/baikal/Specific/ENABLE_INSTALL -sudo vi /etc/apache2/sites-available/baikal -``` - -```plain - - ServerName baikal - DocumentRoot /var/www/baikal - - ErrorLog /var/logsbaikal.error_log - TransferLog /var/log/baikal.access_log - LogLevel warn - - - Order allow,deny - Allow from all - - -``` - -```sh -sudo ln -s /etc/apache2/sites-available/baikal /etc/apache2/sites-enabled -sudo service apache2 restart -``` - -Point your browser to http://hostname/baikal and there you go. diff --git a/sources/LICENSE.txt b/sources/LICENSE.txt deleted file mode 100644 index 911d17d..0000000 --- a/sources/LICENSE.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - Baïkal Server, a lightweight CalDAV and CardDAV server. - Copyright (C) 2012 Jérôme Schneider - - This program 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 3 of the License, or - (at your option) any later version. - - This program 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. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Baïkal Server Copyright (C) 2012 Jérôme Schneider - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/sources/README.md b/sources/README.md deleted file mode 100644 index 5c95815..0000000 --- a/sources/README.md +++ /dev/null @@ -1,51 +0,0 @@ -# 1. About this package - -This package contains a release of Baïkal. -Go to http://baikal-server.com to get more information about this package, and upgrades. - -# 2. What is Baïkal ? - -Baïkal is an open source lightweight CalDAV and CardDAV server. It's developped -by Jérôme Schneider and based on the excellent [SabreDAV](http://code.google.com/p/sabredav/ "SabreDAV") project. -Baïkal is distributed under the GPL license. - -To get more info about the GPL license, visit -http://www.opensource.org/licenses/gpl-license.php. - -# 3. Baïkal requirements - -Baïkal is based on PHP 5.3.1+, and uses a SQLite3 or MySQL with PHP PDO. For more -information regarding these requirements see the INSTALL.md file in this folder. - -# 4. What should you do if you have a problem ? - - 1. Read the available documentation carefully - - 2. Search the web carefully about Baïkal CalDAV CardDAV - - 3. If you have identified a genuine new bug, - report it at https://github.com/jeromeschneider/Baikal/issues - -# 5. How to install / configure Baïkal - -Please read INSTALL.md in this folder. - -# 6. How to configure my CalDAV / CardDAV client ? - -Please read INSTALL.md in this folder. - -# 7. How to upgrade my Baïkal server to a new version ? - -Please read UPGRADE.md in this folder. - -# 8. Troubleshooting - -Please read TROUBLESHOOTING.md in this folder. - -# 9. Credits - -Baïkal is developed by Jérôme Schneider. -Jérôme Schneider (@jeromeschneider) is admin and lead developer. -Many thanks to Daniel Aleksandersen (@zcode) for greatly improving the quality of the project page (http://baikal-server.com). Much appreciated, Daniel :) - --- Jérôme Schneider Mon, 21 Aug 2012 12:17:00 +0100 diff --git a/sources/Specific/.htaccess b/sources/Specific/.htaccess deleted file mode 100644 index cb24fd7..0000000 --- a/sources/Specific/.htaccess +++ /dev/null @@ -1,2 +0,0 @@ -Order allow,deny -Deny from all diff --git a/sources/Specific/ENABLE_INSTALL b/sources/Specific/ENABLE_INSTALL deleted file mode 100644 index e69de29..0000000 diff --git a/sources/Specific/db/.gitignore b/sources/Specific/db/.gitignore deleted file mode 100644 index 86d0cb2..0000000 --- a/sources/Specific/db/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -# Ignore everything in this directory -* -# Except this file -!.gitignore \ No newline at end of file diff --git a/sources/Specific/virtualhosts/baikal.apache2 b/sources/Specific/virtualhosts/baikal.apache2 deleted file mode 100644 index 3aa173a..0000000 --- a/sources/Specific/virtualhosts/baikal.apache2 +++ /dev/null @@ -1,16 +0,0 @@ - - - DocumentRoot /var/www/dav.mydomain.com/html - ServerName dav.mydomain.com - - RewriteEngine On - RewriteRule /.well-known/carddav /card.php [R,L] - RewriteRule /.well-known/caldav /cal.php [R,L] - - - Options None - Options +FollowSymlinks - AllowOverride All - - - diff --git a/sources/Specific/virtualhosts/baikal.nginx b/sources/Specific/virtualhosts/baikal.nginx deleted file mode 100644 index 9144a98..0000000 --- a/sources/Specific/virtualhosts/baikal.nginx +++ /dev/null @@ -1,31 +0,0 @@ -server { - listen 80; - server_name dav.mydomain.com; - - root /var/www/dav.mydomain.com; - index index.php; - - rewrite ^/.well-known/caldav /cal.php redirect; - rewrite ^/.well-known/carddav /card.php redirect; - - charset utf-8; - - location ~ /(\.ht|Core|Specific) { - deny all; - return 404; - } - - location ~ ^(.+\.php)(.*)$ { - try_files $fastcgi_script_name =404; - fastcgi_split_path_info ^(.+\.php)(.*)$; - fastcgi_pass unix:/var/run/php-fpm/php-fpm.sock; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - include /etc/nginx/fastcgi_params; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /var/www/nginx-default; - } -} diff --git a/sources/TROUBLESHOOTING.md b/sources/TROUBLESHOOTING.md deleted file mode 100644 index b9f6a6d..0000000 --- a/sources/TROUBLESHOOTING.md +++ /dev/null @@ -1,66 +0,0 @@ -# 1. About this package - -This package contains a release of Baïkal. -Go to http://baikal-server.com to get more information about this package, and upgrades. - -# 2. Problem with authentication (CalDAV and CardDAV) - -On webservers where PHP is served as FastCGI (check your phpinfo() -to find out if that's the case for you), Apache does not pass HTTP -Auth informations to PHP, and thus preventing Cal/CardDAV to auth -requests properly. -Baïkal tries to address this issue by re-routing HTTP Auth informations -using Apaches mod_rewrite. This is done by the Apache config directives -found in the /.htaccess file that comes with Baïkal (or /html/.htaccess -for the non-ftp package). -Note: if this file is empty / does not exist, you should try to add it manually -(sometimes FTP clients decide to not send files with names beginning with a dot ".") - -# 3. Troubleshooting calendar access (please check 2. first) - -To troubleshoot user auth / data access, you may use curl to debug server responses. On a command line, run: - - curl -so - --digest --user username:password http://hostname/cal.php/calendars/username/default - -(Be sure that the username exists, has the right password set, and has a calendar named default first). - -If you see this, auth works for this username/password/calendar, so it has to be client-related: - - GET is only implemented on File objects - -If you see this, password is wrong (case-sensitive) (despite the message indicating that it's the username): - - Incorrect username - -If you see this, username is wrong: - - The supplied username was not on file - -If you see this, auth works but the "principals" part of the URL is wrong (the /username/ after "calendars" in the URL): - - Principal with name username not found - -If you see this, auth works but the calendar does not exist for this user: - - Calendar with name 'defaults' could not be found - -If you see this, auth works and the calendar exists, but the provided user has no permission to access this calendar: - - Sabre_DAVACL_Exception_NeedPrivileges - -If you see one of these, the URL is not well formed / invalid: - - File not found: XXXXX in 'root' - -Or - - The requested URL XXXXX was not found on this server. - -If you see nothing at all, curl cannot resolve your host. - -# 4. Database is readonly (sqlite) - -Using SQLite (the default setup), if you have troubles when putting data in the database, -(an exception "unable to open database file" is thrown) check that: - * the system user running your Apache/PHP has write permissions on Specific/db/ (*the folder*) - * the system user running your Apache/PHP has write permissions on Specific/db/db.sqlite (*the file*) diff --git a/sources/UPGRADE.md b/sources/UPGRADE.md deleted file mode 100644 index 9eb0f11..0000000 --- a/sources/UPGRADE.md +++ /dev/null @@ -1,16 +0,0 @@ -This document explains how to upgrade your Baïkal installation - -## Upgrading Baïkal - -1. First thing, if you are using MySQL, backup your database. If you are using SQLite, your db file is in the `Specific` folder, backup this folder. -2. Rename your Baïkal root folder. For example from `/var/baikal` to `/var/baikal-old` -3. Download and unzip baïkal to exact folder of your old installation: `/var/baikal` in our example. -4. If working on SSH, apply correct ownership/permissions to files. - 1. For the ownership, you can refer to the old installation `baikal-old`. Use `ls -l baikal-old/` command to see the ownership (for example `root:www-data`), and then set them with `sudo chown -Rf root:www-data baikal` - 2. For the permissions, you can execute the following command: `sudo chmod -Rf 770 baikal` -5. Replace the folder `baikal/Specific` (the new one) by `baikal-old/Specific` (the old one) (even for MySQL) -6. Using your browser, navigate to your baikal admin, the Upgrade wizard should start. - -## Troubleshooting - -See TROUBLESHOOTING.md \ No newline at end of file diff --git a/sources/composer.json b/sources/composer.json deleted file mode 100644 index 0008184..0000000 --- a/sources/composer.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "jeromeschneider/baikal", - "description": "Baïkal is a lightweight CalDAV + CardDAV server based on PHP, SQLite and SabreDAV", - "keywords": ["Framework", "WebDAV", "CalDAV", "CardDAV", "iCalendar"], - "homepage": "http://code.google.com/p/sabredav/", - "license" : "GPL-3.0", - "authors": [ - { - "name": "Jérôme Schneider", - "email": "mail@jeromeschneider.fr", - "homepage" : "http://jerome.io", - "role" : "Developer" - } - ], - "require": { - "php" : ">=5.3.1", - "sabre/dav" : "1.8.*" - }, - "autoload": { - "psr-0" : { - "Baikal" : "Core/Frameworks/", - "Flake" : "Core/Frameworks/", - "Formal" : "Core/Frameworks/" - } - }, - "support" : { - "source" : "https://github.com/jeromeschneider/Baikal" - } -} diff --git a/sources/html/.htaccess b/sources/html/.htaccess deleted file mode 100644 index 607a52f..0000000 --- a/sources/html/.htaccess +++ /dev/null @@ -1,16 +0,0 @@ -# Disabling cache management -# that could cause problems with DAV requests -# Useful only for Apache servers, with AllowOverride All -# (ie, .htaccess files enabled) - -# Allow HTTP headers with Apache/FastCGI -# See http://code.google.com/p/sabredav/wiki/Authentication#Apache_+_(Fast)CGI - - - RewriteEngine On - RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L] - - - - ExpiresActive Off - \ No newline at end of file diff --git a/sources/html/admin/index.php b/sources/html/admin/index.php deleted file mode 120000 index 9882e2a..0000000 --- a/sources/html/admin/index.php +++ /dev/null @@ -1 +0,0 @@ -../../Core/Frameworks/BaikalAdmin/WWWRoot/index.php \ No newline at end of file diff --git a/sources/html/admin/install/index.php b/sources/html/admin/install/index.php deleted file mode 120000 index 1f9cdfe..0000000 --- a/sources/html/admin/install/index.php +++ /dev/null @@ -1 +0,0 @@ -../../../Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php \ No newline at end of file diff --git a/sources/html/cal.php b/sources/html/cal.php deleted file mode 120000 index f7f240c..0000000 --- a/sources/html/cal.php +++ /dev/null @@ -1 +0,0 @@ -../Core/Frameworks/Baikal/WWWRoot/cal.php \ No newline at end of file diff --git a/sources/html/card.php b/sources/html/card.php deleted file mode 120000 index 8b81841..0000000 --- a/sources/html/card.php +++ /dev/null @@ -1 +0,0 @@ -../Core/Frameworks/Baikal/WWWRoot/card.php \ No newline at end of file diff --git a/sources/html/index.php b/sources/html/index.php deleted file mode 120000 index 16a3bef..0000000 --- a/sources/html/index.php +++ /dev/null @@ -1 +0,0 @@ -../Core/Frameworks/Baikal/WWWRoot/index.php \ No newline at end of file diff --git a/sources/html/res/core b/sources/html/res/core deleted file mode 120000 index 2985272..0000000 --- a/sources/html/res/core +++ /dev/null @@ -1 +0,0 @@ -../../Core/Resources/Web \ No newline at end of file