release 2.38 (#1344)

filesender · Jan 25, 2023 · 307c987 · 307c987
1 parent b2fbddb
commit 307c987
Show file tree

Hide file tree

Showing 23 changed files with 111 additions and 47 deletions.
diff --git a/classes/exceptions/Exceptions.class.php b/classes/exceptions/Exceptions.class.php
@@ -351,6 +351,10 @@ public static function unserialize($serialized)
     {
         $exception = (array)json_decode(base64_decode($serialized));
 
+        array_walk_recursive($exception, function(&$value) {
+            $value = preg_replace('`\{(tr:)*(cfg|conf|config):([^}]+)\}`', '', $value);
+        });
+
         if (!array_key_exists('message', $exception)) {
             throw new DetailedException('not_an_exception', $exception);
         }

diff --git a/language/cs_CZ/guest_created.mail.php b/language/cs_CZ/guest_created.mail.php
@@ -53,7 +53,11 @@
         </tr>
         <tr>
             <td>Platná do</td>
+{if:guest.does_not_expire}
+            <td>nikdy</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>

diff --git a/language/da_DK/guest_created.mail.php b/language/da_DK/guest_created.mail.php
@@ -53,7 +53,11 @@
         </tr>
         <tr>
             <td>Gyldig indtil</td>
+{if:guest.does_not_expire}
+            <td>aldrig</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>
@@ -70,4 +74,4 @@
 <p>
     Med venlig hilsen<br />
     {cfg:site_name}
-</p>
+</p>
diff --git a/language/de_DE/guest_created.mail.php b/language/de_DE/guest_created.mail.php
@@ -53,7 +53,11 @@
         </tr>
         <tr>
             <td>Gültig bis</td>
+{if:guest.does_not_expire}
+            <td>niemals</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>

diff --git a/language/en_AU/guest_created.mail.php b/language/en_AU/guest_created.mail.php
@@ -53,7 +53,11 @@
         </tr>
         <tr>
             <td>Valid until</td>
+{if:guest.does_not_expire}
+            <td>never</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>

diff --git a/language/es_ES/guest_created.mail.php b/language/es_ES/guest_created.mail.php
@@ -54,7 +54,11 @@
         </tr>
         <tr>
             <td>Fecha de expiración</td>
+{if:guest.does_not_expire}
+            <td>nunca</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>
@@ -71,4 +75,4 @@
 <p>
     Saludos,<br />
     {cfg:site_name}
-</p>
+</p>
diff --git a/language/et_EE/guest_created.mail.php b/language/et_EE/guest_created.mail.php
@@ -53,7 +53,11 @@
         </tr>
         <tr>
             <td>Vautšer kehtib kuni</td>
+{if:guest.does_not_expire}
+            <td>iial</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>

diff --git a/language/fa_IR/guest_created.mail.php b/language/fa_IR/guest_created.mail.php
@@ -50,7 +50,11 @@
         </tr>
         <tr>
             <td>انقضا</td>
+{if:guest.does_not_expire}
+            <td>هیچگاه</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>
@@ -68,4 +72,4 @@
     آرزوی بهترین‌ها برای شما
 <br />
     {cfg:site_name}
-</p>
+</p>
diff --git a/language/fi_FI/guest_created.mail.php b/language/fi_FI/guest_created.mail.php
@@ -52,7 +52,11 @@
         </tr>
         <tr>
             <td>Voimassa</td>
+{if:guest.does_not_expire}
+            <td>ei koskaan</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>

diff --git a/language/hr_HR/guest_created.mail.php b/language/hr_HR/guest_created.mail.php
@@ -53,7 +53,11 @@
         </tr>
         <tr>
             <td>Vrijedi do</td>
+{if:guest.does_not_expire}
+            <td>nikada</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>
@@ -70,4 +74,4 @@
 <p>
     Lijepi pozdrav,<br />
     {cfg:site_name}
-</p>
+</p>
diff --git a/language/it_IT/guest_created.mail.php b/language/it_IT/guest_created.mail.php
@@ -53,7 +53,11 @@
         </tr>
         <tr>
             <td>Valido fino al</td>
+{if:guest.does_not_expire}
+            <td>mai</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>

diff --git a/language/ja_JP/guest_created.mail.php b/language/ja_JP/guest_created.mail.php
@@ -53,7 +53,11 @@
         </tr>
         <tr>
             <td>無効化日</td>
+{if:guest.does_not_expire}
+            <td>なし</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>

diff --git a/language/nl_NL/guest_created.mail.php b/language/nl_NL/guest_created.mail.php
@@ -53,7 +53,11 @@
         </tr>
         <tr>
             <td>Geldig tot</td>
+{if:guest.does_not_expire}
+            <td>Nooit</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>
@@ -70,4 +74,4 @@
 <p>
     Hoogachtend,<br />
     {cfg:site_name}
-</p>
+</p>
diff --git a/language/pl_PL/guest_created.mail.php b/language/pl_PL/guest_created.mail.php
@@ -53,7 +53,11 @@
         </tr>
         <tr>
             <td>Ważność</td>
+{if:guest.does_not_expire}
+            <td>nigdy</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>

diff --git a/language/pt_BR/guest_created.mail.php b/language/pt_BR/guest_created.mail.php
@@ -64,7 +64,11 @@
         </tr>
         <tr>
             <td>Válido até</td>
+{if:guest.does_not_expire}
+            <td>Nunca</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>

diff --git a/language/ru_RU/guest_created.mail.php b/language/ru_RU/guest_created.mail.php
@@ -55,7 +55,11 @@
         </tr>
         <tr>
             <td>Срок истечения ваучера</td>
+{if:guest.does_not_expire}
+            <td>Никогда</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>

diff --git a/language/sl_SI/guest_created.mail.php b/language/sl_SI/guest_created.mail.php
@@ -53,7 +53,11 @@
         </tr>
         <tr>
             <td>Veljavno do</td>
+{if:guest.does_not_expire}
+            <td>nikoli</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>
@@ -70,4 +74,4 @@
 <p>
     Lep pozdrav,<br />
     {cfg:site_name}
-</p>
+</p>
diff --git a/language/sr_RS/guest_created.mail.php b/language/sr_RS/guest_created.mail.php
@@ -53,7 +53,11 @@
         </tr>
         <tr>
             <td>Važi do</td>
+{if:guest.does_not_expire}
+            <td>nikada</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>
@@ -70,4 +74,4 @@
 <p>
     Lep pozdrav,<br />
     {cfg:site_name}
-</p>
+</p>
diff --git a/language/tr_TR/guest_created.mail.php b/language/tr_TR/guest_created.mail.php
@@ -53,7 +53,11 @@
         </tr>
         <tr>
             <td>Valid until</td>
+{if:guest.does_not_expire}
+            <td>asla</td>
+{else}
             <td>{date:guest.expires}</td>
+{endif}
         </tr>
     </tbody>
 </table>

diff --git a/templates/admin_transfers_section.php b/templates/admin_transfers_section.php
@@ -24,8 +24,10 @@
             $selector .= " AND id >= $idmin AND id <= $idmax ";
         }
     }
