").load(traq.base + '_misc/format_text', { data: data.content });
-
- item.append(summary);
- item.append(created_at);
- item.append(content);
- news_container.append(item);
- });
- });
- } else {
- $("#traq_news .secure_alert").show();
- }
-});
diff --git a/dev/docker/php56-apache b/dev/docker/php56-apache
deleted file mode 100644
index e4cb2053f..000000000
--- a/dev/docker/php56-apache
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM php:5.6-apache
-
-RUN docker-php-ext-install pdo_mysql
-RUN printf '[PHP]\ndate.timezone = "US/Central"\n' > /usr/local/etc/php/conf.d/tzone.ini
-
-RUN a2enmod rewrite
diff --git a/dev/docker/php73-apache b/dev/docker/php80-apache
similarity index 74%
rename from dev/docker/php73-apache
rename to dev/docker/php80-apache
index d3f468fcd..7126e11de 100644
--- a/dev/docker/php73-apache
+++ b/dev/docker/php80-apache
@@ -1,4 +1,4 @@
-FROM php:7.3-apache
+FROM php:8.0-apache
RUN docker-php-ext-install pdo_mysql
diff --git a/docker-compose.yml b/docker-compose.yml
index 2e22db575..44078f4e7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
container_name: traq3_web
build:
context: .
- dockerfile: dev/docker/php73-apache
+ dockerfile: dev/docker/php80-apache
working_dir: /var/www/html
volumes:
- .:/var/www/html
@@ -14,19 +14,6 @@ services:
links:
- mysql:db
- web56:
- container_name: traq3_web56
- build:
- context: .
- dockerfile: dev/docker/php56-apache
- working_dir: /var/www/html
- volumes:
- - .:/var/www/html
- ports:
- - 3001:80
- links:
- - mysql:db
-
mysql:
container_name: traq3_db
image: mariadb:10
diff --git a/install/index.php b/install/index.php
index 88db09c56..b6b0c7815 100644
--- a/install/index.php
+++ b/install/index.php
@@ -142,6 +142,7 @@
// Fetch the install SQL.
$install_sql = file_get_contents('./install.sql');
$install_sql = str_replace('traq_', $_SESSION['db']['prefix'], $install_sql);
+ $install_sql = preg_replace('/^(#.*)$/m', '', $install_sql);
$queries = explode(';', $install_sql);
// Run the install queries.
diff --git a/package.json b/package.json
index e5c1c2abc..8346c5c7c 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,13 @@
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore"
},
"dependencies": {
+ "@fortawesome/fontawesome-svg-core": "^6.1.1",
+ "@fortawesome/free-regular-svg-icons": "^6.1.1",
+ "@fortawesome/free-solid-svg-icons": "^6.1.1",
+ "@fortawesome/vue-fontawesome": "^3.0.1",
"axios": "^0.27.2",
+ "easymde": "^2.16.1",
+ "luxon": "^2.4.0",
"pinia": "^2.0.14",
"vue": "^3.2.37"
},
@@ -24,11 +30,16 @@
"@vue/eslint-config-typescript": "^11.0.0",
"@vue/test-utils": "^2.0.0",
"@vue/tsconfig": "^0.1.3",
+ "autoprefixer": "^10.4.7",
"eslint": "^8.5.0",
"eslint-plugin-vue": "^9.0.0",
"jsdom": "^20.0.0",
"npm-run-all": "^4.1.5",
+ "postcss": "^8.4.14",
+ "postcss-nesting": "^10.1.9",
"prettier": "^2.5.1",
+ "sass": "^1.53.0",
+ "tailwindcss": "^3.1.4",
"typescript": "~4.7.4",
"vite": "^2.9.12",
"vitest": "^0.15.1",
diff --git a/postcss.config.js b/postcss.config.js
new file mode 100644
index 000000000..2ac1a49b9
--- /dev/null
+++ b/postcss.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+ plugins: [
+ require("tailwindcss/nesting"),
+ require("tailwindcss"),
+ require("autoprefixer"),
+ ],
+}
diff --git a/tailwind.config.js b/tailwind.config.js
new file mode 100644
index 000000000..de4fa018a
--- /dev/null
+++ b/tailwind.config.js
@@ -0,0 +1,25 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+ content: ["./traq-ui/**/*.{vue,js,ts,jsx,tsx}"],
+ theme: {
+ extend: {
+ colors: {
+ brand: {
+ 100: "#d6e4ee",
+ 200: "#aec9dd",
+ 300: "#85aecc",
+ 400: "#5d93bb",
+ 500: "#3478aa",
+ 600: "#2a6088",
+ 700: "#1f4866",
+ 800: "#153044",
+ 900: "#0a1822",
+ },
+ },
+ },
+ },
+ plugins: [],
+ corePlugins: {
+ preflight: false,
+ },
+}
diff --git a/traq-ui/components/EasyMDE.vue b/traq-ui/components/EasyMDE.vue
new file mode 100644
index 000000000..7622c3ec0
--- /dev/null
+++ b/traq-ui/components/EasyMDE.vue
@@ -0,0 +1,47 @@
+
+
+
+
+
diff --git a/traq-ui/components/PaginationLinks.vue b/traq-ui/components/PaginationLinks.vue
new file mode 100644
index 000000000..5e057fef7
--- /dev/null
+++ b/traq-ui/components/PaginationLinks.vue
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+ [a-zA-Z0-9\-\_]+)');
+const PROJECT_SLUG = '(?P[a-zA-Z0-9\-\_]+)';
Router::add('root', 'traq::controllers::Projects.index');
Router::add('404', 'traq::controllers::Error.404');
@@ -33,8 +33,14 @@
Router::add('/users/validate/(.*)', 'traq::controllers::Users.validate/$1');
// API
-Router::add('/statuses', 'traq::controllers::API.statuses');
-Router::add('/priorities', 'traq::controllers::API.priorities');
+Router::add('/api/auth', 'traq::controllers::API.auth');
+Router::add('/api/auth/'.PROJECT_SLUG, 'traq::controllers::API.auth');
+Router::add('/api/types', 'traq::controllers::API.types');
+Router::add('/api/statuses', 'traq::controllers::API.statuses');
+Router::add('/api/priorities', 'traq::controllers::API.priorities');
+Router::add('/api/'.PROJECT_SLUG.'/components', 'traq::controllers::API.components');
+Router::add('/api/'.PROJECT_SLUG.'/custom-fields', 'traq::controllers::API.customFields');
+Router::add('/api/'.PROJECT_SLUG.'/members', 'traq::controllers::API.projectMembers');
// Misc
Router::add('/_js(?:.js)?', 'traq::controllers::Misc.javascript');
@@ -51,54 +57,54 @@
// ------------------------------------------------
// Project routes
Router::add('/projects', 'traq::controllers::Projects.index');
-Router::add('/' . RTR_PROJSLUG . '/milestone/(?P[a-zA-Z0-9\-_.]+?)', 'traq::controllers::Projects.milestone/$2');
-Router::add('/' . RTR_PROJSLUG . '/(timeline|roadmap|changelog)', 'traq::controllers::Projects.$2');
-Router::add('/' . RTR_PROJSLUG . '/timeline/([0-9]+)/delete', 'traq::controllers::Projects.delete_timeline_event/$2');
-Router::add('/' . RTR_PROJSLUG . '/roadmap/(completed|all|cancelled)', 'traq::controllers::Projects.roadmap/$2');
-Router::add('/' . RTR_PROJSLUG, 'traq::controllers::Projects.view');
+Router::add('/' . PROJECT_SLUG . '/milestone/(?P[a-zA-Z0-9\-_.]+?)', 'traq::controllers::Projects.milestone/$2');
+Router::add('/' . PROJECT_SLUG . '/(timeline|roadmap|changelog)', 'traq::controllers::Projects.$2');
+Router::add('/' . PROJECT_SLUG . '/timeline/([0-9]+)/delete', 'traq::controllers::Projects.delete_timeline_event/$2');
+Router::add('/' . PROJECT_SLUG . '/roadmap/(completed|all|cancelled)', 'traq::controllers::Projects.roadmap/$2');
+Router::add('/' . PROJECT_SLUG, 'traq::controllers::Projects.view');
// Ticket routes
-Router::add('/' . RTR_PROJSLUG . '/tickets/new', 'traq::controllers::Tickets.new');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P[0-9]+)', 'traq::controllers::Tickets.view/$2');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P[0-9]+)/move', 'traq::controllers::Tickets.move/$2');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P[0-9]+)/delete', 'traq::controllers::Tickets.delete/$2');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P[0-9]+)/(update|edit|vote|voters)', 'traq::controllers::Tickets.$3/$2');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P[0-9]+)/history/([0-9]+)/edit', 'traq::controllers::TicketHistory.edit/$3');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P[0-9]+)/history/([0-9]+)/delete', 'traq::controllers::TicketHistory.delete/$3');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P[0-9]+)/tasks/manage', 'traq::controllers::TicketTasks.manage/$2');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P[0-9]+)/tasks/([0-9]+)', 'traq::controllers::TicketTasks.toggle/$2,$3');
-Router::add('/' . RTR_PROJSLUG . '/tickets/mass_actions', 'traq::controllers::Tickets.mass_actions');
-Router::add('/' . RTR_PROJSLUG . '/tickets/update_filters', 'traq::controllers::Tickets.update_filters');
-Router::add('/' . RTR_PROJSLUG . '/tickets', 'traq::controllers::Tickets.index');
+Router::add('/' . PROJECT_SLUG . '/tickets/new', 'traq::controllers::Tickets.new');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P[0-9]+)', 'traq::controllers::Tickets.view/$2');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P[0-9]+)/move', 'traq::controllers::Tickets.move/$2');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P[0-9]+)/delete', 'traq::controllers::Tickets.delete/$2');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P[0-9]+)/(update|edit|vote|voters)', 'traq::controllers::Tickets.$3/$2');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P[0-9]+)/history/([0-9]+)/edit', 'traq::controllers::TicketHistory.edit/$3');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P[0-9]+)/history/([0-9]+)/delete', 'traq::controllers::TicketHistory.delete/$3');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P[0-9]+)/tasks/manage', 'traq::controllers::TicketTasks.manage/$2');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P[0-9]+)/tasks/([0-9]+)', 'traq::controllers::TicketTasks.toggle/$2,$3');
+Router::add('/' . PROJECT_SLUG . '/tickets/mass-actions', 'traq::controllers::Tickets.mass_actions');
+Router::add('/' . PROJECT_SLUG . '/tickets/update_filters', 'traq::controllers::Tickets.update_filters');
+Router::add('/' . PROJECT_SLUG . '/tickets', 'traq::controllers::Tickets.index');
// Wiki routes
-Router::add('/' . RTR_PROJSLUG . '/wiki', 'traq::controllers::Wiki.view', array('slug' => 'main'));
-Router::add('/' . RTR_PROJSLUG . '/wiki/_pages', 'traq::controllers::Wiki.pages');
-Router::add('/' . RTR_PROJSLUG . '/wiki/_new', 'traq::controllers::Wiki.new');
-Router::add('/' . RTR_PROJSLUG . '/wiki/(?P[a-zA-Z0-9\-\_/]+)/_edit', 'traq::controllers::Wiki.edit');
-Router::add('/' . RTR_PROJSLUG . '/wiki/(?P[a-zA-Z0-9\-\_/]+)/_delete', 'traq::controllers::Wiki.delete');
-Router::add('/' . RTR_PROJSLUG . '/wiki/(?P[a-zA-Z0-9\-\_/]+)/_revisions', 'traq::controllers::Wiki.revisions/$2');
-Router::add('/' . RTR_PROJSLUG . '/wiki/(?P[a-zA-Z0-9\-\_/]+)/_revisions/(\d+)', 'traq::controllers::Wiki.revision/$2,$3');
-Router::add('/' . RTR_PROJSLUG . '/wiki/(?P[a-zA-Z0-9\-\_/]+)', 'traq::controllers::Wiki.view');
+Router::add('/' . PROJECT_SLUG . '/wiki', 'traq::controllers::Wiki.view', array('slug' => 'main'));
+Router::add('/' . PROJECT_SLUG . '/wiki/_pages', 'traq::controllers::Wiki.pages');
+Router::add('/' . PROJECT_SLUG . '/wiki/_new', 'traq::controllers::Wiki.new');
+Router::add('/' . PROJECT_SLUG . '/wiki/(?P[a-zA-Z0-9\-\_/]+)/_edit', 'traq::controllers::Wiki.edit');
+Router::add('/' . PROJECT_SLUG . '/wiki/(?P[a-zA-Z0-9\-\_/]+)/_delete', 'traq::controllers::Wiki.delete');
+Router::add('/' . PROJECT_SLUG . '/wiki/(?P[a-zA-Z0-9\-\_/]+)/_revisions', 'traq::controllers::Wiki.revisions/$2');
+Router::add('/' . PROJECT_SLUG . '/wiki/(?P[a-zA-Z0-9\-\_/]+)/_revisions/(\d+)', 'traq::controllers::Wiki.revision/$2,$3');
+Router::add('/' . PROJECT_SLUG . '/wiki/(?P[a-zA-Z0-9\-\_/]+)', 'traq::controllers::Wiki.view');
// Project settings routes
-Router::add('/' . RTR_PROJSLUG . '/settings', 'traq::controllers::ProjectSettings::Options.index');
-Router::add('/' . RTR_PROJSLUG . '/settings/(milestones|components|members|repositories)', 'traq::controllers::ProjectSettings::$2.index');
-Router::add('/' . RTR_PROJSLUG . '/settings/(milestones|components|members|repositories)/new', 'traq::controllers::ProjectSettings::$2.new');
-Router::add('/' . RTR_PROJSLUG . '/settings/(milestones|components|members)/([0-9]+)/(edit|delete)', 'traq::controllers::ProjectSettings::$2.$4/$3');
-Router::add('/' . RTR_PROJSLUG . '/settings/custom_fields', 'traq::controllers::ProjectSettings::CustomFields.index');
-Router::add('/' . RTR_PROJSLUG . '/settings/custom_fields/new', 'traq::controllers::ProjectSettings::CustomFields.new');
-Router::add('/' . RTR_PROJSLUG . '/settings/custom_fields/([0-9]+)/(edit|delete)', 'traq::controllers::ProjectSettings::CustomFields.$3/$2');
+Router::add('/' . PROJECT_SLUG . '/settings', 'traq::controllers::ProjectSettings::Options.index');
+Router::add('/' . PROJECT_SLUG . '/settings/(milestones|components|members|repositories)', 'traq::controllers::ProjectSettings::$2.index');
+Router::add('/' . PROJECT_SLUG . '/settings/(milestones|components|members|repositories)/new', 'traq::controllers::ProjectSettings::$2.new');
+Router::add('/' . PROJECT_SLUG . '/settings/(milestones|components|members)/([0-9]+)/(edit|delete)', 'traq::controllers::ProjectSettings::$2.$4/$3');
+Router::add('/' . PROJECT_SLUG . '/settings/custom_fields', 'traq::controllers::ProjectSettings::CustomFields.index');
+Router::add('/' . PROJECT_SLUG . '/settings/custom_fields/new', 'traq::controllers::ProjectSettings::CustomFields.new');
+Router::add('/' . PROJECT_SLUG . '/settings/custom_fields/([0-9]+)/(edit|delete)', 'traq::controllers::ProjectSettings::CustomFields.$3/$2');
-Router::add('/' . RTR_PROJSLUG . '/settings/members/save', 'traq::controllers::ProjectSettings::Members.save');
+Router::add('/' . PROJECT_SLUG . '/settings/members/save', 'traq::controllers::ProjectSettings::Members.save');
// Project permission routes
-Router::add('/' . RTR_PROJSLUG . '/settings/permissions/(groups|roles)', 'traq::controllers::ProjectSettings::Permissions.index/$2');
+Router::add('/' . PROJECT_SLUG . '/settings/permissions/(groups|roles)', 'traq::controllers::ProjectSettings::Permissions.index/$2');
// Subscription routes
-Router::add('/' . RTR_PROJSLUG . '/(?:un)?subscribe', 'traq::controllers::Subscriptions.toggle/project,$1');
-Router::add('/' . RTR_PROJSLUG . '/milestone/(?P[a-zA-Z0-9\-_.]+?)/(?:un)?subscribe', 'traq::controllers::Subscriptions.toggle/milestone,$2');
-Router::add('/' . RTR_PROJSLUG . '/tickets/(?P[0-9]+)/(?:un)?subscribe', 'traq::controllers::Subscriptions.toggle/ticket,$2');
+Router::add('/' . PROJECT_SLUG . '/(?:un)?subscribe', 'traq::controllers::Subscriptions.toggle/project,$1');
+Router::add('/' . PROJECT_SLUG . '/milestone/(?P[a-zA-Z0-9\-_.]+?)/(?:un)?subscribe', 'traq::controllers::Subscriptions.toggle/milestone,$2');
+Router::add('/' . PROJECT_SLUG . '/tickets/(?P[0-9]+)/(?:un)?subscribe', 'traq::controllers::Subscriptions.toggle/ticket,$2');
// ------------------------------------------------
// AdminCP routes
diff --git a/vendor/traq/controllers/api.php b/vendor/traq/controllers/api.php
index 55eaf4127..598771f2c 100644
--- a/vendor/traq/controllers/api.php
+++ b/vendor/traq/controllers/api.php
@@ -21,10 +21,14 @@
namespace traq\controllers;
use avalon\output\View;
+use avalon\http\Router;
+use avalon\output\Body;
use avalon\core\Load;
+use traq\models\Type;
use traq\models\Status;
use traq\models\Priority;
+use traq\models\Permission;
/**
* API controller.
@@ -36,6 +40,27 @@
*/
class API extends AppController
{
+ public function __construct()
+ {
+ Router::$extension = 'json';
+ parent::__construct();
+
+ $this->render['layout'] = false;
+ $this->render['view'] = false;
+
+ header('Content-Type: application/json; charset=UTF-8');
+ }
+
+ /**
+ * Ticket types.
+ *
+ * @return string
+ */
+ public function action_types()
+ {
+ Body::append(to_json(Type::fetch_all()));
+ }
+
/**
* Ticket statuses.
*
@@ -43,7 +68,7 @@ class API extends AppController
*/
public function action_statuses()
{
- View::set('statuses', Status::fetch_all());
+ Body::append(to_json(Status::fetch_all()));
}
/**
@@ -53,6 +78,74 @@ public function action_statuses()
*/
public function action_priorities()
{
- View::set('priorities', Priority::fetch_all());
+ Body::append(to_json(Priority::fetch_all()));
+ }
+
+ /**
+ * Project components.
+ */
+ public function action_components()
+ {
+ Body::append(to_json($this->project->components->exec()->fetch_all()));
+ }
+
+ /**
+ * Project components.
+ */
+ public function action_customFields()
+ {
+ Body::append(to_json($this->project->custom_fields->exec()->fetch_all()));
+ }
+
+ /**
+ * Project members.
+ */
+ public function action_projectMembers()
+ {
+ $members = array_map(
+ function ($userRole) {
+ return [
+ 'id' => $userRole->user->id,
+ 'username' => $userRole->user->username,
+ 'name' => $userRole->user->name,
+ 'role' => $userRole->role->name,
+ ];
+ },
+ $this->project->user_roles->exec()->fetch_all()
+ );
+
+ Body::append(to_json($members));
+ }
+
+ /**
+ * Current authenticated user.
+ */
+ public function action_auth()
+ {
+ $data = false;
+
+ if ($this->user) {
+ $data = $this->user->__toArray([
+ 'id',
+ 'username',
+ 'name',
+ 'group_id',
+ 'locale',
+ ]);
+
+ $data['id'] = (int) $data['id'];
+ $data['group_id'] = (int) $data['group_id'];
+
+ $data['permissions'] = [];
+ if ($this->project) {
+ foreach ($this->user->getPermissions($this->project->id) as $permission) {
+ if ((bool) $permission->value) {
+ $data['permissions'][$permission->action] = (bool) $permission->value;
+ }
+ }
+ }
+ }
+
+ Body::append(to_json($data));
}
}
diff --git a/vendor/traq/controllers/app_controller.php b/vendor/traq/controllers/app_controller.php
index 141231ead..97984b05d 100644
--- a/vendor/traq/controllers/app_controller.php
+++ b/vendor/traq/controllers/app_controller.php
@@ -28,6 +28,7 @@
use avalon\Database;
use avalon\http\Request;
use avalon\http\Router;
+use avalon\output\Body;
use avalon\output\View;
use traq\models\User;
@@ -226,6 +227,22 @@ protected function bad_api_request($message)
View::set(compact('message'));
}
+ /**
+ * API Response.
+ *
+ * @param array $data
+ */
+ protected function apiResponse(array $data)
+ {
+ Router::$extension = 'json';
+
+ $this->render['layout'] = false;
+ $this->render['view'] = false;
+
+ header('Content-Type: application/json; charset=UTF-8');
+ Body::append(to_json($data));
+ }
+
public function __shutdown()
{
// Plain layout for JSON and API requests
diff --git a/vendor/traq/controllers/tickets.php b/vendor/traq/controllers/tickets.php
index 0b0892f48..deff33e57 100644
--- a/vendor/traq/controllers/tickets.php
+++ b/vendor/traq/controllers/tickets.php
@@ -38,6 +38,7 @@
use traq\models\User;
use traq\models\Subscription;
use traq\models\CustomField;
+use traq\models\CustomFieldValue;
use traq\models\Timeline;
use traq\helpers\TicketFilterQuery;
use traq\helpers\Pagination;
@@ -82,7 +83,9 @@ public function __construct()
public function action_index()
{
// Atom feed
- $this->feeds[] = array(Request::requestUri() . ".atom", l('x_ticket_feed', $this->project->name));
+ $this->feeds[] = [
+ Request::requestUri() . ".atom", l('x_ticket_feed', $this->project->name)
+ ];
// Create ticket filter query
$filter_query = new TicketFilterQuery($this->project);
@@ -95,28 +98,8 @@ public function action_index()
}
}
- // Any filters stored in the session?
- if (!count($filter_query->filters())
- and isset($_SESSION['ticket_filters'])
- and isset($_SESSION['ticket_filters'][$this->project->id])) {
- foreach (explode('&', $_SESSION['ticket_filters'][$this->project->id]) as $filter_value) {
- if (strpos($filter_value, '=')) {
- $filter_value = explode('=', $filter_value);
- if (in_array($filter_value[0], array_keys(ticket_filters_for($this->project)))) {
- $value = isset($filter_value[1]) ? explode(',', urldecode($filter_value[1])) : array();
- $filter_query->process($filter_value[0], $value);
- }
- }
- }
- } else {
- $_SESSION['ticket_filters'][$this->project->id] = Request::$query;
- }
-
- // Send filters to the view
- View::set('filters', $filter_query->filters());
-
// Fetch tickets
- $tickets = array();
+ $tickets = [];
$rows = $this->db->select('tickets.*')->from('tickets')->custom_sql($filter_query->sql());
// Order by creation date for atom feed
@@ -177,54 +160,32 @@ public function action_index()
View::set(compact('pagination'));
unset($all_rows);
- // Add to tickets array
- foreach($rows->exec()->fetch_all() as $row) {
- $tickets[] = new Ticket($row, false);
- }
-
- // Send the tickets array to the view..
- View::set('tickets', $tickets);
-
- // Columns
- $this->get_columns();
- }
-
- private function get_columns()
- {
- $allowed_columns = ticketlist_allowed_columns();
+ $customFields = [];
+ $ticketCustomFields = [];
+ $projectCustomFields = $this->project->custom_fields->exec()->fetch_all();
- // Add custom fields
- foreach ($this->custom_fields as $field) {
- $allowed_columns[] = $field->id;
+ foreach ($projectCustomFields as $customField) {
+ $customFields[$customField->id] = $customField;
}
- // Set columns from form
- if (Request::method() == 'post' and isset(Request::$post['update_columns'])) {
- $new_columns = array();
- foreach (Request::$post['columns'] as $column) {
- $new_columns[] = $column;
- }
- $_SESSION['columns'] = Request::$request['columns'] = $new_columns;
+ $customFieldValues = CustomFieldValue::fetch_all();
+ foreach ($customFieldValues as $customFieldValue) {
+ // $customFields[$customFieldValue->custom_field_id]['values'][$customFieldValue->ticket_id] = $customFieldValue->value;
+ $customField = $customFields[$customFieldValue->custom_field_id];
+ $slug = str_replace('-', '_', $customField->slug);
+ $ticketCustomFields[$customFieldValue->ticket_id][$slug] = $customFieldValue->value;
}
- // Get columns
- $columns = array();
- if (isset($_SESSION['columns']) or isset(Request::$request['columns'])) {
- // Loop over customs from session or request
- foreach ((isset($_SESSION['columns']) ? $_SESSION['columns'] : explode(',', Request::$request['columns'])) as $column) {
- // Make sure it's a valid column
- if (in_array($column, $allowed_columns)) {
- $columns[] = $column;
- }
- }
- }
- // Use default columns
- else {
- $columns = ticket_columns();
+ // Add to tickets array
+ foreach($rows->exec()->fetch_all() as $row) {
+ $ticket = (new Ticket($row, false))->__toArray();
+ $ticket['custom_fields'] = $ticketCustomFields[$ticket['id']] ?? [];
+
+ $tickets[] = $ticket;
}
- // Send columns to view
- View::set('columns', $columns);
+ // Send the tickets array to the view..
+ View::set('tickets', $tickets);
}
/**
@@ -429,7 +390,7 @@ public function action_new()
// Check if the ticket data is valid...
// if it is, save the ticket to the DB and
// redirect to the ticket page.
- if (check_ticket_creation_delay($ticket) and $ticket->is_valid()) {
+ if (($this->user->group->is_admin || check_ticket_creation_delay($ticket)) && $ticket->is_valid()) {
// Set last ticket creation time
$_SESSION['last_ticket_creation'] = time();
@@ -771,7 +732,9 @@ public function action_mass_actions()
}
// Decode tickets array
- $tickets = json_decode(Request::post('tickets'), true);
+ $tickets = is_array(Request::post('tickets'))
+ ? Request::post('tickets')
+ : $json_decode(Request::post('tickets'), true);
// Make sure there are some tickets
if (!is_array($tickets) and !count($tickets)) {
@@ -781,54 +744,61 @@ public function action_mass_actions()
// Loop over tickets and process actions
foreach ($tickets as $ticket_id) {
$ticket = Ticket::select('*')->where('project_id', $this->project->id)->where('ticket_id', $ticket_id)->exec()->fetch();
-
- $data = array();
+ $data = [];
// Type
if ($this->user->permission($this->project->id, 'ticket_properties_change_type')
- and Request::post('type', -1) != -1) {
+ && Request::post('type', -1) != -1
+ ) {
$data['type_id'] = Request::post('type');
}
// Milestone
if ($this->user->permission($this->project->id, 'ticket_properties_change_milestone')
- and Request::post('milestone', -1) != -1) {
+ && Request::post('milestone', -1) != -1
+ ) {
$data['milestone_id'] = Request::post('milestone');
}
// Version
if ($this->user->permission($this->project->id, 'ticket_properties_change_version')
- and Request::post('version', -1) != -1) {
+ && Request::post('version', -1) != -1
+ ) {
$data['version_id'] = Request::post('version');
}
// Component
if ($this->user->permission($this->project->id, 'ticket_properties_change_component')
- and Request::post('component', -1) != -1) {
+ && Request::post('component', -1) != -1
+ ) {
$data['component_id'] = Request::post('component');
}
// Severity
if ($this->user->permission($this->project->id, 'ticket_properties_change_severity')
- and Request::post('severity', -1) != -1) {
+ && Request::post('severity', -1) != -1
+ ) {
$data['severity_id'] = Request::post('severity');
}
// Priority
if ($this->user->permission($this->project->id, 'ticket_properties_change_priority')
- and Request::post('priority', -1) != -1) {
+ && Request::post('priority', -1) != -1
+ ) {
$data['priority_id'] = Request::post('priority');
}
// Status
if ($this->user->permission($this->project->id, 'ticket_properties_change_status')
- and Request::post('status', -1) != -1) {
+ && Request::post('status', -1) != -1
+ ) {
$data['status_id'] = Request::post('status');
}
// Assigned to
if ($this->user->permission($this->project->id, 'ticket_properties_change_assigned_to')
- and Request::post('assigned_to', -1) != -1) {
+ && Request::post('assigned_to', -1) != -1
+ ) {
$data['assigned_to_id'] = Request::post('assigned_to');
}
@@ -841,97 +811,11 @@ public function action_mass_actions()
// Clear selected tickets
setcookie('selected_tickets', '', time(), '/');
- Request::redirectTo($this->project->href('tickets'));
- }
-
- /**
- * Processes the ticket filters form and
- * builds the query string.
- */
- public function action_update_filters()
- {
- $query_string = array();
-
- // Add filter
- if (isset(Request::$post['add_filter'])) {
- $new_filter = Request::$post['new_filter'];
-
- // Make sure the filter index exists
- if (!isset(Request::$post['filters'][$new_filter])) {
- Request::$post['filters'][$new_filter] = array('values' => array());
- }
-
- // Add the blank value
- Request::$post['filters'][$new_filter] = array(
- 'prefix' => '',
- 'values' => array()
- );
- }
-
- foreach (Request::post('filters', array()) as $name => $filter) {
- // Don't bother if this isn't a valid filter.
- if (!in_array($name, array_keys(ticket_filters_for($this->project)))) {
- continue;
- }
-
- // Process filters
- switch ($name) {
- // Summary, description,
- // owner and assigned to
- case 'summary':
- case 'description':
- case 'owner':
- case 'assigned_to':
- case 'search':
- $values = array();
- foreach ($filter['values'] as $value) {
- $values[] = urlencode($value);
- }
- $query_string[] = "{$name}=" . $filter['prefix'] . implode(',', $values);
- break;
-
- // Milestone, version, type,
- // status and component
- case 'milestone':
- case 'version':
- case 'type':
- case 'status':
- case 'component':
- case 'priority':
- case 'severity':
- // Class name
- $class = '\\traq\\models\\' . ucfirst($name == 'version' ? 'milestone' : $name);
-
- switch ($name) {
- case 'milestone':
- case 'version':
- $field = 'slug';
- break;
-
- default:
- $field = 'name';
- break;
- }
-
- // Values
- $values = array();
- foreach ($filter['values'] as $value) {
- $values[] = urlencode($class::find($value)->{$field});
- }
-
- $query_string[] = "{$name}=" . $filter['prefix'] . implode(',', $values);
- break;
- }
-
- // Process custom field filters
- if ($field = CustomField::find('slug', $name)) {
- $query_string[] = "{$field->slug}={$filter['prefix']}" . implode(',', $filter['values']);
- }
+ if (Router::$extension === '.json') {
+ $this->apiResponse(['success' => true]);
+ } else {
+ Request::redirectTo($this->project->href('tickets'));
}
-
- // Save to session and redirect
- $_SESSION['ticket_filters'][$this->project->id] = implode('&', $query_string);
- Request::redirectTo($this->project->href('tickets') . '?' . implode('&', $query_string));
}
/**
diff --git a/vendor/traq/helpers/ticket_filter_query.php b/vendor/traq/helpers/ticket_filter_query.php
index b7f11d3f1..0932a9b38 100644
--- a/vendor/traq/helpers/ticket_filter_query.php
+++ b/vendor/traq/helpers/ticket_filter_query.php
@@ -60,6 +60,8 @@ public function process($field, $values)
$values = explode(',', $values);
}
+ $values = array_map(fn($val) => addslashes($val), $values);
+
$condition = '';
if (substr($values[0], 0, 1) == '!') {
$condition = 'NOT';
@@ -202,11 +204,15 @@ private function add($field, $condition, $values)
// Sort values low to high
asort($values);
+ $values = array_map(
+ fn($val) => '"'.$val.'"',
+ $values
+ );
- if (count($values) == 1 && !empty($values[0])) {
+ if (count($values) >= 1 && !empty($values[0])) {
$this->custom_field_sql[] = "
`fields`.`custom_field_id` = {$custom_field->id}
- AND `fields`.`value` IN ('" . implode("','", $values) . "')
+ AND `fields`.`value` ${condition} IN ('" . implode("','", $values) . "')
AND `fields`.`ticket_id` = `" . Database::connection()->prefix . "tickets`.`id`
";
}
@@ -233,7 +239,9 @@ public function sql()
$sql = array();
if (count($this->custom_field_sql)) {
- $sql[] = "JOIN `" . Database::connection()->prefix . "custom_field_values` AS `fields` ON (" . implode(' AND ', $this->custom_field_sql) . ")";
+ foreach ($this->custom_field_sql as $index => $customFieldSql) {
+ $sql[] = "JOIN `" . Database::connection()->prefix . "custom_field_values` AS `fields${index}` ON (" . str_replace('`fields`', "`fields${index}`", $customFieldSql) . ")";
+ }
}
$sql[] = " WHERE `project_id` = {$this->project->id}";
diff --git a/vendor/traq/helpers/tickets.php b/vendor/traq/helpers/tickets.php
index 38cb02851..e8dd43ffa 100644
--- a/vendor/traq/helpers/tickets.php
+++ b/vendor/traq/helpers/tickets.php
@@ -396,29 +396,6 @@ function ticket_filter_options_for($filter, $project_id = null) {
return $options;
}
-/**
- * Ticket listing sort indicator.
- *
- * @param string $column
- */
-function ticketlist_sort_indicator($column)
-{
- // Default
- $order = 'priority_id.ASC';
-
- // Check if order_by is set, and use it if it is
- if (isset(Request::$request['order_by'])) {
- $order = Request::$request['order_by'];
- }
-
- // Split column and order
- $order = explode('.', $order);
-
- if ($column == $order[0]) {
- return View::render('tickets/_sort_indicator', array('order' => strtolower($order[1])));
- }
-}
-
/**
* Returns a list of available ticket history sorting options
* for use with the `Form::select` helper.
diff --git a/vendor/traq/helpers/ui.php b/vendor/traq/helpers/ui.php
index 25fff61d3..aef0b3003 100644
--- a/vendor/traq/helpers/ui.php
+++ b/vendor/traq/helpers/ui.php
@@ -32,10 +32,21 @@ function ui_package($entry) {
$manifestPath = dirname(dirname(dirname(__DIR__))).'/assets/ui/manifest.json';
$manifest = json_decode(file_get_contents($manifestPath), true);
- $index = "traq-ui/${entry}/${entry}.ts";
+ $index = "traq-ui/${entry}.ts";
if (isset($manifest[$index])) {
- $file = $manifest[$index]['file'];
+ $info = $manifest[$index];
+ $file = $info['file'];
- return HTML::js_inc(Request::base()."assets/ui/${file}");
+ $html = [];
+
+ if (isset($info['css'])) {
+ foreach ($info['css'] as $cssFile) {
+ $html[] = HTML::css_link(Request::base()."assets/ui/${cssFile}");
+ }
+ }
+
+ $html[] = HTML::js_inc(Request::base()."assets/ui/${file}");
+
+ return implode(PHP_EOL, $html);
}
}
\ No newline at end of file
diff --git a/vendor/traq/models/custom_field.php b/vendor/traq/models/custom_field.php
index 295102d13..119555b3e 100644
--- a/vendor/traq/models/custom_field.php
+++ b/vendor/traq/models/custom_field.php
@@ -379,4 +379,27 @@ public function save()
return false;
}
+
+ public function __toArray($fields = null)
+ {
+ $ticketTypeIds = array_map(
+ fn($id) => (int) $id,
+ $this->ticket_type_ids
+ );
+
+ return [
+ 'id' => (int) $this->id,
+ 'name' => $this->name,
+ 'slug' => $this->slug,
+ 'type' => $this->type,
+ 'is_required' => (bool) $this->is_required,
+ 'min_length' => (int) $this->min_length,
+ 'max_length' => (int) $this->max_length,
+ 'multiple' => (bool) $this->multiple,
+ 'regex' => $this->regex,
+ 'values' => $this->type === 'select' ? explode("\n", $this->values) : $this->values,
+ 'default_value' => $this->default_value,
+ 'ticket_type_ids' => $ticketTypeIds,
+ ];
+ }
}
diff --git a/vendor/traq/models/status.php b/vendor/traq/models/status.php
index 946fe6b45..db81cf7b0 100644
--- a/vendor/traq/models/status.php
+++ b/vendor/traq/models/status.php
@@ -72,4 +72,14 @@ public function is_valid()
$this->errors = $errors;
return !count($errors) > 0;
}
+
+ public function __toArray($fields = null)
+ {
+ return [
+ 'id' => (int) $this->id,
+ 'name' => $this->name,
+ 'status' => (int) $this->status,
+ 'changelog' => (bool) $this->changelog,
+ ];
+ }
}
diff --git a/vendor/traq/models/user.php b/vendor/traq/models/user.php
index 497bca84c..6f69fdcbb 100644
--- a/vendor/traq/models/user.php
+++ b/vendor/traq/models/user.php
@@ -145,28 +145,42 @@ public function permission($project_id, $action)
return true;
}
- // Check if the projects permissions has been fetched
+ $perms = $this->getPermissions($project_id, $action);
+
+ if (!isset($perms[$action])) {
+ return false;
+ }
+
+ return $perms[$action]->value;
+ }
+
+ /**
+ * Get the users permissions
+ *
+ * @param int $projectId
+ *
+ * @return array
+ */
+ public function getPermissions(int $projectId): array
+ {
+ // Check if the projects permissions has been fetched
// if not, fetch them.
- if (!isset($this->permissions['project'][$project_id])) {
- $this->permissions['project'][$project_id] = Permission::get_permissions($project_id, $this->_data['group_id']);
+ if (!isset($this->permissions['project'][$projectId])) {
+ $this->permissions['project'][$projectId] = Permission::get_permissions($projectId, $this->_data['group_id']);
}
// Check if the user has a role for the project and
// fetch the permissions if not already done so...
- $role_id = $this->get_project_role($project_id);
- if ($role_id and !isset($this->permissions['role'][$project_id])) {
- $this->permissions['role'][$project_id] = Permission::get_permissions($project_id, $role_id, 'role');
- } elseif (!isset($this->permissions['role'][$project_id])) {
- $this->permissions['role'][$project_id] = array();
+ $roleId = $this->get_project_role($projectId);
+ if ($roleId and !isset($this->permissions['role'][$projectId])) {
+ $this->permissions['role'][$projectId] = Permission::get_permissions($projectId, $roleId, 'role');
+ } elseif (!isset($this->permissions['role'][$projectId])) {
+ $this->permissions['role'][$projectId] = array();
}
- $perms = array_merge($this->permissions['project'][$project_id], $this->permissions['role'][$project_id]);
-
- if (!isset($perms[$action])) {
- return false;
- }
+ $perms = array_merge($this->permissions['project'][$projectId], $this->permissions['role'][$projectId]);
- return $perms[$action]->value;
+ return $perms;
}
/**
diff --git a/vendor/traq/plugins/markdown/Michelf/Markdown.php b/vendor/traq/plugins/markdown/Michelf/Markdown.php
deleted file mode 100755
index 74486470a..000000000
--- a/vendor/traq/plugins/markdown/Michelf/Markdown.php
+++ /dev/null
@@ -1,3094 +0,0 @@
-
-#
-# Original Markdown
-# Copyright (c) 2004-2006 John Gruber
-# ` to ` \n`, handling nested tags
- # in between.
-
- [ ]{0,'.$less_than_tab.'}
- <('.$block_tags_b_re.')# start tag = $2
- '.$attr.'> # attributes followed by > and \n
- '.$content.' # content, support nesting
- # the matching end tag
- [ ]* # trailing spaces/tabs
- (?=\n+|\Z) # followed by a newline or end of document
-
- | # Special version for tags of group a.
-
- [ ]{0,'.$less_than_tab.'}
- <('.$block_tags_a_re.')# start tag = $3
- '.$attr.'>[ ]*\n # attributes followed by >
- '.$content2.' # content, support nesting
- # the matching end tag
- [ ]* # trailing spaces/tabs
- (?=\n+|\Z) # followed by a newline or end of document
-
- | # Special case just for
. It was easier to make a special - # case than to make the other regex more complicated. - - [ ]{0,'.$less_than_tab.'} - <(hr) # start tag = $2 - '.$attr.' # attributes - /?> # the matching end tag - [ ]* - (?=\n{2,}|\Z) # followed by a blank line or end of document - - | # Special case for standalone HTML comments: - - [ ]{0,'.$less_than_tab.'} - (?s: - - ) - [ ]* - (?=\n{2,}|\Z) # followed by a blank line or end of document - - | # PHP and ASP-style processor instructions ( - ) - [ ]* - (?=\n{2,}|\Z) # followed by a blank line or end of document - - ) - )}Sxmi', - array(&$this, '_hashHTMLBlocks_callback'), - $text); - - return $text; - } - protected function _hashHTMLBlocks_callback($matches) { - $text = $matches[1]; - $key = $this->hashBlock($text); - return "\n\n$key\n\n"; - } - - - protected function hashPart($text, $boundary = 'X') { - # - # Called whenever a tag must be hashed when a function insert an atomic - # element in the text stream. Passing $text to through this function gives - # a unique text-token which will be reverted back when calling unhash. - # - # The $boundary argument specify what character should be used to surround - # the token. By convension, "B" is used for block elements that needs not - # to be wrapped into paragraph tags at the end, ":" is used for elements - # that are word separators and "X" is used in the general case. - # - # Swap back any tag hash found in $text so we do not have to `unhash` - # multiple times at the end. - $text = $this->unhash($text); - - # Then hash the block. - static $i = 0; - $key = "$boundary\x1A" . ++$i . $boundary; - $this->html_hashes[$key] = $text; - return $key; # String that will replace the tag. - } - - - protected function hashBlock($text) { - # - # Shortcut function for hashPart with block-level boundaries. - # - return $this->hashPart($text, 'B'); - } - - - protected $block_gamut = array( - # - # These are all the transformations that form block-level - # tags like paragraphs, headers, and list items. - # - "doHeaders" => 10, - "doHorizontalRules" => 20, - - "doLists" => 40, - "doCodeBlocks" => 50, - "doBlockQuotes" => 60, - ); - - protected function runBlockGamut($text) { - # - # Run block gamut tranformations. - # - # We need to escape raw HTML in Markdown source before doing anything - # else. This need to be done for each block, and not only at the - # begining in the Markdown function since hashed blocks can be part of - # list items and could have been indented. Indented blocks would have - # been seen as a code block in a previous pass of hashHTMLBlocks. - $text = $this->hashHTMLBlocks($text); - - return $this->runBasicBlockGamut($text); - } - - protected function runBasicBlockGamut($text) { - # - # Run block gamut tranformations, without hashing HTML blocks. This is - # useful when HTML blocks are known to be already hashed, like in the first - # whole-document pass. - # - foreach ($this->block_gamut as $method => $priority) { - $text = $this->{$method}($text); - } - - # Finally form paragraph and restore hashed blocks. - $text = $this->formParagraphs($text); - - return $text; - } - - - protected function doHorizontalRules($text) { - # Do Horizontal Rules: - return preg_replace( - '{ - ^[ ]{0,3} # Leading space - ([-*_]) # $1: First marker - (?> # Repeated marker group - [ ]{0,2} # Zero, one, or two spaces. - \1 # Marker character - ){2,} # Group repeated at least twice - [ ]* # Tailing spaces - $ # End of line. - }mx', - "\n".$this->hashBlock("empty_element_suffix")."\n",
- $text);
- }
-
-
- protected $span_gamut = array(
- #
- # These are all the transformations that occur *within* block-level
- # tags like paragraphs, headers, and list items.
- #
- # Process character escapes, code spans, and inline HTML
- # in one shot.
- "parseSpan" => -30,
-
- # Process anchor and image tags. Images must come first,
- # because ![foo][f] looks like an anchor.
- "doImages" => 10,
- "doAnchors" => 20,
-
- # Make links out of things like `).
- "doAutoLinks" => 30,
- "encodeAmpsAndAngles" => 40,
-
- "doItalicsAndBold" => 50,
- "doHardBreaks" => 60,
- );
-
- protected function runSpanGamut($text) {
- #
- # Run span gamut tranformations.
- #
- foreach ($this->span_gamut as $method => $priority) {
- $text = $this->{$method}($text);
- }
-
- return $text;
- }
-
-
- protected function doHardBreaks($text) {
- # Do hard breaks:
- return preg_replace_callback('/ {2,}\n/',
- array(&$this, '_doHardBreaks_callback'), $text);
- }
- protected function _doHardBreaks_callback($matches) {
- return $this->hashPart("empty_element_suffix\n");
- }
-
-
- protected function doAnchors($text) {
- #
- # Turn Markdown link shortcuts into XHTML tags.
- #
- if ($this->in_anchor) return $text;
- $this->in_anchor = true;
-
- #
- # First, handle reference-style links: [link text] [id]
- #
- $text = preg_replace_callback('{
- ( # wrap whole match in $1
- \[
- ('.$this->nested_brackets_re.') # link text = $2
- \]
-
- [ ]? # one optional space
- (?:\n[ ]*)? # one optional newline followed by spaces
-
- \[
- (.*?) # id = $3
- \]
- )
- }xs',
- array(&$this, '_doAnchors_reference_callback'), $text);
-
- #
- # Next, inline-style links: [link text](url "optional title")
- #
- $text = preg_replace_callback('{
- ( # wrap whole match in $1
- \[
- ('.$this->nested_brackets_re.') # link text = $2
- \]
- \( # literal paren
- [ \n]*
- (?:
- <(.+?)> # href = $3
- |
- ('.$this->nested_url_parenthesis_re.') # href = $4
- )
- [ \n]*
- ( # $5
- ([\'"]) # quote char = $6
- (.*?) # Title = $7
- \6 # matching quote
- [ \n]* # ignore any spaces/tabs between closing quote and )
- )? # title is optional
- \)
- )
- }xs',
- array(&$this, '_doAnchors_inline_callback'), $text);
-
- #
- # Last, handle reference-style shortcuts: [link text]
- # These must come last in case you've also got [link text][1]
- # or [link text](/foo)
- #
- $text = preg_replace_callback('{
- ( # wrap whole match in $1
- \[
- ([^\[\]]+) # link text = $2; can\'t contain [ or ]
- \]
- )
- }xs',
- array(&$this, '_doAnchors_reference_callback'), $text);
-
- $this->in_anchor = false;
- return $text;
- }
- protected function _doAnchors_reference_callback($matches) {
- $whole_match = $matches[1];
- $link_text = $matches[2];
- $link_id =& $matches[3];
-
- if ($link_id == "") {
- # for shortcut links like [this][] or [this].
- $link_id = $link_text;
- }
-
- # lower-case and turn embedded newlines into spaces
- $link_id = strtolower($link_id);
- $link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
-
- if (isset($this->urls[$link_id])) {
- $url = $this->urls[$link_id];
- $url = $this->encodeAttribute($url);
-
- $result = "titles[$link_id] ) ) {
- $title = $this->titles[$link_id];
- $title = $this->encodeAttribute($title);
- $result .= " title=\"$title\"";
- }
-
- $link_text = $this->runSpanGamut($link_text);
- $result .= ">$link_text";
- $result = $this->hashPart($result);
- }
- else {
- $result = $whole_match;
- }
- return $result;
- }
- protected function _doAnchors_inline_callback($matches) {
- $whole_match = $matches[1];
- $link_text = $this->runSpanGamut($matches[2]);
- $url = $matches[3] == '' ? $matches[4] : $matches[3];
- $title =& $matches[7];
-
- $url = $this->encodeAttribute($url);
-
- $result = "encodeAttribute($title);
- $result .= " title=\"$title\"";
- }
-
- $link_text = $this->runSpanGamut($link_text);
- $result .= ">$link_text";
-
- return $this->hashPart($result);
- }
-
-
- protected function doImages($text) {
- #
- # Turn Markdown image shortcuts into ![]()
tags.
- #
- #
- # First, handle reference-style labeled images: ![alt text][id]
- #
- $text = preg_replace_callback('{
- ( # wrap whole match in $1
- !\[
- ('.$this->nested_brackets_re.') # alt text = $2
- \]
-
- [ ]? # one optional space
- (?:\n[ ]*)? # one optional newline followed by spaces
-
- \[
- (.*?) # id = $3
- \]
-
- )
- }xs',
- array(&$this, '_doImages_reference_callback'), $text);
-
- #
- # Next, handle inline images: 
- # Don't forget: encode * and _
- #
- $text = preg_replace_callback('{
- ( # wrap whole match in $1
- !\[
- ('.$this->nested_brackets_re.') # alt text = $2
- \]
- \s? # One optional whitespace character
- \( # literal paren
- [ \n]*
- (?:
- <(\S*)> # src url = $3
- |
- ('.$this->nested_url_parenthesis_re.') # src url = $4
- )
- [ \n]*
- ( # $5
- ([\'"]) # quote char = $6
- (.*?) # title = $7
- \6 # matching quote
- [ \n]*
- )? # title is optional
- \)
- )
- }xs',
- array(&$this, '_doImages_inline_callback'), $text);
-
- return $text;
- }
- protected function _doImages_reference_callback($matches) {
- $whole_match = $matches[1];
- $alt_text = $matches[2];
- $link_id = strtolower($matches[3]);
-
- if ($link_id == "") {
- $link_id = strtolower($alt_text); # for shortcut links like ![this][].
- }
-
- $alt_text = $this->encodeAttribute($alt_text);
- if (isset($this->urls[$link_id])) {
- $url = $this->encodeAttribute($this->urls[$link_id]);
- $result = "![\"$alt_text\"";](\"$url\")
titles[$link_id])) {
- $title = $this->titles[$link_id];
- $title = $this->encodeAttribute($title);
- $result .= " title=\"$title\"";
- }
- $result .= $this->empty_element_suffix;
- $result = $this->hashPart($result);
- }
- else {
- # If there's no such link ID, leave intact:
- $result = $whole_match;
- }
-
- return $result;
- }
- protected function _doImages_inline_callback($matches) {
- $whole_match = $matches[1];
- $alt_text = $matches[2];
- $url = $matches[3] == '' ? $matches[4] : $matches[3];
- $title =& $matches[7];
-
- $alt_text = $this->encodeAttribute($alt_text);
- $url = $this->encodeAttribute($url);
- $result = "encodeAttribute($title);
- $result .= " title=\"$title\""; # $title already quoted
- }
- $result .= $this->empty_element_suffix;
-
- return $this->hashPart($result);
- }
-
-
- protected function doHeaders($text) {
- # Setext-style headers:
- # Header 1
- # ========
- #
- # Header 2
- # --------
- #
- $text = preg_replace_callback('{ ^(.+?)[ ]*\n(=+|-+)[ ]*\n+ }mx',
- array(&$this, '_doHeaders_callback_setext'), $text);
-
- # atx-style headers:
- # # Header 1
- # ## Header 2
- # ## Header 2 with closing hashes ##
- # ...
- # ###### Header 6
- #
- $text = preg_replace_callback('{
- ^(\#{1,6}) # $1 = string of #\'s
- [ ]*
- (.+?) # $2 = Header text
- [ ]*
- \#* # optional closing #\'s (not counted)
- \n+
- }xm',
- array(&$this, '_doHeaders_callback_atx'), $text);
-
- return $text;
- }
- protected function _doHeaders_callback_setext($matches) {
- # Terrible hack to check we haven't found an empty list item.
- if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
- return $matches[0];
-
- $level = $matches[2]{0} == '=' ? 1 : 2;
- $block = "".$this->runSpanGamut($matches[1])." ";
- return "\n" . $this->hashBlock($block) . "\n\n";
- }
- protected function _doHeaders_callback_atx($matches) {
- $level = strlen($matches[1]);
- $block = "".$this->runSpanGamut($matches[2])." ";
- return "\n" . $this->hashBlock($block) . "\n\n";
- }
-
-
- protected function doLists($text) {
- #
- # Form HTML ordered (numbered) and unordered (bulleted) lists.
- #
- $less_than_tab = $this->tab_width - 1;
-
- # Re-usable patterns to match list item bullets and number markers:
- $marker_ul_re = '[*+-]';
- $marker_ol_re = '\d+[\.]';
- $marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
-
- $markers_relist = array(
- $marker_ul_re => $marker_ol_re,
- $marker_ol_re => $marker_ul_re,
- );
-
- foreach ($markers_relist as $marker_re => $other_marker_re) {
- # Re-usable pattern to match any entirel ul or ol list:
- $whole_list_re = '
- ( # $1 = whole list
- ( # $2
- ([ ]{0,'.$less_than_tab.'}) # $3 = number of spaces
- ('.$marker_re.') # $4 = first list item marker
- [ ]+
- )
- (?s:.+?)
- ( # $5
- \z
- |
- \n{2,}
- (?=\S)
- (?! # Negative lookahead for another list item marker
- [ ]*
- '.$marker_re.'[ ]+
- )
- |
- (?= # Lookahead for another kind of list
- \n
- \3 # Must have the same indentation
- '.$other_marker_re.'[ ]+
- )
- )
- )
- '; // mx
-
- # We use a different prefix before nested lists than top-level lists.
- # See extended comment in _ProcessListItems().
-
- if ($this->list_level) {
- $text = preg_replace_callback('{
- ^
- '.$whole_list_re.'
- }mx',
- array(&$this, '_doLists_callback'), $text);
- }
- else {
- $text = preg_replace_callback('{
- (?:(?<=\n)\n|\A\n?) # Must eat the newline
- '.$whole_list_re.'
- }mx',
- array(&$this, '_doLists_callback'), $text);
- }
- }
-
- return $text;
- }
- protected function _doLists_callback($matches) {
- # Re-usable patterns to match list item bullets and number markers:
- $marker_ul_re = '[*+-]';
- $marker_ol_re = '\d+[\.]';
- $marker_any_re = "(?:$marker_ul_re|$marker_ol_re)";
-
- $list = $matches[1];
- $list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
-
- $marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
-
- $list .= "\n";
- $result = $this->processListItems($list, $marker_any_re);
-
- $result = $this->hashBlock("<$list_type>\n" . $result . "");
- return "\n". $result ."\n\n";
- }
-
- protected $list_level = 0;
-
- protected function processListItems($list_str, $marker_any_re) {
- #
- # Process the contents of a single ordered or unordered list, splitting it
- # into individual list items.
- #
- # The $this->list_level global keeps track of when we're inside a list.
- # Each time we enter a list, we increment it; when we leave a list,
- # we decrement. If it's zero, we're not in a list anymore.
- #
- # We do this because when we're not inside a list, we want to treat
- # something like this:
- #
- # I recommend upgrading to version
- # 8. Oops, now this line is treated
- # as a sub-list.
- #
- # As a single paragraph, despite the fact that the second line starts
- # with a digit-period-space sequence.
- #
- # Whereas when we're inside a list (or sub-list), that line will be
- # treated as the start of a sub-list. What a kludge, huh? This is
- # an aspect of Markdown's syntax that's hard to parse perfectly
- # without resorting to mind-reading. Perhaps the solution is to
- # change the syntax rules such that sub-lists must start with a
- # starting cardinal number; e.g. "1." or "a.".
-
- $this->list_level++;
-
- # trim trailing blank lines:
- $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
- $list_str = preg_replace_callback('{
- (\n)? # leading line = $1
- (^[ ]*) # leading whitespace = $2
- ('.$marker_any_re.' # list marker and space = $3
- (?:[ ]+|(?=\n)) # space only required if item is not empty
- )
- ((?s:.*?)) # list item text = $4
- (?:(\n+(?=\n))|\n) # tailing blank line = $5
- (?= \n* (\z | \2 ('.$marker_any_re.') (?:[ ]+|(?=\n))))
- }xm',
- array(&$this, '_processListItems_callback'), $list_str);
-
- $this->list_level--;
- return $list_str;
- }
- protected function _processListItems_callback($matches) {
- $item = $matches[4];
- $leading_line =& $matches[1];
- $leading_space =& $matches[2];
- $marker_space = $matches[3];
- $tailing_blank_line =& $matches[5];
-
- if ($leading_line || $tailing_blank_line ||
- preg_match('/\n{2,}/', $item))
- {
- # Replace marker with the appropriate whitespace indentation
- $item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
- $item = $this->runBlockGamut($this->outdent($item)."\n");
- }
- else {
- # Recursion for sub-lists:
- $item = $this->doLists($this->outdent($item));
- $item = preg_replace('/\n+$/', '', $item);
- $item = $this->runSpanGamut($item);
- }
-
- return "" . $item . " \n";
- }
-
-
- protected function doCodeBlocks($text) {
- #
- # Process Markdown `
+
+
+
+
diff --git a/traq-ui/css/buttons.css b/traq-ui/css/buttons.css
new file mode 100644
index 000000000..eb7947a39
--- /dev/null
+++ b/traq-ui/css/buttons.css
@@ -0,0 +1,101 @@
+.btn-group {
+ & > button {
+ @apply rounded-none;
+
+ &:first-child {
+ @apply rounded-l;
+ }
+
+ &:last-child {
+ @apply rounded-r;
+ }
+ }
+}
+
+.input-group {
+ display: flex;
+ align-items: flex-start;
+
+ & > * {
+ @apply !rounded-none;
+
+ &:first-child {
+ @apply !rounded-l;
+ }
+
+ &:last-child {
+ @apply !rounded-r;
+ }
+ }
+}
+
+button,
+input[type="submit"],
+input[type="button"],
+input[type="reset"] {
+ line-height: 1.25;
+ @apply text-sm;
+ @apply py-2 px-3;
+ @apply border border-solid rounded;
+ @apply bg-gray-200 hover:bg-gray-300 active:bg-gray-400;
+ @apply border-gray-200 hover:border-gray-300 active:border-gray-400;
+ @apply focus:ring-4 ring-gray-400/30;
+ @apply transition-all;
+ @apply cursor-pointer;
+ @apply appearance-none;
+
+ &:disabled {
+ @apply cursor-not-allowed;
+
+ &,
+ &:hover,
+ &:active {
+ @apply bg-gray-100 border-gray-100;
+ }
+ }
+
+ &.btn-primary {
+ @apply text-white;
+ @apply bg-brand-500 hover:bg-brand-600 active:bg-brand-700;
+ @apply border-brand-500 hover:border-brand-600 active:border-brand-700;
+ @apply ring-brand-500/30;
+
+ &:disabled {
+ &,
+ &:hover,
+ &:active {
+ @apply bg-brand-300 border-brand-300;
+ }
+ }
+ }
+
+ &.btn-success {
+ @apply text-white;
+ @apply bg-emerald-500 hover:bg-emerald-600 active:bg-emerald-700;
+ @apply border-emerald-500 hover:border-emerald-600 active:border-emerald-700;
+ @apply ring-emerald-500/30;
+
+ &:disabled {
+ &,
+ &:hover,
+ &:active {
+ @apply bg-emerald-300 border-emerald-300;
+ }
+ }
+ }
+
+ &.btn-danger {
+ @apply text-white;
+ @apply bg-red-500 hover:bg-red-600 active:bg-red-700;
+ @apply border-red-500 hover:border-red-600 active:border-red-700;
+ @apply ring-red-500/30;
+
+ &:disabled {
+ &,
+ &:hover,
+ &:active {
+ @apply bg-red-300 border-red-300;
+ }
+ }
+ }
+}
diff --git a/traq-ui/css/content.css b/traq-ui/css/content.css
new file mode 100644
index 000000000..943e1f061
--- /dev/null
+++ b/traq-ui/css/content.css
@@ -0,0 +1,27 @@
+body {
+ /* background: #e9e9e9; */
+ @apply bg-gray-50;
+ @apply text-white;
+}
+
+#page_title {
+ line-height: 1;
+ @apply my-2;
+}
+
+#page {
+ @apply bg-white;
+ @apply text-black;
+ @apply shadow-sm;
+ @apply pb-2;
+}
+
+.content {
+ padding: 10px;
+}
+
+#footer {
+ @apply mt-5;
+ @apply text-gray-400;
+ @apply text-center;
+}
diff --git a/traq-ui/css/forms.css b/traq-ui/css/forms.css
new file mode 100644
index 000000000..0ad98375e
--- /dev/null
+++ b/traq-ui/css/forms.css
@@ -0,0 +1,47 @@
+select,
+input[type="text"],
+input[type="password"] {
+ @apply border border-gray-400 focus:border-brand-600 rounded;
+ @apply focus:ring-4 focus:ring-brand-500/20;
+ @apply text-sm text-gray-800;
+ @apply py-2 px-3;
+ @apply transition-all;
+ @apply text-sm;
+}
+
+select,
+input[type="text"],
+input[type="password"],
+input[type="button"],
+input[type="reset"],
+button {
+ line-height: 1.25;
+ @apply box-border;
+ @apply appearance-none;
+ /* @apply min-h-[32px]; */
+}
+
+select:not([multiple]) {
+ padding-right: 30px;
+ background-repeat: no-repeat;
+ background-position: right 0.75rem center;
+ background-size: 10px;
+ background-image: url('data:image/svg+xml,');
+}
+
+input[type="checkbox"] {
+ appearance: none;
+ background-repeat: no-repeat;
+ background-position: center 3px;
+ background-size: 10px;
+
+ @apply p-2;
+ @apply bg-gray-50 active:bg-gray-200;
+ @apply border border-solid border-gray-400 focus:border-brand-600 rounded;
+ @apply focus:ring-4 focus:ring-brand-500/20;
+ @apply transition-all;
+
+ &:checked {
+ background-image: url('data:image/svg+xml,');
+ }
+}
diff --git a/traq-ui/css/header.css b/traq-ui/css/header.css
new file mode 100644
index 000000000..ee84d425e
--- /dev/null
+++ b/traq-ui/css/header.css
@@ -0,0 +1,46 @@
+#header,
+#nav {
+ /* background: #3478aa; */
+ @apply bg-brand-500;
+ @apply text-white;
+}
+
+#meta_nav {
+ /* background: #265f98; */
+ @apply bg-brand-600;
+
+ @apply text-xs;
+ @apply h-5;
+ padding: 2px 5px;
+
+ @apply flex;
+ @apply items-center;
+
+ & ul {
+ margin: 0;
+ padding: 0;
+
+ & li {
+ display: inline;
+ margin-right: 5px;
+
+ &:last-child {
+ margin-right: 0;
+ }
+ }
+ }
+
+ & a {
+ color: #fff;
+ text-decoration: none;
+ }
+
+ & li.active,
+ & a:hover {
+ text-decoration: underline;
+ }
+}
+
+#user_nav {
+ float: right;
+}
diff --git a/traq-ui/css/main.css b/traq-ui/css/main.css
new file mode 100644
index 000000000..e9d4bf014
--- /dev/null
+++ b/traq-ui/css/main.css
@@ -0,0 +1,5 @@
+@import "easymde/dist/easymde.min.css";
+
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
diff --git a/traq-ui/main.ts b/traq-ui/main.ts
new file mode 100644
index 000000000..0e55116d2
--- /dev/null
+++ b/traq-ui/main.ts
@@ -0,0 +1,4 @@
+import "./css/main.css"
+import "./css/header.css"
+import "./css/content.css"
+import "./css/buttons.css"
diff --git a/traq-ui/stores/auth.ts b/traq-ui/stores/auth.ts
new file mode 100644
index 000000000..cf636b535
--- /dev/null
+++ b/traq-ui/stores/auth.ts
@@ -0,0 +1,40 @@
+import { defineStore } from "pinia"
+
+export interface User {
+ id: number
+ username: string
+ name: string
+ groupId: number
+ isAdmin: boolean
+ permissions: { [key: string]: boolean }
+}
+
+interface AuthStore {
+ user: User
+}
+
+export const useAuthStore = defineStore("auth", {
+ state: (): AuthStore => ({
+ user: null,
+ }),
+ getters: {
+ name(state) {
+ return state.user?.name
+ },
+ },
+ actions: {
+ setAuth(user: User): void {
+ this.user = user
+ },
+ can(action: string): boolean {
+ if (this.user?.isAdmin) {
+ return true
+ }
+
+ return this.user?.permissions ? this.user?.permissions[action] : false
+ },
+ canOneOf(permissions: string[]): boolean {
+ return permissions.map((p) => this.can(p)).includes(true)
+ },
+ },
+})
diff --git a/traq-ui/ticket-listing/MassActions.vue b/traq-ui/ticket-listing/MassActions.vue
new file mode 100644
index 000000000..e4e1a1631
--- /dev/null
+++ b/traq-ui/ticket-listing/MassActions.vue
@@ -0,0 +1,293 @@
+
+
+
+
+
+
+ {{ totalPages > 0 ? currentPage : 0 }} of {{ totalPages }}
+
+
+ Next
+
+
+ Next
+
+
+
+
+
diff --git a/traq-ui/ticket-listing/TicketColumns.vue b/traq-ui/ticket-listing/TicketColumns.vue
new file mode 100644
index 000000000..a4b9dd405
--- /dev/null
+++ b/traq-ui/ticket-listing/TicketColumns.vue
@@ -0,0 +1,170 @@
+
+
+
+
+
+
+
diff --git a/traq-ui/ticket-listing/TicketFilters.vue b/traq-ui/ticket-listing/TicketFilters.vue
new file mode 100644
index 000000000..eac2b1c98
--- /dev/null
+++ b/traq-ui/ticket-listing/TicketFilters.vue
@@ -0,0 +1,499 @@
+
+
+
+
+
+
+
diff --git a/traq-ui/ticket-listing/TicketListing.vue b/traq-ui/ticket-listing/TicketListing.vue
new file mode 100644
index 000000000..ac4c398d4
--- /dev/null
+++ b/traq-ui/ticket-listing/TicketListing.vue
@@ -0,0 +1,374 @@
+
+
+
+ + Mass Actions ({{ ticketIds.length }} tickets) +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | + + | +
+ ID
+
+ |
+
+ Summary
+
+ |
+
+ Status
+
+ |
+
+ Owner
+
+ |
+
+ Type
+
+ |
+
+ Component
+
+ |
+
+ Milestone
+
+ |
+
+ Assignee
+
+ |
+
+ Priority
+
+ |
+
+ Severity
+
+ |
+
+ Reported
+
+ |
+
+ Updated
+
+ |
+
+ Votes
+
+ |
+
+
+ {{ field.name }}
+
+ |
+
+
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| + + | +{{ ticket.ticket_id }} | ++ + {{ ticket.summary }} + + | +{{ ticket.status.name }} | ++ {{ ticket.user.name }} + | +{{ ticket.type.name }} | +{{ ticket.component?.name ?? "-" }} | +{{ ticket.milestone?.name ?? "-" }} | ++ {{ ticket.assigned_to.name }} + - + | +{{ ticket.priority.name }} | +{{ ticket.severity.name }} | +{{ formatDate(ticket.created_at) }} | +{{ formatDate(ticket.updated_at) }} | +{{ ticket.votes }} | + +{{ ticket.custom_fields[field.slug.replaceAll("-", "_")] ?? "-" }} | + +
s around - # "paragraphs" that are wrapped in non-block-level tags, such as anchors, - # phrase emphasis, and spans. The list of tags we're looking for is - # hard-coded: - # - # * List "a" is made of tags which can be both inline or block-level. - # These will be treated block-level when the start tag is alone on - # its line, otherwise they're not matched here and will be taken as - # inline later. - # * List "b" is made of tags which are always block-level; - # - $block_tags_a_re = 'ins|del'; - $block_tags_b_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|'. - 'script|noscript|form|fieldset|iframe|math|svg|'. - 'article|section|nav|aside|hgroup|header|footer|'. - 'figure'; - - # Regular expression for the content of a block tag. - $nested_tags_level = 4; - $attr = ' - (?> # optional tag attributes - \s # starts with whitespace - (?> - [^>"/]+ # text outside quotes - | - /+(?!>) # slash not followed by ">" - | - "[^"]*" # text inside double quotes (tolerate ">") - | - \'[^\']*\' # text inside single quotes (tolerate ">") - )* - )? - '; - $content = - str_repeat(' - (?> - [^<]+ # content without tag - | - <\2 # nested opening tag - '.$attr.' # attributes - (?> - /> - | - >', $nested_tags_level). # end of opening tag - '.*?'. # last level nested tag content - str_repeat(' - # closing nested tag - ) - | - <(?!/\2\s*> # other tags with a different name - ) - )*', - $nested_tags_level); - $content2 = str_replace('\2', '\3', $content); - - # First, look for nested blocks, e.g.: - #
- #
- #
- # The outermost tags must start at the left margin for this to match, and
- # the inner nested divs must be indented.
- # We need to do this before the next, more liberal match, because the next
- # match will start at the first `
- # tags for inner block must be indented.
- #
- # ` and stop at the first `
`.
- $text = preg_replace_callback('{(?>
- (?>
- (?<=\n\n) # Starting after a blank line
- | # or
- \A\n? # the beginning of the doc
- )
- ( # save in $1
-
- # Match from `\n. It was easier to make a special - # case than to make the other regex more complicated. - - [ ]{0,'.$less_than_tab.'} - <(hr) # start tag = $2 - '.$attr.' # attributes - /?> # the matching end tag - [ ]* - (?=\n{2,}|\Z) # followed by a blank line or end of document - - | # Special case for standalone HTML comments: - - [ ]{0,'.$less_than_tab.'} - (?s: - - ) - [ ]* - (?=\n{2,}|\Z) # followed by a blank line or end of document - - | # PHP and ASP-style processor instructions ( - ) - [ ]* - (?=\n{2,}|\Z) # followed by a blank line or end of document - - ) - )}Sxmi', - array(&$this, '_hashHTMLBlocks_callback'), - $text); - - return $text; - } - protected function _hashHTMLBlocks_callback($matches) { - $text = $matches[1]; - $key = $this->hashBlock($text); - return "\n\n$key\n\n"; - } - - - protected function hashPart($text, $boundary = 'X') { - # - # Called whenever a tag must be hashed when a function insert an atomic - # element in the text stream. Passing $text to through this function gives - # a unique text-token which will be reverted back when calling unhash. - # - # The $boundary argument specify what character should be used to surround - # the token. By convension, "B" is used for block elements that needs not - # to be wrapped into paragraph tags at the end, ":" is used for elements - # that are word separators and "X" is used in the general case. - # - # Swap back any tag hash found in $text so we do not have to `unhash` - # multiple times at the end. - $text = $this->unhash($text); - - # Then hash the block. - static $i = 0; - $key = "$boundary\x1A" . ++$i . $boundary; - $this->html_hashes[$key] = $text; - return $key; # String that will replace the tag. - } - - - protected function hashBlock($text) { - # - # Shortcut function for hashPart with block-level boundaries. - # - return $this->hashPart($text, 'B'); - } - - - protected $block_gamut = array( - # - # These are all the transformations that form block-level - # tags like paragraphs, headers, and list items. - # - "doHeaders" => 10, - "doHorizontalRules" => 20, - - "doLists" => 40, - "doCodeBlocks" => 50, - "doBlockQuotes" => 60, - ); - - protected function runBlockGamut($text) { - # - # Run block gamut tranformations. - # - # We need to escape raw HTML in Markdown source before doing anything - # else. This need to be done for each block, and not only at the - # begining in the Markdown function since hashed blocks can be part of - # list items and could have been indented. Indented blocks would have - # been seen as a code block in a previous pass of hashHTMLBlocks. - $text = $this->hashHTMLBlocks($text); - - return $this->runBasicBlockGamut($text); - } - - protected function runBasicBlockGamut($text) { - # - # Run block gamut tranformations, without hashing HTML blocks. This is - # useful when HTML blocks are known to be already hashed, like in the first - # whole-document pass. - # - foreach ($this->block_gamut as $method => $priority) { - $text = $this->{$method}($text); - } - - # Finally form paragraph and restore hashed blocks. - $text = $this->formParagraphs($text); - - return $text; - } - - - protected function doHorizontalRules($text) { - # Do Horizontal Rules: - return preg_replace( - '{ - ^[ ]{0,3} # Leading space - ([-*_]) # $1: First marker - (?> # Repeated marker group - [ ]{0,2} # Zero, one, or two spaces. - \1 # Marker character - ){2,} # Group repeated at least twice - [ ]* # Tailing spaces - $ # End of line. - }mx', - "\n".$this->hashBlock("
` blocks.
- #
- $text = preg_replace_callback('{
- (?:\n\n|\A\n?)
- ( # $1 = the code block -- one or more lines, starting with a space/tab
- (?>
- [ ]{'.$this->tab_width.'} # Lines must start with a tab or a tab-width of spaces
- .*\n+
- )+
- )
- ((?=^[ ]{0,'.$this->tab_width.'}\S)|\Z) # Lookahead for non-space at line-start, or end of doc
- }xm',
- array(&$this, '_doCodeBlocks_callback'), $text);
-
- return $text;
- }
- protected function _doCodeBlocks_callback($matches) {
- $codeblock = $matches[1];
-
- $codeblock = $this->outdent($codeblock);
- $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
-
- # trim leading newlines and trailing newlines
- $codeblock = preg_replace('/\A\n+|\n+\z/', '', $codeblock);
-
- $codeblock = "$codeblock\n
";
- return "\n\n".$this->hashBlock($codeblock)."\n\n";
- }
-
-
- protected function makeCodeSpan($code) {
- #
- # Create a code span markup for $code. Called from handleSpanToken.
- #
- $code = htmlspecialchars(trim($code), ENT_NOQUOTES);
- return $this->hashPart("$code");
- }
-
-
- protected $em_relist = array(
- '' => '(?:(? '(?<=\S|^)(? '(?<=\S|^)(? '(?:(? '(?<=\S|^)(? '(?<=\S|^)(? '(?:(? '(?<=\S|^)(? '(?<=\S|^)(?em_relist as $em => $em_re) {
- foreach ($this->strong_relist as $strong => $strong_re) {
- # Construct list of allowed token expressions.
- $token_relist = array();
- if (isset($this->em_strong_relist["$em$strong"])) {
- $token_relist[] = $this->em_strong_relist["$em$strong"];
- }
- $token_relist[] = $em_re;
- $token_relist[] = $strong_re;
-
- # Construct master expression from list.
- $token_re = '{('. implode('|', $token_relist) .')}';
- $this->em_strong_prepared_relist["$em$strong"] = $token_re;
- }
- }
- }
-
- protected function doItalicsAndBold($text) {
- $token_stack = array('');
- $text_stack = array('');
- $em = '';
- $strong = '';
- $tree_char_em = false;
-
- while (1) {
- #
- # Get prepared regular expression for seraching emphasis tokens
- # in current context.
- #
- $token_re = $this->em_strong_prepared_relist["$em$strong"];
-
- #
- # Each loop iteration search for the next emphasis token.
- # Each token is then passed to handleSpanToken.
- #
- $parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
- $text_stack[0] .= $parts[0];
- $token =& $parts[1];
- $text =& $parts[2];
-
- if (empty($token)) {
- # Reached end of text span: empty stack without emitting.
- # any more emphasis.
- while ($token_stack[0]) {
- $text_stack[1] .= array_shift($token_stack);
- $text_stack[0] .= array_shift($text_stack);
- }
- break;
- }
-
- $token_len = strlen($token);
- if ($tree_char_em) {
- # Reached closing marker while inside a three-char emphasis.
- if ($token_len == 3) {
- # Three-char closing marker, close em and strong.
- array_shift($token_stack);
- $span = array_shift($text_stack);
- $span = $this->runSpanGamut($span);
- $span = "$span";
- $text_stack[0] .= $this->hashPart($span);
- $em = '';
- $strong = '';
- } else {
- # Other closing marker: close one em or strong and
- # change current token state to match the other
- $token_stack[0] = str_repeat($token{0}, 3-$token_len);
- $tag = $token_len == 2 ? "strong" : "em";
- $span = $text_stack[0];
- $span = $this->runSpanGamut($span);
- $span = "<$tag>$span";
- $text_stack[0] = $this->hashPart($span);
- $$tag = ''; # $$tag stands for $em or $strong
- }
- $tree_char_em = false;
- } else if ($token_len == 3) {
- if ($em) {
- # Reached closing marker for both em and strong.
- # Closing strong marker:
- for ($i = 0; $i < 2; ++$i) {
- $shifted_token = array_shift($token_stack);
- $tag = strlen($shifted_token) == 2 ? "strong" : "em";
- $span = array_shift($text_stack);
- $span = $this->runSpanGamut($span);
- $span = "<$tag>$span";
- $text_stack[0] .= $this->hashPart($span);
- $$tag = ''; # $$tag stands for $em or $strong
- }
- } else {
- # Reached opening three-char emphasis marker. Push on token
- # stack; will be handled by the special condition above.
- $em = $token{0};
- $strong = "$em$em";
- array_unshift($token_stack, $token);
- array_unshift($text_stack, '');
- $tree_char_em = true;
- }
- } else if ($token_len == 2) {
- if ($strong) {
- # Unwind any dangling emphasis marker:
- if (strlen($token_stack[0]) == 1) {
- $text_stack[1] .= array_shift($token_stack);
- $text_stack[0] .= array_shift($text_stack);
- }
- # Closing strong marker:
- array_shift($token_stack);
- $span = array_shift($text_stack);
- $span = $this->runSpanGamut($span);
- $span = "$span";
- $text_stack[0] .= $this->hashPart($span);
- $strong = '';
- } else {
- array_unshift($token_stack, $token);
- array_unshift($text_stack, '');
- $strong = $token;
- }
- } else {
- # Here $token_len == 1
- if ($em) {
- if (strlen($token_stack[0]) == 1) {
- # Closing emphasis marker:
- array_shift($token_stack);
- $span = array_shift($text_stack);
- $span = $this->runSpanGamut($span);
- $span = "$span";
- $text_stack[0] .= $this->hashPart($span);
- $em = '';
- } else {
- $text_stack[0] .= $token;
- }
- } else {
- array_unshift($token_stack, $token);
- array_unshift($text_stack, '');
- $em = $token;
- }
- }
- }
- return $text_stack[0];
- }
-
-
- protected function doBlockQuotes($text) {
- $text = preg_replace_callback('/
- ( # Wrap whole match in $1
- (?>
- ^[ ]*>[ ]? # ">" at the start of a line
- .+\n # rest of the first line
- (.+\n)* # subsequent consecutive lines
- \n* # blanks
- )+
- )
- /xm',
- array(&$this, '_doBlockQuotes_callback'), $text);
-
- return $text;
- }
- protected function _doBlockQuotes_callback($matches) {
- $bq = $matches[1];
- # trim one level of quoting - trim whitespace-only lines
- $bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
- $bq = $this->runBlockGamut($bq); # recurse
-
- $bq = preg_replace('/^/m', " ", $bq);
- # These leading spaces cause problem with content,
- # so we need to fix that:
- $bq = preg_replace_callback('{(\s*.+?
)}sx',
- array(&$this, '_doBlockQuotes_callback2'), $bq);
-
- return "\n". $this->hashBlock("\n$bq\n
")."\n\n";
- }
- protected function _doBlockQuotes_callback2($matches) {
- $pre = $matches[1];
- $pre = preg_replace('/^ /m', '', $pre);
- return $pre;
- }
-
-
- protected function formParagraphs($text) {
- #
- # Params:
- # $text - string to process with html tags
- #
- # Strip leading and trailing lines:
- $text = preg_replace('/\A\n+|\n+\z/', '', $text);
-
- $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
- #
- # Wrap
tags and unhashify HTML blocks
- #
- foreach ($grafs as $key => $value) {
- if (!preg_match('/^B\x1A[0-9]+B$/', $value)) {
- # Is a paragraph.
- $value = $this->runSpanGamut($value);
- $value = preg_replace('/^([ ]*)/', "
", $value);
- $value .= "
";
- $grafs[$key] = $this->unhash($value);
- }
- else {
- # Is a block.
- # Modify elements of @grafs in-place...
- $graf = $value;
- $block = $this->html_hashes[$graf];
- $graf = $block;
-// if (preg_match('{
-// \A
-// ( # $1 = tag
-// ]*
-// \b
-// markdown\s*=\s* ([\'"]) # $2 = attr quote char
-// 1
-// \2
-// [^>]*
-// >
-// )
-// ( # $3 = contents
-// .*
-// )
-// () # $4 = closing tag
-// \z
-// }xs', $block, $matches))
-// {
-// list(, $div_open, , $div_content, $div_close) = $matches;
-//
-// # We can't call Markdown(), because that resets the hash;
-// # that initialization code should be pulled into its own sub, though.
-// $div_content = $this->hashHTMLBlocks($div_content);
-//
-// # Run document gamut methods on the content.
-// foreach ($this->document_gamut as $method => $priority) {
-// $div_content = $this->{$method}($div_content);
-// }
-//
-// $div_open = preg_replace(
-// '{\smarkdown\s*=\s*([\'"]).+?\1}', '', $div_open);
-//
-// $graf = $div_open . "\n" . $div_content . "\n" . $div_close;
-// }
- $grafs[$key] = $graf;
- }
- }
-
- return implode("\n\n", $grafs);
- }
-
-
- protected function encodeAttribute($text) {
- #
- # Encode text for a double-quoted HTML attribute. This function
- # is *not* suitable for attributes enclosed in single quotes.
- #
- $text = $this->encodeAmpsAndAngles($text);
- $text = str_replace('"', '"', $text);
- return $text;
- }
-
-
- protected function encodeAmpsAndAngles($text) {
- #
- # Smart processing for ampersands and angle brackets that need to
- # be encoded. Valid character entities are left alone unless the
- # no-entities mode is set.
- #
- if ($this->no_entities) {
- $text = str_replace('&', '&', $text);
- } else {
- # Ampersand-encoding based entirely on Nat Irons's Amputator
- # MT plugin:
- $text = preg_replace_callback('{
- <
- (?:mailto:)?
- (
- (?:
- [-!#$%&\'*+/=?^_`.{|}~\w\x80-\xFF]+
- |
- ".*?"
- )
- \@
- (?:
- [-a-z0-9\x80-\xFF]+(\.[-a-z0-9\x80-\xFF]+)*\.[a-z]+
- |
- \[[\d.a-fA-F:]+\] # IPv4 & IPv6
- )
- )
- >
- }xi',
- array(&$this, '_doAutoLinks_email_callback'), $text);
-
- return $text;
- }
- protected function _doAutoLinks_url_callback($matches) {
- $url = $this->encodeAttribute($matches[1]);
- $link = "$url";
- return $this->hashPart($link);
- }
- protected function _doAutoLinks_email_callback($matches) {
- $address = $matches[1];
- $link = $this->encodeEmailAddress($address);
- return $this->hashPart($link);
- }
-
-
- protected function encodeEmailAddress($addr) {
- #
- # Input: an email address, e.g. "foo@example.com"
- #
- # Output: the email address as a mailto link, with each character
- # of the address encoded as either a decimal or hex entity, in
- # the hopes of foiling most address harvesting spam bots. E.g.:
- #
- #
- #
- # Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
- # With some optimizations by Milian Wolff.
- #
- $addr = "mailto:" . $addr;
- $chars = preg_split('/(? $char) {
- $ord = ord($char);
- # Ignore non-ascii chars.
- if ($ord < 128) {
- $r = ($seed * (1 + $key)) % 100; # Pseudo-random function.
- # roughly 10% raw, 45% hex, 45% dec
- # '@' *must* be encoded. I insist.
- if ($r > 90 && $char != '@') /* do nothing */;
- else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
- else $chars[$key] = '&#'.$ord.';';
- }
- }
-
- $addr = implode('', $chars);
- $text = implode('', array_slice($chars, 7)); # text without `mailto:`
- $addr = "$text";
-
- return $addr;
- }
-
-
- protected function parseSpan($str) {
- #
- # Take the string $str and parse it into tokens, hashing embeded HTML,
- # escaped characters and handling code spans.
- #
- $output = '';
-
- $span_re = '{
- (
- \\\\'.$this->escape_chars_re.'
- |
- (?no_markup ? '' : '
- |
- # comment
- |
- <\?.*?\?> | <%.*?%> # processing instruction
- |
- <[!$]?[-a-zA-Z0-9:_]+ # regular tags
- (?>
- \s
- (?>[^"\'>]+|"[^"]*"|\'[^\']*\')*
- )?
- >
- |
- <[-a-zA-Z0-9:_]+\s*/> # xml-style empty tag
- |
- # closing tag
- ').'
- )
- }xs';
-
- while (1) {
- #
- # Each loop iteration seach for either the next tag, the next
- # openning code span marker, or the next escaped character.
- # Each token is then passed to handleSpanToken.
- #
- $parts = preg_split($span_re, $str, 2, PREG_SPLIT_DELIM_CAPTURE);
-
- # Create token from text preceding tag.
- if ($parts[0] != "") {
- $output .= $parts[0];
- }
-
- # Check if we reach the end.
- if (isset($parts[1])) {
- $output .= $this->handleSpanToken($parts[1], $parts[2]);
- $str = $parts[2];
- }
- else {
- break;
- }
- }
-
- return $output;
- }
-
-
- protected function handleSpanToken($token, &$str) {
- #
- # Handle $token provided by parseSpan by determining its nature and
- # returning the corresponding value that should replace it.
- #
- switch ($token{0}) {
- case "\\":
- return $this->hashPart("&#". ord($token{1}). ";");
- case "`":
- # Search for end marker in remaining text.
- if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm',
- $str, $matches))
- {
- $str = $matches[2];
- $codespan = $this->makeCodeSpan($matches[1]);
- return $this->hashPart($codespan);
- }
- return $token; // return as text since no ending marker found.
- default:
- return $this->hashPart($token);
- }
- }
-
-
- protected function outdent($text) {
- #
- # Remove one level of line-leading tabs or spaces
- #
- return preg_replace('/^(\t|[ ]{1,'.$this->tab_width.'})/m', '', $text);
- }
-
-
- # String length function for detab. `_initDetab` will create a function to
- # hanlde UTF-8 if the default function does not exist.
- protected $utf8_strlen = 'mb_strlen';
-
- protected function detab($text) {
- #
- # Replace tabs with the appropriate amount of space.
- #
- # For each line we separate the line in blocks delemited by
- # tab characters. Then we reconstruct every line by adding the
- # appropriate number of space between each blocks.
-
- $text = preg_replace_callback('/^.*\t.*$/m',
- array(&$this, '_detab_callback'), $text);
-
- return $text;
- }
- protected function _detab_callback($matches) {
- $line = $matches[0];
- $strlen = $this->utf8_strlen; # strlen function for UTF-8.
-
- # Split in blocks.
- $blocks = explode("\t", $line);
- # Add each blocks to the line.
- $line = $blocks[0];
- unset($blocks[0]); # Do not add first block twice.
- foreach ($blocks as $block) {
- # Calculate amount of space, insert spaces, insert block.
- $amount = $this->tab_width -
- $strlen($line, 'UTF-8') % $this->tab_width;
- $line .= str_repeat(" ", $amount) . $block;
- }
- return $line;
- }
- protected function _initDetab() {
- #
- # Check for the availability of the function in the `utf8_strlen` property
- # (initially `mb_strlen`). If the function is not available, create a
- # function that will loosely count the number of UTF-8 characters with a
- # regular expression.
- #
- if (function_exists($this->utf8_strlen)) return;
- $this->utf8_strlen = create_function('$text', 'return preg_match_all(
- "/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/",
- $text, $m);');
- }
-
-
- protected function unhash($text) {
- #
- # Swap back in all the tags hashed by _HashHTMLBlocks.
- #
- return preg_replace_callback('/(.)\x1A[0-9]+\1/',
- array(&$this, '_unhash_callback'), $text);
- }
- protected function _unhash_callback($matches) {
- return $this->html_hashes[$matches[0]];
- }
-
-}
-
-
-#
-# Temporary Markdown Extra Parser Implementation Class
-#
-# NOTE: DON'T USE THIS CLASS
-# Currently the implementation of of Extra resides here in this temporary class.
-# This makes it easier to propagate the changes between the three different
-# packaging styles of PHP Markdown. When this issue is resolved, this
-# MarkdownExtra_TmpImpl class here will disappear and \Michelf\MarkdownExtra
-# will contain the code. So please use \Michelf\MarkdownExtra and ignore this
-# one.
-#
-
-class _MarkdownExtra_TmpImpl extends \Michelf\Markdown {
-
- ### Configuration Variables ###
-
- # Prefix for footnote ids.
- public $fn_id_prefix = "";
-
- # Optional title attribute for footnote links and backlinks.
- public $fn_link_title = "";
- public $fn_backlink_title = "";
-
- # Optional class attribute for footnote links and backlinks.
- public $fn_link_class = "footnote-ref";
- public $fn_backlink_class = "footnote-backref";
-
- # Class name for table cell alignment (%% replaced left/center/right)
- # For instance: 'go-%%' becomes 'go-left' or 'go-right' or 'go-center'
- # If empty, the align attribute is used instead of a class name.
- public $table_align_class_tmpl = '';
-
- # Optional class prefix for fenced code block.
- public $code_class_prefix = "";
- # Class attribute for code blocks goes on the `code` tag;
- # setting this to true will put attributes on the `pre` tag instead.
- public $code_attr_on_pre = false;
-
- # Predefined abbreviations.
- public $predef_abbr = array();
-
-
- ### Parser Implementation ###
-
- public function __construct() {
- #
- # Constructor function. Initialize the parser object.
- #
- # Add extra escapable characters before parent constructor
- # initialize the table.
- $this->escape_chars .= ':|';
-
- # Insert extra document, block, and span transformations.
- # Parent constructor will do the sorting.
- $this->document_gamut += array(
- "doFencedCodeBlocks" => 5,
- "stripFootnotes" => 15,
- "stripAbbreviations" => 25,
- "appendFootnotes" => 50,
- );
- $this->block_gamut += array(
- "doFencedCodeBlocks" => 5,
- "doTables" => 15,
- "doDefLists" => 45,
- );
- $this->span_gamut += array(
- "doFootnotes" => 5,
- "doAbbreviations" => 70,
- );
-
- parent::__construct();
- }
-
-
- # Extra variables used during extra transformations.
- protected $footnotes = array();
- protected $footnotes_ordered = array();
- protected $footnotes_ref_count = array();
- protected $footnotes_numbers = array();
- protected $abbr_desciptions = array();
- protected $abbr_word_re = '';
-
- # Give the current footnote number.
- protected $footnote_counter = 1;
-
-
- protected function setup() {
- #
- # Setting up Extra-specific variables.
- #
- parent::setup();
-
- $this->footnotes = array();
- $this->footnotes_ordered = array();
- $this->footnotes_ref_count = array();
- $this->footnotes_numbers = array();
- $this->abbr_desciptions = array();
- $this->abbr_word_re = '';
- $this->footnote_counter = 1;
-
- foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
- if ($this->abbr_word_re)
- $this->abbr_word_re .= '|';
- $this->abbr_word_re .= preg_quote($abbr_word);
- $this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
- }
- }
-
- protected function teardown() {
- #
- # Clearing Extra-specific variables.
- #
- $this->footnotes = array();
- $this->footnotes_ordered = array();
- $this->footnotes_ref_count = array();
- $this->footnotes_numbers = array();
- $this->abbr_desciptions = array();
- $this->abbr_word_re = '';
-
- parent::teardown();
- }
-
-
- ### Extra Attribute Parser ###
-
- # Expression to use to catch attributes (includes the braces)
- protected $id_class_attr_catch_re = '\{((?:[ ]*[#.][-_:a-zA-Z0-9]+){1,})[ ]*\}';
- # Expression to use when parsing in a context when no capture is desired
- protected $id_class_attr_nocatch_re = '\{(?:[ ]*[#.][-_:a-zA-Z0-9]+){1,}[ ]*\}';
-
- protected function doExtraAttributes($tag_name, $attr) {
- #
- # Parse attributes caught by the $this->id_class_attr_catch_re expression
- # and return the HTML-formatted list of attributes.
- #
- # Currently supported attributes are .class and #id.
- #
- if (empty($attr)) return "";
-
- # Split on components
- preg_match_all('/[#.][-_:a-zA-Z0-9]+/', $attr, $matches);
- $elements = $matches[0];
-
- # handle classes and ids (only first id taken into account)
- $classes = array();
- $id = false;
- foreach ($elements as $element) {
- if ($element{0} == '.') {
- $classes[] = substr($element, 1);
- } else if ($element{0} == '#') {
- if ($id === false) $id = substr($element, 1);
- }
- }
-
- # compose attributes as string
- $attr_str = "";
- if (!empty($id)) {
- $attr_str .= ' id="'.$id.'"';
- }
- if (!empty($classes)) {
- $attr_str .= ' class="'.implode(" ", $classes).'"';
- }
- return $attr_str;
- }
-
-
- protected function stripLinkDefinitions($text) {
- #
- # Strips link definitions from text, stores the URLs and titles in
- # hash references.
- #
- $less_than_tab = $this->tab_width - 1;
-
- # Link defs are in the form: ^[id]: url "optional title"
- $text = preg_replace_callback('{
- ^[ ]{0,'.$less_than_tab.'}\[(.+)\][ ]?: # id = $1
- [ ]*
- \n? # maybe *one* newline
- [ ]*
- (?:
- <(.+?)> # url = $2
- |
- (\S+?) # url = $3
- )
- [ ]*
- \n? # maybe one newline
- [ ]*
- (?:
- (?<=\s) # lookbehind for whitespace
- ["(]
- (.*?) # title = $4
- [")]
- [ ]*
- )? # title is optional
- (?:[ ]* '.$this->id_class_attr_catch_re.' )? # $5 = extra id & class attr
- (?:\n+|\Z)
- }xm',
- array(&$this, '_stripLinkDefinitions_callback'),
- $text);
- return $text;
- }
- protected function _stripLinkDefinitions_callback($matches) {
- $link_id = strtolower($matches[1]);
- $url = $matches[2] == '' ? $matches[3] : $matches[2];
- $this->urls[$link_id] = $url;
- $this->titles[$link_id] =& $matches[4];
- $this->ref_attr[$link_id] = $this->doExtraAttributes("", $dummy =& $matches[5]);
- return ''; # String that will replace the block
- }
-
-
- ### HTML Block Parser ###
-
- # Tags that are always treated as block tags:
- protected $block_tags_re = 'p|div|h[1-6]|blockquote|pre|table|dl|ol|ul|address|form|fieldset|iframe|hr|legend|article|section|nav|aside|hgroup|header|footer|figcaption';
-
- # Tags treated as block tags only if the opening tag is alone on its line:
- protected $context_block_tags_re = 'script|noscript|ins|del|iframe|object|source|track|param|math|svg|canvas|audio|video';
-
- # Tags where markdown="1" default to span mode:
- protected $contain_span_tags_re = 'p|h[1-6]|li|dd|dt|td|th|legend|address';
-
- # Tags which must not have their contents modified, no matter where
- # they appear:
- protected $clean_tags_re = 'script|math|svg';
-
- # Tags that do not need to be closed.
- protected $auto_close_tags_re = 'hr|img|param|source|track';
-
-
- protected function hashHTMLBlocks($text) {
- #
- # Hashify HTML Blocks and "clean tags".
- #
- # We only want to do this for block-level HTML tags, such as headers,
- # lists, and tables. That's because we still want to wrap s around
- # "paragraphs" that are wrapped in non-block-level tags, such as anchors,
- # phrase emphasis, and spans. The list of tags we're looking for is
- # hard-coded.
- #
- # This works by calling _HashHTMLBlocks_InMarkdown, which then calls
- # _HashHTMLBlocks_InHTML when it encounter block tags. When the markdown="1"
- # attribute is found within a tag, _HashHTMLBlocks_InHTML calls back
- # _HashHTMLBlocks_InMarkdown to handle the Markdown syntax within the tag.
- # These two functions are calling each other. It's recursive!
- #
- if ($this->no_markup) return $text;
-
- #
- # Call the HTML-in-Markdown hasher.
- #
- list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
-
- return $text;
- }
- protected function _hashHTMLBlocks_inMarkdown($text, $indent = 0,
- $enclosing_tag_re = '', $span = false)
- {
- #
- # Parse markdown text, calling _HashHTMLBlocks_InHTML for block tags.
- #
- # * $indent is the number of space to be ignored when checking for code
- # blocks. This is important because if we don't take the indent into
- # account, something like this (which looks right) won't work as expected:
- #
- #
- #
- # Hello World. <-- Is this a Markdown code block or text?
- # <-- Is this a Markdown code block or a real tag?
- #
- #
- # If you don't like this, just don't indent the tag on which
- # you apply the markdown="1" attribute.
- #
- # * If $enclosing_tag_re is not empty, stops at the first unmatched closing
- # tag with that name. Nested tags supported.
- #
- # * If $span is true, text inside must treated as span. So any double
- # newline will be replaced by a single newline so that it does not create
- # paragraphs.
- #
- # Returns an array of that form: ( processed text , remaining text )
- #
- if ($text === '') return array('', '');
-
- # Regex to check for the presense of newlines around a block tag.
- $newline_before_re = '/(?:^\n?|\n\n)*$/';
- $newline_after_re =
- '{
- ^ # Start of text following the tag.
- (?>[ ]*)? # Optional comment.
- [ ]*\n # Must be followed by newline.
- }xs';
-
- # Regex to match any tag.
- $block_tag_re =
- '{
- ( # $2: Capture whole tag.
- # Tag name.
- '.$this->block_tags_re.' |
- '.$this->context_block_tags_re.' |
- '.$this->clean_tags_re.' |
- (?!\s)'.$enclosing_tag_re.'
- )
- (?:
- (?=[\s"\'/a-zA-Z0-9]) # Allowed characters after tag name.
- (?>
- ".*?" | # Double quotes (can contain `>`)
- \'.*?\' | # Single quotes (can contain `>`)
- .+? # Anything but quotes and `>`.
- )*?
- )?
- > # End of tag.
- |
- # HTML Comment
- |
- <\?.*?\?> | <%.*?%> # Processing instruction
- |
- # CData Block
- |
- # Code span marker
- `+
- '. ( !$span ? ' # If not in span.
- |
- # Indented code block
- (?: ^[ ]*\n | ^ | \n[ ]*\n )
- [ ]{'.($indent+4).'}[^\n]* \n
- (?>
- (?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n
- )*
- |
- # Fenced code block marker
- (?<= ^ | \n )
- [ ]{0,'.($indent+3).'}~{3,}
- [ ]*
- (?:
- \.?[-_:a-zA-Z0-9]+ # standalone class name
- |
- '.$this->id_class_attr_nocatch_re.' # extra attributes
- )?
- [ ]*
- \n
- ' : '' ). ' # End (if not is span).
- )
- }xs';
-
-
- $depth = 0; # Current depth inside the tag tree.
- $parsed = ""; # Parsed text that will be returned.
-
- #
- # Loop through every tag until we find the closing tag of the parent
- # or loop until reaching the end of text if no parent tag specified.
- #
- do {
- #
- # Split the text using the first $tag_match pattern found.
- # Text before pattern will be first in the array, text after
- # pattern will be at the end, and between will be any catches made
- # by the pattern.
- #
- $parts = preg_split($block_tag_re, $text, 2,
- PREG_SPLIT_DELIM_CAPTURE);
-
- # If in Markdown span mode, add a empty-string span-level hash
- # after each newline to prevent triggering any block element.
- if ($span) {
- $void = $this->hashPart("", ':');
- $newline = "$void\n";
- $parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
- }
-
- $parsed .= $parts[0]; # Text before current tag.
-
- # If end of $text has been reached. Stop loop.
- if (count($parts) < 3) {
- $text = "";
- break;
- }
-
- $tag = $parts[1]; # Tag to handle.
- $text = $parts[2]; # Remaining text after current tag.
- $tag_re = preg_quote($tag); # For use in a regular expression.
-
- #
- # Check for: Code span marker
- #
- if ($tag{0} == "`") {
- # Find corresponding end marker.
- $tag_re = preg_quote($tag);
- if (preg_match('{^(?>.+?|\n(?!\n))*?(?.*\n)*?[ ]{'.($fence_indent).'}'.$fence_re.'[ ]*(?:\n|$)}', $text,
- $matches))
- {
- # End marker found: pass text unchanged until marker.
- $parsed .= $tag . $matches[0];
- $text = substr($text, strlen($matches[0]));
- }
- else {
- # No end marker: just skip it.
- $parsed .= $tag;
- }
- }
- #
- # Check for: Indented code block.
- #
- else if ($tag{0} == "\n" || $tag{0} == " ") {
- # Indented code block: pass it unchanged, will be handled
- # later.
- $parsed .= $tag;
- }
- #
- # Check for: Opening Block level tag or
- # Opening Context Block tag (like ins and del)
- # used as a block tag (tag is alone on it's line).
- #
- else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) ||
- ( preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
- preg_match($newline_before_re, $parsed) &&
- preg_match($newline_after_re, $text) )
- )
- {
- # Need to parse tag and following text using the HTML parser.
- list($block_text, $text) =
- $this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
-
- # Make sure it stays outside of any paragraph by adding newlines.
- $parsed .= "\n\n$block_text\n\n";
- }
- #
- # Check for: Clean tag (like script, math)
- # HTML Comments, processing instructions.
- #
- else if (preg_match('{^<(?:'.$this->clean_tags_re.')\b}', $tag) ||
- $tag{1} == '!' || $tag{1} == '?')
- {
- # Need to parse tag and following text using the HTML parser.
- # (don't check for markdown attribute)
- list($block_text, $text) =
- $this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
-
- $parsed .= $block_text;
- }
- #
- # Check for: Tag with same name as enclosing tag.
- #
- else if ($enclosing_tag_re !== '' &&
- # Same name as enclosing tag.
- preg_match('{^= 0);
-
- return array($parsed, $text);
- }
- protected function _hashHTMLBlocks_inHTML($text, $hash_method, $md_attr) {
- #
- # Parse HTML, calling _HashHTMLBlocks_InMarkdown for block tags.
- #
- # * Calls $hash_method to convert any blocks.
- # * Stops when the first opening tag closes.
- # * $md_attr indicate if the use of the `markdown="1"` attribute is allowed.
- # (it is not inside clean tags)
- #
- # Returns an array of that form: ( processed text , remaining text )
- #
- if ($text === '') return array('', '');
-
- # Regex to match `markdown` attribute inside of a tag.
- $markdown_attr_re = '
- {
- \s* # Eat whitespace before the `markdown` attribute
- markdown
- \s*=\s*
- (?>
- (["\']) # $1: quote delimiter
- (.*?) # $2: attribute value
- \1 # matching delimiter
- |
- ([^\s>]*) # $3: unquoted attribute value
- )
- () # $4: make $3 always defined (avoid warnings)
- }xs';
-
- # Regex to match any tag.
- $tag_re = '{
- ( # $2: Capture whole tag.
-
- ".*?" | # Double quotes (can contain `>`)
- \'.*?\' | # Single quotes (can contain `>`)
- .+? # Anything but quotes and `>`.
- )*?
- )?
- > # End of tag.
- |
- # HTML Comment
- |
- <\?.*?\?> | <%.*?%> # Processing instruction
- |
- # CData Block
- )
- }xs';
-
- $original_text = $text; # Save original text in case of faliure.
-
- $depth = 0; # Current depth inside the tag tree.
- $block_text = ""; # Temporary text holder for current text.
- $parsed = ""; # Parsed text that will be returned.
-
- #
- # Get the name of the starting tag.
- # (This pattern makes $base_tag_name_re safe without quoting.)
- #
- if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
- $base_tag_name_re = $matches[1];
-
- #
- # Loop through every tag until we find the corresponding closing tag.
- #
- do {
- #
- # Split the text using the first $tag_match pattern found.
- # Text before pattern will be first in the array, text after
- # pattern will be at the end, and between will be any catches made
- # by the pattern.
- #
- $parts = preg_split($tag_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
-
- if (count($parts) < 3) {
- #
- # End of $text reached with unbalenced tag(s).
- # In that case, we return original text unchanged and pass the
- # first character as filtered to prevent an infinite loop in the
- # parent function.
- #
- return array($original_text{0}, substr($original_text, 1));
- }
-
- $block_text .= $parts[0]; # Text before current tag.
- $tag = $parts[1]; # Tag to handle.
- $text = $parts[2]; # Remaining text after current tag.
-
- #
- # Check for: Auto-close tag (like
)
- # Comments and Processing Instructions.
- #
- if (preg_match('{^auto_close_tags_re.')\b}', $tag) ||
- $tag{1} == '!' || $tag{1} == '?')
- {
- # Just add the tag to the block as if it was text.
- $block_text .= $tag;
- }
- else {
- #
- # Increase/decrease nested tag count. Only do so if
- # the tag's name match base tag's.
- #
- if (preg_match('{^mode = $attr_m[2] . $attr_m[3];
- $span_mode = $this->mode == 'span' || $this->mode != 'block' &&
- preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
-
- # Calculate indent before tag.
- if (preg_match('/(?:^|\n)( *?)(?! ).*?$/', $block_text, $matches)) {
- $strlen = $this->utf8_strlen;
- $indent = $strlen($matches[1], 'UTF-8');
- } else {
- $indent = 0;
- }
-
- # End preceding block with this tag.
- $block_text .= $tag;
- $parsed .= $this->{$hash_method}($block_text);
-
- # Get enclosing tag name for the ParseMarkdown function.
- # (This pattern makes $tag_name_re safe without quoting.)
- preg_match('/^<([\w:$]*)\b/', $tag, $matches);
- $tag_name_re = $matches[1];
-
- # Parse the content using the HTML-in-Markdown parser.
- list ($block_text, $text)
- = $this->_hashHTMLBlocks_inMarkdown($text, $indent,
- $tag_name_re, $span_mode);
-
- # Outdent markdown text.
- if ($indent > 0) {
- $block_text = preg_replace("/^[ ]{1,$indent}/m", "",
- $block_text);
- }
-
- # Append tag content to parsed text.
- if (!$span_mode) $parsed .= "\n\n$block_text\n\n";
- else $parsed .= "$block_text";
-
- # Start over with a new block.
- $block_text = "";
- }
- else $block_text .= $tag;
- }
-
- } while ($depth > 0);
-
- #
- # Hash last block text that wasn't processed inside the loop.
- #
- $parsed .= $this->{$hash_method}($block_text);
-
- return array($parsed, $text);
- }
-
-
- protected function hashClean($text) {
- #
- # Called whenever a tag must be hashed when a function inserts a "clean" tag
- # in $text, it passes through this function and is automaticaly escaped,
- # blocking invalid nested overlap.
- #
- return $this->hashPart($text, 'C');
- }
-
-
- protected function doAnchors($text) {
- #
- # Turn Markdown link shortcuts into XHTML tags.
- #
- if ($this->in_anchor) return $text;
- $this->in_anchor = true;
-
- #
- # First, handle reference-style links: [link text] [id]
- #
- $text = preg_replace_callback('{
- ( # wrap whole match in $1
- \[
- ('.$this->nested_brackets_re.') # link text = $2
- \]
-
- [ ]? # one optional space
- (?:\n[ ]*)? # one optional newline followed by spaces
-
- \[
- (.*?) # id = $3
- \]
- )
- }xs',
- array(&$this, '_doAnchors_reference_callback'), $text);
-
- #
- # Next, inline-style links: [link text](url "optional title")
- #
- $text = preg_replace_callback('{
- ( # wrap whole match in $1
- \[
- ('.$this->nested_brackets_re.') # link text = $2
- \]
- \( # literal paren
- [ \n]*
- (?:
- <(.+?)> # href = $3
- |
- ('.$this->nested_url_parenthesis_re.') # href = $4
- )
- [ \n]*
- ( # $5
- ([\'"]) # quote char = $6
- (.*?) # Title = $7
- \6 # matching quote
- [ \n]* # ignore any spaces/tabs between closing quote and )
- )? # title is optional
- \)
- (?:[ ]? '.$this->id_class_attr_catch_re.' )? # $8 = id/class attributes
- )
- }xs',
- array(&$this, '_doAnchors_inline_callback'), $text);
-
- #
- # Last, handle reference-style shortcuts: [link text]
- # These must come last in case you've also got [link text][1]
- # or [link text](/foo)
- #
- $text = preg_replace_callback('{
- ( # wrap whole match in $1
- \[
- ([^\[\]]+) # link text = $2; can\'t contain [ or ]
- \]
- )
- }xs',
- array(&$this, '_doAnchors_reference_callback'), $text);
-
- $this->in_anchor = false;
- return $text;
- }
- protected function _doAnchors_reference_callback($matches) {
- $whole_match = $matches[1];
- $link_text = $matches[2];
- $link_id =& $matches[3];
-
- if ($link_id == "") {
- # for shortcut links like [this][] or [this].
- $link_id = $link_text;
- }
-
- # lower-case and turn embedded newlines into spaces
- $link_id = strtolower($link_id);
- $link_id = preg_replace('{[ ]?\n}', ' ', $link_id);
-
- if (isset($this->urls[$link_id])) {
- $url = $this->urls[$link_id];
- $url = $this->encodeAttribute($url);
-
- $result = "titles[$link_id] ) ) {
- $title = $this->titles[$link_id];
- $title = $this->encodeAttribute($title);
- $result .= " title=\"$title\"";
- }
- if (isset($this->ref_attr[$link_id]))
- $result .= $this->ref_attr[$link_id];
-
- $link_text = $this->runSpanGamut($link_text);
- $result .= ">$link_text";
- $result = $this->hashPart($result);
- }
- else {
- $result = $whole_match;
- }
- return $result;
- }
- protected function _doAnchors_inline_callback($matches) {
- $whole_match = $matches[1];
- $link_text = $this->runSpanGamut($matches[2]);
- $url = $matches[3] == '' ? $matches[4] : $matches[3];
- $title =& $matches[7];
- $attr = $this->doExtraAttributes("a", $dummy =& $matches[8]);
-
-
- $url = $this->encodeAttribute($url);
-
- $result = "encodeAttribute($title);
- $result .= " title=\"$title\"";
- }
- $result .= $attr;
-
- $link_text = $this->runSpanGamut($link_text);
- $result .= ">$link_text";
-
- return $this->hashPart($result);
- }
-
-
- protected function doImages($text) {
- #
- # Turn Markdown image shortcuts into ![]()
tags.
- #
- #
- # First, handle reference-style labeled images: ![alt text][id]
- #
- $text = preg_replace_callback('{
- ( # wrap whole match in $1
- !\[
- ('.$this->nested_brackets_re.') # alt text = $2
- \]
-
- [ ]? # one optional space
- (?:\n[ ]*)? # one optional newline followed by spaces
-
- \[
- (.*?) # id = $3
- \]
-
- )
- }xs',
- array(&$this, '_doImages_reference_callback'), $text);
-
- #
- # Next, handle inline images: 
- # Don't forget: encode * and _
- #
- $text = preg_replace_callback('{
- ( # wrap whole match in $1
- !\[
- ('.$this->nested_brackets_re.') # alt text = $2
- \]
- \s? # One optional whitespace character
- \( # literal paren
- [ \n]*
- (?:
- <(\S*)> # src url = $3
- |
- ('.$this->nested_url_parenthesis_re.') # src url = $4
- )
- [ \n]*
- ( # $5
- ([\'"]) # quote char = $6
- (.*?) # title = $7
- \6 # matching quote
- [ \n]*
- )? # title is optional
- \)
- (?:[ ]? '.$this->id_class_attr_catch_re.' )? # $8 = id/class attributes
- )
- }xs',
- array(&$this, '_doImages_inline_callback'), $text);
-
- return $text;
- }
- protected function _doImages_reference_callback($matches) {
- $whole_match = $matches[1];
- $alt_text = $matches[2];
- $link_id = strtolower($matches[3]);
-
- if ($link_id == "") {
- $link_id = strtolower($alt_text); # for shortcut links like ![this][].
- }
-
- $alt_text = $this->encodeAttribute($alt_text);
- if (isset($this->urls[$link_id])) {
- $url = $this->encodeAttribute($this->urls[$link_id]);
- $result = "titles[$link_id])) {
- $title = $this->titles[$link_id];
- $title = $this->encodeAttribute($title);
- $result .= " title=\"$title\"";
- }
- if (isset($this->ref_attr[$link_id]))
- $result .= $this->ref_attr[$link_id];
- $result .= $this->empty_element_suffix;
- $result = $this->hashPart($result);
- }
- else {
- # If there's no such link ID, leave intact:
- $result = $whole_match;
- }
-
- return $result;
- }
- protected function _doImages_inline_callback($matches) {
- $whole_match = $matches[1];
- $alt_text = $matches[2];
- $url = $matches[3] == '' ? $matches[4] : $matches[3];
- $title =& $matches[7];
- $attr = $this->doExtraAttributes("img", $dummy =& $matches[8]);
-
- $alt_text = $this->encodeAttribute($alt_text);
- $url = $this->encodeAttribute($url);
- $result = "encodeAttribute($title);
- $result .= " title=\"$title\""; # $title already quoted
- }
- $result .= $attr;
- $result .= $this->empty_element_suffix;
-
- return $this->hashPart($result);
- }
-
-
- protected function doHeaders($text) {
- #
- # Redefined to add id and class attribute support.
- #
- # Setext-style headers:
- # Header 1 {#header1}
- # ========
- #
- # Header 2 {#header2 .class1 .class2}
- # --------
- #
- $text = preg_replace_callback(
- '{
- (^.+?) # $1: Header text
- (?:[ ]+ '.$this->id_class_attr_catch_re.' )? # $3 = id/class attributes
- [ ]*\n(=+|-+)[ ]*\n+ # $3: Header footer
- }mx',
- array(&$this, '_doHeaders_callback_setext'), $text);
-
- # atx-style headers:
- # # Header 1 {#header1}
- # ## Header 2 {#header2}
- # ## Header 2 with closing hashes ## {#header3.class1.class2}
- # ...
- # ###### Header 6 {.class2}
- #
- $text = preg_replace_callback('{
- ^(\#{1,6}) # $1 = string of #\'s
- [ ]*
- (.+?) # $2 = Header text
- [ ]*
- \#* # optional closing #\'s (not counted)
- (?:[ ]+ '.$this->id_class_attr_catch_re.' )? # $3 = id/class attributes
- [ ]*
- \n+
- }xm',
- array(&$this, '_doHeaders_callback_atx'), $text);
-
- return $text;
- }
- protected function _doHeaders_callback_setext($matches) {
- if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
- return $matches[0];
- $level = $matches[3]{0} == '=' ? 1 : 2;
- $attr = $this->doExtraAttributes("h$level", $dummy =& $matches[2]);
- $block = "".$this->runSpanGamut($matches[1])."";
- return "\n" . $this->hashBlock($block) . "\n\n";
- }
- protected function _doHeaders_callback_atx($matches) {
- $level = strlen($matches[1]);
- $attr = $this->doExtraAttributes("h$level", $dummy =& $matches[3]);
- $block = "".$this->runSpanGamut($matches[2])."";
- return "\n" . $this->hashBlock($block) . "\n\n";
- }
-
-
- protected function doTables($text) {
- #
- # Form HTML tables.
- #
- $less_than_tab = $this->tab_width - 1;
- #
- # Find tables with leading pipe.
- #
- # | Header 1 | Header 2
- # | -------- | --------
- # | Cell 1 | Cell 2
- # | Cell 3 | Cell 4
- #
- $text = preg_replace_callback('
- {
- ^ # Start of a line
- [ ]{0,'.$less_than_tab.'} # Allowed whitespace.
- [|] # Optional leading pipe (present)
- (.+) \n # $1: Header row (at least one pipe)
-
- [ ]{0,'.$less_than_tab.'} # Allowed whitespace.
- [|] ([ ]*[-:]+[-| :]*) \n # $2: Header underline
-
- ( # $3: Cells
- (?>
- [ ]* # Allowed whitespace.
- [|] .* \n # Row content.
- )*
- )
- (?=\n|\Z) # Stop at final double newline.
- }xm',
- array(&$this, '_doTable_leadingPipe_callback'), $text);
-
- #
- # Find tables without leading pipe.
- #
- # Header 1 | Header 2
- # -------- | --------
- # Cell 1 | Cell 2
- # Cell 3 | Cell 4
- #
- $text = preg_replace_callback('
- {
- ^ # Start of a line
- [ ]{0,'.$less_than_tab.'} # Allowed whitespace.
- (\S.*[|].*) \n # $1: Header row (at least one pipe)
-
- [ ]{0,'.$less_than_tab.'} # Allowed whitespace.
- ([-:]+[ ]*[|][-| :]*) \n # $2: Header underline
-
- ( # $3: Cells
- (?>
- .* [|] .* \n # Row content
- )*
- )
- (?=\n|\Z) # Stop at final double newline.
- }xm',
- array(&$this, '_DoTable_callback'), $text);
-
- return $text;
- }
- protected function _doTable_leadingPipe_callback($matches) {
- $head = $matches[1];
- $underline = $matches[2];
- $content = $matches[3];
-
- # Remove leading pipe for each row.
- $content = preg_replace('/^ *[|]/m', '', $content);
-
- return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
- }
- protected function _doTable_makeAlignAttr($alignname)
- {
- if (empty($this->table_align_class_tmpl))
- return " align=\"$alignname\"";
-
- $classname = str_replace('%%', $alignname, $this->table_align_class_tmpl);
- return " class=\"$classname\"";
- }
- protected function _doTable_callback($matches) {
- $head = $matches[1];
- $underline = $matches[2];
- $content = $matches[3];
-
- # Remove any tailing pipes for each line.
- $head = preg_replace('/[|] *$/m', '', $head);
- $underline = preg_replace('/[|] *$/m', '', $underline);
- $content = preg_replace('/[|] *$/m', '', $content);
-
- # Reading alignement from header underline.
- $separators = preg_split('/ *[|] */', $underline);
- foreach ($separators as $n => $s) {
- if (preg_match('/^ *-+: *$/', $s))
- $attr[$n] = $this->_doTable_makeAlignAttr('right');
- else if (preg_match('/^ *:-+: *$/', $s))
- $attr[$n] = $this->_doTable_makeAlignAttr('center');
- else if (preg_match('/^ *:-+ *$/', $s))
- $attr[$n] = $this->_doTable_makeAlignAttr('left');
- else
- $attr[$n] = '';
- }
-
- # Parsing span elements, including code spans, character escapes,
- # and inline HTML tags, so that pipes inside those gets ignored.
- $head = $this->parseSpan($head);
- $headers = preg_split('/ *[|] */', $head);
- $col_count = count($headers);
- $attr = array_pad($attr, $col_count, '');
-
- # Write column headers.
- $text = "\n";
- $text .= "\n";
- $text .= "\n";
- foreach ($headers as $n => $header)
- $text .= " ".$this->runSpanGamut(trim($header))."\n";
- $text .= " \n";
- $text .= "\n";
-
- # Split content by row.
- $rows = explode("\n", trim($content, "\n"));
-
- $text .= "\n";
- foreach ($rows as $row) {
- # Parsing span elements, including code spans, character escapes,
- # and inline HTML tags, so that pipes inside those gets ignored.
- $row = $this->parseSpan($row);
-
- # Split row by cell.
- $row_cells = preg_split('/ *[|] */', $row, $col_count);
- $row_cells = array_pad($row_cells, $col_count, '');
-
- $text .= "\n";
- foreach ($row_cells as $n => $cell)
- $text .= " ".$this->runSpanGamut(trim($cell))."\n";
- $text .= " \n";
- }
- $text .= "\n";
- $text .= "
";
-
- return $this->hashBlock($text) . "\n";
- }
-
-
- protected function doDefLists($text) {
- #
- # Form HTML definition lists.
- #
- $less_than_tab = $this->tab_width - 1;
-
- # Re-usable pattern to match any entire dl list:
- $whole_list_re = '(?>
- ( # $1 = whole list
- ( # $2
- [ ]{0,'.$less_than_tab.'}
- ((?>.*\S.*\n)+) # $3 = defined term
- \n?
- [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
- )
- (?s:.+?)
- ( # $4
- \z
- |
- \n{2,}
- (?=\S)
- (?! # Negative lookahead for another term
- [ ]{0,'.$less_than_tab.'}
- (?: \S.*\n )+? # defined term
- \n?
- [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
- )
- (?! # Negative lookahead for another definition
- [ ]{0,'.$less_than_tab.'}:[ ]+ # colon starting definition
- )
- )
- )
- )'; // mx
-
- $text = preg_replace_callback('{
- (?>\A\n?|(?<=\n\n))
- '.$whole_list_re.'
- }mx',
- array(&$this, '_doDefLists_callback'), $text);
-
- return $text;
- }
- protected function _doDefLists_callback($matches) {
- # Re-usable patterns to match list item bullets and number markers:
- $list = $matches[1];
-
- # Turn double returns into triple returns, so that we can make a
- # paragraph for the last item in a list, if necessary:
- $result = trim($this->processDefListItems($list));
- $result = "\n" . $result . "\n
";
- return $this->hashBlock($result) . "\n\n";
- }
-
-
- protected function processDefListItems($list_str) {
- #
- # Process the contents of a single definition list, splitting it
- # into individual term and definition list items.
- #
- $less_than_tab = $this->tab_width - 1;
-
- # trim trailing blank lines:
- $list_str = preg_replace("/\n{2,}\\z/", "\n", $list_str);
-
- # Process definition terms.
- $list_str = preg_replace_callback('{
- (?>\A\n?|\n\n+) # leading line
- ( # definition terms = $1
- [ ]{0,'.$less_than_tab.'} # leading whitespace
- (?!\:[ ]|[ ]) # negative lookahead for a definition
- # mark (colon) or more whitespace.
- (?> \S.* \n)+? # actual term (not whitespace).
- )
- (?=\n?[ ]{0,3}:[ ]) # lookahead for following line feed
- # with a definition mark.
- }xm',
- array(&$this, '_processDefListItems_callback_dt'), $list_str);
-
- # Process actual definitions.
- $list_str = preg_replace_callback('{
- \n(\n+)? # leading line = $1
- ( # marker space = $2
- [ ]{0,'.$less_than_tab.'} # whitespace before colon
- \:[ ]+ # definition mark (colon)
- )
- ((?s:.+?)) # definition text = $3
- (?= \n+ # stop at next definition mark,
- (?: # next term or end of text
- [ ]{0,'.$less_than_tab.'} \:[ ] |
- | \z
- )
- )
- }xm',
- array(&$this, '_processDefListItems_callback_dd'), $list_str);
-
- return $list_str;
- }
- protected function _processDefListItems_callback_dt($matches) {
- $terms = explode("\n", trim($matches[1]));
- $text = '';
- foreach ($terms as $term) {
- $term = $this->runSpanGamut(trim($term));
- $text .= "\n" . $term . " ";
- }
- return $text . "\n";
- }
- protected function _processDefListItems_callback_dd($matches) {
- $leading_line = $matches[1];
- $marker_space = $matches[2];
- $def = $matches[3];
-
- if ($leading_line || preg_match('/\n{2,}/', $def)) {
- # Replace marker with the appropriate whitespace indentation
- $def = str_repeat(' ', strlen($marker_space)) . $def;
- $def = $this->runBlockGamut($this->outdent($def . "\n\n"));
- $def = "\n". $def ."\n";
- }
- else {
- $def = rtrim($def);
- $def = $this->runSpanGamut($this->outdent($def));
- }
-
- return "\n " . $def . " \n";
- }
-
-
- protected function doFencedCodeBlocks($text) {
- #
- # Adding the fenced code block syntax to regular Markdown:
- #
- # ~~~
- # Code block
- # ~~~
- #
- $less_than_tab = $this->tab_width;
-
- $text = preg_replace_callback('{
- (?:\n|\A)
- # 1: Opening marker
- (
- ~{3,} # Marker: three tilde or more.
- )
- [ ]*
- (?:
- \.?([-_:a-zA-Z0-9]+) # 2: standalone class name
- |
- '.$this->id_class_attr_catch_re.' # 3: Extra attributes
- )?
- [ ]* \n # Whitespace and newline following marker.
-
- # 4: Content
- (
- (?>
- (?!\1 [ ]* \n) # Not a closing marker.
- .*\n+
- )+
- )
-
- # Closing marker.
- \1 [ ]* \n
- }xm',
- array(&$this, '_doFencedCodeBlocks_callback'), $text);
-
- return $text;
- }
- protected function _doFencedCodeBlocks_callback($matches) {
- $classname =& $matches[2];
- $attrs =& $matches[3];
- $codeblock = $matches[4];
- $codeblock = htmlspecialchars($codeblock, ENT_NOQUOTES);
- $codeblock = preg_replace_callback('/^\n+/',
- array(&$this, '_doFencedCodeBlocks_newlines'), $codeblock);
-
- if ($classname != "") {
- if ($classname{0} == '.')
- $classname = substr($classname, 1);
- $attr_str = ' class="'.$this->code_class_prefix.$classname.'"';
- } else {
- $attr_str = $this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs);
- }
- $pre_attr_str = $this->code_attr_on_pre ? $attr_str : '';
- $code_attr_str = $this->code_attr_on_pre ? '' : $attr_str;
- $codeblock = "$codeblock";
-
- return "\n\n".$this->hashBlock($codeblock)."\n\n";
- }
- protected function _doFencedCodeBlocks_newlines($matches) {
- return str_repeat("empty_element_suffix",
- strlen($matches[0]));
- }
-
-
- #
- # Redefining emphasis markers so that emphasis by underscore does not
- # work in the middle of a word.
- #
- protected $em_relist = array(
- '' => '(?:(? '(?<=\S|^)(? '(?<=\S|^)(? '(?:(? '(?<=\S|^)(? '(?<=\S|^)(? '(?:(? '(?<=\S|^)(? '(?<=\S|^)(? tags
- #
- # Strip leading and trailing lines:
- $text = preg_replace('/\A\n+|\n+\z/', '', $text);
-
- $grafs = preg_split('/\n{2,}/', $text, -1, PREG_SPLIT_NO_EMPTY);
-
- #
- # Wrap tags and unhashify HTML blocks
- #
- foreach ($grafs as $key => $value) {
- $value = trim($this->runSpanGamut($value));
-
- # Check if this should be enclosed in a paragraph.
- # Clean tag hashes & block tag hashes are left alone.
- $is_p = !preg_match('/^B\x1A[0-9]+B|^C\x1A[0-9]+C$/', $value);
-
- if ($is_p) {
- $value = "
$value
";
- }
- $grafs[$key] = $value;
- }
-
- # Join grafs in one text, then unhash HTML tags.
- $text = implode("\n\n", $grafs);
-
- # Finish by removing any tag hashes still present in $text.
- $text = $this->unhash($text);
-
- return $text;
- }
-
-
- ### Footnotes
-
- protected function stripFootnotes($text) {
- #
- # Strips link definitions from text, stores the URLs and titles in
- # hash references.
- #
- $less_than_tab = $this->tab_width - 1;
-
- # Link defs are in the form: [^id]: url "optional title"
- $text = preg_replace_callback('{
- ^[ ]{0,'.$less_than_tab.'}\[\^(.+?)\][ ]?: # note_id = $1
- [ ]*
- \n? # maybe *one* newline
- ( # text = $2 (no blank lines allowed)
- (?:
- .+ # actual text
- |
- \n # newlines but
- (?!\[\^.+?\]:\s)# negative lookahead for footnote marker.
- (?!\n+[ ]{0,3}\S)# ensure line is not blank and followed
- # by non-indented content
- )*
- )
- }xm',
- array(&$this, '_stripFootnotes_callback'),
- $text);
- return $text;
- }
- protected function _stripFootnotes_callback($matches) {
- $note_id = $this->fn_id_prefix . $matches[1];
- $this->footnotes[$note_id] = $this->outdent($matches[2]);
- return ''; # String that will replace the block
- }
-
-
- protected function doFootnotes($text) {
- #
- # Replace footnote references in $text [^id] with a special text-token
- # which will be replaced by the actual footnote marker in appendFootnotes.
- #
- if (!$this->in_anchor) {
- $text = preg_replace('{\[\^(.+?)\]}', "F\x1Afn:\\1\x1A:", $text);
- }
- return $text;
- }
-
-
- protected function appendFootnotes($text) {
- #
- # Append footnote list to text.
- #
- $text = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
- array(&$this, '_appendFootnotes_callback'), $text);
-
- if (!empty($this->footnotes_ordered)) {
- $text .= "\n\n";
- $text .= "\n";
- $text .= "empty_element_suffix ."\n";
- $text .= "\n\n";
-
- $attr = " rev=\"footnote\"";
- if ($this->fn_backlink_class != "") {
- $class = $this->fn_backlink_class;
- $class = $this->encodeAttribute($class);
- $attr .= " class=\"$class\"";
- }
- if ($this->fn_backlink_title != "") {
- $title = $this->fn_backlink_title;
- $title = $this->encodeAttribute($title);
- $attr .= " title=\"$title\"";
- }
- $num = 0;
-
- while (!empty($this->footnotes_ordered)) {
- $footnote = reset($this->footnotes_ordered);
- $note_id = key($this->footnotes_ordered);
- unset($this->footnotes_ordered[$note_id]);
- $ref_count = $this->footnotes_ref_count[$note_id];
- unset($this->footnotes_ref_count[$note_id]);
- unset($this->footnotes[$note_id]);
-
- $footnote .= "\n"; # Need to append newline before parsing.
- $footnote = $this->runBlockGamut("$footnote\n");
- $footnote = preg_replace_callback('{F\x1Afn:(.*?)\x1A:}',
- array(&$this, '_appendFootnotes_callback'), $footnote);
-
- $attr = str_replace("%%", ++$num, $attr);
- $note_id = $this->encodeAttribute($note_id);
-
- # Prepare backlink, multiple backlinks if multiple references
- $backlink = "↩";
- for ($ref_num = 2; $ref_num <= $ref_count; ++$ref_num) {
- $backlink .= " ↩";
- }
- # Add backlink to last paragraph; create new paragraph if needed.
- if (preg_match('{$}', $footnote)) {
- $footnote = substr($footnote, 0, -4) . " $backlink";
- } else {
- $footnote .= "\n\n$backlink
";
- }
-
- $text .= "- \n";
- $text .= $footnote . "\n";
- $text .= "
\n\n";
- }
-
- $text .= "
\n";
- $text .= " ";
- }
- return $text;
- }
- protected function _appendFootnotes_callback($matches) {
- $node_id = $this->fn_id_prefix . $matches[1];
-
- # Create footnote marker only if it has a corresponding footnote *and*
- # the footnote hasn't been used by another marker.
- if (isset($this->footnotes[$node_id])) {
- $num =& $this->footnotes_numbers[$node_id];
- if (!isset($num)) {
- # Transfer footnote content to the ordered list and give it its
- # number
- $this->footnotes_ordered[$node_id] = $this->footnotes[$node_id];
- $this->footnotes_ref_count[$node_id] = 1;
- $num = $this->footnote_counter++;
- $ref_count_mark = '';
- } else {
- $ref_count_mark = $this->footnotes_ref_count[$node_id] += 1;
- }
-
- $attr = "";
- if ($this->fn_link_class != "") {
- $class = $this->fn_link_class;
- $class = $this->encodeAttribute($class);
- $attr .= " class=\"$class\"";
- }
- if ($this->fn_link_title != "") {
- $title = $this->fn_link_title;
- $title = $this->encodeAttribute($title);
- $attr .= " title=\"$title\"";
- }
-
- $attr = str_replace("%%", $num, $attr);
- $node_id = $this->encodeAttribute($node_id);
-
- return
- "".
- "$num".
- "";
- }
-
- return "[^".$matches[1]."]";
- }
-
-
- ### Abbreviations ###
-
- protected function stripAbbreviations($text) {
- #
- # Strips abbreviations from text, stores titles in hash references.
- #
- $less_than_tab = $this->tab_width - 1;
-
- # Link defs are in the form: [id]*: url "optional title"
- $text = preg_replace_callback('{
- ^[ ]{0,'.$less_than_tab.'}\*\[(.+?)\][ ]?: # abbr_id = $1
- (.*) # text = $2 (no blank lines allowed)
- }xm',
- array(&$this, '_stripAbbreviations_callback'),
- $text);
- return $text;
- }
- protected function _stripAbbreviations_callback($matches) {
- $abbr_word = $matches[1];
- $abbr_desc = $matches[2];
- if ($this->abbr_word_re)
- $this->abbr_word_re .= '|';
- $this->abbr_word_re .= preg_quote($abbr_word);
- $this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
- return ''; # String that will replace the block
- }
-
-
- protected function doAbbreviations($text) {
- #
- # Find defined abbreviations in text and wrap them in elements.
- #
- if ($this->abbr_word_re) {
- // cannot use the /x modifier because abbr_word_re may
- // contain significant spaces:
- $text = preg_replace_callback('{'.
- '(?abbr_word_re.')'.
- '(?![\w\x1A])'.
- '}',
- array(&$this, '_doAbbreviations_callback'), $text);
- }
- return $text;
- }
- protected function _doAbbreviations_callback($matches) {
- $abbr = $matches[0];
- if (isset($this->abbr_desciptions[$abbr])) {
- $desc = $this->abbr_desciptions[$abbr];
- if (empty($desc)) {
- return $this->hashPart("$abbr");
- } else {
- $desc = $this->encodeAttribute($desc);
- return $this->hashPart("$abbr");
- }
- } else {
- return $matches[0];
- }
- }
-
-}
-
diff --git a/vendor/traq/plugins/markdown/Michelf/MarkdownExtra.php b/vendor/traq/plugins/markdown/Michelf/MarkdownExtra.php
deleted file mode 100755
index 04e45292a..000000000
--- a/vendor/traq/plugins/markdown/Michelf/MarkdownExtra.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
-#
-# Original Markdown
-# Copyright (c) 2004-2006 John Gruber
-# \s+/', '', $markup);
+
+ # add footnotes
+
+ if (isset($this->DefinitionData['Footnote']))
+ {
+ $Element = $this->buildFootnoteElement();
+
+ $markup .= "\n" . $this->element($Element);
+ }
+
+ return $markup;
+ }
+
+ #
+ # Blocks
+ #
+
+ #
+ # Abbreviation
+
+ protected function blockAbbreviation($Line)
+ {
+ if (preg_match('/^\*\[(.+?)\]:[ ]*(.+?)[ ]*$/', $Line['text'], $matches))
+ {
+ $this->DefinitionData['Abbreviation'][$matches[1]] = $matches[2];
+
+ $Block = array(
+ 'hidden' => true,
+ );
+
+ return $Block;
+ }
+ }
+
+ #
+ # Footnote
+
+ protected function blockFootnote($Line)
+ {
+ if (preg_match('/^\[\^(.+?)\]:[ ]?(.*)$/', $Line['text'], $matches))
+ {
+ $Block = array(
+ 'label' => $matches[1],
+ 'text' => $matches[2],
+ 'hidden' => true,
+ );
+
+ return $Block;
+ }
+ }
+
+ protected function blockFootnoteContinue($Line, $Block)
+ {
+ if ($Line['text'][0] === '[' and preg_match('/^\[\^(.+?)\]:/', $Line['text']))
+ {
+ return;
+ }
+
+ if (isset($Block['interrupted']))
+ {
+ if ($Line['indent'] >= 4)
+ {
+ $Block['text'] .= "\n\n" . $Line['text'];
+
+ return $Block;
+ }
+ }
+ else
+ {
+ $Block['text'] .= "\n" . $Line['text'];
+
+ return $Block;
+ }
+ }
+
+ protected function blockFootnoteComplete($Block)
+ {
+ $this->DefinitionData['Footnote'][$Block['label']] = array(
+ 'text' => $Block['text'],
+ 'count' => null,
+ 'number' => null,
+ );
+
+ return $Block;
+ }
+
+ #
+ # Definition List
+
+ protected function blockDefinitionList($Line, $Block)
+ {
+ if ( ! isset($Block) or $Block['type'] !== 'Paragraph')
+ {
+ return;
+ }
+
+ $Element = array(
+ 'name' => 'dl',
+ 'elements' => array(),
+ );
+
+ $terms = explode("\n", $Block['element']['handler']['argument']);
+
+ foreach ($terms as $term)
+ {
+ $Element['elements'] []= array(
+ 'name' => 'dt',
+ 'handler' => array(
+ 'function' => 'lineElements',
+ 'argument' => $term,
+ 'destination' => 'elements'
+ ),
+ );
+ }
+
+ $Block['element'] = $Element;
+
+ $Block = $this->addDdElement($Line, $Block);
+
+ return $Block;
+ }
+
+ protected function blockDefinitionListContinue($Line, array $Block)
+ {
+ if ($Line['text'][0] === ':')
+ {
+ $Block = $this->addDdElement($Line, $Block);
+
+ return $Block;
+ }
+ else
+ {
+ if (isset($Block['interrupted']) and $Line['indent'] === 0)
+ {
+ return;
+ }
+
+ if (isset($Block['interrupted']))
+ {
+ $Block['dd']['handler']['function'] = 'textElements';
+ $Block['dd']['handler']['argument'] .= "\n\n";
+
+ $Block['dd']['handler']['destination'] = 'elements';
+
+ unset($Block['interrupted']);
+ }
+
+ $text = substr($Line['body'], min($Line['indent'], 4));
+
+ $Block['dd']['handler']['argument'] .= "\n" . $text;
+
+ return $Block;
+ }
+ }
+
+ #
+ # Header
+
+ protected function blockHeader($Line)
+ {
+ $Block = parent::blockHeader($Line);
+
+ if ($Block !== null && preg_match('/[ #]*{('.$this->regexAttribute.'+)}[ ]*$/', $Block['element']['handler']['argument'], $matches, PREG_OFFSET_CAPTURE))
+ {
+ $attributeString = $matches[1][0];
+
+ $Block['element']['attributes'] = $this->parseAttributeData($attributeString);
+
+ $Block['element']['handler']['argument'] = substr($Block['element']['handler']['argument'], 0, $matches[0][1]);
+ }
+
+ return $Block;
+ }
+
+ #
+ # Markup
+
+ protected function blockMarkup($Line)
+ {
+ if ($this->markupEscaped or $this->safeMode)
+ {
+ return;
+ }
+
+ if (preg_match('/^<(\w[\w-]*)(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*(\/)?>/', $Line['text'], $matches))
+ {
+ $element = strtolower($matches[1]);
+
+ if (in_array($element, $this->textLevelElements))
+ {
+ return;
+ }
+
+ $Block = array(
+ 'name' => $matches[1],
+ 'depth' => 0,
+ 'element' => array(
+ 'rawHtml' => $Line['text'],
+ 'autobreak' => true,
+ ),
+ );
+
+ $length = strlen($matches[0]);
+ $remainder = substr($Line['text'], $length);
+
+ if (trim($remainder) === '')
+ {
+ if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
+ {
+ $Block['closed'] = true;
+ $Block['void'] = true;
+ }
+ }
+ else
+ {
+ if (isset($matches[2]) or in_array($matches[1], $this->voidElements))
+ {
+ return;
+ }
+ if (preg_match('/<\/'.$matches[1].'>[ ]*$/i', $remainder))
+ {
+ $Block['closed'] = true;
+ }
+ }
+
+ return $Block;
+ }
+ }
+
+ protected function blockMarkupContinue($Line, array $Block)
+ {
+ if (isset($Block['closed']))
+ {
+ return;
+ }
+
+ if (preg_match('/^<'.$Block['name'].'(?:[ ]*'.$this->regexHtmlAttribute.')*[ ]*>/i', $Line['text'])) # open
+ {
+ $Block['depth'] ++;
+ }
+
+ if (preg_match('/(.*?)<\/'.$Block['name'].'>[ ]*$/i', $Line['text'], $matches)) # close
+ {
+ if ($Block['depth'] > 0)
+ {
+ $Block['depth'] --;
+ }
+ else
+ {
+ $Block['closed'] = true;
+ }
+ }
+
+ if (isset($Block['interrupted']))
+ {
+ $Block['element']['rawHtml'] .= "\n";
+ unset($Block['interrupted']);
+ }
+
+ $Block['element']['rawHtml'] .= "\n".$Line['body'];
+
+ return $Block;
+ }
+
+ protected function blockMarkupComplete($Block)
+ {
+ if ( ! isset($Block['void']))
+ {
+ $Block['element']['rawHtml'] = $this->processTag($Block['element']['rawHtml']);
+ }
+
+ return $Block;
+ }
+
+ #
+ # Setext
+
+ protected function blockSetextHeader($Line, array $Block = null)
+ {
+ $Block = parent::blockSetextHeader($Line, $Block);
+
+ if ($Block !== null && preg_match('/[ ]*{('.$this->regexAttribute.'+)}[ ]*$/', $Block['element']['handler']['argument'], $matches, PREG_OFFSET_CAPTURE))
+ {
+ $attributeString = $matches[1][0];
+
+ $Block['element']['attributes'] = $this->parseAttributeData($attributeString);
+
+ $Block['element']['handler']['argument'] = substr($Block['element']['handler']['argument'], 0, $matches[0][1]);
+ }
+
+ return $Block;
+ }
+
+ #
+ # Inline Elements
+ #
+
+ #
+ # Footnote Marker
+
+ protected function inlineFootnoteMarker($Excerpt)
+ {
+ if (preg_match('/^\[\^(.+?)\]/', $Excerpt['text'], $matches))
+ {
+ $name = $matches[1];
+
+ if ( ! isset($this->DefinitionData['Footnote'][$name]))
+ {
+ return;
+ }
+
+ $this->DefinitionData['Footnote'][$name]['count'] ++;
+
+ if ( ! isset($this->DefinitionData['Footnote'][$name]['number']))
+ {
+ $this->DefinitionData['Footnote'][$name]['number'] = ++ $this->footnoteCount; # » &
+ }
+
+ $Element = array(
+ 'name' => 'sup',
+ 'attributes' => array('id' => 'fnref'.$this->DefinitionData['Footnote'][$name]['count'].':'.$name),
+ 'element' => array(
+ 'name' => 'a',
+ 'attributes' => array('href' => '#fn:'.$name, 'class' => 'footnote-ref'),
+ 'text' => $this->DefinitionData['Footnote'][$name]['number'],
+ ),
+ );
+
+ return array(
+ 'extent' => strlen($matches[0]),
+ 'element' => $Element,
+ );
+ }
+ }
+
+ private $footnoteCount = 0;
+
+ #
+ # Link
+
+ protected function inlineLink($Excerpt)
+ {
+ $Link = parent::inlineLink($Excerpt);
+
+ $remainder = $Link !== null ? substr($Excerpt['text'], $Link['extent']) : '';
+
+ if (preg_match('/^[ ]*{('.$this->regexAttribute.'+)}/', $remainder, $matches))
+ {
+ $Link['element']['attributes'] += $this->parseAttributeData($matches[1]);
+
+ $Link['extent'] += strlen($matches[0]);
+ }
+
+ return $Link;
+ }
+
+ #
+ # ~
+ #
+
+ private $currentAbreviation;
+ private $currentMeaning;
+
+ protected function insertAbreviation(array $Element)
+ {
+ if (isset($Element['text']))
+ {
+ $Element['elements'] = self::pregReplaceElements(
+ '/\b'.preg_quote($this->currentAbreviation, '/').'\b/',
+ array(
+ array(
+ 'name' => 'abbr',
+ 'attributes' => array(
+ 'title' => $this->currentMeaning,
+ ),
+ 'text' => $this->currentAbreviation,
+ )
+ ),
+ $Element['text']
+ );
+
+ unset($Element['text']);
+ }
+
+ return $Element;
+ }
+
+ protected function inlineText($text)
+ {
+ $Inline = parent::inlineText($text);
+
+ if (isset($this->DefinitionData['Abbreviation']))
+ {
+ foreach ($this->DefinitionData['Abbreviation'] as $abbreviation => $meaning)
+ {
+ $this->currentAbreviation = $abbreviation;
+ $this->currentMeaning = $meaning;
+
+ $Inline['element'] = $this->elementApplyRecursiveDepthFirst(
+ array($this, 'insertAbreviation'),
+ $Inline['element']
+ );
+ }
+ }
+
+ return $Inline;
+ }
+
+ #
+ # Util Methods
+ #
+
+ protected function addDdElement(array $Line, array $Block)
+ {
+ $text = substr($Line['text'], 1);
+ $text = trim($text);
+
+ unset($Block['dd']);
+
+ $Block['dd'] = array(
+ 'name' => 'dd',
+ 'handler' => array(
+ 'function' => 'lineElements',
+ 'argument' => $text,
+ 'destination' => 'elements'
+ ),
+ );
+
+ if (isset($Block['interrupted']))
+ {
+ $Block['dd']['handler']['function'] = 'textElements';
+
+ unset($Block['interrupted']);
+ }
+
+ $Block['element']['elements'] []= & $Block['dd'];
+
+ return $Block;
+ }
+
+ protected function buildFootnoteElement()
+ {
+ $Element = array(
+ 'name' => 'div',
+ 'attributes' => array('class' => 'footnotes'),
+ 'elements' => array(
+ array('name' => 'hr'),
+ array(
+ 'name' => 'ol',
+ 'elements' => array(),
+ ),
+ ),
+ );
+
+ uasort($this->DefinitionData['Footnote'], 'self::sortFootnotes');
+
+ foreach ($this->DefinitionData['Footnote'] as $definitionId => $DefinitionData)
+ {
+ if ( ! isset($DefinitionData['number']))
+ {
+ continue;
+ }
+
+ $text = $DefinitionData['text'];
+
+ $textElements = parent::textElements($text);
+
+ $numbers = range(1, $DefinitionData['count']);
+
+ $backLinkElements = array();
+
+ foreach ($numbers as $number)
+ {
+ $backLinkElements[] = array('text' => ' ');
+ $backLinkElements[] = array(
+ 'name' => 'a',
+ 'attributes' => array(
+ 'href' => "#fnref$number:$definitionId",
+ 'rev' => 'footnote',
+ 'class' => 'footnote-backref',
+ ),
+ 'rawHtml' => '↩',
+ 'allowRawHtmlInSafeMode' => true,
+ 'autobreak' => false,
+ );
+ }
+
+ unset($backLinkElements[0]);
+
+ $n = count($textElements) -1;
+
+ if ($textElements[$n]['name'] === 'p')
+ {
+ $backLinkElements = array_merge(
+ array(
+ array(
+ 'rawHtml' => ' ',
+ 'allowRawHtmlInSafeMode' => true,
+ ),
+ ),
+ $backLinkElements
+ );
+
+ unset($textElements[$n]['name']);
+
+ $textElements[$n] = array(
+ 'name' => 'p',
+ 'elements' => array_merge(
+ array($textElements[$n]),
+ $backLinkElements
+ ),
+ );
+ }
+ else
+ {
+ $textElements[] = array(
+ 'name' => 'p',
+ 'elements' => $backLinkElements
+ );
+ }
+
+ $Element['elements'][1]['elements'] []= array(
+ 'name' => 'li',
+ 'attributes' => array('id' => 'fn:'.$definitionId),
+ 'elements' => array_merge(
+ $textElements
+ ),
+ );
+ }
+
+ return $Element;
+ }
+
+ # ~
+
+ protected function parseAttributeData($attributeString)
+ {
+ $Data = array();
+
+ $attributes = preg_split('/[ ]+/', $attributeString, - 1, PREG_SPLIT_NO_EMPTY);
+
+ foreach ($attributes as $attribute)
+ {
+ if ($attribute[0] === '#')
+ {
+ $Data['id'] = substr($attribute, 1);
+ }
+ else # "."
+ {
+ $classes []= substr($attribute, 1);
+ }
+ }
+
+ if (isset($classes))
+ {
+ $Data['class'] = implode(' ', $classes);
+ }
+
+ return $Data;
+ }
+
+ # ~
+
+ protected function processTag($elementMarkup) # recursive
+ {
+ # http://stackoverflow.com/q/1148928/200145
+ libxml_use_internal_errors(true);
+
+ $DOMDocument = new DOMDocument;
+
+ # http://stackoverflow.com/q/11309194/200145
+ $elementMarkup = mb_convert_encoding($elementMarkup, 'HTML-ENTITIES', 'UTF-8');
+
+ # http://stackoverflow.com/q/4879946/200145
+ $DOMDocument->loadHTML($elementMarkup);
+ $DOMDocument->removeChild($DOMDocument->doctype);
+ $DOMDocument->replaceChild($DOMDocument->firstChild->firstChild->firstChild, $DOMDocument->firstChild);
+
+ $elementText = '';
+
+ if ($DOMDocument->documentElement->getAttribute('markdown') === '1')
+ {
+ foreach ($DOMDocument->documentElement->childNodes as $Node)
+ {
+ $elementText .= $DOMDocument->saveHTML($Node);
+ }
+
+ $DOMDocument->documentElement->removeAttribute('markdown');
+
+ $elementText = "\n".$this->text($elementText)."\n";
+ }
+ else
+ {
+ foreach ($DOMDocument->documentElement->childNodes as $Node)
+ {
+ $nodeMarkup = $DOMDocument->saveHTML($Node);
+
+ if ($Node instanceof DOMElement and ! in_array($Node->nodeName, $this->textLevelElements))
+ {
+ $elementText .= $this->processTag($nodeMarkup);
+ }
+ else
+ {
+ $elementText .= $nodeMarkup;
+ }
+ }
+ }
+
+ # because we don't want for markup to get encoded
+ $DOMDocument->documentElement->nodeValue = 'placeholder\x1A';
+
+ $markup = $DOMDocument->saveHTML($DOMDocument->documentElement);
+ $markup = str_replace('placeholder\x1A', $elementText, $markup);
+
+ return $markup;
+ }
+
+ # ~
+
+ protected function sortFootnotes($A, $B) # callback
+ {
+ return $A['number'] - $B['number'];
+ }
+
+ #
+ # Fields
+ #
+
+ protected $regexAttribute = '(?:[#.][-\w]+[ ]*)';
+}
\ No newline at end of file
diff --git a/vendor/traq/plugins/markdown/markdown.php b/vendor/traq/plugins/markdown/markdown.php
index c309375ef..792ae8357 100644
--- a/vendor/traq/plugins/markdown/markdown.php
+++ b/vendor/traq/plugins/markdown/markdown.php
@@ -22,10 +22,12 @@
namespace traq\plugins;
-require __DIR__ . '/Michelf/Markdown.php';
-require __DIR__ . '/Michelf/MarkdownExtra.php';
+require __DIR__ . '/Parsedown.php';
+require __DIR__ . '/ParsedownExtra.php';
use \FishHook;
+use \Parsedown;
+use \ParsedownExtra;
/**
* Markdown Plugin.
@@ -41,7 +43,7 @@ class Markdown extends \traq\libraries\Plugin
protected static $info = array(
'name' => 'Markdown',
- 'version' => '2.0.1',
+ 'version' => '3.0.0',
'author' => 'Jack P.'
);
@@ -65,11 +67,10 @@ public static function format_text(&$text, $strip_html)
// Initialise parser
if (!isset(static::$parser)) {
- static::$parser = new \Michelf\MarkdownExtra;
- static::$parser->no_markup = true;
+ static::$parser = new ParsedownExtra();
}
// Parse the text
- $text = static::$parser->transform($text);
+ $text = static::$parser->text($text);
}
}
diff --git a/vendor/traq/views/default/_theme.php b/vendor/traq/views/default/_theme.php
index d4462ffd8..5f42f3977 100644
--- a/vendor/traq/views/default/_theme.php
+++ b/vendor/traq/views/default/_theme.php
@@ -20,6 +20,6 @@
return array(
'name' => 'Traq 3.0',
- 'version' => '1.0',
+ 'version' => '2.0',
'author' => 'Jack P.'
);
\ No newline at end of file
diff --git a/vendor/traq/views/default/api/priorities.json.php b/vendor/traq/views/default/api/priorities.json.php
deleted file mode 100644
index 498d4d4f0..000000000
--- a/vendor/traq/views/default/api/priorities.json.php
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/vendor/traq/views/default/api/statuses.json.php b/vendor/traq/views/default/api/statuses.json.php
deleted file mode 100644
index df524b87f..000000000
--- a/vendor/traq/views/default/api/statuses.json.php
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/vendor/traq/views/default/css/default.css b/vendor/traq/views/default/css/default.css
index 7beaf7f39..3cda71738 100644
--- a/vendor/traq/views/default/css/default.css
+++ b/vendor/traq/views/default/css/default.css
@@ -1,7 +1,7 @@
/*!
* Traq
- * Copyright (C) 2009-2014 Jack Polgar
- * Copyright (C) 2012-2014 Traq.io
+ * Copyright (C) 2009-2022 Jack Polgar
+ * Copyright (C) 2012-2022 Traq.io
* https://github.com/nirix
* http://traq.io
*
@@ -18,7 +18,7 @@
*
* You should have received a copy of the GNU General Public License
* along with Traq. If not, see <?php echo implode(' - ', array_reverse($traq->title)); ?>
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
feeds as $feed) { ?>
diff --git a/vendor/traq/views/default/layouts/_meta_nav.phtml b/vendor/traq/views/default/layouts/_meta_nav.phtml
index 12c6f62cd..f8b3064d6 100644
--- a/vendor/traq/views/default/layouts/_meta_nav.phtml
+++ b/vendor/traq/views/default/layouts/_meta_nav.phtml
@@ -1,24 +1,26 @@
diff --git a/vendor/traq/views/default/layouts/default.phtml b/vendor/traq/views/default/layouts/default.phtml
index 860d9a5c4..c07a20a87 100644
--- a/vendor/traq/views/default/layouts/default.phtml
+++ b/vendor/traq/views/default/layouts/default.phtml
@@ -8,56 +8,63 @@
-
+
- name, $project->slug) : HTML::link(settings('title'), null); ?>
-
-
-
-
+
+ name, $project->slug) : HTML::link(settings('title'), null); ?>
+
+
+
+
+
+
+ password_ver == 'sha1') : ?>
+
+
+
+
+
+
+
- password_ver == 'sha1') : ?>
-
-
-
-
-
+
-
-
-
diff --git a/vendor/traq/views/default/tickets/_columns.phtml b/vendor/traq/views/default/tickets/_columns.phtml
deleted file mode 100644
index 34e03f331..000000000
--- a/vendor/traq/views/default/tickets/_columns.phtml
+++ /dev/null
@@ -1,18 +0,0 @@
-
diff --git a/vendor/traq/views/default/tickets/_filters.phtml b/vendor/traq/views/default/tickets/_filters.phtml
deleted file mode 100644
index 8c6b0b0c9..000000000
--- a/vendor/traq/views/default/tickets/_filters.phtml
+++ /dev/null
@@ -1,100 +0,0 @@
-
diff --git a/vendor/traq/views/default/tickets/_sort_indicator.phtml b/vendor/traq/views/default/tickets/_sort_indicator.phtml
deleted file mode 100644
index a43c631a7..000000000
--- a/vendor/traq/views/default/tickets/_sort_indicator.phtml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/vendor/traq/views/default/tickets/index.json.php b/vendor/traq/views/default/tickets/index.json.php
index 3750f1972..ef411b35e 100644
--- a/vendor/traq/views/default/tickets/index.json.php
+++ b/vendor/traq/views/default/tickets/index.json.php
@@ -1,5 +1,5 @@
$pagination->page,
- 'total_pages' => $pagination->total_pages,
+ 'page' => (int) ($pagination->total_pages > 0 ? $pagination->page : 1),
+ 'total_pages' => (int) $pagination->total_pages,
'tickets' => $tickets,
-]); ?>
\ No newline at end of file
+]);
\ No newline at end of file
diff --git a/vendor/traq/views/default/tickets/index.phtml b/vendor/traq/views/default/tickets/index.phtml
index 96745675c..eeab9636a 100644
--- a/vendor/traq/views/default/tickets/index.phtml
+++ b/vendor/traq/views/default/tickets/index.phtml
@@ -1,42 +1,2 @@
-
-
-
-
-
-