moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-23 09:32:15 -05:00
Code Issues Releases Wiki Activity

merge fix 776

Browse Source
This commit is contained in:
Thomas Citharel 2014-08-16 00:54:46 +02:00
commit 1daa8e4a0f
3 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
inc/poche/Poche.class.php
View File

@ -551,19 +551,18 @@ class Poche
* import datas into your wallabag * import datas into your wallabag
* @return boolean * @return boolean
*/ */
public function import()
{ public function import() {
if (isset($_FILES['file'])) {
if ( isset($_FILES['file']) && $_FILES['file']['tmp_name'] ) {
Tools::logm('Import stated: parsing file'); Tools::logm('Import stated: parsing file');
// assume, that file is in json format // assume, that file is in json format
$str_data = file_get_contents($_FILES['file']['tmp_name']); $str_data = file_get_contents($_FILES['file']['tmp_name']);
$data = json_decode($str_data, true); $data = json_decode($str_data, true);
if ( $data === null ) { if ( $data === null ) {
//not json - assume html //not json - assume html
$html = new simple_html_dom(); $html = new simple_html_dom();
$html->load_file($_FILES['file']['tmp_name']); $html->load_file($_FILES['file']['tmp_name']);
$data = array(); $data = array();
@ -580,9 +579,7 @@ class Poche
$data[] = $tmpEntry; $data[] = $tmpEntry;
} }
} }
# the second <ol/ul> is for read links
// the second <ol/ul> is for read links
$read = ((sizeof($data) && $read)?0:1); $read = ((sizeof($data) && $read)?0:1);
} }
} }
@ -631,7 +628,9 @@ class Poche
Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).'); Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).');
} }
else {
$this->messages->add('s', _('Did you forget to select a file?'));
}
// file parsing finished here // file parsing finished here
// now download article contents if any // now download article contents if any
// check if we need to download any content // check if we need to download any content

2
themes/baggy/config.twig
View File

@ -111,7 +111,7 @@
<fieldset class="w500p"> <fieldset class="w500p">
<div class="row"> <div class="row">
<label class="col w150p" for="file">{% trans "File:" %}</label> <label class="col w150p" for="file">{% trans "File:" %}</label>
<input class="col" type="file" id="file" name="file" tabindex="4"> <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
</div> </div>
<div class="row mts txtcenter"> <div class="row mts txtcenter">
<button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button> <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>

2
themes/default/config.twig
View File

@ -110,7 +110,7 @@
<fieldset class="w500p"> <fieldset class="w500p">
<div class="row"> <div class="row">
<label class="col w150p" for="file">{% trans "File:" %}</label> <label class="col w150p" for="file">{% trans "File:" %}</label>
<input class="col" type="file" id="file" name="file" tabindex="4"> <input class="col" type="file" id="file" name="file" tabindex="4" required="required">
</div> </div>
<div class="row mts txtcenter"> <div class="row mts txtcenter">
<button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button> <button class="bouton" type="submit" tabindex="4">{% trans "Import" %}</button>