Merge branch 'master' into rework-configuration

Core/Frameworks/Baikal/WWWRoot/index.php

@@ -40,7 +40,7 @@ if (file_exists(getcwd() . "/Core")) {
 }
 
 if (!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
-    die('<h1>Incomplete installation</h1><p>Ba&iuml;kal dependencies have not been installed. Please, execute "<strong>composer install</strong>" in the folder where you installed Ba&iuml;kal.');
+    die('<h1>Incomplete installation</h1><p>Ba&iuml;kal dependencies have not been installed. If you are a regular user, this means that you probably downloaded the wrong zip file.</p><p>To install the dependencies manually, execute "<strong>composer install</strong>" in the Ba&iuml;kal root folder.</p>');
 }
 
 require PROJECT_PATH_ROOT . 'vendor/autoload.php';

Core/Frameworks/BaikalAdmin/Controller/User/Calendars.php

@@ -68,6 +68,7 @@ class Calendars extends \Flake\Core\Controller {
                 "linkdelete"  => $this->linkDelete($calendar),
                 "icon"        => $calendar->icon(),
                 "label"       => $calendar->label(),
+                "events"      => $calendar->getEventsBaseRequester()->count(),
                 "description" => $calendar->get("description"),
             ];
         }

Core/Frameworks/BaikalAdmin/Resources/Templates/User/Calendars.html

@@ -10,6 +10,7 @@
 	<thead>
 		<tr>
 			<th>Display name</th>
+			<th>Events</th>
 			<th>Description</th>
 			<th class="no-border-left"></th>
 		</tr>
@@ -18,6 +19,7 @@
 		{% for calendar in calendars %}
 		<tr>
 			<td class="col-displayname"><i class="{{ calendar.icon }}"></i>{{ calendar.label|escape }}</td>
+			<td class="col-events">{{ calendar.events|escape }}</td>
 			<td class="col-description">{{ calendar.description|escape }}</td>
 			<td class="col-actions no-border-left">
 				<p class="pull-right">

Core/Frameworks/BaikalAdmin/WWWRoot/index.php

@@ -41,7 +41,7 @@ if (file_exists(dirname(getcwd()) . "/Core")) {
 }
 
 if (!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
-    die('<h1>Incomplete installation</h1><p>Ba&iuml;kal dependencies have not been installed. Please, execute "<strong>composer install</strong>" in the folder where you installed Ba&iuml;kal.');
+    die('<h1>Incomplete installation</h1><p>Ba&iuml;kal dependencies have not been installed. If you are a regular user, this means that you probably downloaded the wrong zip file.</p><p>To install the dependencies manually, execute "<strong>composer install</strong>" in the Ba&iuml;kal root folder.</p>');
 }
 
 require PROJECT_PATH_ROOT . 'vendor/autoload.php';

Core/Frameworks/BaikalAdmin/WWWRoot/install/index.php

@@ -48,7 +48,7 @@ if (file_exists(dirname(dirname(getcwd())) . "/Core")) {
 }
 
 if (!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
-    die('<h1>Incomplete installation</h1><p>Ba&iuml;kal dependencies have not been installed. Please, execute "<strong>composer install</strong>" in the folder where you installed Ba&iuml;kal.');
+    die('<h1>Incomplete installation</h1><p>Ba&iuml;kal dependencies have not been installed. If you are a regular user, this means that you probably downloaded the wrong zip file.</p><p>To install the dependencies manually, execute "<strong>composer install</strong>" in the Ba&iuml;kal root folder.</p>');
 }
 
 require PROJECT_PATH_ROOT . "vendor/autoload.php";

Core/Frameworks/Flake/Core/Database.php

