feat(backend): refactor code based on review feedback

Fixed typo with double 'p'.
Used switch statement in 'get_scheduled_date'
and other

Author: amaninyumu1

lib/servers.php

@@ -274,7 +274,7 @@ private static function match($server, $user, $name) {
         return false;
     }
 
-    private static function appendPpasswordAndUsername(array $server) {
+    private static function appendPasswordAndUsername(array $server) {
         $server['password'] = $server['pass'];
         $server['username'] = $server['user'];
         return $server;
@@ -283,15 +283,15 @@ private static function appendPpasswordAndUsername(array $server) {
     public static function getForMailbox($id) {
         $server = self::get($id, true);
         if ($server) {
-            return self::appendPpasswordAndUsername($server);
+            return self::appendPasswordAndUsername($server);
         }
         return false;
     }
 
     public static function dumpForMailbox($id = false) {
         $list = self::dump($id, true);
         foreach ($list as $index => $server) {
-            $server = self::appendPpasswordAndUsername($server);
+            $server = self::appendPasswordAndUsername($server);
             $list[$index] = $server;
         }
         return $list;

modules/core/functions.php

@@ -639,32 +639,44 @@ function privacy_setting_callback($val, $key, $mod) {
 }
 
 if (!hm_exists('get_scheduled_date')) {
-function get_scheduled_date($format, $only_label = false) {
-    if ($format == 'later_in_day') {
-        $date_string = 'today 18:00';
-        $label = 'Later in the day';
-    } elseif ($format == 'tomorrow') {
-        $date_string = '+1 day 08:00';
-        $label = 'Tomorrow';
-    } elseif ($format == 'next_weekend') {
-        $date_string = 'next Saturday 08:00';
-        $label = 'Next weekend';
-    } elseif ($format == 'next_week') {
-        $date_string = 'next week 08:00';
-        $label = 'Next week';
-    } elseif ($format == 'next_month') {
-        $date_string = 'next month 08:00';
-        $label = 'Next month';
-    } else {
-        $date_string = $format;
-        $label = 'Certain date';
-    }
-    $time = strtotime($date_string);
-    if ($only_label) {
-        return [$label, date('D, H:i', $time)];
-    }
-    return date('D, d M Y H:i', $time);
-}}
+    function get_scheduled_date($format, $only_label = false) {
+        switch ($format) {
+            case 'later_in_day':
+                $date_string = 'today 18:00';
+                $label = 'Later in the day';
+                break;
+            case 'tomorrow':
+                $date_string = '+1 day 08:00';
+                $label = 'Tomorrow';
+                break;
+            case 'next_weekend':
+                $date_string = 'next Saturday 08:00';
+                $label = 'Next weekend';
+                break;
+            case 'next_week':
+                $date_string = 'next week 08:00';
+                $label = 'Next week';
+                break;
+            case 'next_month':
+                $date_string = 'next month 08:00';
+                $label = 'Next month';
+                break;
+            default:
+                $date_string = $format;
+                $label = 'Certain date';
+                break;
+        }
+
+        $time = strtotime($date_string);
+
+        if ($only_label) {
+            return [$label, date('D, H:i', $time)];
+        }
+
+        return date('D, d M Y H:i', $time);
+    }
+}
+
 
 /**
  * @subpackage imap/functions
@@ -721,15 +733,16 @@ function parse_nexter_header($header, $name)
     {
         $header = str_replace("$name: ", '', $header);
         $result = [];
-        foreach (explode(';', $header) as $kv)
+        foreach (explode(';', $header) as $keyValue)
         {
-            $kv = trim($kv);
-            $spacePos = strpos($kv, ' ');
+            $keyValue = trim($keyValue);
+            $spacePos = strpos($keyValue, ' ');
             if ($spacePos > 0) {
-                $result[rtrim(substr($kv, 0, $spacePos), ':')] = trim(substr($kv, $spacePos+1));
+                $result[rtrim(substr($keyValue, 0, $spacePos), ':')] = trim(substr($keyValue, $spacePos+1));
             } else {
-                $result[$kv] = true;
+                $result[$keyValue] = true;
             }
         }
         return $result;
-    }}
+    }
+}

modules/core/message_list_functions.php

@@ -336,11 +336,11 @@ function subject_callback($vals, $style, $output_mod) {
  */
 if (!hm_exists('date_callback')) {
 function date_callback($vals, $style, $output_mod) {
-    $nexter_class = isset($vals[2]) && $vals[2]? ' nexter_date': '';
+    $delayed_class = isset($vals[2]) && $vals[2]? ' delayed_date': '';
     if ($style == 'news') {
-        return sprintf('<div class="msg_date%s">%s<input type="hidden" class="msg_timestamp" value="%s" /></div>', $nexter_class, $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1]));
+        return sprintf('<div class="msg_date%s">%s<input type="hidden" class="msg_timestamp" value="%s" /></div>', $delayed_class, $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1]));
     }
-    return sprintf('<td class="msg_date%s" title="%s">%s<input type="hidden" class="msg_timestamp" value="%s" /></td>', $nexter_class, $output_mod->html_safe(date('r', $vals[1])), $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1]));
+    return sprintf('<td class="msg_date%s" title="%s">%s<input type="hidden" class="msg_timestamp" value="%s" /></td>', $delayed_class, $output_mod->html_safe(date('r', $vals[1])), $output_mod->html_safe($vals[0]), $output_mod->html_safe($vals[1]));
 }}
 
 function dates_holders_callback($vals) {

modules/core/site.css

@@ -1276,7 +1276,7 @@ div.unseen,
 .mobile .imap_sort {
   width: 100%;
 }
-.nexter_date {
+.delayed_date {
   color: var(--bs-primary) !important;
 }