Merge pull request #614 from josaphatim/remove-pop

Removed POP3 support
cypht-org · Sep 11, 2023 · aebc567 · aebc567
2 parents 5fa3fd7 + 6068548
commit aebc567
Show file tree

Hide file tree

Showing 54 changed files with 68 additions and 2,751 deletions.
diff --git a/.travis/hm3.ini b/.travis/hm3.ini
@@ -30,8 +30,7 @@ session_type=PHP
 ; 3 PHP cli scripts to help manage database users in the scripts/ directory (
 ; create_account.php, delete_account.php, and update_password.php). If you want
 ; to authenticate against an IMAP server, you must setup the imap_auth_* settings
-; below. If you want to authenticate against a POP3 server, you must setup the
-; pop3_auth_* settings below. If you want to authenticate against an LDAP server,
+; below. If you want to authenticate against an LDAP server,
 ; you must setup the ldap_auth_* settings. Finally, if you want to let users
 ; pick from a list of popular mail services or try to auto-discover a mail
 ; system, set this to dynamic and make sure the dynamic_login module set is
@@ -42,7 +41,6 @@ session_type=PHP
 ;  DB       Authenticate against the database
 ;  LDAP     Authenticate against an LDAP server
 ;  IMAP     Authenticate using an IMAP server
-;  POP3     Authenticate using a POP3 server
 ;  dynamic  Let the user choose from a list, or try to auto discover the mail
 ;           services based on the E-mail domain
 ;
@@ -89,30 +87,11 @@ imap_auth_port=143
 imap_auth_tls=false
 
 
-; POP3 Authentication
-; -------------------
-; if auth_type is set to POP3, configure the POP3 server to authenticate against
-; with the following settings, otherwise these are ignored.
-;
-; This is just a label used in the UI. It can be set to anything
-pop3_auth_name=localhost
-
-; The hostname or IP address of the POP3 server to authenticate to
-pop3_auth_server=localhost
-
-; The port the POP3 server is listening on.
-pop3_auth_port=110
-
-; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to
-; true to enable TLS connections.
-pop3_auth_tls=
-
-
 ; Default SMTP Server
 ; -------------------
 ; You can set a default SMTP server for all Cypht users. Authentication will be
 ; done with the users login credentials, so this only makes sense if you are
-; using POP3 or IMAP for authentication. Leave these values blank to disable a
+; using IMAP for authentication. Leave these values blank to disable a
 ; default SMTP server, otherwise fill in the required values below
 ;
 ; This is just a label used in the UI. It can be set to anything
@@ -202,7 +181,7 @@ disable_origin_check=false
 ; special rights to. Currently this only enables the "create account" link in
 ; the account module set that provides a form to create a new account. This is
 ; only used if the auth_type is set to DB. Leave this blank if you don't want
-; to define any admin users, or are using IMAP or POP3 authentication.
+; to define any admin users, or are using IMAP authentication.
 admin_users=
 
 
@@ -427,11 +406,6 @@ modules[]=local_contacts
 ; RSS/ATOM feed support
 modules[]=feeds
 
