diff --git a/src/controllers/components/CrawlComponent.php b/src/controllers/components/CrawlComponent.php index eed0e733b..6393b8918 100644 --- a/src/controllers/components/CrawlComponent.php +++ b/src/controllers/components/CrawlComponent.php @@ -3024,7 +3024,7 @@ class CrawlComponent extends Component implements CrawlConstants C\ONE_WEEK, true); } else if (in_array($source['TYPE'], ['feed_podcast', 'scrape_podcast'])) { - $wiki_update_job = new M\WikiMediaJob(); + $wiki_update_job = new M\PodcastDownloadJob(); $wiki_update_job->parsePodcastAuxInfo($source, true); $data['FEED_TEST_RESULTS'] = "<h2>" . tl('crawl_component_parsed_feed'). "</h2>\n" . diff --git a/src/css/search.css b/src/css/search.css index 20f9e8037..788b60479 100755 --- a/src/css/search.css +++ b/src/css/search.css @@ -1192,6 +1192,22 @@ body.mobile text-align: center; text-decoration: none; } +.source-anchor-button +{ + background-color: #E9E9ED; + border: ridge 1px #000; + border-radius: 5px; + color: #000; + cursor: pointer; + display: inline-block; + font-size: 16pt; + margin: 3px; + padding: 6px 5px 5px 5px; + position: relative; + text-align: center; + text-decoration: none; + top: 1px; +} .vote-button { background-color: #DDD; diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini index 008459264..22e158a35 100755 --- a/src/locale/ar/configure.ini +++ b/src/locale/ar/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "توفير مسارات xpath إلى تغ searchsources_element_regex_instruct = "أدخل تغذية regexes. Regexes باستثناء البند فاصل يجب أن يكون 1 القبض على المجموعة." searchsources_element_item_text = "البند:" searchsources_element_save = "حفظ" +searchsources_element_test = "" searchsources_element_edit_subsearch = "تحرير Subsearch" searchsources_element_add_subsearch = "إضافة سوبسيرتش" searchsources_element_foldername = "اسم المجلد:" diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini index 983c09847..a613f7d1d 100755 --- a/src/locale/bn/configure.ini +++ b/src/locale/bn/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "প্রদান xpaths ভোজন searchsources_element_regex_instruct = "লিখতে ফিড regexes. Regexes ছাড়া আইটেম বিভাজক আছে উচিত 1 ক্যাপচার গ্রুপ." searchsources_element_item_text = "আইটেম:" searchsources_element_save = "সংরক্ষণ করুন" +searchsources_element_test = "" searchsources_element_edit_subsearch = "সম্পাদনা Subsearch" searchsources_element_add_subsearch = "যোগ একটি Subsearch" searchsources_element_foldername = "ফোল্ডারের নাম:" diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini index fb4814fa4..8eec69371 100755 --- a/src/locale/de/configure.ini +++ b/src/locale/de/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "Bieten xpaths zu ernähren folgenden searchsources_element_regex_instruct = "Geben Sie feed-regexes. Regexes außer Element separator sollte haben 1 capture-Gruppe." searchsources_element_item_text = "Artikel:" searchsources_element_save = "Speichern" +searchsources_element_test = "" searchsources_element_edit_subsearch = "Edit Subsearch" searchsources_element_add_subsearch = "Fügen Sie eine Subsearch" searchsources_element_foldername = "Ordner-Name:" diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini index 0e319fc18..8b967c195 100644 --- a/src/locale/en_US/configure.ini +++ b/src/locale/en_US/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "Provide xpaths to feed components below:" searchsources_element_regex_instruct = "Enter feed regexes. Regexes except Item separator should have 1 capture group." searchsources_element_item_text = "Item:" searchsources_element_save = "Save" +searchsources_element_test = "Test" searchsources_element_edit_subsearch = "Edit Subsearch" searchsources_element_add_subsearch = "Add a Subsearch" searchsources_element_foldername = "Folder Name:" diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini index 46895d741..db80eb0e4 100755 --- a/src/locale/es/configure.ini +++ b/src/locale/es/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "Proporcionar xpath para alimentar a los c searchsources_element_regex_instruct = "Introduzca alimentación de expresiones regulares. Expresiones regulares, a excepción del Punto separador debe tener 1 captura de grupo." searchsources_element_item_text = "Elemento:" searchsources_element_save = "Guardar" +searchsources_element_test = "" searchsources_element_edit_subsearch = "Editar Subsearch" searchsources_element_add_subsearch = "Añadir un Subsearch" searchsources_element_foldername = "El Nombre De La Carpeta:" diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini index 1670ad311..0af3d05d6 100755 --- a/src/locale/fa/configure.ini +++ b/src/locale/fa/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "ارائه xpaths برای تغذیه ق searchsources_element_regex_instruct = "وارد خوراک regexes. Regexes به جز آیتم جدا کننده باید 1 ضبط ، " searchsources_element_item_text = "مورد:" searchsources_element_save = "صرفه جویی در" +searchsources_element_test = "" searchsources_element_edit_subsearch = "ویرایش Subsearch" searchsources_element_add_subsearch = "زیرجستجویی اضافه کن" searchsources_element_foldername = "نام پوشه:" diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini index 28fa835ab..678d87522 100755 --- a/src/locale/fr_FR/configure.ini +++ b/src/locale/fr_FR/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "Fournir des requêtes Xpath pour nou searchsources_element_regex_instruct = "Entrée d'alimentation regexes. Regexes à l'exception de l'Élément séparateur doit avoir 1 groupe de capture." searchsources_element_item_text = "Article:" searchsources_element_save = "Enregistrer" +searchsources_element_test = "" searchsources_element_edit_subsearch = "Modifier la sous-recherche" searchsources_element_add_subsearch = "Ajouter un sous-recherche" searchsources_element_foldername = "Nom du dossier:" diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini index db8bd0426..f2c597da9 100755 --- a/src/locale/he/configure.ini +++ b/src/locale/he/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "לספק xpaths להאכיל את הרכ searchsources_element_regex_instruct = "הזן להאכיל regexes. Regexes חוץ פריט מפריד צריך 1 ללכוד את הקבוצה." searchsources_element_item_text = "פריט:" searchsources_element_save = "להציל" +searchsources_element_test = "" searchsources_element_edit_subsearch = "עריכה Subsearch" searchsources_element_add_subsearch = "להוסיף Subsearch" searchsources_element_foldername = "שם התיקייה:" diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini index 0d0ab613c..aebabe4d2 100755 --- a/src/locale/hi/configure.ini +++ b/src/locale/hi/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "प्रदान xpaths फ़ीड searchsources_element_regex_instruct = "प्रवेश फ़ीड regexes. Regexes को छोड़कर आइटम विभाजक होना चाहिए 1 पर कब्जा समूह." searchsources_element_item_text = "मद:" searchsources_element_save = "बचाने के लिए" +searchsources_element_test = "" searchsources_element_edit_subsearch = "संपादित करें Subsearch" searchsources_element_add_subsearch = "जोड़ें एक Subsearch" searchsources_element_foldername = "फ़ोल्डर का नाम:" diff --git a/src/locale/id/configure.ini b/src/locale/id/configure.ini index 125a35496..539bad5d7 100755 --- a/src/locale/id/configure.ini +++ b/src/locale/id/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "Memberikan xpaths untuk komponen pakan di searchsources_element_regex_instruct = "Masukkan feed regexes. Regexes kecuali Item pemisah harus memiliki 1 menangkap kelompok." searchsources_element_item_text = "Item:" searchsources_element_save = "Simpan" +searchsources_element_test = "" searchsources_element_edit_subsearch = "Edit Subsearch" searchsources_element_add_subsearch = "Tambahkan Subsearch" searchsources_element_foldername = "Nama Folder:" diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini index 6aafe19b9..43bbd49dc 100755 --- a/src/locale/it/configure.ini +++ b/src/locale/it/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "Fornire xpath per alimentare i componenti searchsources_element_regex_instruct = "Inserire feed espressioni regolari. Espressioni regolari ad eccezione di Elemento separatore deve avere 1 acquisizione di gruppo." searchsources_element_item_text = "Oggetto:" searchsources_element_save = "Salva" +searchsources_element_test = "" searchsources_element_edit_subsearch = "Edit Subsearch" searchsources_element_add_subsearch = "Aggiungi un Subsearch" searchsources_element_foldername = "Nome Cartella:" diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini index 1a4bd32d5..6f8ff1cfe 100755 --- a/src/locale/ja/configure.ini +++ b/src/locale/ja/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "提供xpaths飼料成分。" searchsources_element_regex_instruct = "入飼料regexes. Regexes以外の項目のセパレーターは1を捕ます。" searchsources_element_item_text = "項目:" searchsources_element_save = "保存" +searchsources_element_test = "" searchsources_element_edit_subsearch = "編集Subsearch" searchsources_element_add_subsearch = "追加Subsearch" searchsources_element_foldername = "フォルダの名前:" diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini index 850ea4b0a..0a67e17e6 100755 --- a/src/locale/kn/configure.ini +++ b/src/locale/kn/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "ಒದಗಿಸಲು xpaths ಫೀಡ್ searchsources_element_regex_instruct = "ನಮೂದಿಸಿ ಫೀಡ್ regexes. Regexes ಹೊರತುಪಡಿಸಿ ಐಟಂ ಸಪರೇಟರ್ ಇರಬೇಕು 1 ಹಿಡಿಯಲು ಗುಂಪು." searchsources_element_item_text = "ಐಟಂ:" searchsources_element_save = "ಉಳಿಸಲು" +searchsources_element_test = "" searchsources_element_edit_subsearch = "ಸಂಪಾದಿಸಿ Subsearch" searchsources_element_add_subsearch = "ಸೇರಿಸಿ Subsearch" searchsources_element_foldername = "ಫೋಲ್ಡರ್ ಹೆಸರು:" diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini index 90d135c6a..d8a1e2fbc 100755 --- a/src/locale/ko/configure.ini +++ b/src/locale/ko/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "제공 xpath 을 먹 아래의 구성 요 searchsources_element_regex_instruct = "입력 공급의 정규표현식. 정규표현식을 제외한 품목을 구분해야 1 캡쳐 그룹입니다." searchsources_element_item_text = "품목:" searchsources_element_save = "저장" +searchsources_element_test = "" searchsources_element_edit_subsearch = "편집 Subsearch" searchsources_element_add_subsearch = "추가 Subsearch" searchsources_element_foldername = "폴더 이름:" diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini index 15cabff38..86de81afb 100644 --- a/src/locale/nl/configure.ini +++ b/src/locale/nl/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "Bieden xpaths naar nieuwsfeed onderdelen searchsources_element_regex_instruct = "Voer feed regexes. Regexes behalve scheider moet 1 vastleggen van de groep." searchsources_element_item_text = "Item:" searchsources_element_save = "Opslaan" +searchsources_element_test = "" searchsources_element_edit_subsearch = "bewerk Subsearch" searchsources_element_add_subsearch = "Voeg een Subsearch" searchsources_element_foldername = "Mapnaam:" diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini index 31e1eb62d..76f6c119e 100755 --- a/src/locale/pl/configure.ini +++ b/src/locale/pl/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "Zapewnić język XPath do podawania skła searchsources_element_regex_instruct = "Wprowadź paszy wyrażenia regularne. Wyrażenia regularne, za wyjątkiem separator powinien mieć 1 grupy roboczej." searchsources_element_item_text = "Polecenie:" searchsources_element_save = "Zapisz" +searchsources_element_test = "" searchsources_element_edit_subsearch = "Edycja, Wyszukiwanie Może" searchsources_element_add_subsearch = "Wyszukiwanie może" searchsources_element_foldername = "Nazwa Folderu:" diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini index 5902e28d4..09780f7a3 100755 --- a/src/locale/pt/configure.ini +++ b/src/locale/pt/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "Fornecer xpaths para alimentar os compone searchsources_element_regex_instruct = "Introduza alimentação regexes. Regexes exceto separador de Item deve ter 1 grupo de captura." searchsources_element_item_text = "Item:" searchsources_element_save = "Salvar" +searchsources_element_test = "" searchsources_element_edit_subsearch = "Editar Subsearch" searchsources_element_add_subsearch = "Adicionar um Subsearch" searchsources_element_foldername = "Nome Da Pasta:" diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini index 81621e51e..6ed81c917 100755 --- a/src/locale/ru/configure.ini +++ b/src/locale/ru/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "Обеспечить язык XPath дл searchsources_element_regex_instruct = "Введите корма регулярные выражения. Регулярные выражения, за исключением разделитель должен иметь 1 группу захвата." searchsources_element_item_text = "Пункт:" searchsources_element_save = "Сохранить" +searchsources_element_test = "" searchsources_element_edit_subsearch = "Редактирование, Поиск Может" searchsources_element_add_subsearch = "Добавить поиск может" searchsources_element_foldername = "Имя Папки:" diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini index c931e3f77..6d752beb6 100644 --- a/src/locale/te/configure.ini +++ b/src/locale/te/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "అందించేందుకు xpat searchsources_element_regex_instruct = "ఎంటర్ feed regexes. Regexes తప్ప అంశం విభజించడానికి కలిగి ఉండాలి 1 పట్టుకుని గ్రూప్." searchsources_element_item_text = "అంశం:" searchsources_element_save = "సేవ్" +searchsources_element_test = "" searchsources_element_edit_subsearch = "మార్చు Subsearch" searchsources_element_add_subsearch = "Add a Subsearch" searchsources_element_foldername = "ఫోల్డర్ పేరు:" diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini index 9a5bc288d..d7e5a4a03 100755 --- a/src/locale/th/configure.ini +++ b/src/locale/th/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "ให้ xpaths ต้องแหล่ searchsources_element_regex_instruct = "ป้อนแหล่งป้อน regexes. Regexes ยกเว้นรายการเครื่องหมายแยกเลขหลักน่าจะได้ 1 ถูกจับกลุ่ม" searchsources_element_item_text = "รายการ:" searchsources_element_save = "บันทึก" +searchsources_element_test = "" searchsources_element_edit_subsearch = "แก้ไข Subsearch" searchsources_element_add_subsearch = "เพิ่ม Subsearch" searchsources_element_foldername = "โฟลเดอร์ชื่อ:" diff --git a/src/locale/tl/configure.ini b/src/locale/tl/configure.ini index 5f894103e..2cf579fd5 100644 --- a/src/locale/tl/configure.ini +++ b/src/locale/tl/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "Magbigay ng xpaths sa feed ang mga bahagi searchsources_element_regex_instruct = "Magpasok ng mga feed regexes. Regexes maliban Item separator ay dapat na magkaroon ng 1 makuha ng mga grupo." searchsources_element_item_text = "Item:" searchsources_element_save = "I-Save ang" +searchsources_element_test = "" searchsources_element_edit_subsearch = "I-Edit Ang Subsearch" searchsources_element_add_subsearch = "Magdagdag ng isang Subsearch" searchsources_element_foldername = "Pangalan Ng Folder:" diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini index 84a2b8d12..d6186f417 100755 --- a/src/locale/tr/configure.ini +++ b/src/locale/tr/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "Sağlamak aşağıdaki bileşenleri besle searchsources_element_regex_instruct = "Yem regexes girin. Öğe ayırıcısı dışında Regexes 1 çekim grubu olmalıdır." searchsources_element_item_text = "Madde:" searchsources_element_save = "Kaydet" +searchsources_element_test = "" searchsources_element_edit_subsearch = "Edit Subsearch" searchsources_element_add_subsearch = "Bir Subsearch Ekle " searchsources_element_foldername = "Klasör Adı:" diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini index 9850088e4..73a4c3d6e 100755 --- a/src/locale/vi_VN/configure.ini +++ b/src/locale/vi_VN/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "Cung cấp xpaths để nuôi thành ph searchsources_element_regex_instruct = "Vào thức ăn regexes. Regexes ngoại trừ Mục tách nên có 1 chụp nhóm." searchsources_element_item_text = "Mục:" searchsources_element_save = "Tiết kiệm" +searchsources_element_test = "" searchsources_element_edit_subsearch = "Chỉnh Sửa Subsearch" searchsources_element_add_subsearch = "Thêm một Subsearch" searchsources_element_foldername = "Thư Mục Tên:" diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini index ddad747a3..f7972338f 100755 --- a/src/locale/zh_CN/configure.ini +++ b/src/locale/zh_CN/configure.ini @@ -1294,6 +1294,7 @@ searchsources_element_feed_instruct = "提供xpath饲料组件如下：" searchsources_element_regex_instruct = "该喂regex. Regex除了项目分离器应该有1捕组。" searchsources_element_item_text = "项目：" searchsources_element_save = "保存" +searchsources_element_test = "" searchsources_element_edit_subsearch = "编辑二次检索" searchsources_element_add_subsearch = "加二次检索" searchsources_element_foldername = "文件夹中的名称：" diff --git a/src/views/elements/SearchsourcesElement.php b/src/views/elements/SearchsourcesElement.php index c1e0e7f47..939f63e88 100644 --- a/src/views/elements/SearchsourcesElement.php +++ b/src/views/elements/SearchsourcesElement.php @@ -71,8 +71,7 @@ class SearchsourcesElement extends Element "arg=editsource&ts={$data['ts']}"; ?> <div class="current-activity"> - <div class='float-opposite'><a href='<?= $base_url ?>'><?= - tl('searchsources_element_editsource_form') ?></a></div> + <?= $this->view->helper("close")->render($base_url); ?> <?= $data['FEED_TEST_RESULTS'] ?? "";?></div> <?php } @@ -208,7 +207,7 @@ class SearchsourcesElement extends Element } ?></td> </tr> <tr><th><?= tl('searchsources_element_medianame') ?></th> - <th colspan="3"><?= tl('searchsources_element_action') + <th colspan="2"><?= tl('searchsources_element_action') ?></th></tr><?php foreach ($data['MEDIA_SOURCES'] as $source) { $encode_source = urlencode(urlencode($source['NAME'])); @@ -266,10 +265,6 @@ class SearchsourcesElement extends Element } ?> </td><?php } ?> - <td><a href="<?=$base_url . "&arg=testsource&ts=". - $source['TIMESTAMP'] . $paging1 . $paging2 ?>"><?= - tl('searchsources_element_testmedia') - ?></a></td> <td><a href="<?=$base_url."&arg=editsource&ts=". $source['TIMESTAMP'] . $paging1 . $paging2 ?>"><?= tl('searchsources_element_editmedia') @@ -550,6 +545,26 @@ class SearchsourcesElement extends Element */ public function renderMediaSourceForm($data) { + $admin_url = htmlentities(B\controllerUrl('admin', true)); + $token_string = C\CSRF_TOKEN . "=" . $data[C\CSRF_TOKEN]; + $pre_base_url = $admin_url . $token_string; + $base_url = $pre_base_url . "&a=searchSources"; + $paging_items = ['SUBstart_row', 'SUBend_row', 'SUBnum_show']; + $paging1 = ""; + foreach ($paging_items as $item) { + if (isset($data[strtoupper($item)])) { + $paging1 .= "&" . $item . "=" . + $data[strtoupper($item)]; + } + } + $paging2 = ""; + $paging_items = ['start_row', 'end_row', 'num_show']; + foreach ($paging_items as $item) { + if (isset($data[strtoupper($item)])) { + $paging2 .= "&" . $item . "=" . + $data[strtoupper($item)]; + } + } ?> <form id="add-source-form" method="post"><?php if ($data["SOURCE_FORM_TYPE"] == "editsource") { ?> @@ -734,7 +749,10 @@ class SearchsourcesElement extends Element e("id='focus-button'"); }?> type="submit"><?=tl('searchsources_element_save') - ?></button></td></tr> + ?></button> <a class='source-anchor-button' href="<?= + $base_url . "&arg=testsource&ts=". + $data['ts'] . $paging1 . $paging2?>"><?= + tl('searchsources_element_test')?></a></td></tr> </table> </form><?php }