forks/baikal
1
0
Fork 0
Code Releases Activity

Implement custom cs-fixer settings

Browse source
This commit is contained in:
Phil Davis 2020-02-18 10:54:56 +05:45
parent 0455e70ffe
commit 4c59a80901
114 changed files with 404 additions and 458 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.php_cs.dist
View file

@ -5,8 +5,19 @@ $config->getFinder()
->exclude('vendor')
->in(__DIR__);
$config->setRules([
'@PSR1' => true,
'@Symfony' => true
'@PSR2' => true,
'@Symfony' => true,
'binary_operator_spaces' => ['align_double_arrow' => true],
'braces' => ['position_after_functions_and_oop_constructs' => 'same'],
'concat_space' => ['spacing' => 'one'],
'no_superfluous_phpdoc_tags' => false,
'no_unneeded_control_parentheses' => false,
'phpdoc_align' => false,
'single_line_comment_style' => false,
'single_quote' => false,
'trailing_comma_in_multiline_array' => false,
'visibility_required' => false,
'yoda_style' => false
]);
return $config;

1
Core/Distrib.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#

4
Core/Frameworks/Baikal/Controller/Main.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,16 +25,15 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Controller;
class Main extends \Flake\Core\Controller {
function execute() {
}
function render() {
$oView = new \Baikal\View\Main();
return $oView->render();
}
}

4
Core/Frameworks/Baikal/Controller/Navigation/Topbar/Anonymous.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,16 +25,15 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Controller\Navigation\Topbar;
class Anonymous extends \Flake\Core\Controller {
function execute() {
}
function render() {
$oView = new \Baikal\View\Navigation\Topbar\Anonymous();
return $oView->render();
}
}

24
Core/Frameworks/Baikal/Core/PDOBasicAuth.php
View file

