Changeset 18506 for plugins/nahoWikiPlugin

Timestamp:

05/21/09 14:45:08 (10 months ago)

Author:

naholyr

Message:

[nahoWikiPlugin] branch 1.2 - Release 1.2.1

Files:

• plugins/nahoWikiPlugin/branches/1.2/README (modified) (19 diffs)
• plugins/nahoWikiPlugin/branches/1.2/config/app.yml (modified) (2 diffs)
• plugins/nahoWikiPlugin/branches/1.2/config/search.yml (added)
• plugins/nahoWikiPlugin/branches/1.2/lib/actions/BasenahoWikiActions.php (modified) (10 diffs)
• plugins/nahoWikiPlugin/branches/1.2/lib/actions/BasenahoWikiComponents.php (modified) (6 diffs)
• plugins/nahoWikiPlugin/branches/1.2/lib/config/nahoWikiConfiguration.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/lib/forms/nahoWikiEditForm.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/lib/forms/nahoWikiHistoryForm.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/lib/forms/nahoWikiRevisionsWidget.php (modified) (5 diffs)
• plugins/nahoWikiPlugin/branches/1.2/lib/forms/plugin/PluginnahoWikiEditForm.php (modified) (10 diffs)
• plugins/nahoWikiPlugin/branches/1.2/lib/forms/plugin/PluginnahoWikiHistoryForm.php (modified) (8 diffs)
• plugins/nahoWikiPlugin/branches/1.2/lib/helper/nahoWikiHelper.php (modified) (7 diffs)
• plugins/nahoWikiPlugin/branches/1.2/lib/model/plugin/PluginnahoWikiContent.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/lib/model/plugin/PluginnahoWikiPage.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/lib/model/plugin/PluginnahoWikiPagePeer.php (modified) (11 diffs)
• plugins/nahoWikiPlugin/branches/1.2/lib/model/plugin/PluginnahoWikiRevision.php (modified) (14 diffs)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_breadcrumbs.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_content.php (modified) (2 diffs)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_diff.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_index.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_page.php (modified) (2 diffs)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_page_actions.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_page_edit.php (modified) (2 diffs)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_page_history.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_page_tools.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_searchResult.php (added)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_toc.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/browseSuccess.php (modified) (2 diffs)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/diffSuccess.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/editSuccess.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/userSuccess.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/viewSuccess.php (modified) (1 diff)
• plugins/nahoWikiPlugin/branches/1.2/package.xml (modified) (7 diffs)

plugins/nahoWikiPlugin/branches/1.2/README

