]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'epub' into dev
authortcit <tcit@tcit.fr>
Fri, 16 May 2014 14:31:18 +0000 (16:31 +0200)
committertcit <tcit@tcit.fr>
Fri, 16 May 2014 14:31:18 +0000 (16:31 +0200)
Conflicts:
themes/baggy/home.twig

1  2 
inc/poche/Poche.class.php
themes/baggy/home.twig

index 515d4cac3f482607d51cd69b5f6639ebfea32ecd,bce7d65158a04708734968c82f7eefab5c4623ed..92db7d1b2f23a73b896021805e8550907f08a663
@@@ -511,55 -511,42 +511,55 @@@ class Poch
                  Tools::redirect();
                  break;
              case 'add_tag' :
 -                $tags = explode(',', $_POST['value']);
 -                $entry_id = $_POST['entry_id'];
 -                $entry = $this->store->retrieveOneById($entry_id, $this->user->getId());
 -                if (!$entry) {
 -                    $this->messages->add('e', _('Article not found!'));
 -                    Tools::logm('error : article not found');
 -                    Tools::redirect();
 -                }
 -                //get all already set tags to preven duplicates
 -                $already_set_tags = array();
 -                $entry_tags = $this->store->retrieveTagsByEntry($entry_id);
 -                foreach ($entry_tags as $tag) {
 -                  $already_set_tags[] = $tag['value'];
 +                if (isset($_GET['search'])) {
 +                    //when we want to apply a tag to a search
 +                    $tags = array($_GET['search']);
 +                    $allentry_ids = $this->store->search($tags[0], $this->user->getId());
 +                    $entry_ids = array();
 +                    foreach ($allentry_ids as $eachentry) {
 +                        $entry_ids[] = $eachentry[0];
 +                    }
 +                } else { //add a tag to a single article
 +                    $tags = explode(',', $_POST['value']);
 +                    $entry_ids = array($_POST['entry_id']);
                  }
 -                foreach($tags as $key => $tag_value) {
 -                    $value = trim($tag_value);
 -                    if ($value && !in_array($value, $already_set_tags)) {
 -                      $tag = $this->store->retrieveTagByValue($value);
 -
 -                      if (is_null($tag)) {
 -                          # we create the tag
 -                          $tag = $this->store->createTag($value);
 -                          $sequence = '';
 -                          if (STORAGE == 'postgres') {
 -                              $sequence = 'tags_id_seq';
 +                foreach($entry_ids as $entry_id) {
 +                    $entry = $this->store->retrieveOneById($entry_id, $this->user->getId());
 +                    if (!$entry) {
 +                        $this->messages->add('e', _('Article not found!'));
 +                        Tools::logm('error : article not found');
 +                        Tools::redirect();
 +                    }
 +                    //get all already set tags to preven duplicates
 +                    $already_set_tags = array();
 +                    $entry_tags = $this->store->retrieveTagsByEntry($entry_id);
 +                    foreach ($entry_tags as $tag) {
 +                      $already_set_tags[] = $tag['value'];
 +                    }
 +                    foreach($tags as $key => $tag_value) {
 +                        $value = trim($tag_value);
 +                        if ($value && !in_array($value, $already_set_tags)) {
 +                          $tag = $this->store->retrieveTagByValue($value);
 +                          if (is_null($tag)) {
 +                              # we create the tag
 +                              $tag = $this->store->createTag($value);
 +                              $sequence = '';
 +                              if (STORAGE == 'postgres') {
 +                                  $sequence = 'tags_id_seq';
 +                              }
 +                              $tag_id = $this->store->getLastId($sequence);
 +                          }
 +                          else {
 +                              $tag_id = $tag['id'];
                            }
 -                          $tag_id = $this->store->getLastId($sequence);
 -                      }
 -                      else {
 -                          $tag_id = $tag['id'];
 -                      }
 -
 -                      # we assign the tag to the article
 -                      $this->store->setTagToEntry($tag_id, $entry_id);
 +
 +                          # we assign the tag to the article
 +                          $this->store->setTagToEntry($tag_id, $entry_id);
 +                        }
                      }
                  }
 +                $this->messages->add('s', _('The tag has been applied successfully'));
 +                Tools::logm('The tag has been applied successfully');
                  Tools::redirect();
                  break;
              case 'remove_tag' :
                      Tools::redirect();
                  }
                  $this->store->removeTagForEntry($id, $tag_id);
 +                Tools::logm('tag entry deleted');
 +                if ($this->store->cleanUnusedTag($tag_id)) {
 +                    Tools::logm('tag deleted');
 +                }
 +                $this->messages->add('s', _('The tag has been successfully deleted'));
                  Tools::redirect();
                  break;
              default:
  \r
        return new HTMLPurifier($config);
      }
+     
+     /**
+      * handle epub
+      */
+     public function createEpub() {
+        
+         switch ($_GET['method']) {
+             case 'id':
+                 $entryID = filter_var($_GET['id'],FILTER_SANITIZE_NUMBER_INT);
+                 $entry = $this->store->retrieveOneById($entryID, $this->user->getId());
+                 $entries = array($entry);
+                 $bookTitle = $entry['title'];
+                 $bookFileName = substr($bookTitle, 0, 200);
+                 break;
+             case 'all':
+                 $entries = $this->store->retrieveAll($this->user->getId());
+                 $bookTitle = sprintf(_('All my articles on '), date(_('d.m.y'))); #translatable because each country has it's own date format system
+                 $bookFileName = _('Allarticles') . date(_('dmY'));
+                 break;
+             case 'tag':
+                 $tag = filter_var($_GET['tag'],FILTER_SANITIZE_STRING);
+                 $tags_id = $this->store->retrieveAllTags($this->user->getId(),$tag);
+                 $tag_id = $tags_id[0]["id"]; // we take the first result, which is supposed to match perfectly. There must be a workaround.
+                 $entries = $this->store->retrieveEntriesByTag($tag_id,$this->user->getId());
+                 $bookTitle = sprintf(_('Articles tagged %s'),$tag);
+                 $bookFileName = substr(sprintf(_('Tag %s'),$tag), 0, 200);
+                 break;
+             case 'category':
+                 $category = filter_var($_GET['category'],FILTER_SANITIZE_STRING);
+                 $entries = $this->store->getEntriesByView($category,$this->user->getId());
+                 $bookTitle = sprintf(_('All articles in category %s'), $category);
+                 $bookFileName = substr(sprintf(_('Category %s'),$category), 0, 200);
+                 break;
+             case 'search':
+                 $search = filter_var($_GET['search'],FILTER_SANITIZE_STRING);
+                 $entries = $this->store->search($search,$this->user->getId());
+                 $bookTitle = sprintf(_('All articles for search %s'), $search);
+                 $bookFileName = substr(sprintf(_('Search %s'), $search), 0, 200);
+                 break;
+             case 'default':
+                 die(_('Uh, there is a problem while generating epub.'));
+             
+         }
+         $content_start =
+         "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+         . "<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\">\n"
+         . "<head>"
+         . "<meta http-equiv=\"Default-Style\" content=\"text/html; charset=utf-8\" />\n"
+         . "<title>wallabag articles book</title>\n"
+         . "</head>\n"
+         . "<body>\n";
+         $bookEnd = "</body>\n</html>\n";
+         
+         $log = new Logger("wallabag", TRUE);
+         $fileDir = CACHE;
+         
+         $book = new EPub(EPub::BOOK_VERSION_EPUB3);
+         $log->logLine("new EPub()");
+         $log->logLine("EPub class version: " . EPub::VERSION);
+         $log->logLine("EPub Req. Zip version: " . EPub::REQ_ZIP_VERSION);
+         $log->logLine("Zip version: " . Zip::VERSION);
+         $log->logLine("getCurrentServerURL: " . $book->getCurrentServerURL());
+         $log->logLine("getCurrentPageURL..: " . $book->getCurrentPageURL());
+         
+         $book->setTitle(_('wallabag\'s articles'));
+         $book->setIdentifier("http://$_SERVER[HTTP_HOST]", EPub::IDENTIFIER_URI); // Could also be the ISBN number, prefered for published books, or a UUID.
+         //$book->setLanguage("en"); // Not needed, but included for the example, Language is mandatory, but EPub defaults to "en". Use RFC3066 Language codes, such as "en", "da", "fr" etc.
+         $book->setDescription(_("Some articles saved on my wallabag"));
+         $book->setAuthor("wallabag","wallabag");
+         $book->setPublisher("wallabag","wallabag"); // I hope this is a non existant address :)
+         $book->setDate(time()); // Strictly not needed as the book date defaults to time().
+         //$book->setRights("Copyright and licence information specific for the book."); // As this is generated, this _could_ contain the name or licence information of the user who purchased the book, if needed. If this is used that way, the identifier must also be made unique for the book.
+         $book->setSourceURL("http://$_SERVER[HTTP_HOST]");
+         
+         $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "PHP");
+         $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, "wallabag");
+         
+         $cssData = "body {\n margin-left: .5em;\n margin-right: .5em;\n text-align: justify;\n}\n\np {\n font-family: serif;\n font-size: 10pt;\n text-align: justify;\n text-indent: 1em;\n margin-top: 0px;\n margin-bottom: 1ex;\n}\n\nh1, h2 {\n font-family: sans-serif;\n font-style: italic;\n text-align: center;\n background-color: #6b879c;\n color: white;\n width: 100%;\n}\n\nh1 {\n margin-bottom: 2px;\n}\n\nh2 {\n margin-top: -2px;\n margin-bottom: 2px;\n}\n";
+         
+         $log->logLine("Add Cover");
+         
+         $fullTitle = "<h1> " . $bookTitle . "</h1>\n";
+         
+         $book->setCoverImage("Cover.png", file_get_contents("themes/baggy/img/apple-touch-icon-152.png"), "image/png", $fullTitle);
+         
+         $cover = $content_start . _('<span style="text-align:center;display:block;">Produced by wallabag with PHPePub</span>') . $bookEnd;
+         
+         //$book->addChapter("Table of Contents", "TOC.xhtml", NULL, false, EPub::EXTERNAL_REF_IGNORE);
+         $book->addChapter("Notices", "Cover2.html", $cover);
+         
+         $book->buildTOC();
+         
+         foreach ($entries as $entry) {
+             $tags = $this->store->retrieveTagsByEntry($entry['id']);
+             foreach ($tags as $tag) {
+                 $book->setSubject($tag['value']);
+             }
+             
+             $log->logLine("Set up parameters");
+             
+             $chapter = $content_start . $entry['content'] . $bookEnd;
+             $book->addChapter($entry['title'], htmlspecialchars($entry['title']) . ".html", $chapter, true, EPub::EXTERNAL_REF_ADD);
+             $log->logLine("Added chapter " . $entry['title']);
+         }
+         if (DEBUG_POCHE) { 
+         $epuplog = $book->getLog();
+         $book->addChapter("Log", "Log.html", $content_start . $log->getLog() . "\n</pre>" . $bookEnd); // generation log
+         // Only used in case we need to debug EPub.php.
+         //$book->addChapter("ePubLog", "ePubLog.html", $content_start . $epuplog . "\n</pre>" . $bookEnd); 
+         }
+         $book->finalize();
+         $zipData = $book->sendBook($bookFileName);
+     }
  }
