minor changes in modules

app/modules/cconcert.php

 
         return sprintf("<div class=\"entry-small\">"
                        ."<h6 class=\"date-and-town\">%s %s<span class=\"time-in-header\"> - %s</span></h6>"
-                       ."<span class=\"venue\">%s</span>"
+                       ."<div class=\"venue\">%s</div>" // this used to be a span
                        ."<h5 class=\"name\"><a href=\"/%s\">%s</a></h5>"
                        ."</div>",
                        date("d.m.", $TS),

app/modules/clocation.php

     
     function view_in_toc() {
         $v = (object) $this->values;
-        return sprintf("<div class=\"location\"><a href=\"%s\"><h3>%s</h3></a><span>%s</span></div>",
+        return sprintf("<div class=\"location\"><a href=\"/%s\"><h3>%s</h3></a><span>%s</span></div>",
                        $this->href,
                        $v->name,
                        $v->town
     }
     function view_only_name() {
         $v = (object) $this->values;
-        return sprintf("<div class=\"location\"><a href=\"%s\"><span>%s</span></a></div>",
+        return sprintf("<div class=\"location\"><a href=\"/%s\"><span>%s</span></a></div>",
                        $this->href,
                        $v->name
         );

app/modules/filesinfolders.php

         $ls = scandir($this->folder);
         foreach ($ls as $k=>$f) {
             if (!strncmp($f,'.',1)) continue; // ignore hidden files
-            
             $ex=explode(".", $f);
             $ext=strtolower(end($ex));
             if (array_key_exists($ex[0],$this->domains)) {

app/modules/filesinfolders.php.orig

-<?php
-
-namespace Modules;
-
-class FilesInFolders {
-
-    private $folder;
-    public $content = array();
-    public $extras = array();
-    private $domains = array('default'=>'default');
-    private $keyfiles = array();
-    private $structs = array();
-    private $EXT=array(
-            'txt'=>array( 'txt', 'text', 'md' ),
-            'pic'=>array( 'jpg', 'jpeg', 'png', 'svg' ),
-            'tpl'=>array( 'html', 'htm', 'tpl' ),
-            'csv'=>array( 'csv' )
-        );
-    public $config = array();
-    private $state=array();
-
-    function __construct($folder,$conf=array()) {
-        $f3 = \Base::instance();
-        
-        if(is_dir($folder)) {                    // are we given a valid path?
-            $this->folder = $folder;
-        } else {                                 // and if not?
-            $this->folder = $f3->get('CONTENT')."./";
-        }
-        
-        if(is_array($conf)) {
-            foreach($conf as $key=>$value) {
-                switch($key) {
-                case 'content':
-                    if(is_array($value)) {
-                        foreach($value as $k=>$v) {
-                            $this->domains[$k] = $v;
-                        }
-                    }
-                    break;
-                case 'keyfiles':
-                    if(is_array($value)) {
-                        foreach($value as $k=>$v) {
-                            $this->keyfiles[$k] = $v;
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-        foreach($this->domains as $domain) {
-            $this->content[$domain] = array();
-        }
-        foreach($this->keyfiles as $keys=>$d) {
-            $this->extras[$keys] = "";
-        }
-    }
-
-
-    /////////////////////////////
-    // read folder into struct //
-    /////////////////////////////
-    function prepare_files() {
-
-        foreach ($this->domains as $k=>$v) {
-            foreach($this->EXT as $cat=>$endings) {
-                $this->structs[$k][$cat]=array();
-            }
-        }
-        
-        $ls = scandir($this->folder);
-        foreach ($ls as $k=>$f) {
-            if (!strncmp($f,'.',1)) continue; // ignore hidden files
-            $ex=explode(".", $f);
-            $ext=strtolower(end($ex));
-            if (array_key_exists($ex[0],$this->domains)) {
-                $domain=$ex[0];
-                $sort_key=1;
-            } elseif (array_key_exists($ex[0], $this->keyfiles)) {
-                if(in_array($ext,$this->EXT[$this->keyfiles[$ex[0]]['type']])) {
-                    $this->extras[$ex[0]]=$this->folder.$f;
-                    continue;
-                }
-            } else {
-                $domain='default';
-                $sort_key=0;
-            }
-            foreach ($this->EXT as $cat=>$endings) {
-                if (in_array($ext, $endings)) {
-                    $this->structs[$domain][$cat][$ex[$sort_key]] = $this->folder.$f;
-                }
-            }
-        }
-
-        foreach($this->keyfiles as $key=>$param) {
-            if(!$this->extras[$key]) {
-                $this->extras[$key] = self::search_up(
-                    $key,
-                    array($this->folder,$param['until']),
-                    $this->EXT[$param['type']]);
-            }
-        }
-    }
-
-    
-    ///////////////////////////////////////
-    // prepare content as per the struct //
-    ///////////////////////////////////////
-    function fill_content() {
-        $md = new \Parsedown();
-        foreach($this->domains as $source=>$destination) {
-            $this->state['current_domain'] = $source;
-            foreach($this->structs[$source]['txt'] as $key=>$file) {
-                $str = $this->read_textfile($file);
-                $str = self::content_element_dispatcher($str);
-                $str = $md->text($str);    
-                $str = sprintf("<div class='post'>%s</div>", $str);
-                $this->content[$destination][$key] = sprintf(
-                    "<div class=\"item %s %s\">%s</div>",
-                    $page,
-                    $key,
-                    $str
-                );
-            }
-            //            var_dump($this->structs);
-            foreach($this->structs[$source]['tpl'] as $key=>$file) {
-                $str = file_get_contents($file);
-                $str = \Template::instance()->render($file);
-                $str = self::linkify($str);
-                $this->content[$destination][$key] = sprintf(
-                    "<div class=\"item %s %s\">%s</div>",
-                    $page,
-                    $key,
-                    $str
-                );
-            }
-            foreach($this->structs[$source]['pic'] as $key=>$file) {
-                $this->content[$destination][$key] = sprintf(
-                    "<img class=\"direct\" src=\"/$file\" />"
-                );
-            }
-            foreach($this->structs[$source]['csv'] as $key=>$file) {
-                $csv = new \Modules\Ography($file,TRUE);
-                $str="<table>";
-                foreach($csv->entries as $entry) {
-                    $tmp="";
-                    foreach($entry as $key=>$value) {
-                        $tmp .= sprintf("<td class=\"%s\">%s</td>", $key, $value);
-                    }
-                    $str .= sprintf("<tr>%s</tr>",$tmp);
-                }
-                $str.="</table>";
-                $this->content[$destination][$key] = $str;
-            }
-        }
-    }
-
-    //////////////////////
-    // read config data //
-    //////////////////////
-    function read_config($domain=false) {
-        foreach ($this->domains as $source=>$destination) {
-            if (is_string($domain)) {
-                if ($source != $domain) { continue; }
-            } elseif (is_array($domain)) {
-                if (!in_array($source,$domain)) { continue; }
-            }
-            foreach ($this->structs[$source]['txt'] as $key=>$file) {
-                $this->read_textfile($file);
-            }
-        }
-        return $this->config;
-    }
-    
-    ////////////////
-    // recursions //
-    ////////////////
-    function search_up($key,$paths,$ext) {
-        $return = "";
-
-        if(count($paths) == 2) {
-            $current = $paths[0];
-            $last_try = $paths[1];
-            $ls=scandir($current);
-            foreach($ls as $f) {
-                if(!strncmp($f,'.',1)) continue; // ignore hidden files
-                $ex=explode(".", $f);
-                if(in_array(strtolower(end($ex)),$ext)) {
-                    if($ex[0]==$key) {
-                        $return = $current.$f;
-                        break;
-                    }
-                }
-            }
-        }
-        
-        if ($return) {
-            return $return;
-        } elseif($current == $last_try) {
-            return false;
-        } else {
-            $p = explode('/',$current);
-            array_pop($p);
-            array_pop($p);
-            return self::search_up($key,array(implode("/",$p)."/",$last_try),$ext);
-        }
-    }
-    
-    ///////////////////////
-    // Utility functions //
-    ///////////////////////
-    function read_textfile($file) {
-        $str = file_get_contents($file);
-        $str = self::linkify($str);
-        $str = self::get_config_from_content($str);
-        return $str;
-    }
-    function linkify($string) {
-        $pattern = "/\s@(\w+)[=]([\w,]+)\s/";
-        $count = 0;
-        $new = preg_replace_callback
-            ($pattern,
-             function($m){
-                 $f3 = \Base::instance();
-                 return $f3->get('SITE_URL')
-                     .$f3->alias($m[1],self::$keyword."=".$m[2])
-                     ;},
-             $string);
-        return $new;
-    }
-    function get_config_from_content($string) {
-        $f3 = \Base::instance();
-        $f = 0;
-
-        $pattern = "/#\+(\w+):\s?(.*)/";
-        $f = preg_match_all($pattern, $string,$matches,PREG_PATTERN_ORDER);
-        for ($i=0;$i<$f;$i++) {
-            $string = str_replace($matches[0][$i],"",$string);
-            $key = $matches[1][$i];
-            $value = $matches[2][$i];
-            
-            if(!strncmp(trim($value),'@',1)) {
-                //var_dump($f3->get('DATA'));
-                if (array_key_exists($key,$f3->get('DATA'))) {
-                    $DATA = $f3->get('DATA.'.$key);
-                    $conf = array($DATA['type'],$DATA['dir']);
-                    $relation = new \Modules\TOC($conf,$f3->get('CONTENT'),substr($value,1));
-                    $relation->dispatch();
-                    $this->config[$key]=array_shift($relation->entries);
-                } else {
-                    $this->config[$key]=$value;
-                }
-            } else {
-                $this->config[$key]=$value;
-            }
-        }
-
-        $pattern = "/§>\s*(\w+):(.*?)\R[\011\040]*\R/s";
-        $f = preg_match_all($pattern, $string,$matches,PREG_PATTERN_ORDER);
-        for ($i=0;$i<$f;$i++) {
-            $string = str_replace($matches[0][$i],"",$string);
-            $key = $matches[1][$i];
-            $value = trim($matches[2][$i]);
-            
-            if (!strncmp($value,'@',1)) {
-#                var_dump();
-                if (array_key_exists($key,$f3->get('DATA'))) {
-                    $entries = explode("@",$value);
-                    array_shift($entries); // first entry is always empty
-                    $DATA = $f3->get('DATA.'.$key);
-                    $conf = array($DATA['type'],$DATA['dir']);
-                    $relation = new \Modules\TOC($conf,$f3->get('CONTENT'),$entries);
-                    $relation->dispatch();
-                    
-                    if(/*count($entries) >*/ 1) {
-                        $this->config[$key]= new CMultiple($relation->entries);
-                    } else {
-                        $this->config[$key]=array_shift($relation->entries);
-                    }
-                } else {
-                    $this->config[$key]=$value;
-                }
-            } else {
-                $this->config[$key]=$value;
-            }
-        }
-        return $string;
-    }
-    function content_element_dispatcher($string) {
-        
-        $md = new \Parsedown();
-        $f0 = 0;
-        // find occorances of {| keyword |}
-        $pattern = "/\{\|(.+?)\|\}/s";
-
-        $f = preg_match_all($pattern, $string,$matches,PREG_PATTERN_ORDER);
-        for ($i=0;$i<$f;$i++) {
-            $body = preg_split("/\R/",trim($matches[1][$i]));
-            $request = explode(":", trim(array_shift($body)));
-            $new="";
-            switch($request[0]) {
-            case 'test':
-                $new="seems to work";
-                break;
-            case 'path':
-                $new="/".$this->folder;
-                break;
-            case 'space':
-                $new=sprintf("<div style=\"height:%s;\"></div>",
-                             $request[1]
-                );
-                break;
-            case 'small-text':
-                if(count($body)) { 
-                    $new=sprintf("<div class=\"f1\">%s</div>",
-                                 implode("\n",$body)
-                    );
-                } else {
-                    $new=sprintf("<span class=\"f1\">%s</span>",
-                                 $request[1]
-                    );
-                }
-                break;
-                
-            case 'TOC':
-                // throw away TOC part of request, we don't need it
-                array_shift($request); 
-                $toc = new \Modules\TOC($request,$this->folder,$body);
-                $toc->dispatch();
-                $new=sprintf("<div class=\"TOC %s\">%s</div>",
-                             array_shift($request),
-                             $toc);
-                break;
-
-            case 'header':
-                array_shift($request);
-                $conf = array('path', $this->folder);
-                $v = $this->read_config();
-                switch (array_shift($request)) {
-                case 'event':
-                    $el = new CEvent($v,$conf);
-                    $el->set_layout('archive');
-                    $new = $el;
-                    break;
-                case 'concert':
-                    $el = new CConcert($v,$conf);
-                    $el->set_layout('header');
-                    $new = $el;
-                    break;
-                }
-
-                break;
-                
-            case 'image':
-                $key=$request[1];
-                $image="";
-                if(!$key) {
-                    $new=self::warn("Content Module \"Image\" needs name of a file (without extension)");
-                    break;
-                }
-                
-                foreach($this->structs as $domain=>$destination) {
-                    if(array_key_exists($key, $this->structs[$domain]['pic'])) {
-                        $image = $this->structs[$domain]['pic'][$key];
-                        unset($this->structs[$domain]['pic'][$key]);
-                        unset($this->content[$this->domains[$domain]][$key]);
-                        break;
-                    }
-                }
-
-                if ($image) {
-                    if( in_array($request[2],array('left','right'))) {
-                        $class = $request[2];
-                    } else {
-                        $class = 'left';
-                    }
-                    $img = new \Image($image);
-                    $ratio = ($img->width() >= $img->height())
-                           ? "landscape"
-                           : "portrait"
-                           ;
-
-                    $cached = new CachedImage($image);
-                    
-                    $new=sprintf("<div class='image-container %s'>"
-                                 ."<div class=\"media %s\"><a href=\"/%s\" data-featherlight=\"image\"><img src=\"/%s\" /></a></div>"
-                                 ."<img src=\"/%s\" style=\"display:none;\" />"
-                                 ."<div class=\"caption\">%s</div>"
-                                 ."</div>",
-                                 $class,
-                                 $ratio,
-                                 $cached->get_src(1400),
-                                 $cached->get_src(500),
-                                 $cached->get_src(1400),
-                                 $md->text(implode("\n",$body))
-                    );
-                } else {
-                    $new=self::warn("image \"$key\" not found");
-                }
-                break;
-
-                
-            case 'youtube':
-                if( in_array($request[2],array('left','right'))) {
-                    $class = $request[2];
-                } else {
-                    $class = 'left';
-                }
-                $video=sprintf("<iframe width=\"700vw\" height=\"394vw\" class=\"ytvideo\" "
-                               ."src=\"https://www.youtube.com/embed/%s\"></iframe>",
-                               $request[1]);
-
-                $thumbnail = sprintf("<div class=\"video-thumbnail\"><a href=\"%s\" data-featherlight=\"#%s\">"
-                                     ."<img class=\"thumbnail\" src=\"https://img.youtube.com/vi/%s/mqdefault.jpg\" />"
-                                     ."<img class=\"play-button\" src=\"%s\" />"
-                                     ."</a></div><div class=\"lightbox\" id=\"%s\" >%s</div>",
-                                     "https://www.youtube.com/watch?v=".$request[1],
-                                     $request[1],
-                                     $request[1],
-                                     "/rsc/img/play-button.png",
-                                     $request[1],
-                                     $video
-                );
-                
-                $new=sprintf("<div class='video-container %s'>"
-                             ."<div class=\"media\">%s</div>"
-                             ."<div class=\"caption\">%s</div>"
-                             ."</div>",
-                             $class,
-                             $thumbnail,
-                             $md->text(implode("\n",$body)));
-                break;
-            default:
-                $new=self::warn("Content Module \"".$request[0]."\" unknown");
-                break;
-            }
-
-            $string = str_replace($matches[0][$i],$new,$string);
-        }
-        return $string;
-    }
-    
-    function warn($message) {
-        return sprintf("<div class=\"warning\">%s</div>",$message);
-    }
-}