@@ -3 +3 @@
-== Overview ==
-
- 
+
-the following features:
-  - Create/edit pages with full versionning
@@ -19 +19 @@
-  - A bunch of helpers to provide total integration in your application
-
- 
- 
+
+
-Interwiki work the same way).
-
- 
- 
- 
+
+
+
-basic wiki requirements.
-
- 
+
-improve it, please contact Nicolas Chambrier (naholyr at yahoo dot fr).
-
-== Screenshots ==
-
-  
-  
- 
+
+
+
-
-== Requirements ==
-
-The prerequisites for using the `nahoWiki` plugin are:
- 
- 
- 
- 
- 
+
+
+
+
+
-   installing this plugin is a good choice.
- 
- 
+
+
-   to XHTML contents.
-
@@ -54 +54 @@
-=== PEAR Install ===
-
- 
+
-symfony command line:
-{{{
@@ -62 +62 @@
-=== SVN Install ===
-
- 
+
-plugin in your plugins directory:
-{{{
@@ -68 +68 @@
-}}}
-
- 
+
-property:
-{{{
@@ -78 +78 @@
-}}}
-
- 
+
-`plugins/nahoWikiPlugin/web` to `web/nahoWikiPlugin`.
-
-== General instructions ==
-
- 
+
-plugin.
-{{{
@@ -114 +114 @@
-== Slots ==
-
- 
+
-inside your layout:
-  - wiki_page_actions : For the current page actions
@@ -120 +120 @@
-  - wiki_breadcrumbs : For the wiki breadcrumbs
-
- 
- 
+
+
-app.yml configuration) and include the corresponding slot in your layout.
-
- 
+
-`include_page_name` have been disabled in app.yml):
-
@@ -143 +143 @@
-}}}
-
+== Search with sfLucene ==
+
+If you install `sfLucenePlugin`, you will be able to search through your wiki pages without any effort ;)
+
+=== Installing search feature ===
+
+  * Case 1 : You did not have `sfLucenePlugin` installed before.
+    In this case, it will be extremely simple, just follow these instructions :
+    - Install [http://www.symfony-project.org/plugins/sfLucenePlugin sfLucenePlugin]
+    - In your app.yml, add {{{ lucene: { index: wiki } }}} to use the search configuration defined by `nahoWikiPlugin`
+
+  * Case 2 : You already use `sfLucenePlugin`.
+    In this case, you already have an index you use, and want to integrate wiki pages in those results.
+    For this, you have two solutions :
+    - Use index {{{ wiki }}} in a custom search form (how to do this is a question for sfLucene).
+    - Or copy configuration under `wiki` in `plugins/nahoWikiPlugin/config/search.yml` to your own `search.yml`.
+
+Once you integrated nahoWikiPlugin and sfLucenePlugin, you just have to rebuild your index
+with {{{ $ symfony lucene:rebuild application }}}, then go to `http://mysite/sfLucene/search`
+and check if your wiki pages appear in your search results.
+
+Note that only the last revision of a page is indexed.
+
-== Configuration ==
-
-=== Schema customization ===
-
- 
- 
- 
- 
+
+
+
+
-[http://trac.symfony-project.com/wiki/sfPropelAlternativeSchemaPluginsfPropelAlternativeSchemaPlugin README file] for more information.
-
-=== Extending model, actions, or templates ===
-
- 
+
-`lib/model/nahoWikiClass.php`, which will contain:
-{{{
@@ -167 +190 @@
-}}}
-
- 
+
-`modules/nahoWiki/actions/actions.class.php` in your app's directory:
-{{{
@@ -183 +206 @@
-}}}
-
- 
- 
- 
- 
+
+
+
+
-pages.
- 
- 
+
+
-should be able to customize the rendering with a few efforts.
-
-=== Using another Wiki renderer ===
-
- 
- 
- 
+
+
+
-`nahoWikiContentPeer::doConvert($content)`.
-
@@ -216 +239 @@
-=== app.yml ===
-
- 
+
-add some of the following lines to your application's `app.yml`:
-
@@ -234 +257 @@
-    routes_register:        on            # Enable embedded routing rules ?
-    wrap_class:             nahoWiki      # All pages are wrapped into a <div class="..."> tag. This is its class name.
+    compress_old_revisions: on            # With this option enabled, old revisions are stored as gzip-compressed (saves space)
-
-    # Rendering for internal links, you may need to customize the *_model options if you change rendering engine
@@ -265 +289 @@
-=== Routing rules ===
-
- 
- 
+
+
-your own routing rules.
-
@@ -306 +330 @@
-=== Look and Feel ===
-
- 
- 
- 
+
+
+
-`config/view.yml` file in it, with the following content:
-
@@ -320 +344 @@
-=== Helpers ===
-
- 
+
-application.
-
@@ -346 +370 @@
-
-Note that the namespaces will be passed through __().
- 
+
-"My first namespace  My second namespace  page" depending on your app.yml.
-
@@ -353 +377 @@
-nahoWiki provides basic support for Interwiki.
-
- 
- 
+
+
-this is an Interwiki link.
-
- 
- 
- 
+
+
+
-image/x-trac-wiki)]]
-
- 
+
-folder, and add the key you want :
-
@@ -378 +402 @@
-Page names support namespaces.
-
- 
- 
+
+
-`internal_link_broken_model` for links to unexisting pages.
-
-==== Namespaces ====
-
- 
+
-[http://www.splitbrain.org/projects/dokuwiki DokuWiki]
-
-
+
+
+
+
-
- * User manual for advanced features (mainly namespaces and interwiki)

plugins/nahoWikiPlugin/branches/1.2/config/app.yml

@@ -13 +13 @@
-#    routes_register:        on            # Enable embedded routing rules ?
-#    wrap_class:             nahoWiki      # All pages are wrapped in a <div class="..."> tag. This is its class name.
+#    compress_old_revisions: on            # With this option enabled, old revisions are stored as gzip-compressed (saves space)
-#
-#    # Rendering for internal links, you may need to customize the *_model options if you change rendering engine
@@ -41 +42 @@
-#      # Put here "human" names for your namespaces, example :
-#      # ns: NameSpace
+#
+#    # Form names
+#    # You cannot change form names directly in the configure method : it would not impact the actions and forms wouldn't work anymore
+#    edit_form_name: wiki_edit
+#    diff_form_name: wiki_diff

plugins/nahoWikiPlugin/branches/1.2/lib/actions/BasenahoWikiActions.php

@@ -17 +17 @@
-class BasenahoWikiActions extends sfActions
-{
-
+
-  public function preExecute()
-  {
@@ -23 +23 @@
-    $this->startPage = sfConfig::get('app_nahoWikiPlugin_start_page', 'index');
-    $this->credentialsEdit = sfConfig::get('app_nahoWikiPlugin_credentials_edit', array());
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // Get page from request if not given as parameter (default behaviour)
- 
-
-$request->getParameter('page', $this->startPage)
-
-
+
+
+isset($params['page']) ? $params['page'] : $this->startPage
+
+
-    // Handle case insensitivity
-    $page_name = strtolower($page_name);
-
+
-    // Support default page if not specified in namespace
- 
+
-    {
-      $page_name .= $this->startPage;
-    }
-
+
-    // Retrieve the page, or start a new one if cannot be found
-    $this->page = nahoWikiPagePeer::retrieveByName($page_name);
- 
+
-    {
-      $this->initNewPage($page_name);
-    }
-
+
-    // Retrieve the revision
-    // Supports revision_old & revision_new, transformed into revision[old] & revision[new]
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    // Can be "revision", "revision[new]", depending on how parameters are passed
-$request->getParameter('revision', $this->page->getLatestRevision()
+isset($params['revision']) ? $params['revision'] : $this->page->getLatestRevision(
-    if (is_array($revision))
-    {
@@ -67 +93 @@
-    }
-    $this->revision = $this->page->getRevision($revision);
- 
+
-    {
-      $this->initNewRevision();
-    }
-
+
-    // Generate the URI parameters to keep trace of the requested page
-    $this->uriParams = 'page=' . $this->page->getName();
- 
+
-    {
-      $this->uriParams .= '&revision=' . $this->revision->getRevision();
-    }
-
+
-    // Permissions management
-    $this->canView = $this->page->canView($this->getUser());
-    $this->canEdit = $this->page->canEdit($this->getUser());
-  }
-
+
-  protected function initNewRevision()
-  {
@@ -89 +115 @@
-    $this->revision->setnahoWikiPage($this->page);
-    $this->revision->initUserName();
-
- 
+
+
-    {
-      $this->revision->setRevision($this->page->getLatestRevision()+1);
-    }
-  }
-
+
-  protected function initNewPage($page_name)
-  {
@@ -102 +128 @@
-  }
-
+  protected function checkFormName(sfForm $form)
+  {
+    if ($form->getName() != $this->formName)
+    {
+      throw new Exception('nahoWikiPlugin configuration error - You changed form name without changing value of corresponding *_form_name option');
+    }
+  }
+
-  protected function forward403Unless($condition)
-  {
- 
-
-
+
+
+
-      return;
-    }
-
- 
+
-    {
-      return $this->forward(sfConfig::get('sf_secure_module'), sfConfig::get('sf_secure_action'));
- 
- 
+
+
-    {
-      return $this->forward(sfConfig::get('sf_login_module'), sfConfig::get('sf_login_action'));
-    }
-  }
-
-
+
+
-  protected function updateBreadcrumbs()
-  {
- 
+
-    {
-      $breadcrumbs = $this->getUser()->getAttribute('breadcrumbs', array(), 'nahoWiki');
- 
+
-      {
-        $breadcrumbs[] = $this->page->getName();
-      }
- 
+
-      {
-        array_shift($breadcrumbs);
@@ -137 +171 @@
-    }
-  }
-
-
+
+
-  public function executeIndex(sfWebRequest $request)
-  {
-
+
-    return $this->forward('nahoWiki', 'view');
-  }
-
+
-  public function executeView(sfWebRequest $request)
-  {
-    $this->setPage($request);
-    $this->forward403Unless($this->canView);
-
+
-    $this->updateBreadcrumbs();
-
-
-
-
+
+
+
+
-  public function executeEdit(sfWebRequest $request)
-  {
-
+, null, 'edit'
-    $this->form = new nahoWikiEditForm($this->revision, array(), array('can-edit' => $this->canEdit));
-
+
-    // Do not reject here if not canEdit, cause it then fallbacks on "view source" feature
- 
-
+
+
-    // Generate the username (this is done by the Revision model)
-    $tmp_revision = new nahoWikiRevision;
-    $tmp_revision->initUserName();
-    $this->userName = $tmp_revision->getUserName();
-
+
-    // Save changes
-
-
+
+
+
+
+
+
-      // Here we must be able to edit
-      $this->forward403Unless($this->canEdit);
-ostParameters(
-
+arameter($this->form->getName()
+
-      if ($this->form->isValid())
-      {
-
+
+
-        {
-          $this->redirect('nahoWiki/view?page=' . $this->page->getName());
@@ -183 +222 @@
-      }
-    }
-
+
-    return sfView::SUCCESS;
-  }
@@ -189 +228 @@
-  public function executeHistory(sfWebRequest $request)
-  {
-
-
-
+, null, 'diff'
+
+
-    $this->form = new nahoWikiHistoryForm($this->page);
-
+
-    return sfView::SUCCESS;
-  }
@@ -199 +238 @@
-  public function executeDiff(sfWebRequest $request)
-  {
-
-
-
+, null, 'diff'
+
+
-    $this->forward404If($this->page->isNew());
-    $this->forward404If($this->revision->isNew());
-
+
-    $this->form = new nahoWikiHistoryForm($this->page);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $this->forward404Unless($this->form->isValid());
-
+
-    $this->revision1 = $this->form->getRevision('old');
-    $this->forward404Unless($this->revision1);
-
+
-    $this->revision2 = $this->form->getRevision('new');
-    $this->forward404Unless($this->revision2);
-
-request->getParameter('mode', 'inlin
-
+
+this->form->getValue('mod
+
-    // Direct download
- 
+
-    {
-      $this->getResponse()->setContentType('text/plain');
-      $this->renderText($this->diff);
-
+
-      return sfView::NONE;
-    }
-
-
-
-
+
+
+
+
-  public function executeUser(sfWebRequest $request)
-  {
-    $this->setPage($request, 'User:' . $request->getParameter('name'));
-    $this->forward403Unless($this->canView);
-
-
-
-
+
+
+
+
-  protected function buildIndexTree(&$tree, $path, $fullpath, $expanded)
-  {
- 
+
-    {
-      $tree[$path[0]] = $fullpath;
- 
- 
+
+
-    {
-      $category = array_shift($path) . ':';
- 
+
-      {
-        $tree[$category] = array();
-      }
- 
+
-      {
-        array_shift($expanded);
@@ -257 +308 @@
-    }
-  }
-
+
-  public function executeBrowse(sfWebRequest $request)
-  {
-    $this->setPage($request);
-
+
-    $path = $request->getParameter('path');
-    $tree = array();
-
+
-    $c = new Criteria;
-    $c->addAscendingOrderByColumn(nahoWikiPagePeer::NAME);
-    $pages = nahoWikiPagePeer::doSelect($c);
-
- 
+
+
-    {
-      $this->buildIndexTree($tree, explode(':', $page->getName()), $page->getName(), explode(':', $path));
-    }
-
+
-    $this->tree = $tree;
-    $this->uriParams = 'page=' . urlencode($request->getParameter('page'));
-
-
-
-
+
+
+
+
-}

plugins/nahoWikiPlugin/branches/1.2/lib/actions/BasenahoWikiComponents.php

@@ -4 +4 @@
- *
- * @package    symfony
-             
+
- * @version    SVN: $Id$
- */
@@ -10 +10 @@
-class BasenahoWikiComponents extends sfComponents
-{
-
+
+
+
+
+
+
+
+
+
+
+
-  public function executeContent()
-  {
@@ -16 +26 @@
-      $this->hide_toc = !sfConfig::get('app_nahoWikiPlugin_include_toc', true);
-    }
-
+
-    $start = sfConfig::get('app_nahoWikiPlugin_start_page', 'index');
-    if (!($page_name = $this->pagename)) {
-      $page_name = $start;
-    }
-
+
-    // Support default page if not specified in namespace
-    if (substr($page_name, -1) == ':') {
-      $page_name .= $start;
-    }
-
+
-    // Retrieve the page, or start a new one if cannot be found
-    $this->page = nahoWikiPagePeer::retrieveByName($page_name);
-
+
-    // Build page object
-    if (!$this->page) {
@@ -41 +51 @@
-      $this->revision = $this->page->getRevision($revision);
-    }
-
+
-    // Buil revision object
-    if (!$this->revision) {
@@ -47 +57 @@
-      $this->revision->setnahoWikiPage($this->page);
-    }
-
+
-    // Generate the URI parameters to keep trace of the requested page
-    $this->uriParams = 'page=' . urlencode($this->page->getName());
@@ -53 +63 @@
-      $this->uriParams .= '&revision=' . urlencode($this->revision->getRevision());
-    }
-
+
-    // Permissions
-    $this->canView = $this->page->canView($this->getUser());
-    $this->canEdit = $this->page->canEdit($this->getUser());
-  }
-
+
-}

plugins/nahoWikiPlugin/branches/1.2/lib/config/nahoWikiConfiguration.php

@@ -34 +34 @@
-    $r->prependRoute('wiki_diff_full',      new sfRoute('/wiki/diff.:mode/:page/:revision_old/:revision_new',     array('module' => 'nahoWiki', 'action' => 'diff', 'raw' => '0')));
-    $r->prependRoute('wiki_diff_raw',       new sfRoute('/wiki/diff.:mode.txt/:page/:revision_old/:revision_new', array('module' => 'nahoWiki', 'action' => 'diff', 'raw' => '1')));
+    
+    // Lucene route
+    $r->prependRoute('wiki_lucene',         new sfRoute('/wiki/view-result/:sf_highlight/:page', array('module' => 'nahoWiki', 'action' => 'view')));
-  }
-  

plugins/nahoWikiPlugin/branches/1.2/lib/forms/nahoWikiEditForm.php

@@ -1 @@
- 
+
-
-class nahoWikiEditForm extends PluginnahoWikiEditForm
-{
-
+
+
+
+
+
+
-  public function configure()
-  {
-
+
-  }
-
+
-}

plugins/nahoWikiPlugin/branches/1.2/lib/forms/nahoWikiHistoryForm.php

@@ -3 +3 @@
-class nahoWikiHistoryForm extends PluginnahoWikiHistoryForm
-{
-
+
+
+
+
+
-  public function configure()
-  {
-
+
-  }
-
+
-}

plugins/nahoWikiPlugin/branches/1.2/lib/forms/nahoWikiRevisionsWidget.php

@@ -3 +3 @@
-class nahoWikiRevisionsWidget extends sfWidgetForm
-{
-
+
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addRequiredOption('page');
-  }
-
+
-  public function render($name, $value = null, $attributes = array(), $errors = array())
-  {
@@ -16 +16 @@
-      throw new Exception('Option "page" must be instance of nahoWikiPage');
-    }
-
+
-    sfApplicationConfiguration::getActive()->loadHelpers(array('Date', 'I18n', 'nahoWiki'));
-
- 
- 
+
+
+
-        $this->renderContentTag('th', __('Compare'), array('colspan' => 2)).
-        $this->renderContentTag('th', __('Revision')).
@@ -28 +28 @@
-      )
-    );
-
+
-    $content = '';
-    foreach ($page->getRevisions() as $revision)
@@ -42 +42 @@
-        $attrNew['checked'] = 'checked';
-      }
- 
+
-        $this->renderContentTag('td', $this->renderTag('input', $attrOld)).
-        $this->renderContentTag('td', $this->renderTag('input', $attrNew)).
@@ -48 +48 @@
-        $this->renderContentTag('td', format_datetime($revision->getCreatedAt('U'))).
-        $this->renderContentTag('td', link_to_wiki_user(null, $revision->getUserName())).
-$revision->getComment(
+sfOutputEscaper::escape(ESC_SPECIALCHARS, $revision->getComment()
-      );
-    }
-    $body = $this->renderContentTag('tbody', $content);
-
+
-    return $this->renderContentTag('table', $head.$body, array('class' => 'wiki-history'));
-  }
-
+
-}

plugins/nahoWikiPlugin/branches/1.2/lib/forms/plugin/PluginnahoWikiEditForm.php

@@ -3 +3 @@
-class PluginnahoWikiEditForm extends sfForm
-{
-
+
-  /**
- 
+
-   * @var nahoWikiRevision
-   */
-  protected $object;
-
+
-  /**
- 
+
-   * @param $revision
-   * @param $options
@@ -19 +19 @@
-  public function __construct(nahoWikiRevision $revision, $defaults = array(), $options = array(), $CSRFSecret = null)
-  {
+    var_dump($revision->getContent());
-    $this->object = $revision;
-
+
-    parent::__construct($defaults, $options, $CSRFSecret);
-  }
-
+
-  /**
-   * (non-PHPdoc)
@@ -31 +32 @@
-  {
-    sfApplicationConfiguration::getActive()->loadHelpers('I18N');
-
+
-    $this->setWidgets(array(
+      'page'            => new sfWidgetFormInputHidden(array('default' => $this->object->getnahoWikiPage()->getName())),
+      'revision'        => new sfWidgetFormInputHidden(array('default' => $this->object->getRevision())),
-      'content'         => new sfWidgetFormTextarea(array('default' => strval($this->object->getContent())), array('rows' => 20, 'cols' => 80)),
-      'comment'         => new sfWidgetFormInput(array('default' => $this->object->isNew() ? __('Creation') : $this->object->getComment()), array('size' => 80)),
@@ -38 +41 @@
-      'request-preview' => new sfWidgetFormInput(array('type' => 'submit', 'label' => __('Preview')), array('class' => 'preview-button', 'value' => __('Preview'))),
-    ));
-
+
-    $this->setValidators(array(
+      'page'            => new sfValidatorPass(),
+      'revision'        => new sfValidatorPass(),
-      'content'         => new sfValidatorString(array('required' => true), array('required' => __('The content cannot be left blank. Please enter some text...'))),
-      'comment'         => new sfValidatorString(array('required' => true), array('required' => __('Please enter a comment describing your changes shortly.'))),
@@ -45 +50 @@
-      'request-preview' => new sfValidatorPass(),
-    ));
-
- 
+
+
-    {
-      unset($this['submit'], $this['request-preview']);
@@ -56 +61 @@
-      $this->setDefault('comment', '');
-    }
+
+    $this->widgetSchema->setNameFormat(sfConfig::get('app_nahoWikiPlugin_edit_form_name', 'wiki_edit').'[%s]');
-  }
-
+
-  /**
- 
+
-   * @return unknown_type
-   */
@@ -66 +73 @@
-    $revision = $this->object;
-    $page = $revision->getnahoWikiPage();
-
+
-    if (!$page->isNew())
-    {
-      $revision->archiveContent();
-
+
-      $revision = new nahoWikiRevision();
-      $revision->initUserName();
@@ -76 +83 @@
-      $page->addnahoWikiRevision($revision);
-    }
-
+
-    $revision->setContent($this->getValue('content'));
-    $revision->setComment($this->getValue('comment'));
-
- 
+
+
-    {
-      $page->setLatestRevision($revision->getRevision());
-      $page->save();
-
+
-      return true;
-    }
-
+
-    return false;
-  }
-
+
-  /**
-   * Checks that the value has not changed
- 
+
-   * @param $value
-   * @param $name
@@ -101 +108 @@
-  {
-    $objectValue = call_user_func($this->object, 'get'.ucfirst($name));
-
+
-    if (strval($value) != strval($objectValue))
-    {
@@ -107 +114 @@
-    }
-  }
-
+
-}

plugins/nahoWikiPlugin/branches/1.2/lib/forms/plugin/PluginnahoWikiHistoryForm.php

@@ -3 +3 @@
-class PluginnahoWikiHistoryForm extends sfForm
-{
-
+
-  /**
- 
+
-   * @var nahoWikiPage
-   */
-  protected $object;
-
+
-  /**
- 
+
-   * @param $revision
-   * @param $options
@@ -20 +20 @@
-  {
-    sfApplicationConfiguration::getActive()->loadHelpers('I18N');
-
+
-    $this->object = $page;
-
+
-    parent::__construct($defaults, $options, $CSRFSecret);
-  }
-
+
-  /**
-   * (non-PHPdoc)
@@ -33 +33 @@
-  {
-    $revisions = array('new' => $this->object->getLatestRevision(), 'old' => $this->object->getLatestRevision()-1);
-    
-    $this->setWidgets(array(
-      'page'      => new sfWidgetFormInputHidden(array('default' => $this->object->getName())),
+      'mode'      => new sfWidgetFormInputHidden(array('default' => 'inline')),
-      'revision'  => new nahoWikiRevisionsWidget(array('default' => $revisions, 'page' => $this->object, 'label' => __('History'))),
-      'submit'    => new sfWidgetFormInput(array('type' => 'submit', 'label' => ' '), array('class' => 'submit-button', 'value' => __('View changes between selected versions'))),
-    ));
-
+
-    $this->setValidators(array(
-      'page'     => new sfValidatorPass(),
+      'mode'     => new sfValidatorPass(),
-      'revision' => new sfValidatorPass(),
-      'submit'   => new sfValidatorPass(),
-    ));
+
+    $this->widgetSchema->setNameFormat(sfConfig::get('app_nahoWikiPlugin_diff_form_name', 'wiki_diff').'[%s]');
-  }
-
+
-  /**
- 
+
-   * @var array of nahoWikiRevision
-   */
-  protected $revisions = array();
-
+
-  /**
- 
+
-   * @return nahoWikiRevision
-   */
@@ -64 +67 @@
-      throw new Exception('Revision "'.$type.'" is not defined');
-    }
-
+
-    if (isset($this->revisions[$type]))
-    {
-      return $this->revisions[$type];
-    }
-
+
-    // Note : we do not make a query here, we just ask to page all its revisions (cached), as the history widget will retrieve them anyway
-    $page_revisions = $this->object->getRevisions();
@@ -79 +82 @@
-      }
-    }
-
+
-    throw new Exception('Revision "'.$type.'" cannot be found');
-  }
-
+
-  /**
- 
+
-   * @var Text_Diff
-   */
-  protected $diff = null;
-
+
-  /**
- 
+
-   * @return Text_Diff
-   */
@@ -99 +102 @@
-      return $this->diff;
-    }
-
+
-    $lines1 = explode("\n", $this->getRevision('old')->getContent());
-    $lines2 = explode("\n", $this->getRevision('new')->getContent());
-
+
-    return $this->diff = new Text_Diff('auto', array($lines1, $lines2));
-  }
-
+
-  /**
-   * Renders diff
- 
+
-   * @param $mode e.g. "inline", "context", or "unified"
-   * @return string
@@ -115 +118 @@
-  {
-    $diff = $this->getDiff();
-
+
-    $class = 'Text_Diff_Renderer_' . $mode;
-    if (!class_exists($class))
@@ -121 +124 @@
-      throw new Exception('Invalid diff renderer "'.$mode.'" (class "'.$class.'" not found)');
-    }
-
+
-    $renderer = new $class();
-
+
-    return $renderer->render($diff);
-  }
-
-
-
-
-
-
-
-
-
-
-
+
-}

plugins/nahoWikiPlugin/branches/1.2/lib/helper/nahoWikiHelper.php

@@ -11 +11 @@
-function link_to_diff($text, $page_name, $rev1, $rev2, $mode = 'inline')
-{
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -27 +32 @@
-function link_to_raw_diff($text, $page_name, $rev1, $rev2, $mode = 'unified')
-{
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -41 +51 @@
- * @return string
- */
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  return url_for($url, $absolute);
-}
@@ -66 +78 @@
-    $options = sfToolkit::stringToArray($options);
-  }
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  {
-    $text = htmlspecialchars(nahoWikiPagePeer::getBasename($page_name));
- 
+
-    {
-      $text .= ' rev. ' . $options['revision'];
-    }
-  }
-
+
-  return link_to($text, $url, $options);
-}
@@ -157 +171 @@
-  $options['pagename'] = $page_name;
-  $options['revision'] = $revision;
-
+
-  include_component('nahoWiki', 'content', $options);
-}
@@ -176 +190 @@
-  $options['pagename'] = $page_name;
-  $options['revision'] = $revision;
-
+
-  return get_component('nahoWiki', 'content', $options);
-}
@@ -193 +207 @@
-function translate_namespaces($page_name, $new_separator = ':') {
-  use_helper('I18N');
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-    {
-
-
-
-
-
+
-    }
-
-
+
+
+
-  return $page_name;
-}