+    $placeholders=array();
     $senderemail_full_match = Utilities::arrayKeyOrDefault( $_GET, 'senderemail_full_match', '', FILTER_VALIDATE_BOOLEAN );
-    $senderemail = Utilities::arrayKeyOrDefault( $_GET, 'senderemail', '' );
+    $senderemailUnsanitized = Utilities::arrayKeyOrDefault( $_GET, 'senderemail', '' );
+    $senderemail = Utilities::arrayKeyOrDefault( $_GET, 'senderemail', '', FILTER_SANITIZE_EMAIL );
     // if this is a full match then we can filter the email string.
     if( $senderemail_full_match ) 
         $senderemail = Utilities::arrayKeyOrDefault( $_GET, 'senderemail', '', FILTER_VALIDATE_EMAIL );
@@ -36,20 +38,21 @@
             // Note that we are using semi validated data from above
             // and that this is an admin only page, so hacking is less likely.
             if( $senderemail_full_match ) {
-                $selector .= " AND user_email = '$senderemail' ";
+                $selector .= " AND LOWER(user_email) = :senderemail ";
             } else {
-                if( substr_compare($senderemail, '%', 0, 1 )) {
+                if( substr_compare($senderemailUnsanitized, '%', 0, 1 )) {
                     $senderemail = '%'.$senderemail;
                 }
-                if( substr_compare($senderemail, '%', -1, 1 )) {
+                if( substr_compare($senderemailUnsanitized, '%', -1, 1 )) {
                     $senderemail = $senderemail.'%';
                 }
 
-                $selector .= " AND user_email LIKE '$senderemail' ";
+                $selector .= " AND LOWER(user_email) LIKE :senderemail ";
             }
+            $placeholders[":senderemail"] = mb_strtolower($senderemail);
         } else {
             if( $senderemail_full_match ) {
-                if( strlen(Utilities::arrayKeyOrDefault( $_GET, 'senderemail', '' ))) {
+                if( strlen(Utilities::arrayKeyOrDefault( $_GET, 'senderemail', '', FILTER_SANITIZE_EMAIL ))) {
                     // the email didn't validate so show no search results.
                     $selector .= ' and id < 0 ';
                 }
@@ -70,7 +73,7 @@
         'order'  => $trsort->getOrderByClause(),
         'count'  => $page_size,
         'offset' => $offset
-    ));
+    ), $placeholders);
 
     $navigation = '<div class="transfers_list_page_navigation">'."\n";
     $transfersort = Utilities::getGETparam('transfersort','');
