Changes In Branch dev Through [a8800bc992] Excluding Merge-Ins
This is equivalent to a diff from 1b784acf2e to a8800bc992
2021-10-05
| ||
02:17 | Merge missing commits, fix upgrade check-in: 701cb83b3b user: bohwaz tags: dev | |
2021-05-07
| ||
01:00 | Progress on web editor check-in: 879ddf7e69 user: bohwaz tags: dev | |
2021-05-06
| ||
20:01 | Fix wiki doc check-in: f0cf68d580 user: bohwaz tags: trunk, stable | |
14:10 | Merge trunk changes check-in: a8800bc992 user: bohwaz tags: dev | |
14:02 | Fix wiki decryption check-in: ebb7cd1655 user: bohwaz tags: dev | |
02:12 | Fix web search link check-in: 1b784acf2e user: bohwaz tags: trunk, stable | |
2021-05-05
| ||
11:12 | Fix typo and welcome plugin check-in: 87bc7c956f user: bohwaz tags: trunk, stable | |
Modified src/Makefile from [b82ecb0834] to [c52b2382ef].
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 | wget ${KD2_FILE} -O ${TMP_KD2}/kd2.zip rm -rf "include/lib/KD2" unzip "${TMP_KD2}/kd2.zip" -d include/lib rm -rf ${TMP_KD2} dev-server: php -S localhost:8082 -t www www/_route.php test: find . -name '*.php' -print0 | xargs -0 -n1 php -l > /dev/null phpstan: | > > > | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | wget ${KD2_FILE} -O ${TMP_KD2}/kd2.zip rm -rf "include/lib/KD2" unzip "${TMP_KD2}/kd2.zip" -d include/lib rm -rf ${TMP_KD2} wget -O "include/lib/Parsedown.php" "https://raw.githubusercontent.com/erusev/parsedown/1.7.x/Parsedown.php" wget -O "include/lib/ParsedownExtra.php" "https://raw.githubusercontent.com/erusev/parsedown-extra/0.8.x/ParsedownExtra.php" dev-server: php -S localhost:8082 -t www www/_route.php test: find . -name '*.php' -print0 | xargs -0 -n1 php -l > /dev/null phpstan: |
︙ | ︙ |
Added src/include/data/1.2.0_migration.sql version [e8a38d4240].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | ALTER TABLE membres RENAME TO users; ALTER TABLE plugins RENAME TO plugins_old; -- References old membres table ALTER TABLE services_users RENAME TO services_users; ALTER TABLE services_reminders_sent RENAME TO services_reminders_sent; ALTER TABLE acc_transactions RENAME TO acc_transactions_old; ALTER TABLE acc_transactions_users RENAME TO acc_transactions_users_old; .read 1.2.0_schema.sql INSERT INTO services_users SELECT * FROM services_users_old; INSERT INTO services_reminders_sent SELECT * FROM services_reminders_sent_old; INSERT INTO acc_transactions SELECT * FROM acc_transactions_old; INSERT INTO acc_transactions_users SELECT * FROM acc_transactions_users_old; DROP TABLE services_users_old; DROP TABLE services_reminders_sent_old; DROP TABLE acc_transactions_old; DROP TABLE acc_transactions_users_old; INSERT INTO plugins_signals SELECT * FROM plugins_signaux; INSERT INTO plugins SELECT * FROM plugins_old; DROP TABLE plugins_signaux; DROP TABLE plugins_old; INSERT INTO searches SELECT * FROM recherches; UPDATE searches SET target = 'accounting' WHERE target = 'compta'; UPDATE searches SET target = 'users' WHERE target = 'membres'; DROP TABLE recherches; |
Added src/include/data/1.2.0_schema.sql version [684d261842].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 | --- --- Main stuff --- CREATE TABLE IF NOT EXISTS config ( -- Configuration, key/value store key TEXT PRIMARY KEY NOT NULL, value TEXT NULL ); CREATE TABLE IF NOT EXISTS plugins ( id TEXT NOT NULL PRIMARY KEY, official INTEGER NOT NULL DEFAULT 0, -- 1 if plugin is official name TEXT NOT NULL, description TEXT NULL, author TEXT NULL, url TEXT NULL, version TEXT NOT NULL, menu INTEGER NOT NULL DEFAULT 0, -- 1 if plugin should be shown in sidebar menu menu_condition TEXT NULL, -- Brindille condition to know if item should be shown in menu config TEXT NULL ); CREATE TABLE IF NOT EXISTS plugins_signals -- Link between plugins and signals ( signal TEXT NOT NULL, plugin TEXT NOT NULL REFERENCES plugins (id), callback TEXT NOT NULL, PRIMARY KEY (signal, plugin) ); CREATE TABLE IF NOT EXISTS searches -- Saved searches ( id INTEGER NOT NULL PRIMARY KEY, id_user INTEGER NULL REFERENCES users (id) ON DELETE CASCADE, -- If not NULL, then search will only be visible by this user label TEXT NOT NULL, created TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP CHECK (datetime(created) IS NOT NULL AND datetime(created) = created), target TEXT NOT NULL, -- "users" ou "accounting" type TEXT NOT NULL, -- "json" ou "sql" content TEXT NOT NULL ); CREATE TABLE IF NOT EXISTS compromised_passwords_cache -- Cache des hash de mots de passe compromis ( hash TEXT NOT NULL PRIMARY KEY ); CREATE TABLE IF NOT EXISTS compromised_passwords_cache_ranges -- Cache des préfixes de mots de passe compromis ( prefix TEXT NOT NULL PRIMARY KEY, date INTEGER NOT NULL ); --- --- Users --- -- CREATE TABLE users (...); -- Organization users table, dynamically created CREATE TABLE IF NOT EXISTS users_categories -- Users categories, mainly used to manage rights ( id INTEGER PRIMARY KEY NOT NULL, name TEXT NOT NULL, -- Permissions, 0 = no access, 1 = read-only, 2 = read-write, 9 = admin perm_web INTEGER NOT NULL DEFAULT 1, perm_documents INTEGER NOT NULL DEFAULT 1, perm_users INTEGER NOT NULL DEFAULT 1, perm_accounting INTEGER NOT NULL DEFAULT 1, perm_subscribe INTEGER NOT NULL DEFAULT 0, perm_connect INTEGER NOT NULL DEFAULT 1, perm_config INTEGER NOT NULL DEFAULT 0, hidden INTEGER NOT NULL DEFAULT 0 ); CREATE INDEX users_categories_hidden ON users_categories (hidden); CREATE TABLE IF NOT EXISTS users_sessions -- Permanent sessions for logged-in users ( selector TEXT NOT NULL, hash TEXT NOT NULL, id_user INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE, expire INT NOT NULL, PRIMARY KEY (selector, id_user) ); --- --- Services --- CREATE TABLE IF NOT EXISTS services -- Services types (French: cotisations) ( id INTEGER PRIMARY KEY NOT NULL, label TEXT NOT NULL, description TEXT NULL, duration INTEGER NULL CHECK (duration IS NULL OR duration > 0), -- En jours start_date TEXT NULL CHECK (start_date IS NULL OR date(start_date) = start_date), end_date TEXT NULL CHECK (end_date IS NULL OR (date(end_date) = end_date AND date(end_date) >= date(start_date))) ); CREATE TABLE IF NOT EXISTS services_fees -- Services fees ( id INTEGER PRIMARY KEY NOT NULL, label TEXT NOT NULL, description TEXT NULL, amount INTEGER NULL, formula TEXT NULL, -- Formula to calculate fee amount dynamically (this contains a SQL statement) id_service INTEGER NOT NULL REFERENCES services (id) ON DELETE CASCADE, id_account INTEGER NULL REFERENCES acc_accounts (id) ON DELETE SET NULL CHECK (id_account IS NULL OR id_year IS NOT NULL), -- NULL if fee is not linked to accounting, this is reset using a trigger if the year is deleted id_year INTEGER NULL REFERENCES acc_years (id) ON DELETE SET NULL -- NULL if fee is not linked to accounting ); CREATE TABLE IF NOT EXISTS services_users -- Records of services and fees linked to users ( id INTEGER NOT NULL PRIMARY KEY, id_user INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE, id_service INTEGER NOT NULL REFERENCES services (id) ON DELETE CASCADE, id_fee INTEGER NULL REFERENCES services_fees (id) ON DELETE CASCADE, paid INTEGER NOT NULL DEFAULT 0, expected_amount INTEGER NULL, date TEXT NOT NULL DEFAULT CURRENT_DATE CHECK (date(date) IS NOT NULL AND date(date) = date), expiry_date TEXT NULL CHECK (date(expiry_date) IS NULL OR date(expiry_date) = expiry_date) ); CREATE UNIQUE INDEX IF NOT EXISTS su_unique ON services_users (id_user, id_service, date); CREATE INDEX IF NOT EXISTS su_service ON services_users (id_service); CREATE INDEX IF NOT EXISTS su_fee ON services_users (id_fee); CREATE INDEX IF NOT EXISTS su_paid ON services_users (paid); CREATE INDEX IF NOT EXISTS su_expiry ON services_users (expiry_date); CREATE TABLE IF NOT EXISTS services_reminders -- Reminders for service expiry ( id INTEGER NOT NULL PRIMARY KEY, id_service INTEGER NOT NULL REFERENCES services (id) ON DELETE CASCADE, delay INTEGER NOT NULL, -- Delay in days before or after expiry date subject TEXT NOT NULL, body TEXT NOT NULL ); CREATE TABLE IF NOT EXISTS services_reminders_sent -- Records of sent reminders, to keep track ( id INTEGER NOT NULL PRIMARY KEY, id_user INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE, id_service INTEGER NOT NULL REFERENCES services (id) ON DELETE CASCADE, id_reminder INTEGER NOT NULL REFERENCES services_reminders (id) ON DELETE CASCADE, date TEXT NOT NULL DEFAULT CURRENT_DATE CHECK (date(date) IS NOT NULL AND date(date) = date) ); CREATE UNIQUE INDEX IF NOT EXISTS srs_index ON services_reminders_sent (id_user, id_service, id_reminder, date); CREATE INDEX IF NOT EXISTS srs_reminder ON services_reminders_sent (id_reminder); CREATE INDEX IF NOT EXISTS srs_user ON services_reminders_sent (id_user); -- -- Accounting -- CREATE TABLE IF NOT EXISTS acc_charts -- Accounting charts (plans comptables) ( id INTEGER NOT NULL PRIMARY KEY, country TEXT NOT NULL, code TEXT NULL, -- the code is NULL if the chart is user-created or imported label TEXT NOT NULL, archived INTEGER NOT NULL DEFAULT 0 -- 1 = archived, cannot be changed ); CREATE TABLE IF NOT EXISTS acc_accounts -- Accounts of the charts (comptes) ( id INTEGER NOT NULL PRIMARY KEY, id_chart INTEGER NOT NULL REFERENCES acc_charts ON DELETE CASCADE, code TEXT NOT NULL, -- can contain numbers and letters, eg. 53A, 53B... label TEXT NOT NULL, description TEXT NULL, position INTEGER NOT NULL, -- position in the balance sheet (position actif/passif/charge/produit) type INTEGER NOT NULL DEFAULT 0, -- type (category) of favourite account: bank, cash, third party, etc. user INTEGER NOT NULL DEFAULT 1 -- 0 = is part of the original chart, 0 = has been added by the user ); CREATE UNIQUE INDEX IF NOT EXISTS acc_accounts_codes ON acc_accounts (code, id_chart); CREATE INDEX IF NOT EXISTS acc_accounts_type ON acc_accounts (type); CREATE INDEX IF NOT EXISTS acc_accounts_position ON acc_accounts (position); CREATE TABLE IF NOT EXISTS acc_years -- Years (exercices) ( id INTEGER NOT NULL PRIMARY KEY, label TEXT NOT NULL, start_date TEXT NOT NULL CHECK (date(start_date) IS NOT NULL AND date(start_date) = start_date), end_date TEXT NOT NULL CHECK (date(end_date) IS NOT NULL AND date(end_date) = end_date), closed INTEGER NOT NULL DEFAULT 0, -- 0 = open, 1 = closed id_chart INTEGER NOT NULL REFERENCES acc_charts (id) ); CREATE INDEX IF NOT EXISTS acc_years_closed ON acc_years (closed); -- Make sure id_account is reset when a year is deleted CREATE TRIGGER IF NOT EXISTS acc_years_delete BEFORE DELETE ON acc_years BEGIN UPDATE services_fees SET id_account = NULL, id_year = NULL WHERE id_year = OLD.id; END; CREATE TABLE IF NOT EXISTS acc_transactions -- Transactions (écritures comptables) ( id INTEGER PRIMARY KEY NOT NULL, type INTEGER NOT NULL DEFAULT 0, -- Transaction type, zero is advanced status INTEGER NOT NULL DEFAULT 0, -- Status (bitmark) label TEXT NOT NULL, notes TEXT NULL, reference TEXT NULL, -- N° de pièce comptable date TEXT NOT NULL DEFAULT CURRENT_DATE CHECK (date(date) IS NOT NULL AND date(date) = date), validated INTEGER NOT NULL DEFAULT 0, -- 1 means transaction is locked hash TEXT NULL, prev_hash TEXT NULL, id_year INTEGER NOT NULL REFERENCES acc_years(id), id_creator INTEGER NULL REFERENCES users(id) ON DELETE SET NULL, id_related INTEGER NULL REFERENCES acc_transactions(id) ON DELETE SET NULL -- linked transaction (eg. payment of a debt) ); CREATE INDEX IF NOT EXISTS acc_transactions_year ON acc_transactions (id_year); CREATE INDEX IF NOT EXISTS acc_transactions_date ON acc_transactions (date); CREATE INDEX IF NOT EXISTS acc_transactions_related ON acc_transactions (id_related); CREATE INDEX IF NOT EXISTS acc_transactions_type ON acc_transactions (type, id_year); CREATE INDEX IF NOT EXISTS acc_transactions_status ON acc_transactions (status); CREATE TABLE IF NOT EXISTS acc_transactions_lines -- Transactions lines (lignes des écritures) ( id INTEGER PRIMARY KEY NOT NULL, id_transaction INTEGER NOT NULL REFERENCES acc_transactions (id) ON DELETE CASCADE, id_account INTEGER NOT NULL REFERENCES acc_accounts (id), credit INTEGER NOT NULL, debit INTEGER NOT NULL, reference TEXT NULL, -- Usually a payment reference (par exemple numéro de chèque) label TEXT NULL, reconciled INTEGER NOT NULL DEFAULT 0, id_analytical INTEGER NULL REFERENCES acc_accounts(id) ON DELETE SET NULL, CONSTRAINT line_check1 CHECK ((credit * debit) = 0), CONSTRAINT line_check2 CHECK ((credit + debit) > 0) ); CREATE INDEX IF NOT EXISTS acc_transactions_lines_transaction ON acc_transactions_lines (id_transaction); CREATE INDEX IF NOT EXISTS acc_transactions_lines_account ON acc_transactions_lines (id_account); CREATE INDEX IF NOT EXISTS acc_transactions_lines_analytical ON acc_transactions_lines (id_analytical); CREATE INDEX IF NOT EXISTS acc_transactions_lines_reconciled ON acc_transactions_lines (reconciled); CREATE TABLE IF NOT EXISTS acc_transactions_users -- Linking transactions and users ( id_user INTEGER NOT NULL REFERENCES users (id) ON DELETE CASCADE, id_transaction INTEGER NOT NULL REFERENCES acc_transactions (id) ON DELETE CASCADE, id_service_user INTEGER NULL REFERENCES services_users (id) ON DELETE SET NULL, PRIMARY KEY (id_user, id_transaction) ); CREATE INDEX IF NOT EXISTS acc_transactions_users_service ON acc_transactions_users (id_service_user); ---------- FILES ---------------- CREATE TABLE IF NOT EXISTS files -- Files metadata ( id INTEGER NOT NULL PRIMARY KEY, path TEXT NOT NULL, parent TEXT NOT NULL, name TEXT NOT NULL, -- File name type INTEGER NOT NULL, -- File type, 1 = file, 2 = directory mime TEXT NULL, size INT NULL, modified TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP CHECK (datetime(modified) = modified), image INT NOT NULL DEFAULT 0, CHECK (type = 2 OR (mime IS NOT NULL AND size IS NOT NULL)) ); -- Unique index as this is used to make up a file path CREATE UNIQUE INDEX IF NOT EXISTS files_unique ON files (path); CREATE INDEX IF NOT EXISTS files_parent ON files (parent); CREATE INDEX IF NOT EXISTS files_name ON files (name); CREATE INDEX IF NOT EXISTS files_modified ON files (modified); CREATE TABLE IF NOT EXISTS files_contents -- Files contents (empty if using another storage backend) ( id INTEGER NOT NULL PRIMARY KEY REFERENCES files(id) ON DELETE CASCADE, compressed INT NOT NULL DEFAULT 0, content BLOB NOT NULL ); CREATE VIRTUAL TABLE IF NOT EXISTS files_search USING fts4 -- Search inside files content ( tokenize=unicode61, -- Available from SQLITE 3.7.13 (2012) path TEXT NOT NULL, title TEXT NULL, content TEXT NOT NULL, -- Text content notindexed=path ); CREATE TABLE IF NOT EXISTS web_pages ( id INTEGER NOT NULL PRIMARY KEY, parent TEXT NOT NULL, -- Parent path, empty = web root path TEXT NOT NULL, -- Full page directory name uri TEXT NOT NULL, -- Page identifier file_path TEXT NOT NULL, -- Full file path for contents type INTEGER NOT NULL, -- 1 = Category, 2 = Page status TEXT NOT NULL, format TEXT NOT NULL, published TEXT NOT NULL CHECK (datetime(published) = published), modified TEXT NOT NULL CHECK (datetime(modified) = modified), title TEXT NOT NULL, content TEXT NOT NULL ); CREATE UNIQUE INDEX web_pages_path ON web_pages (path); CREATE UNIQUE INDEX web_pages_file_path ON web_pages (file_path); CREATE INDEX web_pages_parent ON web_pages (parent); CREATE INDEX web_pages_published ON web_pages (published); CREATE INDEX web_pages_title ON web_pages (title); |
Modified src/include/lib/Garradin/Entities/Web/Page.php from [c5b7261d79] to [7794458169].
︙ | ︙ | |||
45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | 'published' => 'DateTime', 'modified' => 'DateTime', 'content' => 'string', ]; const FORMAT_SKRIV = 'skriv'; const FORMAT_ENCRYPTED = 'skriv/encrypted'; const FORMATS_LIST = [ self::FORMAT_SKRIV => 'SkrivML', self::FORMAT_ENCRYPTED => 'Chiffré', ]; const STATUS_ONLINE = 'online'; const STATUS_DRAFT = 'draft'; const STATUS_LIST = [ self::STATUS_ONLINE => 'En ligne', | > > | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | 'published' => 'DateTime', 'modified' => 'DateTime', 'content' => 'string', ]; const FORMAT_SKRIV = 'skriv'; const FORMAT_ENCRYPTED = 'skriv/encrypted'; const FORMAT_MARKDOWN = 'markdown'; const FORMATS_LIST = [ self::FORMAT_SKRIV => 'SkrivML', self::FORMAT_ENCRYPTED => 'Chiffré', self::FORMAT_MARKDOWN => 'Markdown', ]; const STATUS_ONLINE = 'online'; const STATUS_DRAFT = 'draft'; const STATUS_LIST = [ self::STATUS_ONLINE => 'En ligne', |
︙ | ︙ |
Added src/include/lib/Garradin/Web/Render/AttachmentAwareTrait.php version [5455ee42ef].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | <?php namespace Garradin\Web\Render; use Garradin\Utils; use Garradin\Entities\Files\File; trait AttachmentAwareTrait { protected $current_path; protected $context; protected $link_prefix; protected $link_suffix; protected function resolveAttachment(string $uri) { $prefix = $this->current_path; $pos = strpos($uri, '/'); // "Image.jpg" if ($pos === false) { return WWW_URL . $prefix . '/' . $uri; } // "bla/Image.jpg" outside of web context elseif ($this->context !== File::CONTEXT_WEB && $pos !== 0) { return WWW_URL . $this->context . '/' . $uri; } // "bla/Image.jpg" in web context or absolute link, eg. "/transactions/2442/42.jpg" else { return WWW_URL . ltrim($uri, '/'); } } protected function resolveLink(string $uri) { $first = substr($uri, 0, 1); if ($first == '/' || $first == '!') { return Utils::getLocalURL($uri); } if (strpos(Utils::basename($uri), '.') === false) { $uri .= $this->link_suffix; } return $this->link_prefix . $uri; } public function isRelativeTo(File $file) { $this->current_path = Utils::dirname($file->path); $this->context = strtok($this->current_path, '/'); $this->link_suffix = ''; if ($this->context === File::CONTEXT_WEB) { $this->link_prefix = WWW_URL . '/'; $this->current_path = Utils::basename(Utils::dirname($file->path)); } else { $this->link_prefix = $options['prefix'] ?? sprintf(ADMIN_URL . 'common/files/preview.php?p=%s/', $this->context); $this->link_suffix = '.skriv'; } } } |
Added src/include/lib/Garradin/Web/Render/Blocks.php version [7866908ee6].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | <?php namespace Garradin\Web\Render; use Garradin\Entities\Files\File; use Garradin\Squelette_Filtres; use Garradin\Plugin; use Garradin\Utils; use Garradin\Files\Files; use Garradin\UserTemplate\CommonModifiers; use Parsedown; use Parsedown_Extra; use const Garradin\{ADMIN_URL, WWW_URL}; /* display: grid; grid-template-columns: repeat(auto-fit, minmax(100px, 1fr)); grid-gap: 10px; */ class Blocks { static protected $parsedown; protected $_stack = []; public function render(?File $file, ?string $content = null, array $options = []): string { $str = $content ?? $file->fetch(); $out = '<div class="web-blocks">'; // Skip page metadata strtok($str, "\n\n----\n\n"); while ($block = strtok("\n\n----\n\n")) { $out .= $this->block($block); } if ($block = strtok('')) { $out .= $this->block($block); } strtok('', ''); // Free memory foreach ($this->_stack as $type) { $out .= '</article></section>'; } $out .= '</div>'; return $out; } protected function block(string $block): string { $header = strtok($block, "\n\n"); $content = strtok(''); strtok('', ''); // Free memory $out = ''; $content = trim($content, "\n"); $class = sprintf('web-block-%s', $type); switch ($type) { case 'columns': if (array_pop($this->_stack)) { $out .= '</article></section>'; } $out .= '<section class="web-columns">'; return $out; case 'column': if (array_pop($this->_stack)) { $out .= '</article>'; } $out .= '<article class="web-column">'; $this->_stack[] = 'column'; return $out; case 'code': return sprintf('<pre class="%s">%s</pre>', $class, htmlspecialchars($content)); case 'markdown': $md = new Markdown; return sprintf('<div class="web-content %s">%s</div>', $class, $md->render($content)); case 'skriv': $skriv = new Skriv; return sprintf('<div class="web-content %s">%s</div>', $class, $skriv->render($content)); case 'image': return sprintf('<div class="%s">%s</div>', $this->image($content)); case 'gallery': return sprintf('<div class="%s">%s</div>', $this->gallery($content)); case 'heading': return sprintf('<h2 class="%s">%s</h2>', $class, htmlspecialchars($content)); case 'quote': return sprintf('<blockquote class="%s"><p>%s</p></blockquote>', $class, nl2br(htmlspecialchars($content))); case 'video': return sprintf('<iframe class="%s" src="%s" frameborder="0" allow="accelerometer; encrypted-media; gyroscope" allowfullscreen></iframe>', $class, htmlspecialchars($content)); default: throw new \LogicException('Unknown type: ' . $type); } } } |
Modified src/include/lib/Garradin/Web/Render/EncryptedSkriv.php from [8b803e3b49] to [d0d2a69554].
1 2 3 4 5 6 7 8 9 10 | <?php namespace Garradin\Web\Render; use Garradin\Entities\Files\File; use Garradin\Template; use const Garradin\ADMIN_URL; class EncryptedSkriv { | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | <?php namespace Garradin\Web\Render; use Garradin\Entities\Files\File; use Garradin\Template; use const Garradin\ADMIN_URL; class EncryptedSkriv { public function render(File $file, ?string $content = null): string { $tpl = Template::getInstance(); $content = $content ?? $file->fetch(); $tpl->assign('admin_url', ADMIN_URL); $tpl->assign(compact('file', 'content')); return $tpl->fetch('common/files/_file_render_encrypted.tpl'); } } |
Added src/include/lib/Garradin/Web/Render/Markdown.php version [7e10d16363].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | <?php namespace Garradin\Web\Render; use Garradin\Entities\Files\File; use Garradin\Squelette_Filtres; use Garradin\Plugin; use Garradin\Utils; use Garradin\Files\Files; use Garradin\UserTemplate\CommonModifiers; use Parsedown; use Parsedown_Extra; use const Garradin\{ADMIN_URL, WWW_URL}; class Markdown { static protected $parsedown; public function render(?File $file, ?string $content = null, array $options = []): string { if (!self::$parsedown) { self::$parsedown = new ParsedownExtra; self::$parsedown->setBreaksEnabled(true); self::$parsedown->setUrlsLinked(true); self::$parsedown->setSafeMode(true); } $str = $content ?? $file->fetch(); $str = self::$parsedown->text($str); $str = CommonModifiers::typo($str); $str = preg_replace_callback(';<a href="((?!https?://|\w+:).+)">;i', function ($matches) { return sprintf('<a href="%s" target="_parent">', $this->resolveLink($matches[1])); }, $str); return sprintf('<div class="web-content">%s</div>', $str); } } |
Modified src/include/lib/Garradin/Web/Render/Skriv.php from [0996e6e8e0] to [0ea4ef11c0].
1 2 3 4 5 6 | <?php namespace Garradin\Web\Render; use Garradin\Entities\Files\File; | < < < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | < < < | < < < < < < < < | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 | <?php namespace Garradin\Web\Render; use Garradin\Entities\Files\File; use Garradin\Plugin; use Garradin\UserTemplate\CommonModifiers; use KD2\SkrivLite; use const Garradin\{ADMIN_URL, WWW_URL}; class Skriv { use AttachmentAwareTrait; static protected $skriv; public function render(?File $file, ?string $content = null, array $options = []): string { if (!self::$skriv) { self::$skriv = new \KD2\SkrivLite; self::$skriv->registerExtension('file', [self::class, 'SkrivFile']); self::$skriv->registerExtension('image', [self::class, 'SkrivImage']); // Enregistrer d'autres extensions éventuellement Plugin::fireSignal('skriv.init', ['skriv' => self::$skriv]); } $skriv =& self::$skriv; if ($file) { $this->isRelativeTo($file); } $str = $content ?? $file->fetch(); $str = preg_replace_callback('/#file:\[([^\]\h]+)\]/', function ($match) { return $this->resolveAttachment($match[1]); }, $str); $str = $skriv->render($str); $str = CommonModifiers::typo($str); $str = preg_replace_callback(';<a href="((?!https?://|\w+:).+)">;i', function ($matches) { return sprintf('<a href="%s" target="_parent">', $this->resolveLink($matches[1])); }, $str); return sprintf('<div class="web-content">%s</div>', $str); } /** * Callback utilisé pour l'extension <<file>> dans le wiki-texte * @param array $args Arguments passés à l'extension * @param string $content Contenu éventuel (en mode bloc) * @param SkrivLite $skriv Objet SkrivLite */ static public function SkrivFile(array $args, ?string $content, SkrivLite $skriv): string { $name = $args[0] ?? null; $caption = $args[1] ?? null; if (!$name || !$this->current_path) { return $skriv->parseError('/!\ Tag file : aucun nom de fichier indiqué.'); } if (empty($caption)) { $caption = $name; } $url = $this->resolveAttachment($name); $ext = substr($name, strrpos($name, '.')+1); return sprintf( '<aside class="file" data-type="%s"><a href="%s" class="internal-file">%s</a> <small>(%s)</small></aside>', htmlspecialchars($ext), htmlspecialchars($url), htmlspecialchars($caption), htmlspecialchars(strtoupper($ext)) ); } |
︙ | ︙ | |||
140 141 142 143 144 145 146 | { static $align_values = ['left', 'right', 'center']; $name = $args[0] ?? null; $align = $args[1] ?? null; $caption = $args[2] ?? null; | | | | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | { static $align_values = ['left', 'right', 'center']; $name = $args[0] ?? null; $align = $args[1] ?? null; $caption = $args[2] ?? null; if (!$name || !$this->current_path) { return $skriv->parseError('/!\ Tag image : aucun nom de fichier indiqué.'); } $url = $this->resolveAttachment($name); $thumb_url = sprintf('%s?%dpx', $url, $align == 'center' ? 500 : 200); $out = sprintf('<a href="%s" class="internal-image" target="_image"><img src="%s" alt="%s" loading="lazy" /></a>', htmlspecialchars($url), htmlspecialchars($thumb_url), htmlspecialchars($caption ?? $name) ); |
︙ | ︙ |
Modified src/include/lib/Garradin/Web/Web.php from [8b024968b4] to [631bb6f7f6].
︙ | ︙ | |||
20 21 22 23 24 25 26 | class Web { static public function search(string $search): array { $results = Files::search($search, File::CONTEXT_WEB . '%'); foreach ($results as &$result) { | | | | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | class Web { static public function search(string $search): array { $results = Files::search($search, File::CONTEXT_WEB . '%'); foreach ($results as &$result) { $result->uri = Utils::dirname(substr($result->path, strlen(File::CONTEXT_WEB) + 1)); $result->breadcrumbs = []; $path = ''; foreach (explode('/', $result->uri) as $part) { $path = trim($path . '/' . $part, '/'); $result->breadcrumbs[$path] = $part; } } return $results; } |
︙ | ︙ |
Modified src/templates/docs/index.tpl from [cb91864560] to [a651c91f9d].
︙ | ︙ | |||
144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | {/if} </td> </tr> {/if} {/foreach} </tbody> {if $can_delete} <tfoot> <tr> <td class="check"><input type="checkbox" value="Tout cocher / décocher" id="f_all2" /><label for="f_all2"></label></td> <td class="actions" colspan="5"> <em>Pour les fichiers cochés :</em> <input type="hidden" name="parent" value="{$path}" /> <select name="action"> <option value="">— Choisir une action à effectuer —</option> {if $context == File::CONTEXT_DOCUMENTS} <option value="move">Déplacer</option> {/if} <option value="delete">Supprimer</option> </select> <noscript> {button type="submit" value="OK" shape="right" label="Valider"} </noscript> | > < > | 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 | {/if} </td> </tr> {/if} {/foreach} </tbody> {if $can_delete} <tfoot> <tr> <td class="check"><input type="checkbox" value="Tout cocher / décocher" id="f_all2" /><label for="f_all2"></label></td> <td class="actions" colspan="5"> <em>Pour les fichiers cochés :</em> <input type="hidden" name="parent" value="{$path}" /> <select name="action"> <option value="">— Choisir une action à effectuer —</option> {if $context == File::CONTEXT_DOCUMENTS} <option value="move">Déplacer</option> {/if} <option value="delete">Supprimer</option> </select> <noscript> {button type="submit" value="OK" shape="right" label="Valider"} </noscript> </td> </tr> </tfoot> {/if} </table> {elseif $list instanceof \Garradin\DynamicList} {include file="common/dynamic_list_head.tpl" check=false} {foreach from=$list->iterate() item="item"} |
︙ | ︙ |
Modified src/www/admin/common/files/rename.php from [c1d61a3f81] to [608f53cc1f].
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | } if (!$file->checkWriteAccess($session)) { throw new UserException('Vous n\'avez pas le droit de modifier ce fichier.'); } $context = $file->context(); $csrf_key = 'file_rename_' . $file->pathHash(); $form->runIf('rename', function () use ($file) { $file->changeFileName(f('new_name')); }, $csrf_key, '!'); $tpl->assign(compact('file', 'csrf_key')); $tpl->display('common/files/rename.tpl'); | > > > > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | } if (!$file->checkWriteAccess($session)) { throw new UserException('Vous n\'avez pas le droit de modifier ce fichier.'); } $context = $file->context(); if ($context == File::CONTEXT_CONFIG || $context == File::CONTEXT_WEB) { throw new UserException('Vous n\'avez pas le droit de renommer ce fichier.'); } $csrf_key = 'file_rename_' . $file->pathHash(); $form->runIf('rename', function () use ($file) { $file->changeFileName(f('new_name')); }, $csrf_key, '!'); $tpl->assign(compact('file', 'csrf_key')); $tpl->display('common/files/rename.tpl'); |
Added src/www/admin/static/scripts/web_editor.js version [882b005b1b].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | (function () { const TYPES = ['code', ]; window.WebEditor = class { constructor(textarea) { this.textarea = textarea; this.parse(textarea.value) this.editor = } build() { } parse(text) { var blocks = text.split("\n\n----\n\n"); this.blocks = []; for (var i = 0; i < blocks.length; i++) { let block = blocks[i]; if ((i % 1) == 0) { this.blocks.push(this.parseMeta(block)); } else { this.blocks[this.blocks.length - 1].content = block.trim("\r\n"); } } } parseMeta(text) { var lines = text.split("\n"); var meta = {}; for (var i = 0; i < lines.length; i++) { var line = lines[i].split(':', 2); if (line.length != 2) { continue; } meta[line[0].trim().toLowerCase()] = line[1].trim(); } return meta; } } })(); |