1
0
mirror of https://github.com/chylex/Lightning-Tracker.git synced 2025-08-10 13:40:39 +02:00

Fix formatting & remove unnecessary code and TODOs

This commit is contained in:
chylex 2020-08-18 15:50:00 +02:00
parent 133556ce2d
commit e2e30e5145
9 changed files with 13 additions and 16 deletions

View File

@ -34,8 +34,8 @@ CREATE TABLE IF NOT EXISTS `issues` (
FOREIGN KEY (`milestone_gid`, `tracker_id`)
# Ensures the milestone-tracker pair is always valid.
REFERENCES `milestones` (`gid`, `tracker_id`)
ON UPDATE NO ACTION
ON DELETE NO ACTION,
ON UPDATE RESTRICT
ON DELETE RESTRICT,
FOREIGN KEY (`scale`)
REFERENCES `issue_weights` (`scale`)
ON UPDATE RESTRICT

View File

@ -15,10 +15,11 @@ CREATE TABLE IF NOT EXISTS `tracker_members` (
REFERENCES `tracker_roles` (`id`)
ON UPDATE CASCADE
ON DELETE SET NULL,
FOREIGN KEY (`role_id`, `tracker_id`) # Ensures the role-tracker pair is always valid.
FOREIGN KEY (`role_id`, `tracker_id`)
# Ensures the role-tracker pair is always valid.
REFERENCES `tracker_roles` (`id`, `tracker_id`)
ON UPDATE NO ACTION
ON DELETE NO ACTION
ON UPDATE RESTRICT
ON DELETE RESTRICT
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4
COLLATE utf8mb4_general_ci

View File

@ -15,10 +15,11 @@ CREATE TABLE IF NOT EXISTS `tracker_user_settings` (
REFERENCES `milestones` (`gid`)
ON UPDATE CASCADE
ON DELETE SET NULL,
FOREIGN KEY (`active_milestone`, `tracker_id`) # Ensures the milestone-tracker pair is always valid.
FOREIGN KEY (`active_milestone`, `tracker_id`)
# Ensures the milestone-tracker pair is always valid.
REFERENCES `milestones` (`gid`, `tracker_id`)
ON UPDATE NO ACTION
ON DELETE NO ACTION
ON UPDATE RESTRICT
ON DELETE RESTRICT
) ENGINE = InnoDB
DEFAULT CHARSET = utf8mb4
COLLATE utf8mb4_general_ci

View File

@ -3,7 +3,6 @@ declare(strict_types = 1);
namespace Database\Filters\Conditions;
use Database\Filters\AbstractFilter;
use Database\Filters\Field;
use Database\Filters\IWhereCondition;
use PDOStatement;
@ -14,13 +13,13 @@ final class FieldLike implements IWhereCondition{
private string $value;
public function __construct(string $field, string $value, ?string $table_name = null){
$this->field =new Field($field, $table_name);
$this->field = new Field($field, $table_name);
$this->value = $value;
}
public function getSql(): string{
$field_name = $this->field->getFieldName();
return $this->field->getSql()." LIKE CONCAT('%', :$field_name, '%')"; // TODO use utf8mb4_0900_ai_ci if available
return $this->field->getSql()." LIKE CONCAT('%', :$field_name, '%')";
}
public function prepareStatement(PDOStatement $stmt): void{

View File

@ -3,7 +3,6 @@ declare(strict_types = 1);
namespace Database\Filters\Conditions;
use Database\Filters\AbstractFilter;
use Database\Filters\Field;
use Database\Filters\IWhereCondition;
use PDOStatement;

View File

@ -16,7 +16,6 @@ use function Database\bind;
final class TrackerFilter extends AbstractFilter{
public static function getUserVisibilityClause(?string $table_name = null): string{
// TODO have roles which ban the user instead?
return
' OR '.Field::sql('owner_id', $table_name).' = :user_id_1'.
' OR EXISTS(SELECT 1 FROM tracker_members tm WHERE tm.tracker_id = '.Field::sql('id', $table_name).' AND tm.user_id = :user_id_2)';

View File

@ -31,7 +31,7 @@ class LoginController extends AbstractHandlerController{
if (self::strEndsWith($current_path, '/register')){
$return = '';
}
elseif(self::strEndsWith($current_path, '/login')){
elseif (self::strEndsWith($current_path, '/login')){
$return = $_GET['return'] ?? '';
}
else{

View File

@ -6,7 +6,6 @@ namespace Pages\Models;
use LogicException;
use Pages\Components\Navigation\NavigationComponent;
use Pages\Components\Text;
use Pages\Controllers\Handlers\RequireLoginState;
use Pages\Controllers\Mixed\LoginController;
use Pages\IModel;
use Routing\Request;

View File

@ -52,7 +52,6 @@ $base_url_path = parse_url(BASE_URL, PHP_URL_PATH) ?? '/';
$base_url_protocol = mb_substr(BASE_URL, 0, $base_url_split + 3);
$base_url_domain_path = mb_substr(BASE_URL, $base_url_split + 3);
define('BASE_PATH', $base_url_path);
define('BASE_PATH_ENC', (new UrlString($base_url_path))->encoded());
define('BASE_URL_ENC', $base_url_protocol.(new UrlString($base_url_domain_path))->encoded());