From: Reini U. <ru...@us...> - 2002-08-17 15:52:57
|
Update of /cvsroot/phpwiki/phpwiki/lib/plugin In directory usw-pr-cvs1:/tmp/cvs-serv29246/lib/plugin Modified Files: Calendar.php WikiForm.php Added Files: CacheTest.php RecentChangesCached.php TexToPng.php VisualWiki.php Log Message: added SubPages support: see SUBPAGE_SEPERATOR in index.php added ImageLinks [ img | link ], like [images/prev.gif|PrevLink][images/next.gif|NextLink] external image links might be a security risk. added support for a local pear copy (DB, Cache) added Johannes Große's VisualWiki and cached plugins. fixed some Subpage related pages and templates. (Calender plugin) --- NEW FILE: CacheTest.php --- <?php // -*-php-*- // +---------------------------------------------------------------------+ // | CacheTest.php | // +---------------------------------------------------------------------+ // | simple test of the WikiPluginCached class which provides a | // | text to image conversion. | // | This is a usage example of WikiPluginCached. | // | | // | Copyright (C) 2002 Johannes Große (Johannes Große) | // | You may copy this code freely under the conditions of the GPL | // +---------------------------------------------------------------------+ /*------------------------------------------------------------------------ | CacheTest *------------------------------------------------------------------------ | | You may call this plugin as follows: | | <?plugin CacheTest text="What a wonderful test!" ?> | /*----------------------------------------------------------------------- | | Source | *----------------------------------------------------------------------*/ /*----------------------------------------------------------------------- | WikiPlugin_CacheTest *----------------------------------------------------------------------*/ require_once "lib/WikiPluginCached.php"; class WikiPlugin_CacheTest extends WikiPluginCached { /* --------- overwrite virtual or abstract methods ---------------- */ function getPluginType() { return PLUGIN_CACHED_IMG_ONDEMAND; } function getName() { return "CacheTest"; } function getDescription() { return 'This is a simple example using WikiPluginCached.'; } function getDefaultArguments() { return array('text' => $this->getDescription(), 'font' => '3', 'type' => 'png' ); } // should return image handle // if an error occurs you MUST call $this->complain('aboutwhichidocomplain') // you may produce an image handle to an error image // if you do not, WikiPluginImageCache will do so. function getImage($dbi, $argarray, $request) { extract($argarray); return $this->produceGraphics($text,$font); // This should also work // return $this->lazy_produceGraphics($text,$font); } // getImage function getImageType($dbi, $argarray, $request) { extract($argarray); if (in_array($type,array('png','gif','jpg'))) { return $type; } return 'png'; } function getAlt($dbi, $argarray, $request) { // ALT-text for <img> tag extract($argarray); return $text; } function getExpire($dbi, $argarray, $request) { return '+600'; // 600 seconds life time } /* -------------------- extremely simple converter -------------------- */ function produceGraphics($text, $font ) { // The idea (and some code) is stolen from the text2png plugin // but I did not want to use TTF. ImageString is quite ugly // and quite compatible. It's only a usage example. if ($font<1 || $font>5) { $text = "Fontnr. (font=\"$font\") should be in range 1-5"; $this->complain($text); $font = 3; } $ok = ($im = @ImageCreate(400, 40)); $bg_color = ImageColorAllocate($im, 240, 240, 240); $text_color1 = ImageColorAllocate($im, 120, 120, 120); $text_color2 = ImageColorAllocate($im, 0, 0, 0); ImageFilledRectangle($im, 0, 0, 149, 49, $bg_color); ImageString($im, $font, 11, 12, $text, $text_color1); ImageString($im, $font, 10, 10, $text, $text_color2); if (!$ok) { // simple error handling by WikiPluginImageCache $this->complain("Could not create image"); return false; } // image creation takes really _much_ time :-) // so caching is very useful! sleep(4); return $im; } // produce_Graphics /* -------------------------------------------------------------------- */ // we could have used the simple built-in text2img function // instead of writing our own: function lazy_produceGraphics( $text, $font ) { if ($font<1 || $font>5) { $text = "Fontnr. (font=\"$font\") should be in range 1-5"; $this->complain($text); $font = 3; } return $this->text2img($text,$font,array(0,0,0),array(255,255,255)); } // lazy_produceGraphics } // WikiPlugin_CacheTest // For emacs users // Local Variables: // mode: php // tab-width: 4 // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: ?> --- NEW FILE: RecentChangesCached.php --- <?php // -*-php-*- // +---------------------------------------------------------------------+ // | WikiPluginCached.php | // +---------------------------------------------------------------------+ // | Copyright (C) 2002 Johannes Große (Johannes Große) | // | You may copy this code freely under the conditions of the GPL | // +---------------------------------------------------------------------+ /* There is a bug in it: When the cache is empty and you safe the wikipages, an immediately created cached output of RecentChanges will at the rss-image-link include an action=edit */ require_once "lib/WikiPluginCached.php"; require_once "lib/plugin/RecentChanges.php"; class WikiPlugin_RecentChangesCached extends WikiPluginCached { /* --------- overwrite virtual or abstract methods ---------------- */ function getPluginType() { return PLUGIN_CACHED_HTML; } function getName() { return "RecentChangesCached"; } function getDescription() { return 'Caches output of RecentChanges called with default arguments.'; } function getDefaultArguments() { return WikiPlugin_RecentChanges::getDefaultArguments(); } function getExpire($dbi, $argarray, $request) { return '+900'; // 15 minutes } function getHtml($dbi, $argarray, $request) { $loader = new WikiPluginLoader; return $loader->expandPI('<?plugin RecentChanges ' . WikiPluginCached::glueArgs($argarray) . ' ?>',$request); } } // WikiPlugin_TexToPng // For emacs users // Local Variables: // mode: php // tab-width: 4 // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: ?> --- NEW FILE: TexToPng.php --- <?php // -*-php-*- // +---------------------------------------------------------------------+ // | TexToPng.php | // +---------------------------------------------------------------------+ // | This is a WikiPlugin that surrounds tex commands given as parameter | // | with a page description and renders it using several existing | // | engines into a gif, png or jpeg file. | // | TexToPng is usage example for WikiPluginCached. | // | | // | Copyright (C) 2002 Johannes Große (Johannes Große) | // | You may copy this code freely under the conditions of the GPL | // +---------------------------------------------------------------------+ /*----------------------------------------------------------------------- | CONFIGURATION *----------------------------------------------------------------------- | output mere debug messages (should be set to false in a stable | version) | */ define('TexToPng_debug', false); /*----------------------------------------------------------------------- | OPTION DEFAULTS *----------------------------------------------------------------------*/ /*---- | use antialias for rendering; | anitalias: blurs, _looks better_, needs twice space, renders slowlier | */ define('TexToPng_antialias', true); /*---- | Use transparent background; dont combine with antialias on a dark | background. Seems to have a bug: produces strange effects for some | ps-files (almost non readable,blurred output) even when directly | invoked from shell. So its probably a pstoimg bug. | */ define('TexToPng_transparent', false); /*---- | default value for rescaling | allowed range: 0 - 5 (integer) | */ define('TexToPng_magstep', 3); /*----------------------------------------------------------------------- | | Source | *----------------------------------------------------------------------*/ // check boolean constants if (!defined('TexToPng_debug')) { define('TexToPng_debug', false); } if (!defined('TexToPng_antialias')) { define('TexToPng_antialias', false); } if (!defined('TexToPng_transparent')) { define('TexToPng_transparent', false); } /*----------------------------------------------------------------------- | WikiPlugin_TexToPng *----------------------------------------------------------------------*/ require_once "lib/WikiPluginCached.php"; class WikiPlugin_TexToPng extends WikiPluginCached { /* --------- overwrite virtual or abstract methods ---------------- */ function getPluginType() { return PLUGIN_CACHED_IMG_ONDEMAND; } function getName() { return "TexToPng"; } function getDescription() { return 'Converts TeX to an image. May be used to embed' . ' formulas in PhpWiki.'; } function getDefaultArguments() { return array('tex' => "", 'magstep' => TexToPng_magstep, 'img' => 'png', 'subslash' => 'off', 'antialias' => TexToPng_antialias ? 'on' : 'off', 'transparent' => TexToPng_transparent ? 'on' : 'off', 'center' => 'off'); } function getImage($dbi, $argarray, $request) { extract($argarray); $this->checkParams($tex, $magstep, $subslash, $antialias, $transparent); return $this->TexToImg($tex, $magstep, $antialias, $transparent); } // run function getExpire($dbi, $argarray, $request) { return '0'; } function getImageType($dbi, $argarray, $request) { extract($argarray); return $img; } function getAlt($dbi, $argarray, $request) { extract($argarray); return $tex; } function embedImg($url,$dbi,$argarray,$request) { $html = HTML::img( array( 'src' => $url, 'alt' => htmlspecialchars($this->getAlt($dbi,$argarray,$request)) )); if ($argarray['center']=='on') return HTML::div( array('style' => 'text-align:center;'), $html); return $html; } /* -------------------- error handling ---------------------------- */ function dbg( $out ) { // test if verbose debug info is selected if (TexToPng_debug) { $this->complain( $out."\n" ); } else { if (!$this->_errortext) { // yeah, I've been told to be quiet, but obviously // an error occured. So at least complain silently. $this->complain(' '); } } } // dbg /* -------------------- parameter handling ------------------------ */ function helptext() { $aa= TexToPng_antialias ?'on(default)$|$off':'on$|$off(default)'; $tp= TexToPng_transparent?'on(default)$|$off':'on$|$off(default)'; $help = '/settabs/+/indent&$<$?plugin /bf{Tex} & [{/tt transparent}] & = "png(default)$|$jpeg$|$gif"& /cr'."\n". '/+&$<$?plugin /bf{TexToPng} & /hfill {/tt tex} & = "/TeX/ commands"& /cr'."\n". '/+& & /hfill [{/tt img}] & = "png(default)$|$jpeg$|$gif"& /cr'."\n". '/+& & /hfill [{/tt magstep}] & = "0 to 5 ('.TexToPng_magstep.' default)"& /cr'."\n". '/+& & /hfill [{/tt center}] & = "on$|$off(default)"& /cr'."\n". '/+& & /hfill [{/tt subslash}] & = "on$|$off(default)"& /cr'."\n". '/+& & /hfill [{/tt antialias}] & = "'.$aa.'"& /cr'."\n". '/+& & /hfill [{/tt transparent}] & = "'.$tp.'"&?$>$ /cr'."\n"; return strtr($help, '/', '\\' ); } // helptext function checkParams( &$tex, &$magstep, $subslash, &$aalias, &$transp ) { if ($subslash=='on') { // WORKAROUND for backslashes $tex = strtr($tex,'/','\\'); } // ------- check parameters $def = $this->getDefaultArguments(); if ($tex=='') { $tex = $this->helptext(); } if ($magstep < 0 || $magstep > 5 ) { $magstep = $def["magstep"]; } // calculate magnification factor $magstep = floor(10*pow(1.2,$magstep))/10; $aalias = $aalias != 'off'; $transp = $transp != 'off'; } // checkParams /* ------------------ image creation ------------------------------ */ function execute($cmd,$complainvisibly=false) { exec($cmd, $errortxt, $returnval); $ok = $returnval == 0; if (!$ok) { if (!$complainvisibly) { $this->dbg('Error during execution of '.$cmd ); }; while (list($key,$value)=each($errortxt)) { if ($complainvisibly) { $this->complain( $value."\n" ); } else { $this->dbg( $value ); } } } return $ok; } // execute /* ---------------------------------------------------------------- */ function createTexFile($texfile,$texstr) { if ($ok=($fp=fopen($texfile, 'w'))!=0 ) { // prepare .tex file $texcommands = '\nopagenumbers' . "\n" . '\hoffset=0cm' . "\n" . '\voffset=0cm' . "\n" . // '\hsize=20cm' . "\n" . // '\vsize=10ex' . "\n" . $texstr . "\n" . '\vfill\eject' . "\n" . '\end' . "\n\n"; $ok = fwrite($fp, $texcommands); $ok = fclose($fp) && $ok; // close anyway } if (!$ok) { $this->dbg('could not write .tex file: ' . $texstr); } return $ok; } // createTexFile /* ---------------------------------------------------------------- */ function TexToImg($texstr, $scale, $aalias, $transp) { $cacheparams = $GLOBALS['CacheParams']; $tempfiles = tempnam($cacheparams['cache_dir'],'TexToPng'); $img = 0; // $size = 0; // procuce options for pstoimg $options = ($aalias ? '-aaliastext -color 8 ' : '-color 1 ') . ($transp ? '-transparent ' : '') . '-scale ' . $scale . ' ' . '-type png -crop btlr -geometry 600x150 -margins 0,0'; // rely on intelligent bool interpretation $ok= $tempfiles && $this->createTexFile($tempfiles.'.tex',$texstr) && $this->execute('cd '.$cacheparams['cache_dir'].'; '. 'tex '.$tempfiles.'.tex',true) && $this->execute('dvips -o'.$tempfiles.'.ps '.$tempfiles.'.dvi') && $this->execute('pstoimg '.$options. ' -out '.$tempfiles.'.png '. $tempfiles.'.ps' ) && file_exists( $tempfiles.'.png' ); if ($ok) { if (!($img = ImageCreateFromPNG( $tempfiles.'.png' ))) { $this->dbg("Could not open just created image file: $tempfiles"); $ok = false; } } // clean up tmpdir; in debug mode only if no error occured if ( !TexToPng_debug || (TexToPng_debug && $ok)) { if ($tempfiles) { unlink($tempfiles); unlink($tempfiles.'.ps'); unlink($tempfiles.'.tex'); //unlink($tempfiles.'.aux'); unlink($tempfiles.'.dvi'); unlink($tempfiles.'.log'); unlink($tempfiles.'.png'); } } if ($ok) { return $img; } return false; } // TexToImg } // WikiPlugin_TexToPng // For emacs users // Local Variables: // mode: php // tab-width: 4 // c-basic-offset: 4 // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: ?> --- NEW FILE: VisualWiki.php --- <?php // -*-php-*- // +---------------------------------------------------------------------+ // | VisualWiki.php | // +---------------------------------------------------------------------+ // | Produces graphical site map of PhpWiki | // | | // | Copyright (C) 2002 Johannes Große (Johannes Große) | // | You may copy this code freely under the conditions of the GPL | // +---------------------------------------------------------------------+ define('VISUALWIKI_ALLOWOPTIONS',true); // Name of the Truetypefont - Helvetica is probably easier to read //define('VISUALWIKIFONT','Helvetica'); //define('VISUALWIKIFONT','Times'); define('VISUALWIKIFONT','Arial'); if (!defined('VISUALWIKI_ALLOWOPTIONS')) define('VISUALWIKI_ALLOWOPTIONS',false); require_once "lib/WikiPluginCached.php"; /** * Example for an image map creating plugin. It produces a graphical * sitemap of PhpWiki by calling the <code>dot</code> commandline tool * from graphviz (http://www.graphviz.org). * * @author Johannes Große * @version 0.8 */ class WikiPlugin_VisualWiki extends WikiPluginCached { // ToDo: check if "ImageCreateFrom$imgtype"() exists. /** * Sets plugin type to map production */ function getPluginType() { return PLUGIN_CACHED_MAP; } /** * Sets the plugin's name to VisualWiki. It can be called by * <code><?plugin VisualWiki?></code>, now. This * name must correspond to the filename and the class name. */ function getName() { return "VisualWiki"; } /** * Sets textual description. */ function getDescription() { return 'Visualizes the Wiki structure in a graph.'; } /** * Returns default arguments. This is put into a separate * function to allow its usage by both <code>getDefaultArguments</code> * and <code>checkArguments</code> */ function defaultarguments() { return array('imgtype' => 'png', 'width' => 5, 'height' => 7, 'colorby' => 'age', 'fillnodes' => 'off', 'label' => 'name', 'shape' => 'ellipse', 'large_nb' => 5, 'recent_nb' => 5, 'refined_nb' => 15, 'backlink_nb' => 5, 'neighbour_list' => '', 'exclude_list' => '', 'include_list' => '', 'fontsize' => 10, 'help' => false ); } /** * Sets the default arguments. WikiPlugin also regards these as * the allowed arguments. Since WikiPluginCached stores an image * for each different set of parameters, there can be a lot of * these (large) graphs if you allow different parameters. * Set <code>VISUALWIKI_ALLOWOPTIONS</code> to <code>false</code> * to allow no options to be set and use only the default paramters. * This will need an disk space of about 20 Kbyte all the time. */ function getDefaultArguments() { if (VISUALWIKI_ALLOWOPTIONS) return $this->defaultarguments(); else return array(); } /** * Substitutes each forbidden parameter value by the default value * defined in <code>defaultarguments</code>. */ function checkArguments(&$arg) { extract($arg); $def = $this->defaultarguments(); if (($width<3) ||($width>15)) $arg['width'] = $def['width']; if (($height<3) ||($height>20)) $arg['height'] = $def['height']; if (($fontsize<8) ||($fontsize>24)) $arg['fontsize'] = $def['fontsize']; if (!in_array($label,array('name','number'))) $arg['label'] = $def['label']; if (!in_array($shape,array('ellipse','box','point','circle','plaintext'))) $arg['shape'] = $def['shape']; if (!in_array($colorby,array('age','revtime'))) $arg['colorby'] = $def['colorby']; if (!in_array($fillnodes,array('on','off'))) $arg['fillnodes'] = $def['fillnodes']; if (($large_nb<0) ||($large_nb>50)) $arg['large_nb'] = $def['large_nb']; if (($recent_nb<0) ||($recent_nb>50)) $arg['recent_nb'] = $def['recent_nb']; if (($refined_nb<0) ||($refined_nb>50)) $arg['refined_nb'] = $def['refined_nb']; if (($backlink_nb<0)||($backlink_nb>50)) $arg['backlink_nb'] = $def['backlink_nb']; if (!in_array($imgtype,$GLOBALS['CacheParams']['imgtypes'])) $arg['imgtype'] = $def['imgtype']; if (empty($fontname)) $arg['fontname'] = VISUALWIKIFONT; } /** * Checks options, creates help page if necessary, calls both * database access and image map production functions. * @return array($map,$html) */ function getMap($dbi, $argarray, $request) { if (!VISUALWIKI_ALLOWOPTIONS) $argarray = $this->defaultarguments(); $this->checkArguments($argarray); //extract($argarray); if ($argarray['help']) return array($this->helpImage(), ' '); // FIXME $this->createColors(); $this->extract_wikipages($dbi, $argarray); /* ($dbi, $large, $recent, $refined, $backlink, $neighbour, $excludelist, $includelist,$color );*/ return $this->invokeDot($argarray); /*($width,$height,$color,$shape,$text);*/ } /** * Sets the expire time to one day (so the image producing * functions are called seldomly) or to about two minutes * if a help screen is created. */ function getExpire($dbi, $argarray, $request) { if ($argarray['help']) return '+120'; // 2 minutes return sprintf('+%d',3*86000); // approx 3 days } /** * Sets the imagetype according to user wishes and * relies on WikiPluginCached to catch illegal image * formats. * (I feel unsure whether this option is reasonable in * this case, because png will definitely have the * best results.) * * @return string 'png', 'gif', 'jpeg' */ function getImageType($dbi, $argarray, $request) { return $argarray['imgtype']; } /** * This gives an alternative text description of * the image map. I do not know whether it interferes * with the <code>title</code> attributes in <area> * tags of the image map. Perhaps this will be removed. * @return string */ function getAlt($dbi, $argstr, $request) { return $this->getDescription(); } // ------------------------------------------------------------------------------------------ /** * Returns an image containing a usage description of the plugin. * @return string image handle */ function helpImage() { $def = $this->defaultarguments(); $other_imgtypes = $GLOBALS['CacheParams']['imgtypes']; unset ($other_imgtypes[$def['imgtype']]); $helparr = array( '<?plugin '.$this->getName() . ' img' => ' = "' . $def['imgtype'] . "(default)|" . join('|',$GLOBALS['CacheParams']['imgtypes']).'"', 'width' => ' = "width in inches"', 'height' => ' = "height in inches"', 'fontname' => ' = "font family"', 'fontsize' => ' = "fontsize in points"', 'colorby' => ' = "age|revtime|none"', 'fillnodes' => ' = "on|off"', 'shape' => ' = "ellipse(default)|box|circle|point"', 'label' => ' = "name|number"', 'large_nb' => ' = "number of largest pages to be selected"', 'recent_nb' => ' = "number of youngest pages"', 'refined_nb' => ' = "#pages with smallest time between revisions"', 'backlink_nb' => ' = "number of pages with most backlinks"', 'neighbour_list' => ' = "find pages linked from and to these pages"', 'exclude_list' => ' = "colon separated list of pages to be excluded"', 'include_list' => ' = "colon separated list" ?>' ); $length = 0; foreach($helparr as $alignright => $alignleft) { $length = max($length, strlen($alignright)); } $helptext =''; foreach($helparr as $alignright => $alignleft) { $helptext .= substr(' ' . $alignright, -$length).$alignleft."\n"; } return $this->text2img($helptext,4,array(1,0,0), array(255,255,255)); } /** * Selects the first (smallest or biggest) WikiPages in * a given category. * * @param number integer number of page names to be found * @param category string attribute of the pages which is used * to compare them * @param minimum boolean true finds smallest, false finds biggest * @return array list of page names found to be the best */ function findbest($number, $category, $minimum ) { // select the $number best in the category '$category' $pages = &$this->pages; $names = &$this->names; $selected = array(); $i=0; foreach($names as $name) { if ($i++>=$number) break; $selected[$name] = $pages[$name][$category]; } //echo "<pre>$category "; var_dump($selected); "</pre>"; $compareto = $minimum ? 0x79999999 : -0x79999999; $i=0; foreach ($names as $name) { if ($i++<$number) continue; if ($minimum) { if (($crit = $pages[$name][$category]) < $compareto) { $selected[$name] = $crit; asort($selected,SORT_NUMERIC); array_pop($selected); $compareto = end($selected); } } elseif (($crit = $pages[$name][$category]) > $compareto) { $selected[$name] = $crit; arsort($selected,SORT_NUMERIC); array_pop($selected); $compareto = end($selected); } } //echo "<pre>$category "; var_dump($selected); "</pre>"; return array_keys($selected); } /** * Extracts a subset of all pages from the wiki and find their * connections to other pages. Also collects some page features * like size, age, revision number which are used to find the * most attractive pages. * * @param dbi WikiDB database handle to access all Wiki pages * @param LARGE integer number of largest pages which should * be included * @param RECENT integer number of the youngest pages to be included * @param REFINED integer number of the pages with shortes revision interval * @param BACKLINK integer number of the pages with most backlinks * @param EXCLUDELIST string colon ':' separated list of page names which * should not be displayed (like PhpWiki, for example) * @param INCLUDELIST string colon separated list of pages which are allways * included (for example your own page :) * @param COLOR string 'age', 'revtime' or 'none'; Selects which page * feature is used to determine the filling color of * the nodes in the graph. * @return void */ function extract_wikipages($dbi, $argarray) { // $LARGE, $RECENT, $REFINED, $BACKLINK, $NEIGHBOUR, $EXCLUDELIST, $INCLUDELIST,$COLOR $now = time(); extract($argarray); // FIXME: gettextify? $exclude_list = explode(':',$exclude_list); $include_list = explode(':',$include_list); $neighbour_list = explode(':',$neighbour_list); // FIXME remove INCLUDED from EXCLUDED // collect all pages $allpages = $dbi->getAllPages(); $pages = &$this->pages; $countpages=0; while ($page = $allpages->next()) { $name = $page->getName(); // skip exluded pages if (in_array($name,$exclude_list)) continue; // false = get links from actual page // true = get links to actual page ("backlinks") $backlinks = $page->getLinks(true); unset($bconnection); $bconnection = array(); while ($blink = $backlinks->next()) { array_push($bconnection, $blink->getName()); } unset($backlinks); // include all neighbours of pages listed in $NEIGHBOUR if (in_array($name,$neighbour_list)) { $l = $page->getLinks(false); $con = array(); while ($link = $l->next()) { array_push($con, $link->getName()); } $include_list = array_merge($include_list,$bconnection,$con); unset($l); unset($con); } unset($currev); $currev = $page->getCurrentRevision(); $pages[$name] = array( 'age' => $now-$currev->get('mtime'), 'revnr' => $currev->getVersion(), 'links' => array(), 'backlink_nb' => count($bconnection), 'backlinks' => $bconnection, 'size' => 1000 // FIXME ); $pages[$name]['revtime'] = $pages[$name]['age']/($pages[$name]['revnr']); unset($page); } unset($allpages); $this->names = array_keys($pages); $countpages = count($pages); // now select each page matching to given parameters $all_selected = array_unique(array_merge( $this->findbest($recent_nb, 'age', true), $this->findbest($refined_nb, 'revtime', true), $x=$this->findbest($backlink_nb, 'backlink_nb', false), // $this->findbest($large_nb, 'size', false), $include_list)); foreach($all_selected as $name) if (isset($pages[$name])) $newpages[$name] = $pages[$name]; unset($this->names); unset($this->pages); $this->pages = $newpages; $pages = &$this->pages; $this->names = array_keys($pages); unset($newpages); unset($all_selected); $countpages = count($pages); // remove dead links and collect links reset($pages); while( list($name,$page) = each($pages) ) { if (is_array($page['backlinks'])) { reset($page['backlinks']); while ( list($index, $link) = each( $page['backlinks'] ) ) { if ( !isset($pages[$link]) || $link == $name ) { unset($pages[$name]['backlinks'][$index]); } else { array_push($pages[$link]['links'],$name); //array_push($this->everylink, array($link,$name)); } } } } if ($colorby=='none') return; list($oldestname) = $this->findbest(1, $colorby, false); $this->oldest = $pages[$oldestname][$colorby]; foreach($this->names as $name) $pages[$name]['color'] = $this->getColor($pages[$name][$colorby]/$this->oldest); } // extract_wikipages /** * Creates the text file description of the graph needed to invoke * <code>dot</code>. * * @param filename string name of the dot file to be created * @param width float width of the output graph in inches * @param height float height of the graph in inches * @param colorby string color sceme beeing used ('age','revtime','none') * @param shape string node shape; 'ellipse','box','circle','point' * @param label string 'name': label by name, 'number': label by unique number * @return boolean error status; true=ok; false=error */ function createDotFile($filename,$argarray) { extract($argarray); if (!$fp=fopen($filename, 'w')) return false; $fillstring = ($fillnodes=='on')?'style=filled,':''; $ok = true; $names = &$this->names; $pages = &$this->pages; $nametonumber = array_flip($names); $dot = "digraph VisualWiki {\n" // } . " size=\"$width,$height\";\n "; switch ($shape) { case 'point': $dot .= "edge [arrowhead=none];\nnode [shape=$shape,fontname=$fontname,width=0.15,height=0.15,fontsize=$fontsize];\n"; break; case 'box': $dot .= "node [shape=$shape,fontname=$fontname,width=0.4,height=0.4,fontsize=$fontsize];\n"; break; case 'circle': $dot .= "node [shape=$shape,fontname=$fontname,width=0.25,height=0.25,fontsize=$fontsize];\n"; break; default : $dot .= "node [fontname=$fontname,shape=$shape,fontsize=$fontsize];\n" ; } $dot .= "\n"; $i=0; foreach ($names as $name) { $url = rawurlencode($name); // patch to allow page/subpage as with the Calender plugin $url = preg_replace('/%2F/','/',$url); $nodename = ($label!='name'?$nametonumber[$name]+1:$name); $dot .= " \"$nodename\" [URL=\"$url\""; if ($colorby != 'none') { $col = $pages[$name]['color']; $dot .= sprintf(',%scolor="#%02X%02X%02X"',$fillstring, $col[0],$col[1],$col[2]); } $dot .= "];\n"; if (!empty($pages[$name]['links'])) { unset($linkarray); if ($label!='name') foreach($pages[$name]['links'] as $linkname) $linkarray[] = $nametonumber[$linkname]+1; else $linkarray = $pages[$name]['links']; $linkstring = join('"; "', $linkarray ); $c = count($pages[$name]['links']); $dot .= " \"$nodename\" -> " . ($c>1?'{':'') . "\"$linkstring\";" . ($c>1?'}':'') . "\n"; } } if ($colorby!='none') { $dot .= "\n subgraph cluster_legend {\n" . " node[fontname=$fontname,shape=box,width=0.4,height=0.4,fontsize=$fontsize];\n" . " fillcolor=lightgrey;\n" . " style=filled;\n" . " fontname=$fontname;\n" . " fontsize=$fontsize;\n" . " label=\"".gettext("Legend")."\";\n"; $oldest= ceil($this->oldest/(24*3600)); $max = 5; $legend = array(); for($i=0;$i<$max;$i++) { $time = floor($i/$max*$oldest); $name = '"'.$time.' '.gettext('days').'"'; $col = $this->getColor($i/$max); $dot .= sprintf(' %s [%scolor="#%02X%02X%02X"];', $name, $fillstring,$col[0],$col[1],$col[2]) . "\n"; $legend[] = $name; } $dot .= ' '. join(' -> ', $legend) . ";\n }\n"; } // { $dot .= "}\n"; $ok = fwrite($fp, $dot); $ok = fclose($fp) && $ok; // close anyway return $ok; } /** * Execute system command. * * @param cmd string command to be invoked * @return boolean error status; true=ok; false=error */ function execute($cmd) { exec($cmd, $errortxt, $returnval); return ($returnval == 0); } /** * Produces a dot file, calls dot twice to obtain an image and a * text description of active areas for hyperlinking and returns * an image and an html map. * * @param width float width of the output graph in inches * @param height float height of the graph in inches * @param colorby string color sceme beeing used ('age','revtime','none') * @param shape string node shape; 'ellipse','box','circle','point' * @param label string not used anymore */ function invokeDot($argarray) { $cacheparams = $GLOBALS['CacheParams']; $tempfiles = tempnam($cacheparams['cache_dir'],'VisualWiki'); $gif = $argarray['imgtype']; $ImageCreateFromFunc = "ImageCreateFrom$gif"; $ok = $tempfiles && $this->createDotFile($tempfiles.'.dot',$argarray) && $this->execute("dot -T$gif $tempfiles.dot -o $tempfiles.$gif") && $this->execute("dot -Timap $tempfiles.dot -o $tempfiles.map") && file_exists( "$tempfiles.$gif" ) && file_exists( $tempfiles.'.map' ) && ($img = $ImageCreateFromFunc( "$tempfiles.$gif" )) && ($fp = fopen($tempfiles.'.map','r')); $map = HTML(); if ($ok) { while (!feof($fp)) { $line = fgets($fp,1000); if (substr($line,0,1)=='#') continue; list($shape,$url,$e1,$e2,$e3,$e4) = sscanf($line,"%s %s %d,%d %d,%d"); if ($shape!='rect') continue; // dot sometimes gives not allways the right order so // so we have to sort a bit $x1 = min($e1,$e3); $x2 = max($e1,$e3); $y1 = min($e2,$e4); $y2 = max($e2,$e4); $map->pushContent(HTML::area( array( 'shape' => 'rect', 'coords' => "$x1,$y1,$x2,$y2", 'href' => $url, 'title' => rawurldecode($url) ))); } fclose($fp); } // clean up tempfiles if ($ok and isset($_GET['debug']) and $tempfiles) { unlink($tempfiles); unlink("$tempfiles.$gif"); unlink($tempfiles.'.map'); unlink($tempfiles.'.dot'); } if ($ok) return array($img,$map); else return array(false,false); } // invokeDot /** * Prepares some rainbow colors for the nodes of the graph * and stores them in an array which may be accessed with * <code>getColor</code>. */ function createColors() { $predefcolors = array( array('red' => 255, 'green' => 0, 'blue' => 0), array('red' => 255, 'green' => 255, 'blue' => 0), array('red' => 0, 'green' => 255, 'blue' => 0), array('red' => 0, 'green' => 255, 'blue' => 255), array('red' => 0, 'green' => 0, 'blue' => 255), array('red' => 100, 'green' => 100, 'blue' => 100) ); $steps = 2; $numberofcolors = count($predefcolors)*$steps; $promille = -1; foreach($predefcolors as $color) { if ($promille < 0) { $oldcolor = $color; $promille=0; continue; } for ($i=0; $i<$steps; $i++) $this->ColorTab[++$promille / $numberofcolors * 1000] = array( floor(interpolate( $oldcolor['red'], $color['red'], $i/$steps )), floor(interpolate( $oldcolor['green'], $color['green'], $i/$steps )), floor(interpolate( $oldcolor['blue'], $color['blue'], $i/$steps )) ); $oldcolor = $color; } //echo"<pre>"; var_dump($this->ColorTab); echo "</pre>"; } /** * Translates a value from 0.0 to 1.0 into rainbow color. * red -> orange -> green -> blue -> gray * * @param promille float value between 0.0 and 1.0 * @return array(red,green,blue) */ function getColor($promille) { foreach( $this->ColorTab as $pro => $col ) { if ($promille*1000 < $pro) return $col; } $lastcol = end($this->ColorTab); return $lastcol; } // getColor } // WikiPlugin_VisualWiki /** * Linear interpolates a value between two point a and b * at a value pos. * @return float interpolated value */ function interpolate($a, $b, $pos) { return $a + ($b-$a)*$pos; } ?> Index: Calendar.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/Calendar.php,v retrieving revision 1.22 retrieving revision 1.23 diff -u -2 -b -p -d -r1.22 -r1.23 --- Calendar.php 11 Feb 2002 02:25:16 -0000 1.22 +++ Calendar.php 17 Aug 2002 15:52:51 -0000 1.23 @@ -30,5 +30,5 @@ extends WikiPlugin function getDefaultArguments() { - return array('prefix' => '[pagename].', + return array('prefix' => '[pagename]' . SUBPAGE_SEPARATOR, 'date_format' => '%Y-%m-%d', 'year' => '', Index: WikiForm.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/WikiForm.php,v retrieving revision 1.4 retrieving revision 1.5 diff -u -2 -b -p -d -r1.4 -r1.5 --- WikiForm.php 20 Feb 2002 00:16:11 -0000 1.4 +++ WikiForm.php 17 Aug 2002 15:52:51 -0000 1.5 @@ -16,5 +16,6 @@ extends WikiPlugin return array('action' => 'upload', // 'upload', 'loadfile', or 'dumpserial' 'default' => false, - 'buttontext' => false); + 'buttontext' => false, + 'size' => 50); } @@ -33,5 +34,5 @@ extends WikiPlugin $input = array('type' => 'text', 'value' => $default, - 'size' => 50); + 'size' => $size); switch ($action) { @@ -42,4 +43,10 @@ extends WikiPlugin if (!$buttontext) $buttontext = _("Load File"); + $class = false; + break; + case 'login': + $input['name'] = 'source'; + if (!$buttontext) + $buttontext = _("Login"); $class = 'wikiadmin'; break; @@ -69,5 +76,5 @@ extends WikiPlugin if (!$buttontext) $buttontext = _("Upload"); - $class = false; // local OS function, so use natve OS button + $class = false; // local OS function, so use native OS button break; default: @@ -80,5 +87,5 @@ extends WikiPlugin $button = Button('submit:', $buttontext, $class); - $form->pushContent(HTML::div(array('class' => $class), + $form->pushContent(HTML::span(array('class' => $class), $input, $button)); |