plugins/nahoWikiPlugin/branches/1.2/lib/model/plugin/PluginnahoWikiContent.php

@@ -4 +4 @@
- * Subclass for representing a row from the 'sf_simple_wiki_content' table.
- *
- 
+
- *
- * @package plugins.nahoWikiPlugin.lib.model
- 
+
-class PluginnahoWikiContent extends BasenahoWikiContent
-{
-
+
+
+
-  public function getGzContent()
-  {
-$v = parent::getGzContent();
-
-if (is_resource($v)) {
-
-while ($part = fread($v, 1024
+if (is_null($this->gz_content_unstreamed))
+{
+  $v = parent::getGzContent();
+
+if (is_resource($v
-      {
-
+
+
+
+
+
+
-      }
-
-return $str;
-} else { // it's already
-
-return strval($v);
+else
+{
+    // it's not
+  $this->gz_content_unstreamed = strval($v);
+}
-    }
+
+    return $this->gz_content_unstreamed;
-  }
-
+
-}

plugins/nahoWikiPlugin/branches/1.2/lib/model/plugin/PluginnahoWikiPage.php

@@ -168 +168 @@
-  }
-
+  /**
+   * Shortcut to get content
+   * 
+   * @param $revision
+   * @return string
+   */
+  public function getContent($revision = null)
+  {
+    return $this->getRevision($revision)->getContent();
+  }
+  
-}
+
+// Lucene integration
+if (class_exists('sfLucene', true))
+{
+  sfLucenePropelBehavior::getInitializer()->setup('nahoWikiPage');
+}

plugins/nahoWikiPlugin/branches/1.2/lib/model/plugin/PluginnahoWikiPagePeer.php

@@ -4 +4 @@
- * Subclass for performing query and update operations on the 'sf_simple_wiki_page' table.
- *
- 
+
- *
- * @package plugins.nahoWikiPlugin.lib.model
- 
+
-class PluginnahoWikiPagePeer extends BasenahoWikiPagePeer
-{
-
+
-  /**
-   * Returns the URL to page named $page_name (from $page)
@@ -18 +18 @@
-   * @return string
-   */
-
+, array $additionalParameters = array()
-  {
-
+
+
+
+
+
+
+
+
-  }
-
+
-  /**
-   * Returns the PCRE mask that validates page names
@@ -38 +45 @@
-    }
-    $mask .= ']+';
-
+
-    return $mask;
-  }
-
+
-  /**
-   * Gets basename from full pagename
@@ -52 +59 @@
-    $ns_separator = sfConfig::get('app_nahoWikiPlugin_ns_separator', ':');
-    $parts = explode($ns_separator, $page_name);
-
+
-    return array_pop($parts);
-  }
-
+
-  /**
-   * Gets namespace from full pagename
@@ -62 +69 @@
-   * @return string
-   */
-
+
-  public static function getNamespace($page_name)
-  {
@@ -68 +75 @@
-    $parts = explode($ns_separator, $page_name);
-    array_pop($parts);
-
+
-    return implode($ns_separator, $parts);
-  }
-
+
-  /**
-   * Retrieve a page from its name
@@ -78 +85 @@
-   * @return nahoWikiPage
-   */
-
+
-  public static function retrieveByName($name)
-  {
-    $c = new Criteria;
-    $c->add(self::NAME, $name);
-
+
-    return self::doSelectOne($c);
-  }
-
+
-  /**
-   * Retrieve pages from their names
@@ -93 +100 @@
-   * @return array
-   */
-
+
-  public static function retrieveByNames($names)
-  {
-    $c = new Criteria;
-    $c->add(self::NAME, $names, Criteria::IN);
-
+
-    return self::doSelect($c);
-  }
-
+
-  /**
-   * Retrieve a page from its name
@@ -108 +115 @@
-   * @return nahoWikiPage
-   */
-
+
-  public static function retrieveByNameJoinAll($name)
-  {
-    $result = self::retrieveByNamesJoinAll(array($name));
-
+
-    if (is_array($result) && count($result)) {
-      return $result[0];
@@ -119 +126 @@
-    }
-  }
-
+
-  /**
-   * Retrieve pages from their names
@@ -126 +133 @@
-   * @return array
-   */
-
+
-  public static function retrieveByNamesJoinAll($names)
-  {
-    $c = new Criteria;
-    $c->add(self::NAME, $names, Criteria::IN);
-
+
-    return nahoWikiRevisionPeer::doSelectJoinAll($c);
-  }
-
-
+
+
-}

plugins/nahoWikiPlugin/branches/1.2/lib/model/plugin/PluginnahoWikiRevision.php

@@ -4 +4 @@
- * Subclass for representing a row from the 'sf_simple_wiki_revision' table.
- *
- 
+
- *
- * @package plugins.nahoWikiPlugin.lib.model
- 
+
-class PluginnahoWikiRevision extends BasenahoWikiRevision
-{
-
+
-  /**
-  * Taken from sfIp2Country
@@ -44 +44 @@
-    return ($ip ? $ip : isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '127.0.0.1'); // Return with the found IP, the remote address or the local loopback address
-  }
-
+
-  /**
-   * Initializes username from context
@@ -58 +58 @@
-    }
-  }
-
+
-  /**
-   * Is current revision the latest for its page ?
@@ -68 +68 @@
-    return $this->getRevision() == $this->getPage()->getLatestRevision();
-  }
-
+
-  /**
-   * Returns the attached page
@@ -74 +74 @@
-   * @return nahoWikiPage
-   */
-
+
-  public function getPage()
-  {
-    return $this->getnahoWikiPage();
-  }
-
+
-  /**
-   * Gets content
@@ -85 +85 @@
-   * @return string
-   */
-
+
-  public function getContent()
-  {
-    $content_storage = $this->getnahoWikiContent();
-
+
-    if (!$content_storage) {
-      return null;
-    }
-
+
-    $uncompressed_content = $content_storage->getContent();
-    $compressed_content = $content_storage->getGzContent();
-
-
-
-
-
-
-
-
-
-
+
+
-  }
-
+
-  /**
-   * Gets converted content
@@ -113 +105 @@
-   * @return string
-   */
-
+
-  public function getXHTMLContent()
-  {
@@ -120 +112 @@
-    $content = nahoWikiContentPeer::doConvert($content);
-    $content = nahoWikiContentPeer::postConvert($this->getPage(), $content);
-
+
-    return $content;
-  }
-
+
-  /**
-   * Defines content
@@ -129 +121 @@
-   * @param string $content
-   */
-
+
-  public function setContent($content)
-  {
@@ -139 +131 @@
-    $content_storage->setContent($content);
-  }
-
+
-  /**
-   * Compress current content to save space
@@ -145 +137 @@
-   * @return boolean
-   */
-
+
-  public function archiveContent()
-  {
-
-
-
+
+
-      return false;
-    }
-
+
+
+
+
+
+
+
+
-    $uncompressed_content = $content_storage->getContent();
-
+
+
-      $compressed_content = gzdeflate($uncompressed_content, 9);
-      $content_storage->setGzContent($compressed_content);
@@ -161 +160 @@
-      $content_storage->save();
-    }
-
+
-    return true;
-  }
-
+
-  /**
-   * Uncompress content
@@ -170 +169 @@
-   * @return boolean
-   */
-
+
-  public function unarchiveContent()
-  {
-    $content_storage = $this->getnahoWikiContent();
-
-
+
+
+
-      return false;
-    }
-
+
-    $compressed_content = $content_storage->getGzContent();
-
+
+
-      $uncompressed_content = gzinflate($compressed_content, 9);
-      $content_storage->setGzContent(null);
@@ -186 +187 @@
-      $content_storage->save();
-    }
-
+
-    return true;
-  }
-
-
+
+
-}

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_breadcrumbs.php