@ -12,23 +12,22 @@ namespace Baikal\Core;
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class PDOBasicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic {
/**
* Reference to PDO connection
* Reference to PDO connection.
*
* @var PDO
*/
protected $pdo;
/**
* PDO table name we'll be using
* PDO table name we'll be using.
*
* @var string
*/
protected $tableName;
/**
* Authentication realm
* Authentication realm.
*
* @var string
*/
@ -48,39 +47,38 @@ class PDOBasicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic {
* @param string $tableName The PDO table name to use
*/
function __construct(\PDO $pdo, $authRealm, $tableName = 'users') {
$this->pdo = $pdo;
$this->tableName = $tableName;
$this->authRealm = $authRealm;
}
/**
* Validates a username and password
* 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
*/
function validateUserPass($username, $password) {
$stmt = $this->pdo->prepare('SELECT username, digesta1 FROM ' . $this->tableName . ' WHERE username = ?');
$stmt->execute([$username]);
$result = $stmt->fetchAll();
if (!count($result)) return false;
if (!count($result)) {
return false;
}
$hash = md5($username . ':' . $this->authRealm . ':' . $password);
if ($result[0]['digesta1'] === $hash)
{
if ($result[0]['digesta1'] === $hash) {
$this->currentUser = $username;
return true;
}
return false;
}
}

29
Core/Frameworks/Baikal/Core/Server.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,14 +25,13 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Core;
use PDO;
use Symfony\Component\Yaml\Yaml;
/**
* The Baikal Server
* The Baikal Server.
*
* This class sets up the underlying Sabre\DAV\Server object.
*
@ -40,7 +40,6 @@ use Symfony\Component\Yaml\Yaml;
* @license http://sabre.io/license/ GPLv2
*/
class Server {
/**
* Is CalDAV enabled?
*
@ -56,41 +55,40 @@ class Server {
protected $enableCardDAV;
/**
* "Basic" or "Digest"
* "Basic" or "Digest".
*
* @var string
*/
protected $authType;
/**
* HTTP authentication realm
* HTTP authentication realm.
*
* @var string
*/
protected $authRealm;
/**
* Reference to Database object
* Reference to Database object.
*
* @var PDO
*/
protected $pdo;
/**
* baseUri for the sabre/dav server
* baseUri for the sabre/dav server.
*
* @var string
*/
protected $baseUri;
/**
* The sabre/dav Server object
* The sabre/dav Server object.
*
* @var \Sabre\DAV\Server
*/
protected $server;
/**
* Creates the server object.
*
@ -102,7 +100,6 @@ class Server {
* @param string $baseUri
*/
function __construct($enableCalDAV, $enableCardDAV, $authType, $authRealm, PDO $pdo, $baseUri) {
$this->enableCalDAV = $enableCalDAV;
$this->enableCardDAV = $enableCardDAV;
$this->authType = $authType;
@ -111,27 +108,23 @@ class Server {
$this->baseUri = $baseUri;
$this->initServer();
}
/**
* Starts processing
* Starts processing.
*
* @return void
*/
function start() {
$this->server->exec();
}
/**
* Initializes the server object
* Initializes the server object.
*
* @return void
*/
protected function initServer() {
try {
$config = Yaml::parseFile(PROJECT_PATH_CONFIG . "baikal.yaml");
} catch (\Exception $e) {
@ -188,11 +181,10 @@ class Server {
}
$this->server->on('exception', [$this, 'exception']);
}
/**
* Log failed accesses, matching the default fail2ban nginx/apache auth rules
* Log failed accesses, matching the default fail2ban nginx/apache auth rules.
*
* @return void
*/
@ -211,5 +203,4 @@ class Server {
error_log($e);
}
}
}

9
Core/Frameworks/Baikal/Core/Tools.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Core;
class Tools {
@ -60,7 +60,6 @@ class Tools {
}
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)) {
@ -102,7 +101,6 @@ class Tools {
}
static function isDBStructurallyComplete(\Flake\Core\Database $oDB) {
$aRequiredTables = self::getRequiredTablesList();
$aPresentTables = $oDB->tables();
@ -119,6 +117,7 @@ class Tools {
@flush();
@ob_flush();
$confirmation = @trim(fgets(STDIN));
return $confirmation;
}
@ -127,6 +126,7 @@ class Tools {
if (rtrim(shell_exec($command)) !== 'OK') {
trigger_error("Can't invoke bash");
return;
}
@ -136,11 +136,11 @@ class Tools {
$password = rtrim(shell_exec($command));
echo "\n";
return $password;
}
static function getCopyrightNotice($sLinePrefixChar = "#", $sLineSuffixChar = "", $sOpening = false, $sClosing = false) {
if ($sOpening === false) {
$sOpening = str_repeat("#", 78);
}
@ -196,6 +196,7 @@ CODE;
$aZones = \DateTimeZone::listIdentifiers();
reset($aZones);
return $aZones;
}
}

3
Core/Frameworks/Baikal/Core/View.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,13 +25,13 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Core;
class View extends \Flake\Core\View {
function templatesPath() {
$sViewName = get_class($this);
$sTemplate = str_replace("\\", "/", substr($sViewName, strlen("Baikal\\View\\"))) . ".html";
return PROJECT_PATH_ROOT . "Core/Resources/Web/Baikal/Templates/" . $sTemplate;
}
}

8
Core/Frameworks/Baikal/Framework.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,13 +25,11 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal;
use Symfony\Component\Yaml\Yaml;
class Framework extends \Flake\Core\Framework {
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
@ -44,7 +43,6 @@ class Framework extends \Flake\Core\Framework {
}
static function bootstrap() {
# Registering Baikal classloader
define("BAIKAL_PATH_FRAMEWORKROOT", dirname(__FILE__) . "/");
@ -62,12 +60,10 @@ class Framework extends \Flake\Core\Framework {
if (!isset($config['system']['configured_version'])) {
self::installTool();
} else {
# Check that running version matches configured version
if (version_compare(BAIKAL_VERSION, $config['system']['configured_version']) > 0) {
self::installTool();
} else {
# Check that admin password is set
if (!$config['system']['admin_passwordhash']) {
self::installTool();
@ -76,11 +72,9 @@ class Framework extends \Flake\Core\Framework {
\Baikal\Core\Tools::assertBaikalIsOk();
set_error_handler("\Baikal\Framework::exception_error_handler");
}
}
}
}
# Mapping PHP errors to exceptions; needed by SabreDAV

3
Core/Frameworks/Baikal/Model/AddressBook.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Model;
class AddressBook extends \Flake\Core\Model\Db {
@ -106,7 +106,6 @@ class AddressBook extends \Flake\Core\Model\Db {
}
function destroy() {
$oContacts = $this->getContactsBaseRequester()->execute();
foreach ($oContacts as $contact) {
$contact->destroy();

2
Core/Frameworks/Baikal/Model/AddressBook/Contact.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Model\AddressBook;
class Contact extends \Flake\Core\Model\Db {

7
Core/Frameworks/Baikal/Model/Calendar.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Model;
use Symfony\Component\Yaml\Yaml;
@ -95,7 +95,6 @@ class Calendar extends \Flake\Core\Model\Db {
}
function get($sPropName) {
if ($sPropName === "components") {
return $this->oCalendar->get($sPropName);
}
@ -126,13 +125,11 @@ class Calendar extends \Flake\Core\Model\Db {
}
function set($sPropName, $sValue) {
if ($sPropName === "components") {
return $this->oCalendar->set($sPropName, $sValue);
}
if ($sPropName === "todos") {
if (($sComponents = $this->get("components")) !== "") {
$aComponents = explode(",", $sComponents);
} else {
@ -153,7 +150,6 @@ class Calendar extends \Flake\Core\Model\Db {
}
if ($sPropName === "notes") {
if (($sComponents = $this->get("components")) !== "") {
$aComponents = explode(",", $sComponents);
} else {
@ -228,7 +224,6 @@ class Calendar extends \Flake\Core\Model\Db {
"help" => "If checked, notes will be enabled on this calendar.",
]));
if ($this->floating()) {
$oMorpho->element("uri")->setOption(
"help",

3
Core/Frameworks/Baikal/Model/Calendar/Calendar.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Model\Calendar;
class Calendar extends \Flake\Core\Model\Db {
@ -47,6 +47,7 @@ class Calendar extends \Flake\Core\Model\Db {
return false;
} else {
reset($aRs);
return true;
}
}

2
Core/Frameworks/Baikal/Model/Calendar/Event.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Model\Calendar;
class Event extends \Flake\Core\Model\Db {

5
Core/Frameworks/Baikal/Model/Config.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,13 +25,11 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Model;
use Symfony\Component\Yaml\Yaml;
abstract class Config extends \Flake\Core\Model\NoDb {
protected $sConfigFileSection = "";
protected $aData = [];
@ -89,7 +88,6 @@ abstract class Config extends \Flake\Core\Model\NoDb {
$config = Yaml::parseFile(PROJECT_PATH_CONFIG . "baikal.yaml");
} else {
$config = [];
}
$config[$this->sConfigFileSection] = $this->aData;
$yaml = Yaml::dump($config);
@ -97,6 +95,5 @@ abstract class Config extends \Flake\Core\Model\NoDb {
}
function destroy() {
}
}

3
Core/Frameworks/Baikal/Model/Config/Database.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Model\Config;
class Database extends \Baikal\Model\Config {
protected $aConstants = [
"sqlite_file" => [
"type" => "litteral",

4
Core/Frameworks/Baikal/Model/Config/Distrib.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Model\Config;
class Distrib extends \Baikal\Model\Config {
protected $aConstants = [
"BAIKAL_VERSION" => [
"type" => "string",
@ -48,6 +47,7 @@ class Distrib extends \Baikal\Model\Config {
function formMorphologyForThisModelInstance() {
$oMorpho = new \Formal\Form\Morphology();
return $oMorpho;
}

5
Core/Frameworks/Baikal/Model/Config/Standard.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,13 +25,11 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Model\Config;
use Symfony\Component\Yaml\Yaml;
class Standard extends \Baikal\Model\Config {
protected $aConstants = [
"timezone" => [
"type" => "string",
@ -84,7 +83,6 @@ class Standard extends \Baikal\Model\Config {
"options" => \Baikal\Core\Tools::timezones(),
]));
$oMorpho->add(new \Formal\Element\Checkbox([
"prop" => "card_enabled",
"label" => "Enable CardDAV"
@ -125,7 +123,6 @@ class Standard extends \Baikal\Model\Config {
}
if (!isset($config['system']["admin_passwordhash"]) || trim($config['system']["admin_passwordhash"]) === "") {
# No password set (Form is used in install tool), so password is required as it has to be defined
$oMorpho->element("admin_passwordhash")->setOption("validation", "required");
} else {

3
Core/Frameworks/Baikal/Model/Config/System.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Model\Config;
class System extends \Baikal\Model\Config {
protected $aConstants = [
"sqlite_file" => [
"type" => "litteral",

2
Core/Frameworks/Baikal/Model/Principal.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Model;
class Principal extends \Flake\Core\Model\Db {

7
Core/Frameworks/Baikal/Model/User.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\Model;
use Symfony\Component\Yaml\Yaml;
@ -79,7 +79,6 @@ class User extends \Flake\Core\Model\Db {
}
function get($sPropName) {
if ($sPropName === "password" || $sPropName === "passwordconfirm") {
# Special handling for password and passwordconfirm
return "";
@ -101,7 +100,6 @@ class User extends \Flake\Core\Model\Db {
}
function set($sPropName, $sPropValue) {
if ($sPropName === "password" || $sPropName === "passwordconfirm") {
# Special handling for password and passwordconfirm
@ -129,7 +127,6 @@ class User extends \Flake\Core\Model\Db {
}
function persist() {
$bFloating = $this->floating();
# Persisted first, as Model users loads this data
@ -139,7 +136,6 @@ class User extends \Flake\Core\Model\Db {
parent::persist();
if ($bFloating) {
# Creating default calendar for user
$oDefaultCalendar = new \Baikal\Model\Calendar();
$oDefaultCalendar->set(
@ -281,7 +277,6 @@ class User extends \Flake\Core\Model\Db {
}
function getPasswordHashForPassword($sPassword) {
try {
$config = Yaml::parseFile(PROJECT_PATH_CONFIG . "baikal.yaml");
} catch (\Exception $e) {

3
Core/Frameworks/Baikal/View/Main.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,9 +25,7 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\View;
class Main extends \Baikal\Core\View {
}

3
Core/Frameworks/Baikal/View/Navigation/Topbar/Anonymous.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,9 +25,7 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Baikal\View\Navigation\Topbar;
class Anonymous extends \Baikal\Core\View {
}

4
Core/Frameworks/BaikalAdmin/Controller/Dashboard.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,18 +25,15 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller;
use Symfony\Component\Yaml\Yaml;
class Dashboard extends \Flake\Core\Controller {
function execute() {
}
function render() {
$config = Yaml::parseFile(PROJECT_PATH_CONFIG . "baikal.yaml");
$oView = new \BaikalAdmin\View\Dashboard();

24
Core/Frameworks/BaikalAdmin/Controller/Install/Database.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,13 +25,11 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller\Install;
use Symfony\Component\Yaml\Yaml;
class Database extends \Flake\Core\Controller {
protected $aMessages = [];
protected $oModel;
protected $oForm; # \Formal\Form
@ -39,7 +38,7 @@ class Database extends \Flake\Core\Controller {
$this->oModel = new \Baikal\Model\Config\System();
if (file_exists(PROJECT_PATH_SPECIFIC . "config.system.php")) {
require_once(PROJECT_PATH_SPECIFIC . "config.system.php");
require_once PROJECT_PATH_SPECIFIC . "config.system.php";
$this->oModel->set('sqlite_file', PROJECT_SQLITE_FILE);
$this->oModel->set('mysql', PROJECT_DB_MYSQL);
$this->oModel->set('mysql_host', PROJECT_DB_MYSQL_HOST);
@ -75,7 +74,6 @@ class Database extends \Flake\Core\Controller {
$oView->setData("baikalversion", BAIKAL_VERSION);
if ($this->oForm->persisted()) {
$sMessage = "<p>Baïkal is now installed, and its database properly configured. <strong>For security reasons, this installation wizard is now disabled.</strong></p>";
$sMessage . "<p>&nbsp;</p>";
$sMessage .= "<p><a class='btn btn-success' href='" . PROJECT_URI . "admin/'>Start using Baïkal</a></p>";
@ -92,13 +90,12 @@ class Database extends \Flake\Core\Controller {
}
function validateConnection($oForm, $oMorpho) {
if ($oForm->refreshed()){
if ($oForm->refreshed()) {
return true;
}
$bMySQLEnabled = $oMorpho->element("mysql")->value();
if ($bMySQLEnabled) {
$sHost = $oMorpho->element("mysql_host")->value();
$sDbname = $oMorpho->element("mysql_dbname")->value();
$sUsername = $oMorpho->element("mysql_username")->value();
@ -113,7 +110,6 @@ class Database extends \Flake\Core\Controller {
);
if (($aMissingTables = \Baikal\Core\Tools::isDBStructurallyComplete($oDb)) !== true) {
# Checking if all tables are missing
$aRequiredTables = \Baikal\Core\Tools::getRequiredTablesList();
if (count($aRequiredTables) !== count($aMissingTables)) {
@ -144,31 +140,29 @@ class Database extends \Flake\Core\Controller {
$oForm->declareError($oMorpho->element("mysql_password"));
}
} else {
$sFile = $oMorpho->element("sqlite_file")->value();
try {
# Asserting DB file is writable
if (file_exists($sFile) && !is_writable($sFile)) {
$sMessage = "DB file is not writable. Please give write permissions on file <span style='font-family: monospace'>" . $sFile . "</span>";
$oForm->declareError($oMorpho->element("sqlite_file"), $sMessage);
return false;
}
# Asserting DB directory is writable
if (!is_writable(dirname($sFile))) {
$sMessage = "The <em>FOLDER</em> containing the DB file is not writable, and it has to.<br />Please give write permissions on folder <span style='font-family: monospace'>" . dirname($sFile) . "</span>";
$oForm->declareError($oMorpho->element("sqlite_file"), $sMessage);
return false;
}
$oDb = new \Flake\Core\Database\Sqlite(
$sFile
);
if (($aMissingTables = \Baikal\Core\Tools::isDBStructurallyComplete($oDb)) !== true) {
# Checking if all tables are missing
$aRequiredTables = \Baikal\Core\Tools::getRequiredTablesList();
if (count($aRequiredTables) !== count($aMissingTables)) {
@ -186,7 +180,9 @@ class Database extends \Flake\Core\Controller {
# We add these tables ourselves to the database, to initialize Baïkal
$sSqlDefinition = file_get_contents(PROJECT_PATH_CORERESOURCES . "Db/SQLite/db.sql");
foreach (explode(';', $sSqlDefinition) as $query) {
if (!trim($query)) continue;
if (!trim($query)) {
continue;
}
$oDb->query($query);
}
}
@ -196,7 +192,7 @@ class Database extends \Flake\Core\Controller {
} catch (\Exception $e) {
$oForm->declareError(
$oMorpho->element("sqlite_file"),
"Baïkal was not able to establish a connexion to the SQLite database as configured.<br />SQLite says: " . $e->getMessage() . (string)$e
"Baïkal was not able to establish a connexion to the SQLite database as configured.<br />SQLite says: " . $e->getMessage() . (string) $e
);
}
// SQLite
@ -204,7 +200,6 @@ class Database extends \Flake\Core\Controller {
}
function hideMySQLFieldWhenNeeded(\Formal\Form $oForm, \Formal\Form\Morphology $oMorpho) {
if ($oForm->submitted()) {
$bMySQL = (intval($oForm->postValue("mysql")) === 1);
} else {
@ -219,7 +214,6 @@ class Database extends \Flake\Core\Controller {
if ($bMySQL === true) {
$oMorpho->remove("sqlite_file");
} else {
$oMorpho->remove("mysql_host");
$oMorpho->remove("mysql_dbname");
$oMorpho->remove("mysql_username");

15
Core/Frameworks/BaikalAdmin/Controller/Install/Initialize.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller\Install;
class Initialize extends \Flake\Core\Controller {
protected $aMessages = [];
protected $oModel;
protected $oForm; # \Formal\Form
@ -49,7 +48,7 @@ class Initialize extends \Flake\Core\Controller {
// If we come from pre-0.7.0, we need to get the values from the config.php and config.system.php files
if (file_exists(PROJECT_PATH_SPECIFIC . "config.php")) {
require_once(PROJECT_PATH_SPECIFIC . "config.php");
require_once PROJECT_PATH_SPECIFIC . "config.php";
$this->oModel->set('timezone', PROJECT_TIMEZONE);
$this->oModel->set('card_enabled', BAIKAL_CARD_ENABLED);
$this->oModel->set('cal_enabled', BAIKAL_CAL_ENABLED);
@ -65,7 +64,6 @@ class Initialize extends \Flake\Core\Controller {
$this->oForm->execute();
if ($this->oForm->persisted()) {
// If we come from pre-0.7.0, we need to remove the INSTALL_DISABLED file so we go to the next step
if (file_exists(PROJECT_PATH_SPECIFIC . '/INSTALL_DISABLED')) {
@unlink(PROJECT_PATH_SPECIFIC . '/INSTALL_DISABLED');
@ -76,16 +74,15 @@ class Initialize extends \Flake\Core\Controller {
# Creating system config, and initializing BAIKAL_ENCRYPTION_KEY
$oSystemConfig = new \Baikal\Model\Config\System("system");
$oSystemConfig->set("encryption_key", md5(microtime() . rand()));
$oSystemConfig->set("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("mysql", true);
$oSystemConfig->set("mysql", true);
}
$oSystemConfig->persist();
}
}
}
@ -101,13 +98,12 @@ class Initialize extends \Flake\Core\Controller {
// we need to tell the installer page to show a warning message.
$oView->setData("oldConfigSystem", file_exists(PROJECT_PATH_SPECIFIC . "config.system.php"));
if ($this->oForm->persisted()) {
$sLink = PROJECT_URI . "admin/install/?/database";
\Flake\Util\Tools::redirect($sLink);
exit(0);
#$sMessage = "<p>Baïkal is now configured. You may <a class='btn btn-success' href='" . PROJECT_URI . "admin/'>Access the Baïkal admin</a></p>";
#$sMessage = "<p>Baïkal is now configured. You may <a class='btn btn-success' href='" . PROJECT_URI . "admin/'>Access the Baïkal admin</a></p>";
#$sForm = "";
} else {
$sMessage = "";
@ -121,7 +117,6 @@ class Initialize extends \Flake\Core\Controller {
}
protected function createHtaccessFilesIfNeeded() {
if (!file_exists(PROJECT_PATH_DOCUMENTROOT . ".htaccess")) {
@copy(PROJECT_PATH_CORERESOURCES . "System/htaccess-documentroot", PROJECT_PATH_DOCUMENTROOT . ".htaccess");
}

4
Core/Frameworks/BaikalAdmin/Controller/Install/UpgradeConfirmation.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,13 +25,11 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller\Install;
use Symfony\Component\Yaml\Yaml;
class UpgradeConfirmation extends \Flake\Core\Controller {
function execute() {
}
@ -51,6 +50,7 @@ class UpgradeConfirmation extends \Flake\Core\Controller {
$oView->setData("message", $sMessage);
$oView->setData("projectUri", PROJECT_URI);
return $oView->render();
}
}

34
Core/Frameworks/BaikalAdmin/Controller/Install/VersionUpgrade.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,13 +25,11 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller\Install;
use Symfony\Component\Yaml\Yaml;
class VersionUpgrade extends \Flake\Core\Controller {
protected $aMessages = [];
protected $oModel;
protected $oForm; # \Formal\Form
@ -42,7 +41,6 @@ class VersionUpgrade extends \Flake\Core\Controller {
}
function render() {
try {
$config = Yaml::parseFile(PROJECT_PATH_CONFIG . "baikal.yaml");
} catch (\Exception $e) {
@ -70,7 +68,7 @@ HTML;
$bSuccess = $this->upgrade($config['system']['configured_version'], BAIKAL_VERSION);
} catch (\Exception $e) {
$bSuccess = false;
$this->aErrors[] = 'Uncaught exception during upgrade: ' . (string)$e;
$this->aErrors[] = 'Uncaught exception during upgrade: ' . (string) $e;
}
if (!empty($this->aErrors)) {
@ -91,7 +89,6 @@ HTML;
}
protected function upgrade($sVersionFrom, $sVersionTo) {
if (version_compare($sVersionFrom, '0.2.3', '<=')) {
throw new \Exception('This version of Baikal does not support upgrading from version 0.2.3 and older. Please request help on Github if this is a problem.');
}
@ -103,12 +100,10 @@ HTML;
// Upgrading from sabre/dav 1.8 schema to 3.1 schema.
if (defined("PROJECT_DB_MYSQL") && PROJECT_DB_MYSQL === true) {
// MySQL upgrade
// sabre/dav 2.0 changes
foreach (['calendar', 'addressbook'] as $dataType) {
$tableName = $dataType . 's';
$pdo->exec("ALTER TABLE $tableName ADD synctoken INT(11) UNSIGNED NOT NULL DEFAULT '1'");
$this->aSuccess[] = 'synctoken was added to ' . $tableName;
@ -128,7 +123,6 @@ HTML;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
");
$this->aSuccess[] = $changesTable . ' was created';
}
$pdo->exec("
@ -189,13 +183,11 @@ HTML;
");
$pdo->exec('CREATE UNIQUE INDEX path_property ON propertystorage (path(600), name(100));');
$this->aSuccess[] = 'propertystorage was created';
} else {
// SQLite upgrade
// sabre/dav 2.0 changes
foreach (['calendar', 'addressbook'] as $dataType) {
$tableName = $dataType . 's';
// Note: we can't remove the ctag field in sqlite :(;
$pdo->exec("ALTER TABLE $tableName ADD synctoken integer");
@ -212,7 +204,6 @@ HTML;
);
");
$this->aSuccess[] = $changesTable . ' was created';
}
$pdo->exec("
CREATE TABLE calendarsubscriptions (
@ -268,8 +259,6 @@ HTML;
");
$pdo->exec('CREATE UNIQUE INDEX path_property ON propertystorage (path, name);');
$this->aSuccess[] = 'propertystorage was created';
}
// Statements for both SQLite and MySQL
@ -288,7 +277,6 @@ HTML;
$counter = 0;
while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
try {
$vobj = \Sabre\VObject\Reader::read($row['calendardata']);
} catch (\Exception $e) {
@ -301,11 +289,10 @@ HTML;
$vobj->destroy();
continue;
}
$uid = (string)$item->UID;
$uid = (string) $item->UID;
$stmt->execute([$uid, $row['id']]);
$counter++;
++$counter;
$vobj->destroy();
}
$this->aSuccess[] = 'uid was recalculated for calendarobjects';
@ -313,25 +300,20 @@ HTML;
$stmt1 = $pdo->prepare('INSERT INTO propertystorage (path, name, valuetype, value) VALUES (?, ?, 3, ?)');
while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
// Inserting the new record
$stmt1->execute([
'addressbooks/' . basename($row['uri']),
'{http://calendarserver.org/ns/}me-card',
serialize(new \Sabre\DAV\Xml\Property\Href($row['vcardurl']))
]);
}
$this->aSuccess[] = 'vcardurl was migrated to the propertystorage system';
}
if (version_compare($sVersionFrom, '0.4.0', '<')) {
// The sqlite schema had issues with both the calendar and
// addressbooks tables. The tables didn't have a DEFAULT '1' for
// the synctoken column. So we're adding it now.
if (!defined("PROJECT_DB_MYSQL") || PROJECT_DB_MYSQL === false) {
$pdo->exec('UPDATE calendars SET synctoken = 1 WHERE synctoken IS NULL');
$tmpTable = '_' . time();
@ -355,17 +337,13 @@ CREATE TABLE calendars (
$pdo->exec('INSERT INTO calendars SELECT id, principaluri, displayname, uri, synctoken, description, calendarorder, calendarcolor, timezone, components, transparent FROM calendars' . $tmpTable);
$this->aSuccess[] = 'Updated calendars table';
}
}
if (version_compare($sVersionFrom, '0.4.5', '<=')) {
// Similar to upgrading from older than 0.4.5, there were still
// issues with a missing DEFAULT 1 for sthe synctoken field in the
// addressbook.
if (!defined("PROJECT_DB_MYSQL") || PROJECT_DB_MYSQL === false) {
$pdo->exec('UPDATE addressbooks SET synctoken = 1 WHERE synctoken IS NULL');
$tmpTable = '_' . time();
@ -384,9 +362,7 @@ CREATE TABLE addressbooks (
$pdo->exec('INSERT INTO addressbooks SELECT id, principaluri, displayname, uri, description, synctoken FROM addressbooks' . $tmpTable);
$this->aSuccess[] = 'Updated addressbooks table';
}
}
if (version_compare($sVersionFrom, '0.5.1', '<')) {
if (!defined("PROJECT_DB_MYSQL") || PROJECT_DB_MYSQL === false) {
@ -524,8 +500,8 @@ SQL
$this->aSuccess[] = 'Migrated calendars table';
}
$this->updateConfiguredVersion($sVersionTo);
return true;
}

4
Core/Frameworks/BaikalAdmin/Controller/Login.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller;
class Login extends \Flake\Core\Controller {
function execute() {
}
@ -80,6 +79,7 @@ class Login extends \Flake\Core\Controller {
protected static function justLoggedOut() {
$aParams = $GLOBALS["ROUTER"]::getURLParams();
return (!empty($aParams) && $aParams[0] === "loggedout");
}
}

3
Core/Frameworks/BaikalAdmin/Controller/Logout.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller;
class Logout extends \Flake\Core\Controller {
function execute() {
\BaikalAdmin\Core\Auth::unAuthenticate();

4
Core/Frameworks/BaikalAdmin/Controller/Navigation/Topbar.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,16 +25,13 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller\Navigation;
class Topbar extends \Flake\Core\Controller {
function execute() {
}
function render() {
$oView = new \BaikalAdmin\View\Navigation\Topbar();
$sCurrentRoute = $GLOBALS["ROUTER"]::getCurrentRoute();

4
Core/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Anonymous.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,16 +25,15 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller\Navigation\Topbar;
class Anonymous extends \Flake\Core\Controller {
function execute() {
}
function render() {
$oView = new \BaikalAdmin\View\Navigation\Topbar\Anonymous();
return $oView->render();
}
}

4
Core/Frameworks/BaikalAdmin/Controller/Navigation/Topbar/Install.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,16 +25,15 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller\Navigation\Topbar;
class Install extends \Flake\Core\Controller {
function execute() {
}
function render() {
$oView = new \BaikalAdmin\View\Navigation\Topbar\Install();
return $oView->render();
}
}

4
Core/Frameworks/BaikalAdmin/Controller/Settings/Standard.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller\Settings;
class Standard extends \Flake\Core\Controller {
/**
* @var \Baikal\Model\Config\Standard
*/
@ -57,7 +56,6 @@ class Standard extends \Flake\Core\Controller {
}
function render() {
$oView = new \BaikalAdmin\View\Settings\Standard();
$oView->setData("form", $this->oForm->render());

17
Core/Frameworks/BaikalAdmin/Controller/Settings/System.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,13 +25,11 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller\Settings;
use Symfony\Component\Yaml\Yaml;
class System extends \Flake\Core\Controller {
/**
* @var \Baikal\Model\Config\System
*/
@ -61,7 +60,6 @@ class System extends \Flake\Core\Controller {
}
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.<br />You might break Baïkal if you misconfigure something here.",
@ -89,7 +87,6 @@ class System extends \Flake\Core\Controller {
if ($bMySQL === true) {
$oMorpho->remove("sqlite_file");
} else {
$oMorpho->remove("mysql_host");
$oMorpho->remove("mysql_dbname");
$oMorpho->remove("mysql_username");
@ -98,11 +95,10 @@ class System extends \Flake\Core\Controller {
}
function validationHook(\Formal\Form $oForm, \Formal\Form\Morphology $oMorpho) {
if ($oForm->refreshed()){
if ($oForm->refreshed()) {
return true;
}
if (intval($oForm->modelInstance()->get("mysql")) === 1) {
# We have to check the MySQL connection
$sHost = $oForm->modelInstance()->get("mysql_host");
$sDbName = $oForm->modelInstance()->get("mysql_dbname");
@ -123,6 +119,7 @@ class System extends \Flake\Core\Controller {
$oForm->declareError($oMorpho->element("mysql_dbname"));
$oForm->declareError($oMorpho->element("mysql_username"));
$oForm->declareError($oMorpho->element("mysql_password"));
return;
}
@ -132,10 +129,10 @@ class System extends \Flake\Core\Controller {
$sMessage .= "<br /><br /><strong>Nothing has been saved</strong>";
$oForm->declareError($oMorpho->element("mysql"), $sMessage);
return;
}
} else {
$sFile = $oMorpho->element("sqlite_file")->value();
try {
@ -143,16 +140,17 @@ class System extends \Flake\Core\Controller {
if (file_exists($sFile) && !is_writable($sFile)) {
$sMessage = "DB file is not writable. Please give write permissions on file <span style='font-family: monospace'>" . $sFile . "</span>";
$oForm->declareError($oMorpho->element("sqlite_file"), $sMessage);
return;
}
# Asserting DB directory is writable
if (!is_writable(dirname($sFile))) {
$sMessage = "The <em>FOLDER</em> containing the DB file is not writable, and it has to.<br />Please give write permissions on folder <span style='font-family: monospace'>" . dirname($sFile) . "</span>";
$oForm->declareError($oMorpho->element("sqlite_file"), $sMessage);
return;
}
$oDb = new \Flake\Core\Database\Sqlite(
$sFile
);
@ -168,11 +166,12 @@ class System extends \Flake\Core\Controller {
$sMessage
);
}
return;
} catch (\Exception $e) {
$oForm->declareError(
$oMorpho->element("sqlite_file"),
"Baïkal was not able to establish a connexion to the SQLite database as configured.<br />SQLite says: " . $e->getMessage() . (string)$e
"Baïkal was not able to establish a connexion to the SQLite database as configured.<br />SQLite says: " . $e->getMessage() . (string) $e
);
}
}

11
Core/Frameworks/BaikalAdmin/Controller/User/AddressBooks.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,18 +25,15 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller\User;
class AddressBooks extends \Flake\Core\Controller {
protected $aMessages = [];
protected $oModel; # \Baikal\Model\Contact
protected $oUser; # \Baikal\Model\User
protected $oForm; # \Formal\Form
function execute() {
if (($iUser = $this->currentUserId()) === false) {
throw new \Exception("BaikalAdmin\Controller\User\Contacts::render(): User get-parameter not found.");
}
@ -56,7 +54,6 @@ class AddressBooks extends \Flake\Core\Controller {
}
function render() {
$oView = new \BaikalAdmin\View\User\AddressBooks();
# User
@ -138,7 +135,6 @@ class AddressBooks extends \Flake\Core\Controller {
}
protected function actionNew() {
# Building floating model object
$this->oModel = new \Baikal\Model\AddressBook();
$this->oModel->set(
@ -234,14 +230,12 @@ class AddressBooks extends \Flake\Core\Controller {
}
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
# happens when user refreshes page on delete-URL, for instance
try {
$oModel = new \Baikal\Model\AddressBook($iModel);
@ -253,7 +247,6 @@ class AddressBooks extends \Flake\Core\Controller {
# 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() . "</strong> from the database !",

11
Core/Frameworks/BaikalAdmin/Controller/User/Calendars.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,18 +25,15 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller\User;
class Calendars extends \Flake\Core\Controller {
protected $aMessages = [];
protected $oModel; # \Baikal\Model\Calendar
protected $oUser; # \Baikal\Model\User
protected $oForm; # \Formal\Form
function execute() {
if (($iUser = $this->currentUserId()) === false) {
throw new \Exception("BaikalAdmin\Controller\User\Calendars::render(): User get-parameter not found.");
}
@ -52,7 +50,6 @@ class Calendars extends \Flake\Core\Controller {
}
function render() {
$oView = new \BaikalAdmin\View\User\Calendars();
# User
@ -134,7 +131,6 @@ class Calendars extends \Flake\Core\Controller {
}
protected function actionNew() {
# Building floating model object
$this->oModel = new \Baikal\Model\Calendar();
$this->oModel->set(
@ -237,14 +233,12 @@ class Calendars extends \Flake\Core\Controller {
}
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
# happens when user refreshes page on delete-URL, for instance
try {
$oModel = new \Baikal\Model\Calendar($iCalendar);
@ -256,7 +250,6 @@ class Calendars extends \Flake\Core\Controller {
# 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() . "</strong> from the database !",

8
Core/Frameworks/BaikalAdmin/Controller/Users.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Controller;
class Users extends \Flake\Core\Controller {
protected $aMessages = [];
/**
@ -56,7 +55,6 @@ class Users extends \Flake\Core\Controller {
}
function render() {
$oView = new \BaikalAdmin\View\Users();
# List of users
@ -159,9 +157,8 @@ class Users extends \Flake\Core\Controller {
$iUser = intval($aParams["delete"]);
if ($this->actionDeleteConfirmed() !== false) {
# catching Exception thrown when model already destroyed
# happens when user refreshes delete-page, for instance
# happens when user refreshes delete-page, for instance
try {
$oUser = new \Baikal\Model\User($iUser);
@ -173,7 +170,6 @@ class Users extends \Flake\Core\Controller {
# 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() . "</strong> from the database !",

8
Core/Frameworks/BaikalAdmin/Core/Auth.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,14 +25,12 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Core;
use Symfony\Component\Yaml\Yaml;
class Auth {
static function isAuthenticated() {
$config = Yaml::parseFile(PROJECT_PATH_CONFIG . "baikal.yaml");
if (isset($_SESSION["baikaladminauth"]) && $_SESSION["baikaladminauth"] === md5($config['system']['admin_passwordhash'])) {
@ -42,7 +41,6 @@ class Auth {
}
static function authenticate() {
if (intval(\Flake\Util\Tools::POST("auth")) !== 1) {
return false;
}
@ -58,11 +56,11 @@ class Auth {
}
if ($sUser === "admin" && $sPassHash === $config['system']['admin_passwordhash']) {
$_SESSION["baikaladminauth"] = md5($config['system']['admin_passwordhash']);
return true;
}
return false;
}
static function unAuthenticate() {
@ -70,7 +68,6 @@ class Auth {
}
static function hashAdminPassword($sPassword) {
try {
$config = Yaml::parseFile(PROJECT_PATH_CONFIG . "baikal.yaml");
} catch (\Exception $e) {
@ -82,5 +79,4 @@ class Auth {
return hash('sha256', 'admin:' . $sAuthRealm . ':' . $sPassword);
}
}

3
Core/Frameworks/BaikalAdmin/Core/View.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,13 +25,13 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Core;
class View extends \Flake\Core\View {
function templatesPath() {
$sViewName = get_class($this);
$sTemplate = str_replace("\\", "/", substr($sViewName, strlen("BaikalAdmin\\View\\"))) . ".html";
return BAIKALADMIN_PATH_TEMPLATES . $sTemplate;
}
}

5
Core/Frameworks/BaikalAdmin/Framework.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin;
class Framework extends \Flake\Core\Framework {
static function bootstrap() {
define("BAIKALADMIN_PATH_ROOT", PROJECT_PATH_ROOT . "Core/Frameworks/BaikalAdmin/"); # ./
@ -38,6 +37,6 @@ class Framework extends \Flake\Core\Framework {
$GLOBALS["ROUTER"]::setURIPath("admin/");
# Include BaikalAdmin Framework config
require_once(BAIKALADMIN_PATH_ROOT . "config.php");
require_once BAIKALADMIN_PATH_ROOT . "config.php";
}
}

5
Core/Frameworks/BaikalAdmin/Resources/GlyphiconsPro/generate-sprite.php
View file

@ -9,7 +9,7 @@ define("MATRIXHEIGHT", 1400);
echo generateSprite(getSymbols(), COLUMNS, ROWS, MATRIXWIDTH, MATRIXHEIGHT, "glyph-");
function getSymbols() {
# Glyphicons Png names, without extension
# Glyphicons Png names, without extension
return [
"000_glass",
"001_leaf",
@ -390,7 +390,7 @@ function generateSprite($aSymbols, $iCols, $iRows, $iPngWidth, $iPngHeight, $sCl
"height" => ceil($iSymbolHeight)
];
$iKey++;
++$iKey;
}
##########################################################################
@ -457,5 +457,6 @@ CSS;
}
$sCss = "\n" . "/* " . count($aSprites) . " glyphs, generated on " . strftime("%Y-%m-%d %H:%M:%S") . "; C=" . $iCols . "; R=" . $iRows . "; W=" . $iPngWidth . "; H=" . $iPngHeight . "; PREFIX=" . $sClassPrefix . " */\n" . $sCss;
return $sCss;
}

3
Core/Frameworks/BaikalAdmin/Route/Dashboard.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Route;
class Dashboard extends \Flake\Core\Route {
static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
$oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Dashboard());
}

3
Core/Frameworks/BaikalAdmin/Route/Logout.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Route;
class Logout extends \Flake\Core\Route {
static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
$oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Logout());
}

3
Core/Frameworks/BaikalAdmin/Route/Settings/Standard.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Route\Settings;
class Standard extends \Flake\Core\Route {
static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
$oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Settings\Standard());
}

3
Core/Frameworks/BaikalAdmin/Route/Settings/System.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Route\Settings;
class System extends \Flake\Core\Route {
static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
$oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Settings\System());
}

3
Core/Frameworks/BaikalAdmin/Route/User/AddressBooks.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Route\User;
class AddressBooks extends \Flake\Core\Route {
static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
$oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\User\AddressBooks(
self::getParams()

3
Core/Frameworks/BaikalAdmin/Route/User/Calendars.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Route\User;
class Calendars extends \Flake\Core\Route {
static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
$aParams = self::getParams();
$oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\User\Calendars($aParams));

3
Core/Frameworks/BaikalAdmin/Route/Users.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\Route;
class Users extends \Flake\Core\Route {
static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
$aParams = self::getParams();
$oRenderContainer->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Users($aParams));

3
Core/Frameworks/BaikalAdmin/View/Dashboard.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,9 +25,7 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\View;
class Dashboard extends \BaikalAdmin\Core\View {
}

2
Core/Frameworks/BaikalAdmin/View/Install/Database.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\View\Install;
class Database extends \BaikalAdmin\Core\View {

2
Core/Frameworks/BaikalAdmin/View/Install/Initialize.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\View\Install;
class Initialize extends \BaikalAdmin\Core\View {

2
Core/Frameworks/BaikalAdmin/View/Install/UpgradeConfirmation.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\View\Install;
class UpgradeConfirmation extends \BaikalAdmin\Core\View {

3
Core/Frameworks/BaikalAdmin/View/Login.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,9 +25,7 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\View;
class Login extends \BaikalAdmin\Core\View {
}

3
Core/Frameworks/BaikalAdmin/View/Navigation/Topbar.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,9 +25,7 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\View\Navigation;
class Topbar extends \BaikalAdmin\Core\View {
}

3
Core/Frameworks/BaikalAdmin/View/Navigation/Topbar/Anonymous.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,9 +25,7 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\View\Navigation\Topbar;
class Anonymous extends \BaikalAdmin\Core\View {
}

3
Core/Frameworks/BaikalAdmin/View/Navigation/Topbar/Install.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,9 +25,7 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\View\Navigation\Topbar;
class Install extends \BaikalAdmin\Core\View {
}

3
Core/Frameworks/BaikalAdmin/View/Settings/Standard.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,9 +25,7 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\View\Settings;
class Standard extends \BaikalAdmin\Core\View {
}

3
Core/Frameworks/BaikalAdmin/View/Settings/System.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,9 +25,7 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\View\Settings;
class System extends \BaikalAdmin\Core\View {
}

2
Core/Frameworks/BaikalAdmin/View/User/AddressBooks.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\View\User;
class AddressBooks extends \BaikalAdmin\Core\View {

2
Core/Frameworks/BaikalAdmin/View/User/Calendars.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\View\User;
class Calendars extends \BaikalAdmin\Core\View {

2
Core/Frameworks/BaikalAdmin/View/Users.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace BaikalAdmin\View;
class Users extends \BaikalAdmin\Core\View {

4
Core/Frameworks/BaikalAdmin/WWWRoot/index.php
View file

@ -59,19 +59,17 @@ $oPage->injectHTTPHeaders();
$oPage->setTitle("Baïkal " . BAIKAL_VERSION . " Web Admin");
$oPage->setBaseUrl(PROJECT_URI);
if (! \BaikalAdmin\Core\Auth::isAuthenticated()) {
if (!\BaikalAdmin\Core\Auth::isAuthenticated()) {
if (\BaikalAdmin\Core\Auth::authenticate()) {
// Redirect to itself
header('Location: ' . $_SERVER['REQUEST_URI']);
exit();
} else {
// Draw login page
$oPage->zone("navbar")->addBlock(new \BaikalAdmin\Controller\Navigation\Topbar\Anonymous());
$oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Login());
}
} else {
// CSRF token check
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (!isset($_POST['CSRF_TOKEN'])) {

1
Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php
View file

@ -77,7 +77,6 @@ try {
if (!$config || !isset($config['system']["configured_version"])) {
# we have to upgrade Baïkal (existing installation)
$oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Install\Initialize());
} elseif (!isset($config['system']["admin_passwordhash"])) {
# we have to set an admin password
$oPage->zone("Payload")->addBlock(new \BaikalAdmin\Controller\Install\Initialize());

1
Core/Frameworks/BaikalAdmin/config.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#

11
Core/Frameworks/Flake/Controller/Cli.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Controller;
class Cli extends \Flake\Core\Render\Container {
/**
* @var array
*/
@ -92,7 +91,6 @@ class Cli extends \Flake\Core\Render\Container {
}
function header($sMsg) {
$sStr = "\n" . str_repeat("#", 80);
$sStr .= "\n" . "#" . str_repeat(" ", 78) . "#";
$sStr .= "\n" . "#" . str_pad(strtoupper($sMsg), 78, " ", STR_PAD_BOTH) . "#";
@ -101,36 +99,42 @@ class Cli extends \Flake\Core\Render\Container {
$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;
}
@ -139,7 +143,6 @@ class Cli extends \Flake\Core\Render\Container {
}
function file_writeBin($sPath, $sData, $bUTF8 = true) {
$rFile = fopen($sPath, "wb");
if ($bUTF8 === true) {

4
Core/Frameworks/Flake/Controller/HtmlBlock.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Controller;
class HtmlBlock extends \Flake\Core\Controller {
/**
* @var string
*/
@ -39,7 +38,6 @@ class HtmlBlock extends \Flake\Core\Controller {
}
function execute() {
}
function render() {

6
Core/Frameworks/Flake/Controller/HtmlBlockTemplated.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Controller;
class HtmlBlockTemplated extends \Flake\Core\Controller {
/**
* @var string
*/
@ -53,8 +52,7 @@ class HtmlBlockTemplated extends \Flake\Core\Controller {
return $sHtml;
}
function execute()
{
function execute() {
// TODO: Implement execute() method.
}
}

5
Core/Frameworks/Flake/Controller/Page.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# 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 = "";
@ -62,6 +61,7 @@ class Page extends \Flake\Core\Render\Container {
function getMetaKeywords() {
$sString = str_replace(["le", "la", "les", "de", "des", "un", "une"], " ", $this->sMetaKeywords);
$sString = \Flake\Util\Tools::stringToUrlToken($sString);
return implode(", ", explode("-", $sString));
}
@ -102,7 +102,6 @@ class Page extends \Flake\Core\Render\Container {
}
function addCss($sCssAbsPath) {
if (\Flake\Util\Frameworks::enabled("LessPHP")) {
$sCompiledPath = PATH_buildcss;
$sFileName = basename($sCssAbsPath);

4
Core/Frameworks/Flake/Controller/Rpc.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Controller;
class Rpc extends \Flake\Core\Render\Container {
function initializeContext() {
$this->injectHTTPHeaders();
$GLOBALS["POSTCONNECTIONSERVICES"] = [];
@ -44,7 +43,6 @@ class Rpc extends \Flake\Core\Render\Container {
# Needed to cut client off when needed
header("Connection: close\r\n");
ignore_user_abort(true);
}
function P3PAllowCrossDomainCookies() {

16
Core/Frameworks/Flake/Core/Collection.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core;
class Collection extends \Flake\Core\FLObject implements \Iterator {
@ -49,6 +49,7 @@ class Collection extends \Flake\Core\FLObject implements \Iterator {
function valid() {
$key = key($this->aCollection);
return ($key !== null && $key !== false);
}
@ -59,11 +60,13 @@ class Collection extends \Flake\Core\FLObject implements \Iterator {
}
$oRes = $this->aCollection[$sKey];
return $oRes;
}
function &each() {
list($key, $val) = each($this->aCollection);
return $val;
}
@ -107,6 +110,7 @@ class Collection extends \Flake\Core\FLObject implements \Iterator {
function &first() {
if (!$this->isEmpty()) {
$aKeys = $this->keys();
return $this->aCollection[array_shift($aKeys)];
}
@ -117,10 +121,12 @@ class Collection extends \Flake\Core\FLObject implements \Iterator {
function &last() {
if (!$this->isEmpty()) {
$aKeys = $this->keys();
return $this->aCollection[array_pop($aKeys)];
}
$var = null;
return $var;
}
@ -148,12 +154,14 @@ class Collection extends \Flake\Core\FLObject implements \Iterator {
function map($sFunc) {
$aData = $this->toArray();
$oNewColl = $this->fromArray(array_map($sFunc, $aData));
return $oNewColl;
}
function walk($sFunc, $aParams = []) {
$aData = $this->toArray();
$oNewColl = $this->fromArray(array_walk($aData, $sFunc, $aParams));
return $oNewColl;
}
@ -179,19 +187,19 @@ class Collection extends \Flake\Core\FLObject implements \Iterator {
$sName[6] === "a"
) {
$sKey = strtolower(substr($sName, 7, 1)) . substr($sName, 8);
$mValue = & $aArguments[0];
$mValue = &$aArguments[0];
if (is_null($mValue)) {
if (array_key_exists($sKey, $this->aMeta)) {
unset($this->aMeta[$sKey]);
}
} else {
$this->aMeta[$sKey] = & $mValue;
$this->aMeta[$sKey] = &$mValue;
}
$res = null;
return $res; # To avoid 'Notice: Only variable references should be returned by reference'
return $res; # To avoid 'Notice: Only variable references should be returned by reference'
} elseif (
strlen($sName) > 7 &&
$sName[0] === "g" &&

4
Core/Frameworks/Flake/Core/CollectionTyped.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core;
class CollectionTyped extends \Flake\Core\Collection {
protected $sTypeClassOrProtocol;
function __construct($sTypeClassOrProtocol) {
@ -47,6 +46,7 @@ class CollectionTyped extends \Flake\Core\Collection {
# Create a new collection like this one
function newCollectionLikeThisOne() {
$oCollection = new \Flake\Core\CollectionTyped($this->sTypeClassOrProtocol);
return $oCollection;
}
}

4
Core/Frameworks/Flake/Core/Controller.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core;
abstract class Controller extends \Flake\Core\FLObject {
protected $aParams = [];
function __construct($aParams = []) {
@ -53,5 +52,6 @@ abstract class Controller extends \Flake\Core\FLObject {
}
abstract function execute();
abstract function render();
}

12
Core/Frameworks/Flake/Core/DOM/HTMLElement.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core\DOM;
class HTMLElement extends \DOMElement {
@ -58,7 +58,7 @@ class HTMLElement extends \DOMElement {
function setInnerHTML($sHtml) {
// first, empty the element
for ($x = $this->childNodes->length - 1; $x >= 0; $x--) {
for ($x = $this->childNodes->length - 1; $x >= 0; --$x) {
$this->removeChild($this->childNodes->item($x));
}
// $value holds our new inner HTML
@ -67,7 +67,9 @@ class HTMLElement extends \DOMElement {
// appendXML() expects well-formed markup (XHTML)
$result = @$f->appendXML($sHtml); // @ to suppress PHP warnings
if ($result) {
if ($f->hasChildNodes()) $this->appendChild($f);
if ($f->hasChildNodes()) {
$this->appendChild($f);
}
} else {
// $value is probably ill-formed
$f = new \DOMDocument();
@ -95,7 +97,7 @@ class HTMLElement extends \DOMElement {
function getInnerHTML() {
$sHtml = '';
$iNodes = $this->childNodes->length;
for ($i = 0; $i < $iNodes; $i++) {
for ($i = 0; $i < $iNodes; ++$i) {
$oItem = $this->childNodes->item($i);
$sHtml .= $oItem->ownerDocument->saveHTML($oItem);
}
@ -113,7 +115,7 @@ class HTMLElement extends \DOMElement {
while (!is_null($oNode->previousSibling)) {
$oNode = $oNode->previousSibling;
$iPos++;
++$iPos;
}
return $iPos;

82
Core/Frameworks/Flake/Core/Database.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core;
abstract class Database extends \Flake\Core\FLObject {
protected $debugOutput;
protected $debug_lastBuiltQuery;
protected $store_lastBuiltQuery;
@ -46,14 +45,12 @@ abstract class Database extends \Flake\Core\FLObject {
}
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
// 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:
// Build query:
$query = 'INSERT INTO ' . $table . '
(
' . implode(',
@ -63,8 +60,11 @@ abstract class Database extends \Flake\Core\FLObject {
', $fields_values) . '
)';
// Return query:
if ($this->debugOutput || $this->store_lastBuiltQuery) $this->debug_lastBuiltQuery = $query;
// Return query:
if ($this->debugOutput || $this->store_lastBuiltQuery) {
$this->debug_lastBuiltQuery = $query;
}
return $query;
}
}
@ -74,12 +74,10 @@ abstract class Database extends \Flake\Core\FLObject {
}
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
// 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 = [];
@ -87,7 +85,7 @@ abstract class Database extends \Flake\Core\FLObject {
$fields[] = $k . '=' . $v;
}
// Build query:
// Build query:
$query = 'UPDATE ' . $table . '
SET
' . implode(',
@ -96,8 +94,11 @@ abstract class Database extends \Flake\Core\FLObject {
WHERE
' . $where : '');
// Return query:
if ($this->debugOutput || $this->store_lastBuiltQuery) $this->debug_lastBuiltQuery = $query;
// Return query:
if ($this->debugOutput || $this->store_lastBuiltQuery) {
$this->debug_lastBuiltQuery = $query;
}
return $query;
}
} else {
@ -110,15 +111,17 @@ abstract class Database extends \Flake\Core\FLObject {
}
function DELETEquery($table, $where) {
if (is_string($where)) {
// Table and fieldnames should be "SQL-injection-safe" when supplied to this function
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;
if ($this->debugOutput || $this->store_lastBuiltQuery) {
$this->debug_lastBuiltQuery = $query;
}
return $query;
} else {
die('<strong>Fatal Error:</strong> "Where" clause argument for DELETE query was not a string in $this->DELETEquery() !');
@ -130,33 +133,35 @@ abstract class Database extends \Flake\Core\FLObject {
}
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:
// 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) {
// Group by:
if (strlen($groupBy) > 0) {
$query .= '
GROUP BY ' . $groupBy;
}
// Order by:
if (strlen($orderBy) > 0) {
// Order by:
if (strlen($orderBy) > 0) {
$query .= '
ORDER BY ' . $orderBy;
}
// Group by:
if (strlen($limit) > 0) {
// Group by:
if (strlen($limit) > 0) {
$query .= '
LIMIT ' . $limit;
}
// Return query:
if ($this->debugOutput || $this->store_lastBuiltQuery) $this->debug_lastBuiltQuery = $query;
// Return query:
if ($this->debugOutput || $this->store_lastBuiltQuery) {
$this->debug_lastBuiltQuery = $query;
}
return $query;
}
@ -165,17 +170,18 @@ abstract class Database extends \Flake\Core\FLObject {
}
function fullQuoteArray($arr, $table, $noQuote = false) {
if (is_string($noQuote)) {
if (is_string($noQuote)) {
$noQuote = explode(',', $noQuote);
} elseif (!is_array($noQuote)) { // sanity check
} elseif (!is_array($noQuote)) { // sanity check
$noQuote = false;
}
foreach ($arr as $k => $v) {
if ($noQuote === false || !in_array($k, $noQuote)) {
foreach ($arr as $k => $v) {
if ($noQuote === false || !in_array($k, $noQuote)) {
$arr[$k] = $this->fullQuote($v, $table);
}
}
return $arr;
}

4
Core/Frameworks/Flake/Core/Database/Mysql.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core\Database;
class Mysql extends \Flake\Core\Database {
protected $sHost = "";
protected $sDbName = "";
protected $sUsername = "";
@ -60,6 +59,7 @@ class Mysql extends \Flake\Core\Database {
asort($aTables);
reset($aTables);
return $aTables;
}
}

4
Core/Frameworks/Flake/Core/Database/Sqlite.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core\Database;
class Sqlite extends \Flake\Core\Database {
protected $sDbPath = "";
function __construct($sDbPath) {
@ -53,6 +52,7 @@ class Sqlite extends \Flake\Core\Database {
}
reset($aTables);
return $aTables;
}
}

2
Core/Frameworks/Flake/Core/Database/Statement.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core\Database;
class Statement extends \Flake\Core\FLObject {

5
Core/Frameworks/Flake/Core/Datastructure/Chain.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core\Datastructure;
class Chain extends \SplDoublyLinkedList {
function push(\Flake\Core\Datastructure\Chainable $value) {
$value->chain($this, $this->count());
parent::push($value);
@ -40,11 +39,13 @@ class Chain extends \SplDoublyLinkedList {
function &first() {
$oRes = $this->bottom();
return $oRes;
}
function &last() {
$oRes = $this->top();
return $oRes;
}

7
Core/Frameworks/Flake/Core/Datastructure/ChainLink.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core\Datastructure;
abstract class ChainLink implements \Flake\Core\Datastructure\Chainable {
@ -66,6 +66,7 @@ abstract class ChainLink implements \Flake\Core\Datastructure\Chainable {
}
$oRes = $this->__container->offsetGet($offset);
return $oRes;
}
@ -83,11 +84,13 @@ abstract class ChainLink implements \Flake\Core\Datastructure\Chainable {
function &next() {
$oRes = $this->__container->next();
return $oRes;
}
function &prev() {
$oPrev = $this->__container->prev();
return $oPrev;
}
@ -101,11 +104,13 @@ abstract class ChainLink implements \Flake\Core\Datastructure\Chainable {
function &first() {
$oRes = $this->__container->first();
return $oRes;
}
function &last() {
$oRes = $this->__container->last();
return $oRes;
}
}

6
Core/Frameworks/Flake/Core/Datastructure/Chainable.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,15 +25,14 @@
# 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 &next(); # This is already specified by interface Iterator
function &prev();
function &first();
function &last();
function chain(\Flake\Core\Datastructure\Chain $chain, $key);

2
Core/Frameworks/Flake/Core/FLObject.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core;
class FLObject {

3
Core/Frameworks/Flake/Core/Framework.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,9 +25,7 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core;
class Framework {
}

5
Core/Frameworks/Flake/Core/Model.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core;
abstract class Model extends \Flake\Core\FLObject {
@ -32,6 +32,7 @@ abstract class Model extends \Flake\Core\FLObject {
protected function getData() {
reset($this->aData);
return $this->aData;
}
@ -58,6 +59,7 @@ abstract class Model extends \Flake\Core\FLObject {
function set($sPropName, $sPropValue) {
if (array_key_exists($sPropName, $this->aData)) {
$this->aData[$sPropName] = $sPropValue;
return $this;
}
@ -82,6 +84,7 @@ abstract class Model extends \Flake\Core\FLObject {
static function humanName() {
$aRes = explode("\\", get_called_class());
return array_pop($aRes);
}

6
Core/Frameworks/Flake/Core/Model/Db.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# 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;
function __construct($sPrimary = false) {
@ -56,11 +55,13 @@ abstract class Db extends \Flake\Core\Model {
static function getDataTable() {
$sClass = get_called_class();
return $sClass::DATATABLE;
}
static function getPrimaryKey() {
$sClass = get_called_class();
return $sClass::PRIMARYKEY;
}
@ -69,7 +70,6 @@ abstract class Db extends \Flake\Core\Model {
}
protected function initByPrimary($sPrimary) {
$rSql = $GLOBALS["DB"]->exec_SELECTquery(
"*",
self::getDataTable(),

3
Core/Frameworks/Flake/Core/Model/NoDb.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core\Model;
abstract class NoDb extends \Flake\Core\Model {
function __construct($aData = false) {
if ($aData !== false) {
$this->aData = $aData;

3
Core/Frameworks/Flake/Core/PostConnectionService.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core;
abstract class PostConnectionService extends \Flake\Core\FLObject {
/**
* @var array
*/

9
Core/Frameworks/Flake/Core/Render/Container.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core\Render;
abstract class Container extends \Flake\Core\Controller {
public $aSequence = [];
public $aBlocks = [];
public $aRendu = [];
@ -39,8 +38,8 @@ abstract class Container extends \Flake\Core\Controller {
"block" => &$oBlock,
"rendu" => "",
];
$this->aSequence[] = & $aTemp;
$this->aBlocks[$sZone][] = & $aTemp["rendu"];
$this->aSequence[] = &$aTemp;
$this->aBlocks[$sZone][] = &$aTemp["rendu"];
}
function &zone($sZone) {
@ -54,6 +53,7 @@ abstract class Container extends \Flake\Core\Controller {
function render() {
$this->execute();
$aRenderedBlocks = $this->renderBlocks();
return implode("", $aRenderedBlocks);
}
@ -75,6 +75,7 @@ abstract class Container extends \Flake\Core\Controller {
}
reset($aHtml);
return $aHtml;
}
}

4
Core/Frameworks/Flake/Core/Render/Zone.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core\Render;
class Zone extends \Flake\Core\FLObject {
@ -32,7 +32,7 @@ class Zone extends \Flake\Core\FLObject {
private $sZone;
function __construct(&$oZonableObject, $sZone) {
$this->oZonableObject = & $oZonableObject;
$this->oZonableObject = &$oZonableObject;
$this->sZone = $sZone;
}

8
Core/Frameworks/Flake/Core/Requester.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core;
abstract class Requester extends \Flake\Core\FLObject {
@ -40,6 +40,7 @@ abstract class Requester extends \Flake\Core\FLObject {
protected function addClause($sField, $sValue) {
$this->addClauseEquals($sField, $sValue);
return $this;
}
@ -54,20 +55,25 @@ abstract class Requester extends \Flake\Core\FLObject {
function orderBy($sOrderField, $sOrderDirection = "ASC") {
$this->sOrderField = $sOrderField;
$this->sOrderDirection = $sOrderDirection;
return $this;
}
function setLimitStart($iLimitStart) {
$this->iLimitStart = $iLimitStart;
return $this;
}
function setLimitNumber($iLimitNumber) {
$this->iLimitNumber = $iLimitNumber;
return $this;
}
abstract function addClauseEquals($sField, $sValue);
abstract function execute();
abstract function count();
}

17
Core/Frameworks/Flake/Core/Requester/Sql.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# 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 = [];
protected $sModelClass = "";
@ -40,66 +39,77 @@ class Sql extends \Flake\Core\Requester {
function setDataTable($sDataTable) {
$this->sDataTable = $sDataTable;
return $this;
}
function addClauseEquals($sField, $sValue) {
$sWrap = "{field}='{value}'";
$this->addClauseWrapped($sField, $sValue, $sWrap);
return $this;
}
function addClauseNotEquals($sField, $sValue) {
$sWrap = "{field}!='{value}'";
$this->addClauseWrapped($sField, $sValue, $sWrap);
return $this;
}
function addClauseLike($sField, $sValue) {
$sWrap = "{field} LIKE '%{value}%'";
$this->addClauseWrapped($sField, $sValue, $sWrap);
return $this;
}
function addClauseLikeBeginning($sField, $sValue) {
$sWrap = "{field} LIKE '{value}%'";
$this->addClauseWrapped($sField, $sValue, $sWrap);
return $this;
}
function addClauseLikeEnd($sField, $sValue) {
$sWrap = "{field} LIKE '%{value}'";
$this->addClauseWrapped($sField, $sValue, $sWrap);
return $this;
}
function addClauseNotLike($sField, $sValue) {
$sWrap = "{field} NOT LIKE '%{value}%'";
$this->addClauseWrapped($sField, $sValue, $sWrap);
return $this;
}
function addClauseNotLikeBeginning($sField, $sValue) {
$sWrap = "{field} NOT LIKE '{value}%'";
$this->addClauseWrapped($sField, $sValue, $sWrap);
return $this;
}
function addClauseNotLikeEnd($sField, $sValue) {
$sWrap = "{field} NOT LIKE '%{value}'";
$this->addClauseWrapped($sField, $sValue, $sWrap);
return $this;
}
function addClauseIn($sField, $sValue) {
$sWrap = "{field} IN ({value})";
$this->addClauseWrapped($sField, $sValue, $sWrap);
return $this;
}
function addClauseNotIn($sField, $sValue) {
$sWrap = "{field} NOT IN ({value})";
$this->addClauseWrapped($sField, $sValue, $sWrap);
return $this;
}
@ -118,11 +128,13 @@ class Sql extends \Flake\Core\Requester {
);
$this->addClauseLiteral($sClause);
return $this;
}
function addClauseLiteral($sClause) {
$this->aClauses[] = $sClause;
return $this;
}
@ -136,6 +148,7 @@ class Sql extends \Flake\Core\Requester {
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'
}

6
Core/Frameworks/Flake/Core/Route.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,15 +25,13 @@
# 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
static function layout(\Flake\Core\Render\Container &$oRenderContainer) {
}
static function parametersMap() {
return [];
}
@ -59,6 +58,7 @@ abstract class Route extends \Flake\Core\FLObject {
}
reset($aRouteParams);
return $aRouteParams;
}
}

3
Core/Frameworks/Flake/Core/Template.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core;
class Template extends \Flake\Core\FLObject {
private $sAbsPath = "";
private $sHtml = "";

3
Core/Frameworks/Flake/Core/View.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Core;
abstract class View extends \Flake\Core\FLObject {
@ -53,6 +53,7 @@ abstract class View extends \Flake\Core\FLObject {
function render() {
$sTemplatePath = $this->templatesPath();
$oTemplate = new \Flake\Core\Template($this->templatesPath());
return $oTemplate->parse($this->getData());
}

45
Core/Frameworks/Flake/Framework.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,13 +25,11 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake;
use Symfony\Component\Yaml\Yaml;
class Framework extends \Flake\Core\Framework {
static function rmBeginSlash($sString) {
if (substr($sString, 0, 1) === "/") {
$sString = substr($sString, 1);
@ -65,13 +64,16 @@ class Framework extends \Flake\Core\Framework {
static function rmQuery($sString) {
$iStart = strpos($sString, "?");
return ($iStart === false) ? $sString : substr($sString, 0, $iStart);
}
static function rmScriptName($sString, $sScriptName) {
$sScriptBaseName = basename($sScriptName);
if (self::endswith($sString, $sScriptBaseName))
if (self::endswith($sString, $sScriptBaseName)) {
return substr($sString, 0, -strlen($sScriptBaseName));
}
return $sString;
}
@ -83,12 +85,14 @@ class Framework extends \Flake\Core\Framework {
static function endsWith($sString, $sTest) {
$iTestLen = strlen($sTest);
if ($iTestLen > strlen($sString)) return false;
if ($iTestLen > strlen($sString)) {
return false;
}
return substr_compare($sString, $sTest, -$iTestLen) === 0;
}
static function bootstrap() {
# Asserting PHP 5.5.0+
if (version_compare(PHP_VERSION, '5.5.0', '<')) {
die('Flake Fatal Error: Flake requires PHP 5.5.0+ to run properly. Your version is: ' . PHP_VERSION . '.');
@ -119,10 +123,18 @@ class Framework extends \Flake\Core\Framework {
# Also: https://github.com/netgusto/Baikal/issues/155
if (in_array(strtolower(ini_get('magic_quotes_gpc')), ['1', 'on'])) {
$process = [];
if (isset($_GET) && is_array($_GET)) { $process[] = &$_GET;}
if (isset($_POST) && is_array($_POST)) { $process[] = &$_POST;}
if (isset($_COOKIE) && is_array($_COOKIE)) { $process[] = &$_COOKIE;}
if (isset($_REQUEST) && is_array($_REQUEST)) { $process[] = &$_REQUEST;}
if (isset($_GET) && is_array($_GET)) {
$process[] = &$_GET;
}
if (isset($_POST) && is_array($_POST)) {
$process[] = &$_POST;
}
if (isset($_COOKIE) && is_array($_COOKIE)) {
$process[] = &$_COOKIE;
}
if (isset($_REQUEST) && is_array($_REQUEST)) {
$process[] = &$_REQUEST;
}
foreach ($process as $key => $val) {
foreach ($val as $k => $v) {
@ -156,7 +168,7 @@ class Framework extends \Flake\Core\Framework {
define("PROJECT_PATH_FRAMEWORKS", PROJECT_PATH_CORE . "Frameworks/");
define("PROJECT_PATH_WWWROOT", PROJECT_PATH_CORE . "WWWRoot/");
require_once(PROJECT_PATH_CORE . "Distrib.php");
require_once PROJECT_PATH_CORE . "Distrib.php";
define("PROJECT_PATH_DOCUMENTROOT", PROJECT_PATH_ROOT . "html/");
@ -180,12 +192,16 @@ class Framework extends \Flake\Core\Framework {
$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);
unset($sScript);
unset($sDirName);
unset($sBaseUrl);
unset($sProtocol);
unset($sHttpBaseUrl);
#################################################################################################
# Include Flake Framework config
require_once(FLAKE_PATH_ROOT . "config.php");
require_once FLAKE_PATH_ROOT . "config.php";
# Determine Router class
$GLOBALS["ROUTER"] = \Flake\Util\Tools::router();
@ -196,7 +212,6 @@ class Framework extends \Flake\Core\Framework {
if (!isset($_SESSION['CSRF_TOKEN'])) {
$_SESSION['CSRF_TOKEN'] = bin2hex(openssl_random_pseudo_bytes(20));
}
}
setlocale(LC_ALL, FLAKE_LOCALE);
@ -213,11 +228,11 @@ class Framework extends \Flake\Core\Framework {
}
protected static function initDb() {
try {
$config = Yaml::parseFile(PROJECT_PATH_CONFIG . "baikal.yaml");
} catch (\Exception $e) {
error_log('Error reading baikal.yaml file : ' . $e->getMessage());
return true;
}
# Dont init db on install, but in normal mode and when upgrading
@ -249,6 +264,7 @@ class Framework extends \Flake\Core\Framework {
if (file_exists($config['database']['sqlite_file']) && is_readable($config['database']['sqlite_file']) && !isset($GLOBALS["DB"])) {
$GLOBALS["DB"] = new \Flake\Core\Database\Sqlite($config['database']['sqlite_file']);
return true;
}
@ -256,7 +272,6 @@ class Framework extends \Flake\Core\Framework {
}
protected static function initDbMysql(array $config) {
if (!$config['database']['mysql_host']) {
die("<h3>The constant PROJECT_DB_MYSQL_HOST, containing the MySQL host name, is not set.<br />You should set it in config/baikal.yaml</h3>");
}

3
Core/Frameworks/Flake/Model/IUser.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,10 +25,10 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Model;
interface IUser {
function isAdmin();
function getDisplayName();
}

5
Core/Frameworks/Flake/Model/User/Admin.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Model\User;
class Admin extends \Flake\Core\Model\NoDb {
function isAdmin() {
return true;
}
@ -38,10 +37,8 @@ class Admin extends \Flake\Core\Model\NoDb {
}
function persist() {
}
function destroy() {
}
}

6
Core/Frameworks/Flake/Model/User/Customer.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# 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";
@ -53,11 +52,9 @@ class Customer extends \Flake\Core\Model\Db implements \Flake\Model\IUser {
}
function persist() {
}
function destroy() {
}
static function hashPassword($sClearPassword, $sSalt) {
@ -86,5 +83,4 @@ class Customer extends \Flake\Core\Model\Db implements \Flake\Model\IUser {
return $oUser;
}
}

3
Core/Frameworks/Flake/Util/Frameworks.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,7 +25,6 @@
# This copyright notice MUST APPEAR in all copies of the script!
#################################################################
namespace Flake\Util;
class Frameworks extends \Flake\Core\FLObject {
@ -38,6 +38,7 @@ class Frameworks extends \Flake\Core\FLObject {
}
$sFrameworkPath = PROJECT_PATH_FRAMEWORKS . $sName;
return file_exists($sFrameworkPath) && is_dir($sFrameworkPath);
}

4
Core/Frameworks/Flake/Util/Profiler.php
View file

@ -1,4 +1,5 @@
<?php
#################################################################
# Copyright notice
#
@ -24,11 +25,9 @@
# 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;
@ -62,6 +61,7 @@ class Profiler extends \Flake\Core\FLObject {
$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);
}
}

Some files were not shown because too many files have changed in this diff Show more