@@ -152,10 +155,7 @@
 
 <?php
 $senderemail_full_match = Utilities::arrayKeyOrDefault( $_GET, 'senderemail_full_match', '', FILTER_VALIDATE_BOOLEAN );
-$senderemail = Utilities::arrayKeyOrDefault( $_GET, 'senderemail', '' );
-if( $senderemail_full_match ) 
-    $senderemail = Utilities::arrayKeyOrDefault( $_GET, 'senderemail', '', FILTER_VALIDATE_EMAIL );
-
+$senderemail = Utilities::arrayKeyOrDefault( $_GET, 'senderemail', '' ); // we don't want to FILTER_SANITIZE_EMAIL here
 $senderemail_full_match_extra = '';
 if( $senderemail_full_match ) {
     $senderemail_full_match_extra = ' checked ';

diff --git a/www/js/graph/aggregate-statistics-data-for-chart.php b/www/js/graph/aggregate-statistics-data-for-chart.php
@@ -135,23 +135,19 @@
 	    'text' => Lang::tr('aggregate_stats_graph_title_per_time_interval')
                           ->r('eventtype',$eventtypetr)->r('epochtype',$epochtypetr)->out()
 	),
-	'legend' => array(
-            'position' => 'none'
-	),
+        'plugins' => array(
+                'legend' => array(
+                    'position' => 'none'
+                ),
+        ),
 	'scales' => array(
-	    'yAxes' => array(
-		array(
-		    'ticks' => array( 'min' => 0 ),
-                    'scaleLabel' => array( 'display' => true,
-                                            'labelString' => $ylabel,
-                                         ),
-		),
-	    ),
-            'xAxes' => array(
-                array(
-                    'type' => 'time',
-		    'ticks' => array( 'min' => 0 ),
+            'yAxes' => array(
+                'display' => true,
+                'title' => array (
+                    'display' => true,
+                    'text' => $ylabel
                 ),
+                'ticks' => array( 'min' => 0 ),
             ),
 	)
     )

diff --git a/www/js/graph/uploadGraph.php b/www/js/graph/uploadGraph.php
@@ -76,15 +76,6 @@
                 ),
 		'ticks' => array( 'min' => 0 ),
 	    ),
-            'x' => array(
-                array(
-                    'type' => 'time',
-                    'time' => array(
-                        'tooltipFormat' => 'DD',
-                    ),
-		    'ticks' => array( 'min' => 0 ),
-                ),
-            ),
 	)
     )
 );