We use cookies to ensure you get the best experience on our website
Home Explore Help
Register Sign In
0ct0pu5
/
forkbb
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Remove single quote character from forced disallowed in username

Visman 1 year ago
parent
392c57f73f
commit
c258e63f36
6 changed files with 29 additions and 6 deletions
Unified View Show Diff Stats
  1. 23 0
      app/Core/View.php
  2. 1 1
      app/Models/Pages/Search.php
  3. 2 2
      app/Models/Validators/Username.php
  4. 1 1
      app/templates/layouts/main.forkbb.php
  5. 1 1
      app/templates/topic.forkbb.php
  6. 1 1
      app/templates/topic_in_search.forkbb.php

+ 23 - 0
app/Core/View.php
View File 

@@ -94,6 +94,29 @@ EOD;
 
         return $this->block('content');
 
         return $this->block('content');
 
     }
 
     }
 
 
 
+    /**
 
+     * Compile echos
 
+     */
 
+    protected function compileEchos(string $value): string
 
+    {
 
+        $value = \preg_replace_callback(
 
+            '%(@)?\{\{!\s*(.+?)\s*!\}\}(\r?\n)?%s',
 
+            function($matches) {
 
+                $whitespace = empty($matches[3]) ? '' : $matches[3] . $matches[3];
 
+
 
+                return $matches[1]
 
+                    ? \substr($matches[0], 1)
 
+                    : '<?= \\htmlspecialchars((string) '
 
+                        . $this->compileEchoDefaults($matches[2])
 
+                        . ', \\ENT_HTML5 | \\ENT_QUOTES | \\ENT_SUBSTITUTE, \'UTF-8\', false) ?>'
 
+                        . $whitespace;
 
+            },
 
+            $value
 
+        );
 
+
 
+        return parent::compileEchos($value);
 
+    }
 
+
 
     /**
 
     /**
 
      * Отправляет HTTP заголовки
 
      * Отправляет HTTP заголовки
 
      */
 
      */

+ 1 - 1
app/Models/Pages/Search.php
View File 

@@ -400,7 +400,7 @@ class Search extends Page
 
 
 
         if (
 
         if (
 
             '*' !== $name
 
             '*' !== $name
 
-            && \preg_match('%[@\'"<>\\/\x00-\x1F]%', $name)
 
+            && \preg_match('%[@"<>\\/\x00-\x1F]%', $name)
 
         ) {
 
         ) {
 
             $v->addError('The :alias is not valid format');
 
             $v->addError('The :alias is not valid format');
 
         }
 
         }

+ 2 - 2
app/Models/Validators/Username.php
View File 

@@ -36,7 +36,7 @@ class Username extends RulesValidator
 
 
 
             if ($this->c->user->isAdmin) {
 
             if ($this->c->user->isAdmin) {
 
                 $max     = 190;
 
                 $max     = 190;
 
-                $pattern = '%^[^@\'"<>\\/\x00-\x1F]+$%D';
 
+                $pattern = '%^[^@"<>\\/\x00-\x1F]+$%D';
 
             } else {
 
             } else {
 
                 $max     = $this->c->USERNAME['max'];
 
                 $max     = $this->c->USERNAME['max'];
 
                 $pattern = $this->c->USERNAME['phpPattern'];
 
                 $pattern = $this->c->USERNAME['phpPattern'];
 
@@ -51,7 +51,7 @@ class Username extends RulesValidator
 
             // паттерн не совпал
 
             // паттерн не совпал
 
             } elseif (
 
             } elseif (
 
                 ! \preg_match($pattern, $username)
 
                 ! \preg_match($pattern, $username)
 
-                || \preg_match('%[@\'"<>\\/\x00-\x1F]%', $username)
 
+                || \preg_match('%[@"<>\\/\x00-\x1F]%', $username)
 
             ) {
 
             ) {
 
                 $v->addError('Login format');
 
                 $v->addError('Login format');
 
             // идущие подряд пробелы
 
             // идущие подряд пробелы

+ 1 - 1
app/templates/layouts/main.forkbb.php
View File 

@@ -3,7 +3,7 @@
 
 <head>
 
 <head>
 
   <meta charset="utf-8">
 
   <meta charset="utf-8">
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>{!! \htmlspecialchars($p->pageTitle, \ENT_HTML5 | \ENT_QUOTES | \ENT_SUBSTITUTE, 'UTF-8', false) !!}</title>
 
+  <title>{{! $p->pageTitle !}}</title>
 
 @foreach ($p->pageHeaders as $pageHeader)
 
 @foreach ($p->pageHeaders as $pageHeader)
 
     @if ('style' === $pageHeader['type'])
 
     @if ('style' === $pageHeader['type'])
 
   <style>{!! $pageHeader['values'][0] !!}</style>
 
   <style>{!! $pageHeader['values'][0] !!}</style>

+ 1 - 1
app/templates/topic.forkbb.php
View File 

@@ -63,7 +63,7 @@
 
           <span class="f-post-posted"><time datetime="{{ \gmdate('c', $post->posted) }}">{{ dt($post->posted) }}</time></span>
 
           <span class="f-post-posted"><time datetime="{{ \gmdate('c', $post->posted) }}">{{ dt($post->posted) }}</time></span>
 
         @endif
 
         @endif
 
         @if ($post->edited)
 
         @if ($post->edited)
 
-          <span class="f-post-edited" title="{{ __(['Last edit', $post->editor, dt($post->edited)]) }}"><span>{!! __('Edited') !!}</span></span>
 
+          <span class="f-post-edited" title="{{! __(['Last edit', $post->editor, dt($post->edited)]) !}}"><span>{!! __('Edited') !!}</span></span>
 
         @endif
 
         @endif
 
           <span class="f-post-number"><a href="{{ $post->link }}" rel="bookmark">#{{ $post->postNumber }}</a></span>
 
           <span class="f-post-number"><a href="{{ $post->link }}" rel="bookmark">#{{ $post->postNumber }}</a></span>
 
         </header>
 
         </header>

+ 1 - 1
app/templates/topic_in_search.forkbb.php
View File 

@@ -48,7 +48,7 @@
 
             <span class="f-post-posted"><a href="{{ $post->link }}" title="{{ __('Go to post') }}" rel="bookmark"><time datetime="{{ \gmdate('c', $post->posted) }}">{{ dt($post->posted) }}</time></a></span>
 
             <span class="f-post-posted"><a href="{{ $post->link }}" title="{{ __('Go to post') }}" rel="bookmark"><time datetime="{{ \gmdate('c', $post->posted) }}">{{ dt($post->posted) }}</time></a></span>
 
           </h3>
 
           </h3>
 
         @if ($post->edited)
 
         @if ($post->edited)
 
-          <span class="f-post-edited" title="{{ __(['Last edit', $post->editor, dt($post->edited)]) }}"><span>{!! __('Edited') !!}</span></span>
 
+          <span class="f-post-edited" title="{{! __(['Last edit', $post->editor, dt($post->edited)]) !}}"><span>{!! __('Edited') !!}</span></span>
 
         @endif
 
         @endif
 
           <span class="f-post-number">#{{ $post->postNumber }}</span>
 
           <span class="f-post-number">#{{ $post->postNumber }}</span>
 
         </header>
 
         </header>

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5