@@ -29,10 +29,10 @@ namespace Flake\Core;
 
 abstract class Database extends \Flake\Core\FLObject {
 
-    private $debugOutput;
+    protected $debugOutput;
-    private $debug_lastBuiltQuery;
+    protected $debug_lastBuiltQuery;
-    private $store_lastBuiltQuery;
+    protected $store_lastBuiltQuery;
-    private $oDb;
+    protected $oDb;
 
     /* common stuff */
 

Core/Frameworks/Flake/Core/Database/Mysql.php

@@ -29,10 +29,6 @@ namespace Flake\Core\Database;
 
 class Mysql extends \Flake\Core\Database {
 
-    protected $oDb = false;    // current DB link
-    protected $debugOutput = false;
-    protected $store_lastBuiltQuery = true;
-    protected $debug_lastBuiltQuery = "";
     protected $sHost = "";
     protected $sDbName = "";
     protected $sUsername = "";

Core/Frameworks/Flake/Core/Database/Sqlite.php

@@ -29,10 +29,6 @@ namespace Flake\Core\Database;
 
 class Sqlite extends \Flake\Core\Database {
 
-    protected $oDb = false;    // current DB link
-    protected $debugOutput = false;
-    protected $store_lastBuiltQuery = true;
-    protected $debug_lastBuiltQuery = "";
     protected $sDbPath = "";
 
     function __construct($sDbPath) {

html/cal.php

@@ -42,7 +42,7 @@ if (file_exists(getcwd() . "/Core")) {
 }
 
 if (!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
-    die('<h1>Incomplete installation</h1><p>Ba&iuml;kal dependencies have not been installed. Please, execute "<strong>composer install</strong>" in the folder where you installed Ba&iuml;kal.');
+    die('<h1>Incomplete installation</h1><p>Ba&iuml;kal dependencies have not been installed. If you are a regular user, this means that you probably downloaded the wrong zip file.</p><p>To install the dependencies manually, execute "<strong>composer install</strong>" in the Ba&iuml;kal root folder.</p>');
 }
 
 require PROJECT_PATH_ROOT . 'vendor/autoload.php';

html/card.php

@@ -42,7 +42,7 @@ if (file_exists(getcwd() . "/Core")) {
 }
 
 if (!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
-    die('<h1>Incomplete installation</h1><p>Ba&iuml;kal dependencies have not been installed. Please, execute "<strong>composer install</strong>" in the folder where you installed Ba&iuml;kal.');
+    die('<h1>Incomplete installation</h1><p>Ba&iuml;kal dependencies have not been installed. If you are a regular user, this means that you probably downloaded the wrong zip file.</p><p>To install the dependencies manually, execute "<strong>composer install</strong>" in the Ba&iuml;kal root folder.</p>');
 }
 
 require PROJECT_PATH_ROOT . 'vendor/autoload.php';

html/dav.php

@@ -42,7 +42,7 @@ if (file_exists(getcwd() . "/Core")) {
 }
 
 if (!file_exists(PROJECT_PATH_ROOT . 'vendor/')) {
-    die('<h1>Incomplete installation</h1><p>Ba&iuml;kal dependencies have not been installed. Please, execute "<strong>composer install</strong>" in the folder where you installed Ba&iuml;kal.');
+    die('<h1>Incomplete installation</h1><p>Ba&iuml;kal dependencies have not been installed. If you are a regular user, this means that you probably downloaded the wrong zip file.</p><p>To install the dependencies manually, execute "<strong>composer install</strong>" in the Ba&iuml;kal root folder.</p>');
 }
 require PROJECT_PATH_ROOT . 'vendor/autoload.php';
 

phpstan.neon

@@ -17,6 +17,3 @@ parameters:
     -
       message: '#Access to undefined constant Flake\\Core\\Model::LABELFIELD.#'
       path: Core/Frameworks/Flake/Core/Model.php
-    -
-      message: '#Declaration of Flake\\Core\\Datastructure\\Chain::push\(Flake\\Core\\Datastructure\\Chainable \$value\) should be compatible with SplDoublyLinkedList::push\(\$value\)#'
-      path: Core/Frameworks/Flake/Core/Datastructure/Chain.php