diff --combined themes/baggy/home.twig
index 8df5ce1ca0dda82800ab9b4e145679fa49589670,ef2e097c1cfb8050d2c5de287a136a209140b1cb..3942d3bf8aef4396db5f0dc4ee1541ce60e48b0e
@@@ -25,7 -25,7 +25,7 @@@
                  {% block pager %}
                      {% if nb_results > 1 %}
                  <div class="results">
 -                    <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}</div>
 +                    <div class="nb-results">{{ nb_results }} {% trans "results" %}{% if search_term is defined %} {% trans %}found for « {{ search_term }} »{% endtrans %}{% endif %}</div>
                          {{ page_links | raw }}
                  </div>
                      {% elseif nb_results == 1 %}
  
                  {% endfor %}
              </div>
+             {{ block('pager') }}
              {% if view == 'home' %}{% if nb_results > 1 %}<a title="{% trans "Mark all the entries as read" %}"  href="./?action=archive_all">{{ "Mark all the entries as read" }}</a>{% endif %}{% endif %}
++
 +            {% if search_term is defined %}<a title="{% trans %} Apply the tag {{ search_term }} to this search {% endtrans %}" href="./?action=add_tag&search={{ search_term }}">{% trans %} Apply the tag {{ search_term }} to this search {% endtrans %}</a>{% endif %}
+             
+             {% if tag %}<a title="{% trans "Download the articles from this tag in an epub" %}" href="./?epub&amp;method=tag&amp;tag={{ tag.value }}">{% trans "Download the articles from this tag in an epub" %}</a>
+             {% elseif search_term is defined %}<a title="{% trans "Download the articles from this search in an epub" %}" href="./?epub&amp;method=search&amp;search={{ search_term }}">{% trans "Download the articles from this search in an epub" %}</a>
+             {% else %}<a title="{% trans "Download the articles from this category in an epub" %}" href="./?epub&amp;method=category&amp;category={{ view }}">{% trans "Download the articles from this category in an epub" %}</a>{% endif %}
+             
              {% endif %}
-             {{ block('pager') }}
  {% endblock %}