Skip to content

Commit

Permalink
Remove unused code
Browse files Browse the repository at this point in the history 
#886
  • Loading branch information
@teusbenschop
teusbenschop committed May 1, 2023
1 parent b982924 commit 808825e
Show file tree
Hide file tree
Showing 14 changed files with 56 additions and 360 deletions.
1 change: 0 additions & 1 deletion Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,6 @@ libbibledit_a_SOURCES = \
read/load.cpp \
read/verse.cpp \
resource/divider.cpp \
filter/indonesian.cpp \
session/confirm.cpp \
sources/abbott-smith.cpp \
database/abbottsmith.cpp \
Expand Down
100 changes: 47 additions & 53 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,8 @@ am_libbibledit_a_OBJECTS = library/bibledit.$(OBJEXT) \
miniz/miniz.$(OBJEXT) nmt/index.$(OBJEXT) nmt/logic.$(OBJEXT) \
tbsx/text.$(OBJEXT) read/index.$(OBJEXT) read/load.$(OBJEXT) \
read/verse.$(OBJEXT) resource/divider.$(OBJEXT) \
filter/indonesian.$(OBJEXT) session/confirm.$(OBJEXT) \
sources/abbott-smith.$(OBJEXT) database/abbottsmith.$(OBJEXT) \
session/confirm.$(OBJEXT) sources/abbott-smith.$(OBJEXT) \
database/abbottsmith.$(OBJEXT) \
resource/comparative9edit.$(OBJEXT) \
resource/comparative1edit.$(OBJEXT) \
resource/translated9edit.$(OBJEXT) \
Expand Down Expand Up @@ -550,51 +550,51 @@ am__depfiles_remade = access/$(DEPDIR)/bible.Po \
filter/$(DEPDIR)/css.Po filter/$(DEPDIR)/date.Po \
filter/$(DEPDIR)/diff.Po filter/$(DEPDIR)/git.Po \
filter/$(DEPDIR)/google.Po filter/$(DEPDIR)/html.Po \
filter/$(DEPDIR)/image.Po filter/$(DEPDIR)/indonesian.Po \
filter/$(DEPDIR)/mail.Po filter/$(DEPDIR)/md5.Po \
filter/$(DEPDIR)/memory.Po filter/$(DEPDIR)/merge.Po \
filter/$(DEPDIR)/note.Po filter/$(DEPDIR)/passage.Po \
filter/$(DEPDIR)/roles.Po filter/$(DEPDIR)/shell.Po \
filter/$(DEPDIR)/string.Po filter/$(DEPDIR)/text.Po \
filter/$(DEPDIR)/url.Po filter/$(DEPDIR)/usfm.Po \
filter/$(DEPDIR)/webview.Po flate/$(DEPDIR)/flate.Po \
fonts/$(DEPDIR)/logic.Po help/$(DEPDIR)/index.Po \
html/$(DEPDIR)/header.Po html/$(DEPDIR)/text.Po \
i18n/$(DEPDIR)/logic.Po images/$(DEPDIR)/fetch.Po \
images/$(DEPDIR)/index.Po images/$(DEPDIR)/logic.Po \
images/$(DEPDIR)/view.Po index/$(DEPDIR)/index.Po \
index/$(DEPDIR)/listing.Po ipc/$(DEPDIR)/focus.Po \
ipc/$(DEPDIR)/notes.Po jobs/$(DEPDIR)/index.Po \
journal/$(DEPDIR)/index.Po journal/$(DEPDIR)/logic.Po \
jsonxx/$(DEPDIR)/jsonxx.Po ldap/$(DEPDIR)/logic.Po \
lexicon/$(DEPDIR)/definition.Po lexicon/$(DEPDIR)/logic.Po \
library/$(DEPDIR)/bibledit.Po library/$(DEPDIR)/locks.Po \
locale/$(DEPDIR)/logic.Po locale/$(DEPDIR)/translate.Po \
manage/$(DEPDIR)/accounts.Po manage/$(DEPDIR)/exports.Po \
manage/$(DEPDIR)/hyphenate.Po manage/$(DEPDIR)/hyphenation.Po \
manage/$(DEPDIR)/index.Po manage/$(DEPDIR)/privileges.Po \
manage/$(DEPDIR)/users.Po manage/$(DEPDIR)/write.Po \
mapping/$(DEPDIR)/index.Po mapping/$(DEPDIR)/map.Po \
mbedtls/$(DEPDIR)/aes.Po mbedtls/$(DEPDIR)/arc4.Po \
mbedtls/$(DEPDIR)/asn1parse.Po mbedtls/$(DEPDIR)/asn1write.Po \
mbedtls/$(DEPDIR)/base64.Po mbedtls/$(DEPDIR)/bignum.Po \
mbedtls/$(DEPDIR)/blowfish.Po mbedtls/$(DEPDIR)/camellia.Po \
mbedtls/$(DEPDIR)/ccm.Po mbedtls/$(DEPDIR)/certs.Po \
mbedtls/$(DEPDIR)/chacha20.Po mbedtls/$(DEPDIR)/chachapoly.Po \
mbedtls/$(DEPDIR)/cipher.Po mbedtls/$(DEPDIR)/cipher_wrap.Po \
mbedtls/$(DEPDIR)/ctr_drbg.Po mbedtls/$(DEPDIR)/debug.Po \
mbedtls/$(DEPDIR)/des.Po mbedtls/$(DEPDIR)/dhm.Po \
mbedtls/$(DEPDIR)/ecdh.Po mbedtls/$(DEPDIR)/ecdsa.Po \
mbedtls/$(DEPDIR)/ecp.Po mbedtls/$(DEPDIR)/ecp_curves.Po \
mbedtls/$(DEPDIR)/entropy.Po mbedtls/$(DEPDIR)/entropy_poll.Po \
mbedtls/$(DEPDIR)/error.Po mbedtls/$(DEPDIR)/gcm.Po \
mbedtls/$(DEPDIR)/hmac_drbg.Po mbedtls/$(DEPDIR)/md.Po \
mbedtls/$(DEPDIR)/md5.Po mbedtls/$(DEPDIR)/md_wrap.Po \
mbedtls/$(DEPDIR)/net_sockets.Po mbedtls/$(DEPDIR)/oid.Po \
mbedtls/$(DEPDIR)/pem.Po mbedtls/$(DEPDIR)/pk.Po \
mbedtls/$(DEPDIR)/pk_wrap.Po mbedtls/$(DEPDIR)/pkcs12.Po \
mbedtls/$(DEPDIR)/pkcs5.Po mbedtls/$(DEPDIR)/pkparse.Po \
mbedtls/$(DEPDIR)/pkwrite.Po mbedtls/$(DEPDIR)/platform.Po \
filter/$(DEPDIR)/image.Po filter/$(DEPDIR)/mail.Po \
filter/$(DEPDIR)/md5.Po filter/$(DEPDIR)/memory.Po \
filter/$(DEPDIR)/merge.Po filter/$(DEPDIR)/note.Po \
filter/$(DEPDIR)/passage.Po filter/$(DEPDIR)/roles.Po \
filter/$(DEPDIR)/shell.Po filter/$(DEPDIR)/string.Po \
filter/$(DEPDIR)/text.Po filter/$(DEPDIR)/url.Po \
filter/$(DEPDIR)/usfm.Po filter/$(DEPDIR)/webview.Po \
flate/$(DEPDIR)/flate.Po fonts/$(DEPDIR)/logic.Po \
help/$(DEPDIR)/index.Po html/$(DEPDIR)/header.Po \
html/$(DEPDIR)/text.Po i18n/$(DEPDIR)/logic.Po \
images/$(DEPDIR)/fetch.Po images/$(DEPDIR)/index.Po \
images/$(DEPDIR)/logic.Po images/$(DEPDIR)/view.Po \
index/$(DEPDIR)/index.Po index/$(DEPDIR)/listing.Po \
ipc/$(DEPDIR)/focus.Po ipc/$(DEPDIR)/notes.Po \
jobs/$(DEPDIR)/index.Po journal/$(DEPDIR)/index.Po \
journal/$(DEPDIR)/logic.Po jsonxx/$(DEPDIR)/jsonxx.Po \
ldap/$(DEPDIR)/logic.Po lexicon/$(DEPDIR)/definition.Po \
lexicon/$(DEPDIR)/logic.Po library/$(DEPDIR)/bibledit.Po \
library/$(DEPDIR)/locks.Po locale/$(DEPDIR)/logic.Po \
locale/$(DEPDIR)/translate.Po manage/$(DEPDIR)/accounts.Po \
manage/$(DEPDIR)/exports.Po manage/$(DEPDIR)/hyphenate.Po \
manage/$(DEPDIR)/hyphenation.Po manage/$(DEPDIR)/index.Po \
manage/$(DEPDIR)/privileges.Po manage/$(DEPDIR)/users.Po \
manage/$(DEPDIR)/write.Po mapping/$(DEPDIR)/index.Po \
mapping/$(DEPDIR)/map.Po mbedtls/$(DEPDIR)/aes.Po \
mbedtls/$(DEPDIR)/arc4.Po mbedtls/$(DEPDIR)/asn1parse.Po \
mbedtls/$(DEPDIR)/asn1write.Po mbedtls/$(DEPDIR)/base64.Po \
mbedtls/$(DEPDIR)/bignum.Po mbedtls/$(DEPDIR)/blowfish.Po \
mbedtls/$(DEPDIR)/camellia.Po mbedtls/$(DEPDIR)/ccm.Po \
mbedtls/$(DEPDIR)/certs.Po mbedtls/$(DEPDIR)/chacha20.Po \
mbedtls/$(DEPDIR)/chachapoly.Po mbedtls/$(DEPDIR)/cipher.Po \
mbedtls/$(DEPDIR)/cipher_wrap.Po mbedtls/$(DEPDIR)/ctr_drbg.Po \
mbedtls/$(DEPDIR)/debug.Po mbedtls/$(DEPDIR)/des.Po \
mbedtls/$(DEPDIR)/dhm.Po mbedtls/$(DEPDIR)/ecdh.Po \
mbedtls/$(DEPDIR)/ecdsa.Po mbedtls/$(DEPDIR)/ecp.Po \
mbedtls/$(DEPDIR)/ecp_curves.Po mbedtls/$(DEPDIR)/entropy.Po \
mbedtls/$(DEPDIR)/entropy_poll.Po mbedtls/$(DEPDIR)/error.Po \
mbedtls/$(DEPDIR)/gcm.Po mbedtls/$(DEPDIR)/hmac_drbg.Po \
mbedtls/$(DEPDIR)/md.Po mbedtls/$(DEPDIR)/md5.Po \
mbedtls/$(DEPDIR)/md_wrap.Po mbedtls/$(DEPDIR)/net_sockets.Po \
mbedtls/$(DEPDIR)/oid.Po mbedtls/$(DEPDIR)/pem.Po \
mbedtls/$(DEPDIR)/pk.Po mbedtls/$(DEPDIR)/pk_wrap.Po \
mbedtls/$(DEPDIR)/pkcs12.Po mbedtls/$(DEPDIR)/pkcs5.Po \
mbedtls/$(DEPDIR)/pkparse.Po mbedtls/$(DEPDIR)/pkwrite.Po \
mbedtls/$(DEPDIR)/platform.Po \
mbedtls/$(DEPDIR)/platform_util.Po \
mbedtls/$(DEPDIR)/poly1305.Po mbedtls/$(DEPDIR)/ripemd160.Po \
mbedtls/$(DEPDIR)/rsa.Po mbedtls/$(DEPDIR)/rsa_internal.Po \
Expand Down Expand Up @@ -1476,7 +1476,6 @@ libbibledit_a_SOURCES = \
read/load.cpp \
read/verse.cpp \
resource/divider.cpp \
filter/indonesian.cpp \
session/confirm.cpp \
sources/abbott-smith.cpp \
database/abbottsmith.cpp \
Expand Down Expand Up @@ -3142,8 +3141,6 @@ read/verse.$(OBJEXT): read/$(am__dirstamp) \
read/$(DEPDIR)/$(am__dirstamp)
resource/divider.$(OBJEXT): resource/$(am__dirstamp) \
resource/$(DEPDIR)/$(am__dirstamp)
filter/indonesian.$(OBJEXT): filter/$(am__dirstamp) \
filter/$(DEPDIR)/$(am__dirstamp)
session/confirm.$(OBJEXT): session/$(am__dirstamp) \
session/$(DEPDIR)/$(am__dirstamp)
sources/abbott-smith.$(OBJEXT): sources/$(am__dirstamp) \
Expand Down Expand Up @@ -3814,7 +3811,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@filter/$(DEPDIR)/google.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@filter/$(DEPDIR)/html.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@filter/$(DEPDIR)/image.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@filter/$(DEPDIR)/indonesian.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@filter/$(DEPDIR)/mail.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@filter/$(DEPDIR)/md5.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@filter/$(DEPDIR)/memory.Po@am__quote@ # am--include-marker
Expand Down Expand Up @@ -4983,7 +4979,6 @@ distclean: distclean-am
-rm -f filter/$(DEPDIR)/google.Po
-rm -f filter/$(DEPDIR)/html.Po
-rm -f filter/$(DEPDIR)/image.Po
-rm -f filter/$(DEPDIR)/indonesian.Po
-rm -f filter/$(DEPDIR)/mail.Po
-rm -f filter/$(DEPDIR)/md5.Po
-rm -f filter/$(DEPDIR)/memory.Po
Expand Down Expand Up @@ -5634,7 +5629,6 @@ maintainer-clean: maintainer-clean-am
-rm -f filter/$(DEPDIR)/google.Po
-rm -f filter/$(DEPDIR)/html.Po
-rm -f filter/$(DEPDIR)/image.Po
-rm -f filter/$(DEPDIR)/indonesian.Po
-rm -f filter/$(DEPDIR)/mail.Po
-rm -f filter/$(DEPDIR)/md5.Po
-rm -f filter/$(DEPDIR)/memory.Po
Expand Down
1 change: 0 additions & 1 deletion demo/logic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <filter/usfm.h>
#include <filter/url.h>
#include <filter/string.h>
#include <filter/indonesian.h>
#include <database/config/general.h>
#include <database/config/bible.h>
#include <database/logs.h>
Expand Down
1 change: 0 additions & 1 deletion editone2/index.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include <filter/string.h>
#include <filter/css.h>
#include <filter/url.h>
#include <filter/indonesian.h>
#include <webserver/request.h>
#include <locale/translate.h>
#include <locale/logic.h>
Expand Down
49 changes: 0 additions & 49 deletions filter/indonesian.cpp
View file

