<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -15,161 +15,159 @@ require_once(DOKU_PLUGIN.'syntax.php');
  */
 class syntax_plugin_meta extends DokuWiki_Syntax_Plugin {
 
-  /**
-   * return some info
-   */
-  function getInfo(){
-    return array(
-      'author' =&gt; 'Esther Brunner',
-      'email'  =&gt; 'wikidesign@gmail.com',
-      'date'   =&gt; '2006-04-15',
-      'name'   =&gt; 'Meta Plugin',
-      'desc'   =&gt; 'Sets metadata for the current page',
-      'url'    =&gt; 'http://wiki.splitbrain.org/plugin:meta',
-    );
-  }
-
-  function getType(){ return 'substition'; }
-  function getSort(){ return 99; }
-  function connectTo($mode) { $this-&gt;Lexer-&gt;addSpecialPattern('~~META:.*?~~',$mode,'plugin_meta');}
-
-  /**
-   * Handle the match
-   */
-  function handle($match, $state, $pos, &amp;$handler){
-    $match = substr($match,7,-2); //strip ~~META: from start and ~~ from end
-    
-    $data = array();
-    $pairs = explode('&amp;', $match);
-    foreach ($pairs as $pair){
-      list($key, $value) = explode('=', $pair, 2);
-      list($key, $subkey) = explode(' ', $key, 2);
-      if (trim($subkey)) $data[trim($key)][trim($subkey)] = trim($value);
-      else $data[trim($key)] = trim($value);
+    /**
+     * return some info
+     */
+    function getInfo() {
+        return array(
+                'author' =&gt; 'Esther Brunner',
+                'email'  =&gt; 'wikidesign@gmail.com',
+                'date'   =&gt; '2006-04-15',
+                'name'   =&gt; 'Meta Plugin',
+                'desc'   =&gt; 'Sets metadata for the current page',
+                'url'    =&gt; 'http://wiki.splitbrain.org/plugin:meta',
+                );
     }
-    $data = array_change_key_case($data, CASE_LOWER);
-    
-    return $data;
-  }
-
-  /**
-   * Create output
-   */
-  function render($mode, &amp;$renderer, $data){
-    if ($mode == 'xthml'){
-      return true; // don't output anything
-    } elseif ($mode == 'metadata'){
-      
-      // do some validation / conversion for date metadata
-      if (isset($data['date'])){
-        if (is_array($data['date'])){
-          foreach ($data['date'] as $key =&gt; $date){
-            $date = $this-&gt;_convertDate(trim($date));
-            if (!$date) unset($data['date'][$key]);
-            else $data['date'][$key] = $date;
-          }
-        } else {
-          unset($data['date']);
-        }
-      }
-      
-      // now merge the arrays
-      $protected = array('description', 'date', 'contributor');
-      foreach ($data as $key =&gt; $value){
-        
-        // be careful with sub-arrays of $meta['relation']
-        if ($key == 'relation'){
-          foreach ($value as $subkey =&gt; $subvalue){
-            $renderer-&gt;meta[$key][$subkey] =
-              array_merge($renderer-&gt;meta[$key][$subkey], $subvalue);
-          }
-          
-        // be careful with some senisitive arrays of $meta
-        } elseif (in_array($key, $protected)){
-          if (is_array($value)){
-            $renderer-&gt;meta[$key] =
-              array_merge($renderer-&gt;meta[$key], $value);
-          }
-        
-        // no special treatment for the rest
-        } else {
-          $renderer-&gt;meta[$key] = $value;
+
+    function getType() { return 'substition'; }
+    function getSort() { return 99; }
+    function connectTo($mode) { $this-&gt;Lexer-&gt;addSpecialPattern('~~META:.*?~~',$mode,'plugin_meta');}
+
+    /**
+     * Handle the match
+     */
+    function handle($match, $state, $pos, &amp;$handler) {
+        $match = substr($match,7,-2); //strip ~~META: from start and ~~ from end
+
+        $data = array();
+        $pairs = explode('&amp;', $match);
+        foreach ($pairs as $pair) {
+            list($key, $value) = explode('=', $pair, 2);
+            list($key, $subkey) = explode(' ', $key, 2);
+            if (trim($subkey)) $data[trim($key)][trim($subkey)] = trim($value);
+            else $data[trim($key)] = trim($value);
         }
-      }
+        $data = array_change_key_case($data, CASE_LOWER);
+
+        return $data;
     }
-  }
-  
-  /**
-   * converts YYYY-MM-DD[ hh:mm:ss][ -&gt; [YYYY-MM-DD ]hh:mm:ss] to PHP timestamps
-   */
-  function _convertDate($date){
-    list($start, $end) = explode('-&gt;', $date, 2);
-    
-    // single date
-    if (!$end){
-      list($date, $time) = explode(' ', trim($start), 2);
-      if (!preg_match('/\d{4}\-\d{2}\-\d{2}/', $date)) return false;
-      $time = $this-&gt;_autocompleteTime($time);
-      return strtotime($date.' '.$time);
-      
-    // duration
-    } else {
-    
-      // start
-      list($startdate, $starttime) = explode(' ', trim($start), 2);
-      $startdate = $this-&gt;_autocompleteDate($startdate);
-      if (!$startdate) return false;
-      $starttime = $this-&gt;_autocompleteTime($starttime);
-      
-      // end
-      list($enddate, $endtime) = explode(' ', trim($end), 2);
-      if (!trim($endtime)){ // only time given
-        $end_date = $this-&gt;_autocompleteDate($enddate, true);
-        if (!$end_date){
-          $endtime = $this-&gt;_autocompleteTime($enddate, true);
-          $enddate = $startdate;
-        } else {            // only date given
-          $enddate = $end_date;
-          $endtime = '23:59:59';
+
+    /**
+     * Create output
+     */
+    function render($mode, &amp;$renderer, $data) {
+        if ($mode == 'xthml') {
+            return true; // don't output anything
+        } elseif ($mode == 'metadata') {
+
+            // do some validation / conversion for date metadata
+            if (isset($data['date'])) {
+                if (is_array($data['date'])) {
+                    foreach ($data['date'] as $key =&gt; $date) {
+                        $date = $this-&gt;_convertDate(trim($date));
+                        if (!$date) unset($data['date'][$key]);
+                        else $data['date'][$key] = $date;
+                    }
+                } else {
+                    unset($data['date']);
+                }
+            }
+
+            // now merge the arrays
+            $protected = array('description', 'date', 'contributor');
+            foreach ($data as $key =&gt; $value) {
+
+                // be careful with sub-arrays of $meta['relation']
+                if ($key == 'relation') {
+                    foreach ($value as $subkey =&gt; $subvalue) {
+                        $renderer-&gt;meta[$key][$subkey] =
+                            array_merge($renderer-&gt;meta[$key][$subkey], $subvalue);
+                    }
+
+                    // be careful with some senisitive arrays of $meta
+                } elseif (in_array($key, $protected)) {
+                    if (is_array($value)) {
+                        $renderer-&gt;meta[$key] =
+                            array_merge($renderer-&gt;meta[$key], $value);
+                    }
+
+                    // no special treatment for the rest
+                } else {
+                    $renderer-&gt;meta[$key] = $value;
+                }
+            }
         }
-      } else {
-        $enddate = $this-&gt;_autocompleteDate($enddate, true);
-        if (!$enddate) $enddate = $startdate;
-        $endtime = $this-&gt;_autocompleteTime($endtime, true);
-      }
-      
-      $start = strtotime($startdate.' '.$starttime);
-      $end   = strtotime($enddate.' '.$endtime);
-      if (!$start || !$end) return false;
-      return array('start' =&gt; $start, 'end' =&gt; $end);
     }
-  }
-  
-  function _autocompleteDate($date, $end=false){
-    if (!preg_match('/^\d{4}\-\d{2}\-\d{2}$/', $date)){
-      if (preg_match('/^\d{4}\-\d{2}$/', $date))
-        // we don't know which month
-        return ($end) ? $date.'-28' : $date.'-01';
-      elseif (preg_match('/^\d{4}$/', $date))
-        return ($end) ? $date.'-12-31' : $date.'-01-01';
-      else return false;
-    } else {
-      return $date;
+
+    /**
+     * converts YYYY-MM-DD[ hh:mm:ss][ -&gt; [YYYY-MM-DD ]hh:mm:ss] to PHP timestamps
+     */
+    function _convertDate($date) {
+        list($start, $end) = explode('-&gt;', $date, 2);
+
+        // single date
+        if (!$end) {
+            list($date, $time) = explode(' ', trim($start), 2);
+            if (!preg_match('/\d{4}\-\d{2}\-\d{2}/', $date)) return false;
+            $time = $this-&gt;_autocompleteTime($time);
+            return strtotime($date.' '.$time);
+
+            // duration
+        } else {
+
+            // start
+            list($startdate, $starttime) = explode(' ', trim($start), 2);
+            $startdate = $this-&gt;_autocompleteDate($startdate);
+            if (!$startdate) return false;
+            $starttime = $this-&gt;_autocompleteTime($starttime);
+
+            // end
+            list($enddate, $endtime) = explode(' ', trim($end), 2);
+            if (!trim($endtime)) { // only time given
+                $end_date = $this-&gt;_autocompleteDate($enddate, true);
+                if (!$end_date) {
+                    $endtime = $this-&gt;_autocompleteTime($enddate, true);
+                    $enddate = $startdate;
+                } else {            // only date given
+                    $enddate = $end_date;
+                    $endtime = '23:59:59';
+                }
+            } else {
+                $enddate = $this-&gt;_autocompleteDate($enddate, true);
+                if (!$enddate) $enddate = $startdate;
+                $endtime = $this-&gt;_autocompleteTime($endtime, true);
+            }
+
+            $start = strtotime($startdate.' '.$starttime);
+            $end   = strtotime($enddate.' '.$endtime);
+            if (!$start || !$end) return false;
+            return array('start' =&gt; $start, 'end' =&gt; $end);
+        }
     }
-  }
-  
-  function _autocompleteTime($time, $end=false){
-    if (!preg_match('/^\d{2}:\d{2}:\d{2}$/', $time)){
-      if (preg_match('/^\d{2}:\d{2}$/', $time))
-        return ($end) ? $time.':59' : $time.':00';
-      elseif (preg_match('/^\d{2}$/', $time))
-        return ($end) ? $time.':59:59': $time.':00:00';
-      else return ($end) ? '23:59:59' : '00:00:00';
-    } else {
-      return $time;
+
+    function _autocompleteDate($date, $end=false) {
+        if (!preg_match('/^\d{4}\-\d{2}\-\d{2}$/', $date)) {
+            if (preg_match('/^\d{4}\-\d{2}$/', $date))
+                // we don't know which month
+                return ($end) ? $date.'-28' : $date.'-01';
+            elseif (preg_match('/^\d{4}$/', $date))
+                return ($end) ? $date.'-12-31' : $date.'-01-01';
+            else return false;
+        } else {
+            return $date;
+        }
     }
-  }
 
+    function _autocompleteTime($time, $end=false) {
+        if (!preg_match('/^\d{2}:\d{2}:\d{2}$/', $time)) {
+            if (preg_match('/^\d{2}:\d{2}$/', $time))
+                return ($end) ? $time.':59' : $time.':00';
+            elseif (preg_match('/^\d{2}$/', $time))
+                return ($end) ? $time.':59:59': $time.':00:00';
+            else return ($end) ? '23:59:59' : '00:00:00';
+        } else {
+            return $time;
+        }
+    }
 }
-
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//vim:ts=4:sw=4:et:enc=utf-8:</diff>
      <filename>syntax.php</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>6f6b0349694528efd9293a3276dc953d50909aea</id>
    </parent>
  </parents>
  <author>
    <name>Michael Klier</name>
    <email>chi@chimeric.de</email>
  </author>
  <url>http://github.com/dokufreaks/plugin-meta/commit/e4d760161d0b846807ca1ef6830bb862b2e6c874</url>
  <id>e4d760161d0b846807ca1ef6830bb862b2e6c874</id>
  <committed-date>2008-06-07T14:05:52-07:00</committed-date>
  <authored-date>2008-06-07T14:05:52-07:00</authored-date>
  <message>fixed code style

darcs-hash:20080607210552-23886-090c54f85b17d3bbe146d1ec9b0c84dd0fe95b9c.gz</message>
  <tree>ca16e5c23f89a29fd8e81a8f531397445ab44930</tree>
  <committer>
    <name>Michael Klier</name>
    <email>chi@chimeric.de</email>
  </committer>
</commit>