-; POP3
-; ----
-; POP3 E-mail account support
-modules[]=pop3
-
 ; IMAP
 ; ----
 ; IMAP E-mail account support. If you want to use Oauth2 over IMAP (currently
@@ -564,7 +538,7 @@ modules[]=keyboard_shortcuts
 
 ; Recover settings
 ; ----------------
-; When using IMAP or POP3 authentication, if a user's password is changed, we
+; When using IMAP authentication, if a user's password is changed, we
 ; can't decrypt the existing user settings. This module detects that situation
 ; and provides a page where a user can enter their old and new passwords to
 ; recover their previous settings.

diff --git a/hm3.sample.ini b/hm3.sample.ini
@@ -34,8 +34,7 @@ session_type=PHP
 ; 3 PHP cli scripts to help manage database users in the scripts/ directory (
 ; create_account.php, delete_account.php, and update_password.php). If you want
 ; to authenticate against an IMAP server, you must setup the imap_auth_* settings
-; below. If you want to authenticate against a POP3 server, you must setup the
-; pop3_auth_* settings below. If you want to authenticate against an LDAP server,
+; below. If you want to authenticate against an LDAP server,
 ; you must setup the ldap_auth_* settings. Finally, if you want to let users
 ; pick from a list of popular mail services or try to auto-discover a mail
 ; system, set this to dynamic and make sure the dynamic_login module set is
@@ -46,7 +45,6 @@ session_type=PHP
 ;  DB       Authenticate against the database
 ;  LDAP     Authenticate against an LDAP server
 ;  IMAP     Authenticate using an IMAP server
-;  POP3     Authenticate using a POP3 server
 ;  dynamic  Let the user choose from a list, or try to auto discover the mail
 ;           services based on the email domain
 ;  custom   Create your own auth class. See the modules/site/lib.php file for
@@ -98,30 +96,11 @@ imap_auth_tls=
 imap_auth_sieve_conf_host=
 
 
-; POP3 Authentication
-; -------------------
-; if auth_type is set to POP3, configure the POP3 server to authenticate against
-; with the following settings, otherwise these are ignored.
-;
-; This is just a label used in the UI. It can be set to anything
-pop3_auth_name=localhost
-
-; The hostname or IP address of the POP3 server to authenticate to
-pop3_auth_server=localhost
-
-; The port the POP3 server is listening on.
-pop3_auth_port=110
-
-; Enable TLS/SSL connections. Leave blank or set to false to disable. Set to
-; true to enable TLS connections.
-pop3_auth_tls=
-
-
 ; Default SMTP Server
 ; -------------------
 ; You can set a default SMTP server for all Cypht users. Authentication will be
 ; done with the users login credentials, so this only makes sense if you are
-; using POP3 or IMAP for authentication. Leave these values blank to disable a
+; using IMAP for authentication. Leave these values blank to disable a
 ; default SMTP server, otherwise fill in the required values below
 ;
 ; This is just a label used in the UI. It can be set to anything
@@ -200,7 +179,7 @@ disable_origin_check=false
 ; special rights to. Currently this only enables the "create account" link in
 ; the account module set that provides a form to create a new account. This is
 ; only used if the auth_type is set to DB. Leave this blank if you don't want
-; to define any admin users, or are using IMAP or POP3 authentication.
+; to define any admin users, or are using IMAP authentication.
 admin_users=
 
 
@@ -315,7 +294,7 @@ css_compress=false
 ; Cypht can use Redis or Memcache to improve performance, as well as to store
 ; user sessions. Configure Redis or Memcached below and Cypht will
 ; automatically use them for caching. All data cached for a user in either
-; system is encrypted. Currently, the feeds, POP3, and IMAP modules will use
+; system is encrypted. Currently, the feeds, and IMAP modules will use
 ; the configured cache. If both Redis and Memcached are configured, Redis will
 ; be used for the cache.
 ;
@@ -420,10 +399,10 @@ allow_external_image_sources=false
 ;
 ; Single server mode
 ; ------------------
-; This setting restricts Cypht to only using a single email source (POP3 or
+; This setting restricts Cypht to only using a single email source (
 ; IMAP) and the default SMTP server defined in this file. It modifies the UI to
 ; remove the ability to add other email sources, and removes the password
-; restriction when saving data between logins. You must use either IMAP or POP3
+; restriction when saving data between logins. You must use either IMAP
 ; authentication for this setting to be enforced, and auth server will be the
 ; single email source users have access to. If you enable this after users
 ; have saved any settings, they will be lost (or if you disable it after they
@@ -580,11 +559,6 @@ modules[]=local_contacts
 ; RSS/ATOM feed support
 modules[]=feeds
 
-; POP3
-; ----
-; POP3 email account support
-modules[]=pop3
-
 ; JMAP
 ; ----
 ; JSON Meta Application Protocol for emails
@@ -742,7 +716,7 @@ modules[]=keyboard_shortcuts
 
 ; Recover settings
 ; ----------------
-; When using IMAP or POP3 authentication, if a user's password is changed, we
+; When using IMAP, if a user's password is changed, we
 ; can't decrypt the existing user settings. This module detects that situation
 ; and provides a page where a user can enter their old and new passwords to
 ; recover their previous settings.

diff --git a/language/az.php b/language/az.php
@@ -69,11 +69,6 @@
     'Test' => 'Test',
     'Forget' => 'Unutmaq',
     'IMAP username' => 'IMAP istifadəçisi',
-    'POP3 Servers' => 'POP3 serverləri',
-    'Add a POP3 Server' => 'POP3 serverini əlavə etmək',
-    'POP3 account name' => 'POP3 istifadəçinin adı',
-    'POP3 server address' => 'POP3 serverinin ünvanı',
-    'POP3 port' => 'POP3 portı',
     'Feeds' => 'Abunələr',
     'Add an RSS/ATOM Feed' => 'RSS/ATOM abunəsini əlavə etmək',
     'Feed name' => 'Abunənin adı',
@@ -104,7 +99,6 @@
     'Feed Settings' => 'Xəbər lentinin qurmaları',
     'Show feed items received since' => 'Lentdə xəbərləri göstərmək',
     'Max feed items to display' => 'Lentdə elementlərin maksimal miqdarı',
-    'POP3 Settings' => 'POP3 qurmaları',
     'Max messages to display' => 'Ekranda mesajların maksimal miqdarı',
     'Contacts' => 'Əlaqələr',
     'Profiles' => 'Profillər',
@@ -151,8 +145,6 @@
     'Forward' => 'Göndərmək',
     'raw' => 'mənbə',
     'All Email' => 'Bütün email',
-    'POP3 username' => 'POP3 istifadəçi',
-    'POP3 password' => 'POP3 şifrə',
 	'ZeroTen (Default)' => 'ZeroTen (susmaya görə)',
     'White Bread' => false,
     'Boring Blues' => false,
@@ -178,8 +170,8 @@
     'You don\'t have any %s sources' => 'Sizdə mənbə yoxdur %s' ,
     'You have %d %s source' => 'Sizdə %d %s mənbə',
     'You have %d %s sources' => 'Sizdə %d %s mənbələr',
-    'Cypht is a webmail program. You can use it to access your E-mail accounts from any service that offers IMAP, POP3, or SMTP access - which most do.' => 'Cypht - WEB vasitəsilə poçtun və xəbərlərin oxunması üçün proqramdır. Istənilən xidmətin elektron poçtuna giriş əldə etmək üçün, hansı ki, IMAP-ı, POP3-ü və ya SMTP-ı dəstəkləyir, ondan istifadə edin.',
-    'Quickly add an account from popular E-mail providers. To manually configure an account, use the IMAP/SMTP/POP3 sections below.' => 'Məşhur xidmət poçtunu tez bir zamanda əlavə edin. Əl ilə konfiqurasiya etmək üçün - parametrlərdə IMAP / SMTP / POP3 bölmələrindən istifadə edin.',
+    'Cypht is a webmail program. You can use it to access your E-mail accounts from any service that offers IMAP or SMTP access - which most do.' => 'Cypht - WEB vasitəsilə poçtun və xəbərlərin oxunması üçün proqramdır. Istənilən xidmətin elektron poçtuna giriş əldə etmək üçün, hansı ki, IMAP-ı və ya SMTP-ı dəstəkləyir, ondan istifadə edin.',
+    'Quickly add an account from popular E-mail providers. To manually configure an account, use the IMAP/SMTP sections below.' => 'Məşhur xidmət poçtunu tez bir zamanda əlavə edin. Əl ilə konfiqurasiya etmək üçün - parametrlərdə IMAP / SMTP bölmələrindən istifadə edin.',
     'Select an E-mail provider' => 'Poçt xidməti seçin',
     'AOL' => false,
     'Fastmail' => false,
@@ -229,7 +221,6 @@
     '%s repository created' => '%s anbar formalaşdırılmışdır',
     '%d commits: ' => '%d şərh:',
     '%d commit: ' => '%d şərh:',
-    'POP3' => false,
     'Site settings updated' => 'Poçtun qurmaları yenilənmişdir',
     'Configuration Map' => 'Qurmaların xəritəsi',
     'Default' => 'Susmaya görə',
@@ -428,8 +419,6 @@
     'Message deleted' => 'Mesaj silinmişdir',
     'NASA API connection' => 'NASA API',
     'NASA API connection disabled' => 'NASA API kəsilmişdir',
-    'POP3 server added' => 'POP3 server əlavə edilmişdir',
-    'POP3 server saved' => 'POP3 server saxlanmışdır',
     'Profile Updated' => 'Profil yenilənmişdir',
     'Removed repository' => 'Uzaqlaşdırılmış anbar',
     'Saved a search' => 'Saxlanmış axtarış',

diff --git a/language/de.php b/language/de.php
@@ -68,11 +68,6 @@
     'Test' => 'Testen',
     'Forget' => 'Vergessen',
     'IMAP username' => 'IMAP Benutzername',
-    'POP3 Servers' => 'POP3 Server',
-    'Add a POP3 Server' => 'Füge einen POP3 Server hinzu',
-    'POP3 account name' => 'POP3 Kontoname',
-    'POP3 server address' => 'POP3 Serveradresse',
-    'POP3 port' => 'POP3 Port',
     'Feeds' => 'Feeds',
     'Add an RSS/ATOM Feed' => 'Füge einen RSS / ATOM-Feed hinzu',
     'Feed name' => 'Feed Name',
@@ -103,7 +98,6 @@
     'Feed Settings' => 'Feed Einstellungen',
     'Show feed items received since' => 'Zeige Feeds für Zeitraum',
     'Max feed items to display' => 'Max. anzuzeigende Feeds',
-    'POP3 Settings' => 'POP3 Einstellungen',
     'Max messages to display' => 'Max. anzuzeigende Nachrichten',
     'Contacts' => 'Kontakte',
     'Profiles' => 'Profile',
@@ -150,8 +144,6 @@
     'Forward' => 'Weiterleiten',
     'raw' => 'quelltext',
     'All Email' => 'Alle E-Mails',
-    'POP3 username' => 'POP3 Benutzername',
-    'POP3 password' => 'POP3 Passwort',
     'White Bread (Default)' => 'Weißbrot (Default)',
     'Boring Blues' => 'Boring Blues',
     'Dark But Not Too Dark' => 'Dunkel, aber nicht zu dunkel',
@@ -176,8 +168,8 @@
     'You don\'t have any %s sources' => 'Du hast noch keine %s Quellen',
     'You have %d %s source' => 'Du hast %d %s Quelle',
     'You have %d %s sources' => 'Du hast %d %s Quellen',
-    'Cypht is a webmail program. You can use it to access your E-mail accounts from any service that offers IMAP, POP3, or SMTP access - which most do.' => 'Mit Cypht ist es dir möglich auf alle deine E-Mail Accounts bei allen Anbietern zuzugreifen! Vorrausgesetzt sie unterstützen einen IMAP, POP3 oder SMTP Zugang - Was bei den meisten der Fall sein wird.',
-    'Quickly add an account from popular E-mail providers. To manually configure an account, use the IMAP/SMTP/POP3 sections below.' => 'Füge schnell und einfach Konten von beliebten E-Mail Anbietern hinzu.\nNutze die IMAP/SMTP/POP3 Abschnitte um ein Konto Manuell zu Konfigurieren.',
+    'Cypht is a webmail program. You can use it to access your E-mail accounts from any service that offers IMAP, or SMTP access - which most do.' => 'Mit Cypht ist es dir möglich auf alle deine E-Mail Accounts bei allen Anbietern zuzugreifen! Vorrausgesetzt sie unterstützen einen IMAP oder SMTP Zugang - Was bei den meisten der Fall sein wird.',
+    'Quickly add an account from popular E-mail providers. To manually configure an account, use the IMAP/SMTP sections below.' => 'Füge schnell und einfach Konten von beliebten E-Mail Anbietern hinzu.\nNutze die IMAP/SMTP Abschnitte um ein Konto Manuell zu Konfigurieren.',
     'Select an E-mail provider' => 'Wähle einen E-Mail Anbieter aus',
     'AOL' => 'AOL',
     'Fastmail' => 'Fastmail',
@@ -227,7 +219,6 @@
     '%s repository created' => '%s Repository erstellt',
     '%d commits: ' => '%d Commits:',
     '%d commit: ' => '%d Commit:',
-    'POP3' => 'POP3',
     'Site settings updated' => 'Seiteneinstellungen aktualisiert',
     'Configuration Map' => 'Configuration Map',
     'Default' => 'Standard',
@@ -425,8 +416,6 @@
     'Message deleted' => 'Nachricht gelöscht',
     'NASA API connection' => 'NASA API Verbindung',
     'NASA API connection disabled' => 'NASA API Verbindung deaktiviert',
-    'POP3 server added' => 'POP3 Server hinzugefügt',
-    'POP3 server saved' => 'POP3 Server gespeichert',
     'Profile Updated' => 'Profil geupdated',
     'Removed repository' => 'Repository entfernen',
     'Saved a search' => 'Suche speichern',

diff --git a/language/en.php b/language/en.php
@@ -68,11 +68,6 @@
     'Test' => false,
     'Forget' => false,
     'IMAP username' => false,
-    'POP3 Servers' => false,
-    'Add a POP3 Server' => false,
-    'POP3 account name' => false,
-    'POP3 server address' => false,
-    'POP3 port' => false,
     'Feeds' => false,
     'Add an RSS/ATOM Feed' => false,
     'Feed name' => false,
@@ -103,7 +98,6 @@
     'Feed Settings' => false,
     'Show feed items received since' => false,
     'Max feed items to display' => false,
-    'POP3 Settings' => false,
     'Max messages to display' => false,
     'Contacts' => false,
     'Profiles' => false,
@@ -150,8 +144,6 @@
     'Forward' => false,
     'raw' => false,
     'All Email' => false,
-    'POP3 username' => false,
-    'POP3 password' => false,
     'White Bread (Default)' => false,
     'Boring Blues' => false,
     'Dark But Not Too Dark' => false,
@@ -176,8 +168,8 @@
     'You don\'t have any %s sources' => false,
     'You have %d %s source' => false,
     'You have %d %s sources' => false,
-    'Cypht is a webmail program. You can use it to access your E-mail accounts from any service that offers IMAP, POP3, or SMTP access - which most do.' => false,
-    'Quickly add an account from popular E-mail providers. To manually configure an account, use the IMAP/SMTP/POP3 sections below.' => false,
+    'Cypht is a webmail program. You can use it to access your E-mail accounts from any service that offers IMAP, or SMTP access - which most do.' => false,
+    'Quickly add an account from popular E-mail providers. To manually configure an account, use the IMAP/SMTP sections below.' => false,
     'Select an E-mail provider' => false,
     'AOL' => false,
     'Fastmail' => false,
@@ -227,7 +219,6 @@
     '%s repository created' => false,
     '%d commits: ' => false,
     '%d commit: ' => false,
-    'POP3' => false,
     'Site settings updated' => false,
     'Configuration Map' => false,
     'Default' => false,
@@ -425,8 +416,6 @@
     'Message deleted' => false,
     'NASA API connection' => false,
     'NASA API connection disabled' => false,
-    'POP3 server added' => false,
-    'POP3 server saved' => false,
     'Profile Updated' => false,
     'Removed repository' => false,
     'Saved a search' => false,