diff --git a/src/controllers/components/SocialComponent.php b/src/controllers/components/SocialComponent.php index cfb607114..bf45d9d14 100644 --- a/src/controllers/components/SocialComponent.php +++ b/src/controllers/components/SocialComponent.php @@ -1712,7 +1712,8 @@ class SocialComponent extends Component implements CrawlConstants ["group_id", "=", max(-$just_thread, $just_group_id), ""], ["access", "!=", C\GROUP_PRIVATE, ""], ["status", "=", C\ACTIVE_STATUS, ""], - ["join_date", "=","", "DESC"]]; + ["join_date", "=", "", "DESC"] + ]; $groups = $group_model->getRows( 0, $limit + $results_per_page, $groups_count, $search_array, [$user_id, false]); @@ -2379,8 +2380,36 @@ class SocialComponent extends Component implements CrawlConstants $parent = $this->parent; $group_model = $parent->model("group"); $data['MODE'] = 'grouped'; + $data['group_sorts'] = [ "name_asc" => + html_entity_decode(tl('social_component_name_asc')), + "name_desc" => html_entity_decode(tl('social_component_name_desc')), + "join_asc" => html_entity_decode(tl('social_component_join_asc')), + "join_desc" => html_entity_decode(tl('social_component_join_desc')), + ]; + $data['GROUP_SORT'] = (!empty($_REQUEST['group_sort']) && + isset($data['group_sorts'][$_REQUEST['group_sort']])) ? + $_REQUEST['group_sort'] : "join_desc"; + $data["GROUP_FILTER"] = (empty($_REQUEST['group_filter'])) ? + "" : $parent->clean($_REQUEST['group_filter'], "string"); + $search_array = []; + if ($data["GROUP_FILTER"]) { + $name_clause = ["name", "CONTAINS", $data["GROUP_FILTER"]]; + } else { + $name_clause = ["name", "", ""]; + } + $name_clause[3] = ($data['GROUP_SORT'] == "name_asc") ? + "ASC" : ($data['GROUP_SORT'] == "name_desc" ? "DESC" : ""); + if ($name_clause != ["name", "", "", ""]) { + $search_array[] = $name_clause; + } + $join_clause = ["join_date", "", ""]; + $join_clause[3] = ($data['GROUP_SORT'] == "join_asc") ? + "ASC" : ($data['GROUP_SORT'] == "join_desc" ? "DESC" : ""); + if ($join_clause != ["join_date", "", "", ""]) { + $search_array[] = $join_clause; + } $data['GROUPS'] = $group_model->getRows($limit, $results_per_page, - $data['NUM_GROUPS'], [], [$user_id, false]); + $data['NUM_GROUPS'], $search_array, [$user_id, false]); $num_shown = count($data['GROUPS']); for ($i = 0; $i < $num_shown; $i++) { $group_id = $data['GROUPS'][$i]['GROUP_ID']; diff --git a/src/css/search.css b/src/css/search.css index 61d9e21cc..07c17d469 100755 --- a/src/css/search.css +++ b/src/css/search.css @@ -2502,7 +2502,7 @@ div.group-result font-size: 16pt; } .mobile .current-activity select, -.small-margin-current-activity select +.mobile .small-margin-current-activity select { font-size: 12pt; } diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini index 104ba78ff..5739f3b59 100755 --- a/src/locale/ar/configure.ini +++ b/src/locale/ar/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "بعد تحريرها فقط في مك social_component_no_update_access = "لا يمكن تحديث آخر!" social_component_post_updated = "آخر تحديث!" social_component_no_group_access = "ليس عضوا أو أن&#039;t قراءة تلك المجموعة. التحول إلى مجموعة عامة!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "لا وظيفة حتى الآن" social_component_signin_to_access = "يرجى تسجيل الدخول إلى حساب مع الوصول إلى هذه المجموعة!" social_component_back = "مرة أخرى" @@ -1345,6 +1349,9 @@ serversettings_element_save = "حفظ" ; GroupfeedElement.php groupfeed_element_add_group = "إضافة مجموعة" groupfeed_element_request_add = "طلب إضافة مجموعة" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "ويكي" groupfeed_element_group_stats = "%s وظائف %s المواضيع" diff --git a/src/locale/ar/statistics.txt b/src/locale/ar/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/ar/statistics.txt +++ b/src/locale/ar/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini index 9722d61fc..f9c6826aa 100755 --- a/src/locale/bn/configure.ini +++ b/src/locale/bn/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "পোস্ট ছিল মাত্ social_component_no_update_access = "না আপডেট পোস্ট!" social_component_post_updated = "পোস্ট আপডেট করা হয়েছে!" social_component_no_group_access = "সদস্য না, বা করতে পারেন,&#039;t পড়তে যে গ্রুপ. সুইচিং পাবলিক গ্রুপ!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "কোন পোস্ট এখনো" social_component_signin_to_access = "দয়া করে লগ ইন করুন একটি অ্যাকাউন্ট অ্যাক্সেস সঙ্গে এই গ্রুপ!" social_component_back = "ফিরে" @@ -1345,6 +1349,9 @@ serversettings_element_save = "সংরক্ষণ করুন" ; GroupfeedElement.php groupfeed_element_add_group = "গ্রুপ যোগ করুন" groupfeed_element_request_add = "অনুরোধ গ্রুপ যোগ করুন" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "উইকি" groupfeed_element_group_stats = "%s পোস্ট, থ্রেড %s" diff --git a/src/locale/bn/statistics.txt b/src/locale/bn/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/bn/statistics.txt +++ b/src/locale/bn/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini index 58b98c48b..5ce0084d3 100755 --- a/src/locale/de/configure.ini +++ b/src/locale/de/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "Beitrag wurde gerade bearbeitet an and social_component_no_update_access = "Kann Nicht Update-Post!" social_component_post_updated = "Post Aktualisiert!" social_component_no_group_access = "Nicht Mitglied ist oder werden kann&#039;t gelesen, dass Gruppe. Den Umstieg auf den öffentlichen Gruppe!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "Keine Beiträge, Die Noch" social_component_signin_to_access = "Bitte melden Sie sich für ein Konto mit Zugriff auf diese Gruppe!" social_component_back = "Zurück" @@ -1345,6 +1349,9 @@ serversettings_element_save = "Speichern" ; GroupfeedElement.php groupfeed_element_add_group = "Gruppe Hinzufügen" groupfeed_element_request_add = "Anfrage Gruppe Hinzufügen" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s Beiträge, %s threads" diff --git a/src/locale/de/statistics.txt b/src/locale/de/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/de/statistics.txt +++ b/src/locale/de/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini index 54692be79..7f9dfd34c 100644 --- a/src/locale/en_US/configure.ini +++ b/src/locale/en_US/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "Post was just edited elsewhere (anothe social_component_no_update_access = "Cannot Update Post!" social_component_post_updated = "Post Updated!" social_component_no_group_access = "Not a member or can't read that group. Switching to public group!" +social_component_name_asc = "Name&uarr;" +social_component_name_desc = "Name&darr;" +social_component_join_asc = "Join Date&uarr;" +social_component_join_desc = "Join Date&darr;" social_component_no_posts_yet = "No Posts Yet" social_component_signin_to_access = "Please log in to an account with access to this group!" social_component_back = "Back" @@ -1100,7 +1104,7 @@ wiki_element_page_resources = "Page Resources" wiki_element_resources_info = "Resources are images, videos, or files associated with this page." wiki_element_rename_failed = "Rename Failed!" wiki_element_delete_operation = "Are you sure you want to delete?" -wiki_element_resource_filter = "Filter" +wiki_element_resource_filter = "Filter:" wiki_element_current_folder = "Use Current Folder" wiki_element_clip_folder = "Clip Folder:" wiki_element_name = "Name" @@ -1345,6 +1349,9 @@ serversettings_element_save = "Save" ; GroupfeedElement.php groupfeed_element_add_group = "Add Group" groupfeed_element_request_add = "Request Add Group" +groupfeed_element_filter = "Filter:" +groupfeed_element_sort = "Sort:" +groupfeed_element_go = "Go" groupfeed_element_my_groups = "My Groups" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s posts, %s threads" diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini index 4e852e1ca..b10cd7a0d 100755 --- a/src/locale/es/configure.ini +++ b/src/locale/es/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "Post se acaba de editar en otro lugar social_component_no_update_access = "No Puede Actualizar El Post!!!" social_component_post_updated = "Post Actualizado!" social_component_no_group_access = "No es miembro, o puede&#039;t leer ese grupo. El cambio a grupo público!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "Aún No Hay Mensajes" social_component_signin_to_access = "Por favor, iniciar sesión en una cuenta con acceso a este grupo!" social_component_back = "De vuelta" @@ -1345,6 +1349,9 @@ serversettings_element_save = "Guardar" ; GroupfeedElement.php groupfeed_element_add_group = "Agregar Grupo" groupfeed_element_request_add = "Solicitud De Agregar Grupo" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s puestos, %s hilos" diff --git a/src/locale/es/statistics.txt b/src/locale/es/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/es/statistics.txt +++ b/src/locale/es/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini index 59c0ca450..b14a5f4f5 100755 --- a/src/locale/fa/configure.ini +++ b/src/locale/fa/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "ارسال شد فقط ویرایش د social_component_no_update_access = "نمی تواند به روز رسانی پست!" social_component_post_updated = "پست به روز شد!" social_component_no_group_access = "نه یک عضو و یا می&#039;t خواندن آن گروه. تعویض به سکس!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "هیچ پست و در عین حال" social_component_signin_to_access = "لطفا برای ورود به یک حساب کاربری با دسترسی به این گروه!" social_component_back = "بازگشت" @@ -1345,6 +1349,9 @@ serversettings_element_save = "صرفه جویی در" ; GroupfeedElement.php groupfeed_element_add_group = "اضافه کردن گروه" groupfeed_element_request_add = "درخواست اضافه کردن گروه" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "ویکی" groupfeed_element_group_stats = "%s پست %s موضوعات" diff --git a/src/locale/fa/statistics.txt b/src/locale/fa/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/fa/statistics.txt +++ b/src/locale/fa/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini index ed958a1cc..7d3404231 100755 --- a/src/locale/fr_FR/configure.ini +++ b/src/locale/fr_FR/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "Post a été publié social_component_no_update_access = "Impossible me mettre à jour le post!" social_component_post_updated = "Post mis à jour!" social_component_no_group_access = "Pas un membre ou peut't lu que groupe. De commutation de groupe public!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "Pas de postes encore" social_component_signin_to_access = "Veuillez vous connecter à un compte ayant accès à ce groupe!" social_component_back = "De retour" @@ -1345,6 +1349,9 @@ serversettings_element_save = "Enregistrer" ; GroupfeedElement.php groupfeed_element_add_group = "Ajouter un groupe" groupfeed_element_request_add = "Demande d'ajouter un groupe" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s postes, %s fils" diff --git a/src/locale/fr_FR/statistics.txt b/src/locale/fr_FR/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/fr_FR/statistics.txt +++ b/src/locale/fr_FR/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini index db6624c33..034025178 100755 --- a/src/locale/he/configure.ini +++ b/src/locale/he/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "הפוסט היה רק לערוך במ social_component_no_update_access = "אין אפשרות לעדכן את הפוסט!" social_component_post_updated = "פוסט מתעדכן!" social_component_no_group_access = "לא חבר או יכול&#039;לא קראתי את הקבוצה הזאת. מיתוג ציבורי קבוצה!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "לא עוד פוסטים" social_component_signin_to_access = "אנא היכנס לחשבון עם גישה לקבוצה זו!" social_component_back = "חזרה" @@ -1345,6 +1349,9 @@ serversettings_element_save = "להציל" ; GroupfeedElement.php groupfeed_element_add_group = "הוספת קבוצה" groupfeed_element_request_add = "בקשה להוסיף קבוצה" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s פוסטים, %s חוטים" diff --git a/src/locale/he/statistics.txt b/src/locale/he/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/he/statistics.txt +++ b/src/locale/he/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini index a083bed3c..91400b88b 100755 --- a/src/locale/hi/configure.ini +++ b/src/locale/hi/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "पोस्ट सिर्फ सं social_component_no_update_access = "अद्यतन नहीं कर सकता पोस्ट!" social_component_post_updated = "पोस्ट अद्यतन!" social_component_no_group_access = "नहीं एक सदस्य या कर सकते हैं&#039;टी पढ़ें । स्विच करने के लिए समूह!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "कोई पोस्ट नहीं अभी तक" social_component_signin_to_access = "कृपया लॉग इन करने के लिए एक खाता के साथ उपयोग करने के लिए इस समूह!" social_component_back = "वापस" @@ -1345,6 +1349,9 @@ serversettings_element_save = "बचाने के लिए" ; GroupfeedElement.php groupfeed_element_add_group = "समूह जोड़ें" groupfeed_element_request_add = "अनुरोध समूह जोड़ें" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "विकी" groupfeed_element_group_stats = "%s पदों, %s सूत्र" diff --git a/src/locale/hi/statistics.txt b/src/locale/hi/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/hi/statistics.txt +++ b/src/locale/hi/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/id/configure.ini b/src/locale/id/configure.ini index 38643c684..c1b4f1fe4 100755 --- a/src/locale/id/configure.ini +++ b/src/locale/id/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "Posting itu hanya diedit di tempat lai social_component_no_update_access = "Tidak Bisa Update Post!" social_component_post_updated = "Posting Diperbarui!" social_component_no_group_access = "Bukan anggota atau dapat&#039;t baca bahwa kelompok. Beralih ke grup publik!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "Tidak Ada Posting Yang Belum" social_component_signin_to_access = "Silahkan log in ke akun dengan akses ke grup ini!" social_component_back = "Kembali" @@ -1345,6 +1349,9 @@ serversettings_element_save = "Simpan" ; GroupfeedElement.php groupfeed_element_add_group = "Tambahkan Group" groupfeed_element_request_add = "Permintaan Tambahkan Group" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s posting, %s benang" diff --git a/src/locale/id/statistics.txt b/src/locale/id/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/id/statistics.txt +++ b/src/locale/id/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini index e1dd84351..3fdabe600 100755 --- a/src/locale/it/configure.ini +++ b/src/locale/it/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "Il Post è stato editato altrove social_component_no_update_access = "Impossibile Aggiornare Il Post!" social_component_post_updated = "Post Aggiornato!" social_component_no_group_access = "Non un membro o di un possibile&#039;t di lettura che di gruppo. Di commutazione per gruppo pubblico!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "Ancora Posts" social_component_signin_to_access = "Si prega di accedere a un account con accesso a questo gruppo!" social_component_back = "Indietro" @@ -1345,6 +1349,9 @@ serversettings_element_save = "Salva" ; GroupfeedElement.php groupfeed_element_add_group = "Aggiungi Gruppo" groupfeed_element_request_add = "Richiesta Aggiungi Gruppo" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s posti, %s thread" diff --git a/src/locale/it/statistics.txt b/src/locale/it/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/it/statistics.txt +++ b/src/locale/it/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini index 851dabf57..a27c4e589 100755 --- a/src/locale/ja/configure.ini +++ b/src/locale/ja/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "後で編集し他の場所で別の social_component_no_update_access = "な更新。" social_component_post_updated = "ポストの商品が紹介されました。" social_component_no_group_access = "会員以外の方です&#039;t読していただきました。 切り替えるパブリックグループ!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "せんだい" social_component_signin_to_access = "ログインしてくださいアカウントにアクセス！" social_component_back = "裏" @@ -1345,6 +1349,9 @@ serversettings_element_save = "保存" ; GroupfeedElement.php groupfeed_element_add_group = "グループの追加" groupfeed_element_request_add = "請求グループの追加" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s、スレッド%s" diff --git a/src/locale/ja/statistics.txt b/src/locale/ja/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/ja/statistics.txt +++ b/src/locale/ja/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini index 8eb8b5deb..0f1bb3d8f 100755 --- a/src/locale/kn/configure.ini +++ b/src/locale/kn/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "ಪೋಸ್ಟ್ ಕೇವಲ ಸಂ social_component_no_update_access = "ಸಾಧ್ಯವಿಲ್ಲ ಅಪ್ಡೇಟ್ ಪೋಸ್ಟ್!" social_component_post_updated = "ಪೋಸ್ಟ್ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ!" social_component_no_group_access = "ಸದಸ್ಯ ಅಲ್ಲ ಅಥವಾ ಮಾಡಬಹುದು&#039;ಟಿ ಓದಲು ಎಂದು ಗುಂಪು. ಸ್ವಿಚಿಂಗ್ ಸಾರ್ವಜನಿಕ ಗುಂಪು!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "ಯಾವುದೇ ಪೋಸ್ಟ್ಗಳು ಇನ್ನೂ" social_component_signin_to_access = "Please log in to ಖಾತೆಯನ್ನು ಪ್ರವೇಶಿಸಲು ಈ ಗುಂಪು!" social_component_back = "ಮತ್ತೆ" @@ -1345,6 +1349,9 @@ serversettings_element_save = "ಉಳಿಸಲು" ; GroupfeedElement.php groupfeed_element_add_group = "ಗುಂಪು ಸೇರಿಸಿ" groupfeed_element_request_add = "ವಿನಂತಿಯನ್ನು ಗುಂಪು ಸೇರಿಸಿ" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "ವಿಕಿ" groupfeed_element_group_stats = "%s ಪೋಸ್ಟ್ಗಳನ್ನು, %s ಎಳೆಗಳನ್ನು" diff --git a/src/locale/kn/statistics.txt b/src/locale/kn/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/kn/statistics.txt +++ b/src/locale/kn/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini index d710e3d4d..c749e0d98 100755 --- a/src/locale/ko/configure.ini +++ b/src/locale/ko/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "게시 그냥 편집 다른 곳에서( social_component_no_update_access = "업데이트할 수 없습니다." social_component_post_updated = "게시 업데이트!" social_component_no_group_access = "회원 또는&#039;t 읽는 그룹이다. 스위칭을 공공 그룹!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "게시물이 없직" social_component_signin_to_access = "시기 바랍에 로그인하여 액세스할 수 있는 계정이다." social_component_back = "시" @@ -1345,6 +1349,9 @@ serversettings_element_save = "저장" ; GroupfeedElement.php groupfeed_element_add_group = "그룹 추가" groupfeed_element_request_add = "요청을 그룹 추가" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s 게시물,%s 스레드" diff --git a/src/locale/ko/statistics.txt b/src/locale/ko/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/ko/statistics.txt +++ b/src/locale/ko/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini index 863edee91..bc7646c83 100644 --- a/src/locale/nl/configure.ini +++ b/src/locale/nl/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "Bericht was gewoon elders bewerkt (een social_component_no_update_access = "Kan niet bijwerken Post!" social_component_post_updated = "Bericht Bijgewerkt!" social_component_no_group_access = "Geen lid is of kan die groep niet lezen. Overschakelen op openbare groep!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "Nog Geen Berichten" social_component_signin_to_access = "Log in om een account met toegang tot deze groep!" social_component_back = "terug" @@ -1345,6 +1349,9 @@ serversettings_element_save = "Opslaan" ; GroupfeedElement.php groupfeed_element_add_group = "Groep toevoegen" groupfeed_element_request_add = "Verzoek Groep toevoegen" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s berichten, %s threads" diff --git a/src/locale/nl/statistics.txt b/src/locale/nl/statistics.txt index eedae9b06..a88e2a194 100644 --- a/src/locale/nl/statistics.txt +++ b/src/locale/nl/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini index 38e52709c..fc0a43891 100755 --- a/src/locale/pl/configure.ini +++ b/src/locale/pl/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "Post był edytowany w innym miejscu i social_component_no_update_access = "Nie Mogę Zaktualizować Post!" social_component_post_updated = "Post Zaktualizowany!" social_component_no_group_access = "Nie jest członkiem lub można&#039;t czytać tę grupę. Przejście do publicznej grupie!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "Odpowiedzi Na Razie Nie Ma" social_component_signin_to_access = "Zaloguj się na konto z dostępem do tej grupy!" social_component_back = "Temu" @@ -1345,6 +1349,9 @@ serversettings_element_save = "Zapisz" ; GroupfeedElement.php groupfeed_element_add_group = "Dodaj Grupę" groupfeed_element_request_add = "Należy Dodać Grupę" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s stanowisk, %s wątków" diff --git a/src/locale/pl/statistics.txt b/src/locale/pl/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/pl/statistics.txt +++ b/src/locale/pl/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini index 609ab3110..698739321 100755 --- a/src/locale/pt/configure.ini +++ b/src/locale/pt/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "O Post foi editado apenas em outro lug social_component_no_update_access = "Não É Possível Atualizar O Post!" social_component_post_updated = "Post Atualizado!" social_component_no_group_access = "Não é um membro ou pode&#039;t ler esse grupo. Alternar para o grupo público!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "Não Há Posts Ainda" social_component_signin_to_access = "Por favor faça login para uma conta com acesso a este grupo!" social_component_back = "De volta" @@ -1345,6 +1349,9 @@ serversettings_element_save = "Salvar" ; GroupfeedElement.php groupfeed_element_add_group = "Adicionar Grupo" groupfeed_element_request_add = "Pedido Adicionar Grupo" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s posts, %s threads" diff --git a/src/locale/pt/statistics.txt b/src/locale/pt/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/pt/statistics.txt +++ b/src/locale/pt/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini index 72fc50066..f3a1afeae 100755 --- a/src/locale/ru/configure.ini +++ b/src/locale/ru/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "Пост был просто отре social_component_no_update_access = "Не Могу Обновить Пост!" social_component_post_updated = "Пост Обновлен!" social_component_no_group_access = "Не является членом или можете&#039;t читать эту группу. Переход к публичной группе!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "Ответов Пока Нет" social_component_signin_to_access = "Пожалуйста, войдите в аккаунт с доступом к этой группе!" social_component_back = "Назад" @@ -1345,6 +1349,9 @@ serversettings_element_save = "Сохранить" ; GroupfeedElement.php groupfeed_element_add_group = "Добавить Группу" groupfeed_element_request_add = "Просьба Добавить Группу" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Вики" groupfeed_element_group_stats = "%s должностей, %s потоков" diff --git a/src/locale/ru/statistics.txt b/src/locale/ru/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/ru/statistics.txt +++ b/src/locale/ru/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini index 779244dda..321b9fdda 100644 --- a/src/locale/te/configure.ini +++ b/src/locale/te/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "పోస్ట్ వేరే చో social_component_no_update_access = "పోస్ట్ ని అప్డేట్ చేయలేరు!" social_component_post_updated = "పోస్ట్ అప్డేట్ చేయబడినది!" social_component_no_group_access = "సభ్యుడు కాదు లేదా ఆ గ్రూప్ ని చదవలేరు.పబ్లిక్ గ్రూప్ కి మార్చండి!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "No Posts Yet" social_component_signin_to_access = "దయచేసి లోనికి ప్రవేశించండి. ఒక ఖాతాను యాక్సెస్ తో ఈ గుంపు!" social_component_back = "వెనుకకు" @@ -1345,6 +1349,9 @@ serversettings_element_save = "సేవ్" ; GroupfeedElement.php groupfeed_element_add_group = "ఆడ్ గ్రూప్" groupfeed_element_request_add = "రిక్వెస్ట్ ఆడ్ గ్రూప్" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s పోస్ట్లు, %s థ్రెడ్లు" diff --git a/src/locale/te/statistics.txt b/src/locale/te/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/te/statistics.txt +++ b/src/locale/te/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini index 5e5dbc345..2749b31b1 100755 --- a/src/locale/th/configure.ini +++ b/src/locale/th/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "โพสแค่ได้แก้ social_component_no_update_access = "ไม่สามารถปรับปรุงโพสต์!" social_component_post_updated = "โพสอัพเดท!" social_component_no_group_access = "ไม่เป็นสมาชิกหรือสามารถ&#039;ทีอ่านกลุ่มนั้น เปลี่ยนกลับสาธารณะชนกลุ่ม!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "ไม่มีกัปตัน..เสาทางนี้รึยัง" social_component_signin_to_access = "ได้โปรดปูมบันทึกในการบัญชีผู้ใช้เข้าถึงกลุ่มนี้!" social_component_back = "กลับมา" @@ -1345,6 +1349,9 @@ serversettings_element_save = "บันทึก" ; GroupfeedElement.php groupfeed_element_add_group = "เพิ่มกลุ่ม" groupfeed_element_request_add = "การร้องขอเพิ่มกลุ่ม" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "ทั้งหมด %s กัปตัน..เสาทางนี้,เธรดข่าวทั้งหมด %s" diff --git a/src/locale/th/statistics.txt b/src/locale/th/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/th/statistics.txt +++ b/src/locale/th/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/tl/configure.ini b/src/locale/tl/configure.ini index 58787bf98..ef0af4b2d 100644 --- a/src/locale/tl/configure.ini +++ b/src/locale/tl/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "Post na ito ay lamang na-edit sa ibang social_component_no_update_access = "Hindi Maaaring I-Update Ang Post Na Ito!" social_component_post_updated = "Mag-Post Ng Update!" social_component_no_group_access = "Hindi isang miyembro o maaari&#039;t basahin ang mga pangkat na iyon. Paglipat sa pampublikong grupo!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "Walang Mga Post Pa" social_component_signin_to_access = "Mangyaring mag-log in sa isang account na may access sa group na ito!" social_component_back = "Bumalik" @@ -1345,6 +1349,9 @@ serversettings_element_save = "I-Save ang" ; GroupfeedElement.php groupfeed_element_add_group = "Magdagdag Ng Mga Grupo" groupfeed_element_request_add = "Kahilingan Magdagdag Ng Mga Grupo" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s post, %s thread" diff --git a/src/locale/tl/statistics.txt b/src/locale/tl/statistics.txt index eedae9b06..a88e2a194 100644 --- a/src/locale/tl/statistics.txt +++ b/src/locale/tl/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini index e474d7990..c2a06f786 100755 --- a/src/locale/tr/configure.ini +++ b/src/locale/tr/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "Yazı sadece (başka bir sekme)başka social_component_no_update_access = "Güncelleme Sonrası Olamaz!" social_component_post_updated = "Güncelleme Sonrası!" social_component_no_group_access = "Üye değil ya&#039;t grup okuyun. Genel grup için geçiş!" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "Henüz Hiçbir Mesaj " social_component_signin_to_access = "Bir hesap, bu grup için erişim ile giriş yapın!" social_component_back = "Geri" @@ -1345,6 +1349,9 @@ serversettings_element_save = "Kaydet" ; GroupfeedElement.php groupfeed_element_add_group = "Grup Ekle " groupfeed_element_request_add = "İstek Grup Ekle " +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s mesajlar, %s konuları" diff --git a/src/locale/tr/statistics.txt b/src/locale/tr/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/tr/statistics.txt +++ b/src/locale/tr/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini index 74281179b..d24b144aa 100755 --- a/src/locale/vi_VN/configure.ini +++ b/src/locale/vi_VN/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "Bài vừa sửa ở nơi kh&aac social_component_no_update_access = "Không Thể Viết Bài!" social_component_post_updated = "Gửi Cập Nhật!" social_component_no_group_access = "Không phải là một thành viên hoặc có thể' \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "Chưa Có Bài Nào Sơ" social_component_signin_to_access = "Xin vui lòng nhập vào một tài khoản truy cập vào nhóm này!" social_component_back = "Trở lại" @@ -1345,6 +1349,9 @@ serversettings_element_save = "Tiết kiệm" ; GroupfeedElement.php groupfeed_element_add_group = "Thêm Nhóm" groupfeed_element_request_add = "Yêu Cầu Thêm Nhóm" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "Wiki" groupfeed_element_group_stats = "%s bài, %s chủ đề" diff --git a/src/locale/vi_VN/statistics.txt b/src/locale/vi_VN/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/vi_VN/statistics.txt +++ b/src/locale/vi_VN/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini index 92f7769d7..7b072c446 100755 --- a/src/locale/zh_CN/configure.ini +++ b/src/locale/zh_CN/configure.ini @@ -238,6 +238,10 @@ social_component_post_edited_elsewhere = "后只是编辑的其他地方(另一 social_component_no_update_access = "无法更新后！" social_component_post_updated = "布更新后的!" social_component_no_group_access = "没有一个成员或者可以&#039;t读组。 切换到公共组！" +social_component_name_asc = "" +social_component_name_desc = "" +social_component_join_asc = "" +social_component_join_desc = "" social_component_no_posts_yet = "没有职位呢" social_component_signin_to_access = "请登录在一个帐户访问这一组！" social_component_back = "回" @@ -1345,6 +1349,9 @@ serversettings_element_save = "保存" ; GroupfeedElement.php groupfeed_element_add_group = "添加组" groupfeed_element_request_add = "请求增加组" +groupfeed_element_filter = "" +groupfeed_element_sort = "" +groupfeed_element_go = "" groupfeed_element_my_groups = "" groupfeed_element_group_wiki = "维基" groupfeed_element_group_stats = "%s个员额中，有%s线" diff --git a/src/locale/zh_CN/statistics.txt b/src/locale/zh_CN/statistics.txt index eedae9b06..a88e2a194 100755 --- a/src/locale/zh_CN/statistics.txt +++ b/src/locale/zh_CN/statistics.txt @@ -1 +1 @@ -d:98; \ No newline at end of file +d:97; \ No newline at end of file diff --git a/src/views/elements/GroupfeedElement.php b/src/views/elements/GroupfeedElement.php index c127ff4c9..a357c7378 100644 --- a/src/views/elements/GroupfeedElement.php +++ b/src/views/elements/GroupfeedElement.php @@ -109,7 +109,23 @@ class GroupfeedElement extends Element implements CrawlConstants public function renderGroupedView($paging_query, &$data) { $token_string = (!empty($data['ADMIN'])) ? C\CSRF_TOKEN . "=". - $data[C\CSRF_TOKEN] : "";?> + $data[C\CSRF_TOKEN] : ""; + ?> + <div class="float-opposite"> + <form> + <input type="hidden" name="<?= C\CSRF_TOKEN ?>" + value="<?= $data[C\CSRF_TOKEN] ?>" /> + <b><label for='group-filter'><?=tl('groupfeed_element_filter') + ?></label></b> + <input class="narrow-field" type="search" name='group_filter' value='<?= + $data["GROUP_FILTER"] ?>'/> + <b><label for='group-sort'><?=tl('groupfeed_element_sort')?></label></b> + <?= $this->view->helper('options')->render("group-sort", "group_sort", + $data['group_sorts'], $data["GROUP_SORT"]) ?> + <button type="submit" class="button-box" ><?= + tl('groupfeed_element_go')?></button> + </form> + </div> <h2><?= tl('groupfeed_element_my_groups') ?></h2><?php foreach ($data['GROUPS'] as $group) {