@@ -1 +1 @@
-<?php use_helper('nahoWiki') ?>
+
+<?php if ($breadcrumbs instanceof sfOutputEscaper) $breadcrumbs = $breadcrumbs->getRawValue() ?>
-
-<div class="wiki-breadcrumbs">
-  <?php $first = true; foreach ($breadcrumbs as $breadcrumb): ?>
-    <?php if (!$first): ?><span class="wiki-breadcrumbs-separator"><?php echo $breadcrumbs_separator ?></span><?php endif ?>
-translate_namespaces($breadcrumb
+sfOutputEscaper::escape(ESC_SPECIALCHARS, translate_namespaces($breadcrumb)
-  <?php $first = false; endforeach ?>
-</div>

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_content.php

@@ -7 +7 @@
-  <h1 class="wiki-title">
-    <?php if (@$preview): ?><em><?php echo __('Preview') ?></em> : <?php endif ?>
-$revision->getPage()->getName(
+htmlspecialchars($revision->getPage()->getName()
-  </h1>
-<?php end_slot() ?>
@@ -17 +17 @@
-    <p class="wiki-warning">
-      <?php echo __('There is no article here yet.') ?>
-uriParams
+sf_data->getRaw('uriParams')
-    </p>
-  <?php else: ?>

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_diff.php

@@ -9 +9 @@
-  <p class="wiki-diff-intro wiki-warning"><?php echo __('There is no difference between the selected revisions.') ?></p>
-<?php else: ?>
-diff
+sf_data->getRaw('diff')
-  <ul class="wiki-diff-links">
-    <li><?php echo link_to_diff(__('View reverse diff'), $page->getName(), $revision2->getRevision(), $revision1->getRevision()) ?></li>

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_index.php

@@ -1 +1 @@
-<ul>
-tree
+sf_data->getRaw('tree')
-  <li>
-  <?php
+    $name = sfOutputEscaper::escape(ESC_SPECIALCHARS, $name);
+
-    if (is_array($elements)) {
-      $fullpath = ($base ? $base . ':' : '') . substr($name, 0, -1);
-      $class = 'wiki-link-category wiki-link-category-' . (count($elements) ? 'open' : 'closed');
-      echo link_to($name, 'nahoWiki/browse?path=' . urlencode($fullpath) . '&' . $uriParams, 'class=' . $class);
-uriParams
+sf_data->getRaw('uriParams')
-    } else {
-      echo link_to_wiki($name, $elements, 'class=wiki-link-page');

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_page.php

@@ -1 +1 @@
-<?php use_helper('I18N') ?>
-
-uriParams
+sf_data->getRaw('uriParams')
-
-<?php if (!$canView): ?>
@@ -11 +11 @@
-  <?php endif ?>
-
-uriParams
+sf_data->getRaw('uriParams')
-
-<?php endif ?>

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_page_actions.php

@@ -1 +1 @@
-<ul class="wiki-actions">
-  <?php if ($canView): ?>
- 
-uriParams
- 
-uriParams
- 
-uriParams
+
+sf_data->getRaw('uriParams')
+
+sf_data->getRaw('uriParams')
+
+sf_data->getRaw('uriParams')
-  <?php endif ?>
- 
-uriParams
+
+sf_data->getRaw('uriParams')
-</ul>

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_page_edit.php

@@ -11 +11 @@
-  <?php endif ?>
-
-?' . $uriParams
-
+'
+
-    <?php if ($canEdit): ?>
-      <?php if (!$sf_user->isAuthenticated()): ?>
@@ -20 +20 @@
-      <?php endif ?>
-    <?php endif ?>
-
+
-    <ul>
-      <?php echo $form->renderUsing('list') ?>
-    </ul>
-
+
-  </form>
-
-f_request->getParameter('request-preview')
+howPreview
-    <p class="wiki-warning"><?php echo __('This is a preview of how your text will look like. Remember: <strong>It is not saved yet</strong> !') ?></p>
-revision
+page->getRevision()
-  <?php endif ?>
-

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_page_history.php

@@ -8 +8 @@
-
-<?php if (@$revision1 && @$revision2): ?>
-diff
+sf_data->getRaw('diff')
-<?php endif ?>

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_page_tools.php

@@ -12 +12 @@
-<?php slot('wiki_page_actions') ?>
-  <?php $action = sfContext::getInstance()->getActionName() ?>
-uriParams
+sf_data->getRaw('uriParams')
-<?php end_slot() ?>
-<?php if ($include_actions_slot) include_slot('wiki_page_actions') ?>

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/_toc.php

@@ -2 +2 @@
-
-<ul class="wiki-toc-level<?php echo $i ?>">
-toc
+sf_data->getRaw('toc')
-    <li class="wiki-toc-level<?php echo $i ?>">
-      <?php if (@$title['title']): ?>

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/browseSuccess.php

@@ -2 +2 @@
-<div class="<?php echo sfConfig::get('app_nahoWikiPlugin_wrap_class', 'nahoWiki') ?>">
-
-uriParams
+sf_data->getRaw('uriParams')
-
-<h1 class="wiki-title"><?php echo __('Index by title') ?></h1>
@@ -8 +8 @@
-<div class="wiki-index">
-  <p><?php echo __('All the pages of the wiki are listed here, sorted by category and name.') ?></p>
-tree, 'base' => '', 'uriParams' => $uriParams
+sf_data->getRaw('tree'), 'base' => '', 'uriParams' => $sf_data->getRaw('uriParams')
-</div>
-

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/diffSuccess.php

@@ -3 +3 @@
-<?php include_partial('page_tools', array('uriParams' => 'page=' . urlencode($page->getName()), 'canView' => $canView, 'canEdit' => $canEdit)) ?>
-
-diff
+sf_data->getRaw('diff')
-
-</div>

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/editSuccess.php

@@ -1 +1 @@
-<div class="<?php echo sfConfig::get('app_nahoWikiPlugin_wrap_class', 'nahoWiki') ?>">
-
-uriParams
+sf_data->getRaw('uriParams')
-
-uriParams, 'userName' => $userName, 'canView' => $canView, 'canEdit' => $canEdit
+sf_data->getRaw('uriParams'), 'userName' => $sf_data->getRaw('userName'), 'canView' => $canView, 'canEdit' => $canEdit, 'showPreview' => $showPreview
-
-</div>

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/userSuccess.php

@@ -6 +6 @@
-<?php end_slot() ?>
-
-uriParams
+sf_data->getRaw('uriParams')
-
-</div>

plugins/nahoWikiPlugin/branches/1.2/modules/nahoWiki/templates/viewSuccess.php

@@ -1 +1 @@
-<div class="<?php echo sfConfig::get('app_nahoWikiPlugin_wrap_class', 'nahoWiki') ?>">
-
-uriParams
+sf_data->getRaw('uriParams')
-
-</div>

plugins/nahoWikiPlugin/branches/1.2/package.xml

@@ -3 +3 @@
-  xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 
+
-http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
-  <name>nahoWikiPlugin</name>
@@ -9 +9 @@
-  <summary>Simple Wiki system plugin.</summary>
-  <description>A simple, but full-featured, Wiki system for Symfony applications. Provides following main features :
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  <lead>
-    <name>Nicolas Chambrier (naholyr)</name>
@@ -23 +25 @@
-    <active>yes</active>
-  </lead>
-02
+21
-  <version>
-0
-0
+1
+1
-  </version>
-  <stability>
@@ -72 +74 @@
-        <dir name="nahoWiki">
-          <dir name="templates">
-
-
-
-
-
-
+
-            <file role="data" name="_content.php" />
-            <file role="data" name="_diff.php" />
+            <file role="data" name="_index.php" />
+            <file role="data" name="_page_actions.php" />
+            <file role="data" name="_page_edit.php" />
+            <file role="data" name="_page_history.php" />
-            <file role="data" name="_page_tools.php" />
+            <file role="data" name="_page.php" />
+            <file role="data" name="_searchResult.php" />
+            <file role="data" name="_toc.php" />
-            <file role="data" name="browseSuccess.php" />
+            <file role="data" name="diffSuccess.php" />
+            <file role="data" name="editSuccess.php" />
-            <file role="data" name="historySuccess.php" />
-            <file role="data" name="userSuccess.php" />
-            <file role="data" name="_page_history.php" />
-            <file role="data" name="diffSuccess.php" />
-            <file role="data" name="_breadcrumbs.php" />
-            <file role="data" name="viewSuccess.php" />
-          </dir>
@@ -194 +197 @@
-        <file role="data" name="config_handlers.yml" />
-        <file role="data" name="interwiki.yml" />
+        <file role="data" name="search.yml" />
-      </dir>
-      <!-- Embedded languages files -->
-      <dir name="i18n">
+        <file role="data" name="messages.de.xml" />
-        <file role="data" name="messages.en.xml" />
-        <file role="data" name="messages.fr.xml" />
@@ -227 +232 @@
-    <release>
-      <version>
+        <release>1.2.1</release>
+        <api>1.2.1</api>
+      </version>
+      <stability>
+        <release>stable</release>
+        <api>stable</api>
+      </stability>
+      <date>2009-05-21</date>
+      <license uri="http://www.opensource.org/licenses/mit-license.html">MIT</license>
+      <notes>  * naholyr : integration of sfLucene, add option to disable gzip compression.
+  * naholyr (thanks to Jens Schulze) : bugfixes and Deutsch translation.
+  * naholyr (thanks to Julien Muetton) : added a name to forms, fixed output escaping.</notes>
+    </release>
+    <release>
+      <version>
-        <release>1.2.0</release>
-        <api>1.2.0</api>
@@ -236 +256 @@
-      <date>2009-05-02</date>
-      <license uri="http://www.opensource.org/licenses/mit-license.html">MIT</license>
-
+  
-    </release>
-  </changelog>