This file was deleted.

27 changes: 0 additions & 27 deletions filter/indonesian.h
View file

This file was deleted.

1 change: 0 additions & 1 deletion manage/accounts.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ string manage_accounts (void * webserver_request)
string message;
user_logic_delete_account (objectUsername, role, email, message);
user_updated = true;
tasks_logic_queue (DELETEINDONESIANFREEUSER, {objectUsername, email});
message.append (" ");
message.append ("See the Journal for progress");
page += assets_page::success (message);
Expand Down
1 change: 0 additions & 1 deletion read/index.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include <filter/string.h>
#include <filter/css.h>
#include <filter/url.h>
#include <filter/indonesian.h>
#include <webserver/request.h>
#include <locale/translate.h>
#include <locale/logic.h>
Expand Down
55 changes: 9 additions & 46 deletions session/signup.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#include <filter/roles.h>
#include <filter/string.h>
#include <filter/url.h>
#include <filter/indonesian.h>
#include <confirm/worker.h>
#include <email/send.h>
#pragma GCC diagnostic push
Expand Down Expand Up @@ -289,60 +288,24 @@ string session_signup ([[maybe_unused]] void * webserver_request)

// Create the contents for the confirmation email
// that will be sent after the account has been verified.
string subsequent_subject = translate("Account opened");
xml_document subsequent_document;
string subsequent_subject {translate("Account opened")};
xml_document subsequent_document {};
node = subsequent_document.append_child ("h3");
node.text ().set (subsequent_subject.c_str());
if (config::logic::default_bibledit_configuration ()) {
node = subsequent_document.append_child ("p");
information = translate("Welcome!");
node.text ().set (information.c_str());
node = subsequent_document.append_child ("p");
information = translate("Your account is now active and you have logged in.");
node.text ().set (information.c_str());
}
if (config::logic::indonesian_cloud_free ()) {
node = subsequent_document.append_child ("p");
information = "Shalom " + user + ",";
node.text ().set (information.c_str());
node = subsequent_document.append_child ("p");
information = "Puji TUHAN, Saudara sudah menjadi Tamu Bibledit!";
node.text ().set (information.c_str());
node = subsequent_document.append_child ("p");
information = "Kami mengajak Saudara supaya sesering mungkin mengunjungi situs alkitabkita.info untuk melihat pengumuman tentang kesempatan mengikuti pelatihan dan seminar zoom. Segeralah menonton semua video petunjuk yang terdapat pada halaman dasar.";
node.text ().set (information.c_str());
node = subsequent_document.append_child ("p");
information = "Di tingkat Bibledit Tamu, Saudara dapat menggunakan Antarmuka Sederhana. Kami sarankan menggunakan Antarmuka Sederhana selama kurang lebih sebulan. Saat Saudara ingin menggunakan Antarmuka Lengkap yang lebih canggih dan powerful, silakan mendaftar untuk tingkat Bibledit Anggota.";
node.text ().set (information.c_str());
node = subsequent_document.append_child ("p");
information = "Harga pendaftaran sebagai anggota adalah Rp 100.000,- setahun. Para anggota diberi izin menginstal program Bibledit dan sumber penelitiannya di komputer dan tablet. Dengan demikian Saudara dapat bekerja dengan Bibledit tanpa menggunakan pulsa data Internet. Lihat informasi lebih lanjut mengenai tingkat anggota di situs alkitabkita.info.";
node.text ().set (information.c_str());
node = subsequent_document.append_child ("p");
information = "Kami tim situs alkitabkita.info sangat berharap dengan menggunakan Bibledit ini Saudara akan dimampukan meneliti Firman Tuhan secara lebih mendalam. Mohon jangan menggunakan kemampuan itu untuk membanggakan dirimu sendiri, tetapi gunakanlah untuk memuliakan TUHAN, untuk mengajar, dan menerjemahkan Firman TUHAN dengan lebih wajar, jelas, dan tepat.";
node.text ().set (information.c_str());
node = subsequent_document.append_child ("p");
information = "Tuhan memberkati!";
node.text ().set (information.c_str());
node = subsequent_document.append_child ("p");
information = "Balazi Gulo";
node.text ().set (information.c_str());
node = subsequent_document.append_child ("p");
information = "Ketua Yayasan Albata";
node.text ().set (information.c_str());
}
string subsequent_body;
node = subsequent_document.append_child ("p");
information = translate("Welcome!");
node.text ().set (information.c_str());
node = subsequent_document.append_child ("p");
information = translate("Your account is now active and you have logged in.");
node.text ().set (information.c_str());
string subsequent_body {};
{
stringstream output;
subsequent_document.print (output, "", format_raw);
subsequent_body = output.str ();
}
// Store the confirmation information in the database.
confirm_worker.setup (mail, user, initial_subject, initial_body, query, subsequent_subject, subsequent_body);
if (config::logic::indonesian_cloud_free ()) {
// In the Indonesian free Cloud, create the Bible for the user.
string bible = filter::indonesian::mytranslation (user);
tasks_logic_queue (CREATEEMPTYBIBLE, {bible});
}
// Done signup.
signed_up = true;
}
Expand Down
Loading

0 comments on commit 808825e

Please sign in to comment.