[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wiki/parse html.php,1.2,1.3 macros.php,1.2,1.3 m
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: wiki/parse html.php,1.2,1.3 macros.php,1.2,1.3 main.php,1.2,1.3 save.php,1.2,1.3 transforms.php,1.2,1.3 |
|
Date: |
Mon, 03 Mar 2003 09:16:27 -0500 |
Update of /cvsroot/phpgroupware/wiki/parse
In directory subversions:/tmp/cvs-serv15091/parse
Modified Files:
html.php macros.php main.php save.php transforms.php
Log Message:
first version of phpgw port, includes:
- automatic install by setup(3)
- some example data
Index: html.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/parse/html.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** html.php 3 Mar 2003 13:37:05 -0000 1.2
--- html.php 3 Mar 2003 14:16:24 -0000 1.3
***************
*** 88,113 ****
function html_table_cell_end()
{ return '</td>'; }
! function html_time($timestamp)
{
global $TimeZoneOff;
! if($timestamp == '') { return 'never'; }
! $time = mktime(substr($timestamp, 8, 2), substr($timestamp, 10, 2),
substr($timestamp, 12, 2), substr($timestamp, 4, 2),
! substr($timestamp, 6, 2), substr($timestamp, 0, 4));
return date('D, d M Y H:i:s', $time + $TimeZoneOff * 60);
}
! function html_gmtime($timestamp)
{
! $time = mktime(substr($timestamp, 8, 2), substr($timestamp, 10, 2),
substr($timestamp, 12, 2), substr($timestamp, 4, 2),
! substr($timestamp, 6, 2), substr($timestamp, 0, 4));
return gmdate('Y-m-d', $time) . 'T' . gmdate('H:i:s', $time) . 'Z';
}
! function html_timestamp($timestamp)
{
global $TimeZoneOff;
! $time = mktime(substr($timestamp, 8, 2), substr($timestamp, 10, 2),
substr($timestamp, 12, 2), substr($timestamp, 4, 2),
! substr($timestamp, 6, 2), substr($timestamp, 0, 4));
return date('Y.m.d H:i:s', $time + $TimeZoneOff * 60);
}
--- 88,113 ----
function html_table_cell_end()
{ return '</td>'; }
! function html_time($time/*stamp*/)
{
global $TimeZoneOff;
! if($time/*stamp*/ == '') { return 'never'; }
! /*$time = mktime(substr($timestamp, 8, 2), substr($timestamp, 10, 2),
substr($timestamp, 12, 2), substr($timestamp, 4, 2),
! substr($timestamp, 6, 2), substr($timestamp, 0, 4));*/
return date('D, d M Y H:i:s', $time + $TimeZoneOff * 60);
}
! function html_gmtime($time/*stamp*/)
{
! /*$time = mktime(substr($timestamp, 8, 2), substr($timestamp, 10, 2),
substr($timestamp, 12, 2), substr($timestamp, 4, 2),
! substr($timestamp, 6, 2), substr($timestamp, 0, 4));*/
return gmdate('Y-m-d', $time) . 'T' . gmdate('H:i:s', $time) . 'Z';
}
! function html_timestamp($time/*stamp*/)
{
global $TimeZoneOff;
! /* $time = mktime(substr($timestamp, 8, 2), substr($timestamp, 10, 2),
substr($timestamp, 12, 2), substr($timestamp, 4, 2),
! substr($timestamp, 6, 2), substr($timestamp, 0, 4)); */
return date('Y.m.d H:i:s', $time + $TimeZoneOff * 60);
}
***************
*** 201,205 ****
html_ref('RecentChanges', 'RecentChanges') . ' | ' .
'<a href="' . $PrefsScript . '">Preferences</a> | '.
! '<a
href="'.$GLOBALS['phpgw']->link("/axiswiki/admin/index.php").'">Administration</a><br>';
} else {
return html_ref($HomePage, $HomePage) . ' | ' .
--- 201,205 ----
html_ref('RecentChanges', 'RecentChanges') . ' | ' .
'<a href="' . $PrefsScript . '">Preferences</a> | '.
! '<a
href="'.$GLOBALS['phpgw']->link("/wiki/admin/index.php").'">Administration</a><br>';
} else {
return html_ref($HomePage, $HomePage) . ' | ' .
Index: macros.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/parse/macros.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** macros.php 3 Mar 2003 13:37:05 -0000 1.2
--- macros.php 3 Mar 2003 14:16:24 -0000 1.3
***************
*** 1,286 ****
! <?php
! // $Id$
!
! // Prepare a category list.
! function view_macro_category($args)
! {
! global $pagestore, $MinEntries, $DayLimit, $full, $page, $Entity;
! global $FlgChr;
!
! $text = '';
! if(strstr($args, '*')) // Category containing all pages.
! {
! $list = $pagestore->allpages();
! }
! else if(strstr($args, '?')) // New pages.
! {
! $list = $pagestore->newpages();
! }
! else if(strstr($args, '~')) // Zero-length (deleted) pages.
! {
! $list = $pagestore->emptypages();
! }
! else // Ordinary list of pages.
! {
! $parsed = parseText($args, array('parse_wikiname', 'parse_freelink'), '');
! $pagenames = array();
! preg_replace('/' . $FlgChr . '(\\d+)' . $FlgChr . '/e',
'$pagenames[]=$Entity[\\1][1]', $parsed);
! $list = $pagestore->givenpages($pagenames);
! }
!
! if(count($list) == 0)
! { return ''; }
!
! usort($list, 'catSort');
!
! $now = time();
!
! for($i = 0; $i < count($list); $i++)
! {
! $editTime = mktime(substr($list[$i][0], 8, 2), substr($list[$i][0], 10,
2),
! substr($list[$i][0], 12, 2), substr($list[$i][0], 4,
2),
! substr($list[$i][0], 6, 2), substr($list[$i][0], 0,
4));
! if($DayLimit && $i >= $MinEntries
! && !$full && ($now - $editTime) > $DayLimit * 24 * 60 * 60)
! { break; }
!
! $text = $text . html_category($list[$i][0], $list[$i][1],
! $list[$i][2], $list[$i][3],
! $list[$i][5]);
! if($i < count($list) - 1) // Don't put a newline on the last
one.
! { $text = $text . html_newline(); }
! }
!
! if($i < count($list))
! { $text = $text . html_fulllist($page, count($list)); }
!
! return $text;
! }
!
! function catSort($p1, $p2)
! { return strcmp($p2[0], $p1[0]); }
!
! function sizeSort($p1, $p2)
! { return $p2[4] - $p1[4]; }
!
! function nameSort($p1, $p2)
! { return strcmp($p1[1], $p2[1]); }
!
! // Prepare a list of pages sorted by size.
! function view_macro_pagesize()
! {
! global $pagestore;
!
! $first = 1;
! $list = $pagestore->allpages();
!
! usort($list, 'sizeSort');
!
! $text = '';
!
! foreach($list as $page)
! {
! if(!$first) // Don't prepend newline to first one.
! { $text = $text . "\n"; }
! else
! { $first = 0; }
!
! $text = $text .
! $page[4] . ' ' . html_ref($page[1], $page[1]);
! }
!
! return html_code($text);
! }
!
! // Prepare a list of pages and those pages they link to.
! function view_macro_linktab()
! {
! global $pagestore, $LkTbl;
!
! $lastpage = '';
! $text = '';
!
! $q1 = $pagestore->dbh->query("SELECT page, link FROM $LkTbl ORDER BY page");
! while(($result = $pagestore->dbh->result($q1)))
! {
! if($lastpage != $result[0])
! {
! if($lastpage != '')
! { $text = $text . "\n"; }
!
! $text = $text . html_ref($result[0], $result[0]) . ' |';
! $lastpage = $result[0];
! }
!
! $text = $text . ' ' . html_ref($result[1], $result[1]);
! }
!
! return html_code($text);
! }
!
! // Prepare a list of pages with no incoming links.
! function view_macro_orphans()
! {
! global $pagestore, $LkTbl;
!
! $text = '';
! $first = 1;
!
! $pages = $pagestore->allpages();
! usort($pages, 'nameSort');
!
! foreach($pages as $page)
! {
! $esc_page = addslashes($page[1]);
! $q2 = $pagestore->dbh->query("SELECT page FROM $LkTbl " .
! "WHERE link='$esc_page' AND
page!='$esc_page'");
! if(!($r2 = $pagestore->dbh->result($q2)) || empty($r2[0]))
! {
! if(!$first) // Don't prepend newline to first one.
! { $text = $text . "\n"; }
! else
! { $first = 0; }
!
! $text = $text . html_ref($page[1], $page[1]);
! }
! }
!
! return html_code($text);
! }
!
! // Prepare a list of pages linked to that do not exist.
! function view_macro_wanted()
! {
! global $pagestore, $LkTbl, $PgTbl;
!
! $text = '';
! $first = 1;
!
! $q1 = $pagestore->dbh->query("SELECT l.link, SUM(l.count) AS ct, p.title " .
! "FROM $LkTbl AS l LEFT JOIN $PgTbl AS p " .
! "ON l.link = p.title " .
! "GROUP BY l.link " .
! "HAVING p.title IS NULL " .
! "ORDER BY ct DESC, l.link");
!
! while(($result = $pagestore->dbh->result($q1)))
! {
! if(!$first) // Don't prepend newline to first one.
! { $text = $text . "\n"; }
! else
! { $first = 0; }
!
! $text = $text . '(' .
! html_url(findURL($result[0]), $result[1]) .
! ') ' . html_ref($result[0], $result[0]);
! }
!
! return html_code($text);
! }
!
! // Prepare a list of pages sorted by how many links they contain.
! function view_macro_outlinks()
! {
! global $pagestore, $LkTbl;
!
! $text = '';
! $first = 1;
!
! $q1 = $pagestore->dbh->query("SELECT page, SUM(count) AS ct FROM $LkTbl " .
! "GROUP BY page ORDER BY ct DESC, page");
! while(($result = $pagestore->dbh->result($q1)))
! {
! if(!$first) // Don't prepend newline to first one.
! { $text = $text . "\n"; }
! else
! { $first = 0; }
!
! $text = $text .
! '(' . $result[1] . ') ' . html_ref($result[0], $result[0]);
! }
!
! return html_code($text);
! }
!
! // Prepare a list of pages sorted by how many links to them exist.
! function view_macro_refs()
! {
! global $pagestore, $LkTbl, $PgTbl;
!
! $text = '';
! $first = 1;
!
! // It's not quite as straightforward as one would imagine to turn the
! // following code into a JOIN, since we want to avoid multiplying the
! // number of links to a page by the number of versions of that page that
! // exist. If anyone has some efficient suggestions, I'd be welcome to
! // entertain them. -- ScottMoonen
!
! $q1 = $pagestore->dbh->query("SELECT link, SUM(count) AS ct FROM $LkTbl " .
! "GROUP BY link ORDER BY ct DESC, link");
! while(($result = $pagestore->dbh->result($q1)))
! {
! $esc_page = addslashes($result[0]);
! $q2 = $pagestore->dbh->query("SELECT MAX(version) FROM $PgTbl " .
! "WHERE title='$esc_page'");
! if(($r2 = $pagestore->dbh->result($q2)) && !empty($r2[0]))
! {
! if(!$first) // Don't prepend newline to first one.
! { $text = $text . "\n"; }
! else
! { $first = 0; }
!
! $text = $text . '(' .
! html_url(findURL($result[0]), $result[1]) . ') ' .
! html_ref($result[0], $result[0]);
! }
! }
!
! return html_code($text);
! }
!
! // This macro inserts an HTML anchor into the text.
! function view_macro_anchor($args)
! {
! preg_match('/^([A-Za-z][-A-Za-z0-9_:.]*)$/', $args, $result);
!
! if($result[1] != '')
! { return html_anchor($result[1]); }
! else
! { return ''; }
! }
!
! // This macro transcludes another page into a wiki page.
! function view_macro_transclude($args)
! {
! global $pagestore, $ParseEngine, $ParseObject;
! static $visited_array = array();
! static $visited_count = 0;
!
! if(!validate_page($args))
! { return '[[Transclude ' . $args . ']]'; }
!
! $visited_array[$visited_count++] = $ParseObject;
! for($i = 0; $i < $visited_count; $i++)
! {
! if($visited_array[$i] == $args)
! {
! $visited_count--;
! return '[[Transclude ' . $args . ']]';
! }
! }
!
! $pg = $pagestore->page($args);
! $pg->read();
! if(!$pg->exists)
! {
! $visited_count--;
! return '[[Transclude ' . $args . ']]';
! }
!
! $result = parseText($pg->text, $ParseEngine, $args);
! $visited_count--;
! return $result;
! }
!
! ?>
--- 1,286 ----
! <?php
! // $Id$
!
! // Prepare a category list.
! function view_macro_category($args)
! {
! global $pagestore, $MinEntries, $DayLimit, $full, $page, $Entity;
! global $FlgChr;
!
! $text = '';
! if(strstr($args, '*')) // Category containing all pages.
! {
! $list = $pagestore->allpages();
! }
! else if(strstr($args, '?')) // New pages.
! {
! $list = $pagestore->newpages();
! }
! else if(strstr($args, '~')) // Zero-length (deleted) pages.
! {
! $list = $pagestore->emptypages();
! }
! else // Ordinary list of pages.
! {
! $parsed = parseText($args, array('parse_wikiname', 'parse_freelink'), '');
! $pagenames = array();
! preg_replace('/' . $FlgChr . '(\\d+)' . $FlgChr . '/e',
'$pagenames[]=$Entity[\\1][1]', $parsed);
! $list = $pagestore->givenpages($pagenames);
! }
!
! if(count($list) == 0)
! { return ''; }
!
! usort($list, 'catSort');
!
! $now = time();
!
! for($i = 0; $i < count($list); $i++)
! {
! $editTime = mktime(substr($list[$i][0], 8, 2), substr($list[$i][0], 10,
2),
! substr($list[$i][0], 12, 2), substr($list[$i][0], 4,
2),
! substr($list[$i][0], 6, 2), substr($list[$i][0], 0,
4));
! if($DayLimit && $i >= $MinEntries
! && !$full && ($now - $editTime) > $DayLimit * 24 * 60 * 60)
! { break; }
!
! $text = $text . html_category($list[$i][0], $list[$i][1],
! $list[$i][2], $list[$i][3],
! $list[$i][5]);
! if($i < count($list) - 1) // Don't put a newline on the last
one.
! { $text = $text . html_newline(); }
! }
!
! if($i < count($list))
! { $text = $text . html_fulllist($page, count($list)); }
!
! return $text;
! }
!
! function catSort($p1, $p2)
! { return strcmp($p2[0], $p1[0]); }
!
! function sizeSort($p1, $p2)
! { return $p2[4] - $p1[4]; }
!
! function nameSort($p1, $p2)
! { return strcmp($p1[1], $p2[1]); }
!
! // Prepare a list of pages sorted by size.
! function view_macro_pagesize()
! {
! global $pagestore;
!
! $first = 1;
! $list = $pagestore->allpages();
!
! usort($list, 'sizeSort');
!
! $text = '';
!
! foreach($list as $page)
! {
! if(!$first) // Don't prepend newline to first one.
! { $text = $text . "\n"; }
! else
! { $first = 0; }
!
! $text = $text .
! $page[4] . ' ' . html_ref($page[1], $page[1]);
! }
!
! return html_code($text);
! }
!
! // Prepare a list of pages and those pages they link to.
! function view_macro_linktab()
! {
! global $pagestore, $LkTbl;
!
! $lastpage = '';
! $text = '';
!
! $q1 = $pagestore->dbh->query("SELECT page, link FROM $LkTbl ORDER BY
page",__LINE__,__FILE__);
! while(($result = $pagestore->dbh->result($q1)))
! {
! if($lastpage != $result[0])
! {
! if($lastpage != '')
! { $text = $text . "\n"; }
!
! $text = $text . html_ref($result[0], $result[0]) . ' |';
! $lastpage = $result[0];
! }
!
! $text = $text . ' ' . html_ref($result[1], $result[1]);
! }
!
! return html_code($text);
! }
!
! // Prepare a list of pages with no incoming links.
! function view_macro_orphans()
! {
! global $pagestore, $LkTbl;
!
! $text = '';
! $first = 1;
!
! $pages = $pagestore->allpages();
! usort($pages, 'nameSort');
!
! foreach($pages as $page)
! {
! $esc_page = addslashes($page[1]);
! $q2 = $pagestore->dbh->query("SELECT page FROM $LkTbl " .
! "WHERE link='$esc_page' AND
page!='$esc_page'",__LINE__,__FILE__);
! if(!($r2 = $pagestore->dbh->result($q2)) || empty($r2[0]))
! {
! if(!$first) // Don't prepend newline to first one.
! { $text = $text . "\n"; }
! else
! { $first = 0; }
!
! $text = $text . html_ref($page[1], $page[1]);
! }
! }
!
! return html_code($text);
! }
!
! // Prepare a list of pages linked to that do not exist.
! function view_macro_wanted()
! {
! global $pagestore, $LkTbl, $PgTbl;
!
! $text = '';
! $first = 1;
!
! $q1 = $pagestore->dbh->query("SELECT l.link, SUM(l.count) AS ct, p.title " .
! "FROM $LkTbl AS l LEFT JOIN $PgTbl AS p " .
! "ON l.link = p.title " .
! "GROUP BY l.link " .
! "HAVING p.title IS NULL " .
! "ORDER BY ct DESC, l.link",__LINE__,__FILE__);
!
! while(($result = $pagestore->dbh->result($q1)))
! {
! if(!$first) // Don't prepend newline to first one.
! { $text = $text . "\n"; }
! else
! { $first = 0; }
!
! $text = $text . '(' .
! html_url(findURL($result[0]), $result[1]) .
! ') ' . html_ref($result[0], $result[0]);
! }
!
! return html_code($text);
! }
!
! // Prepare a list of pages sorted by how many links they contain.
! function view_macro_outlinks()
! {
! global $pagestore, $LkTbl;
!
! $text = '';
! $first = 1;
!
! $q1 = $pagestore->dbh->query("SELECT page, SUM(count) AS ct FROM $LkTbl " .
! "GROUP BY page ORDER BY ct DESC,
page",__LINE__,__FILE__);
! while(($result = $pagestore->dbh->result($q1)))
! {
! if(!$first) // Don't prepend newline to first one.
! { $text = $text . "\n"; }
! else
! { $first = 0; }
!
! $text = $text .
! '(' . $result[1] . ') ' . html_ref($result[0], $result[0]);
! }
!
! return html_code($text);
! }
!
! // Prepare a list of pages sorted by how many links to them exist.
! function view_macro_refs()
! {
! global $pagestore, $LkTbl, $PgTbl;
!
! $text = '';
! $first = 1;
!
! // It's not quite as straightforward as one would imagine to turn the
! // following code into a JOIN, since we want to avoid multiplying the
! // number of links to a page by the number of versions of that page that
! // exist. If anyone has some efficient suggestions, I'd be welcome to
! // entertain them. -- ScottMoonen
!
! $q1 = $pagestore->dbh->query("SELECT link, SUM(count) AS ct FROM $LkTbl " .
! "GROUP BY link ORDER BY ct DESC,
link",__LINE__,__FILE__);
! while(($result = $pagestore->dbh->result($q1)))
! {
! $esc_page = addslashes($result[0]);
! $q2 = $pagestore->dbh->query("SELECT MAX(version) FROM $PgTbl " .
! "WHERE title='$esc_page'",__LINE__,__FILE__);
! if(($r2 = $pagestore->dbh->result($q2)) && !empty($r2[0]))
! {
! if(!$first) // Don't prepend newline to first one.
! { $text = $text . "\n"; }
! else
! { $first = 0; }
!
! $text = $text . '(' .
! html_url(findURL($result[0]), $result[1]) . ') ' .
! html_ref($result[0], $result[0]);
! }
! }
!
! return html_code($text);
! }
!
! // This macro inserts an HTML anchor into the text.
! function view_macro_anchor($args)
! {
! preg_match('/^([A-Za-z][-A-Za-z0-9_:.]*)$/', $args, $result);
!
! if($result[1] != '')
! { return html_anchor($result[1]); }
! else
! { return ''; }
! }
!
! // This macro transcludes another page into a wiki page.
! function view_macro_transclude($args)
! {
! global $pagestore, $ParseEngine, $ParseObject;
! static $visited_array = array();
! static $visited_count = 0;
!
! if(!validate_page($args))
! { return '[[Transclude ' . $args . ']]'; }
!
! $visited_array[$visited_count++] = $ParseObject;
! for($i = 0; $i < $visited_count; $i++)
! {
! if($visited_array[$i] == $args)
! {
! $visited_count--;
! return '[[Transclude ' . $args . ']]';
! }
! }
!
! $pg = $pagestore->page($args);
! $pg->read();
! if(!$pg->exists)
! {
! $visited_count--;
! return '[[Transclude ' . $args . ']]';
! }
!
! $result = parseText($pg->text, $ParseEngine, $args);
! $visited_count--;
! return $result;
! }
!
! ?>
Index: main.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/parse/main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
Index: save.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/parse/save.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
Index: transforms.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/parse/transforms.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wiki/parse html.php,1.2,1.3 macros.php,1.2,1.3 main.php,1.2,1.3 save.php,1.2,1.3 transforms.php,1.2,1.3,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: wiki/action admin.php,1.2,1.3 conflict.php,1.2,1.3 diff.php,1.2,1.3 edit.php,1.2,1.3 find.php,1.2,1.3 history.php,1.2,1.3 macro.php,1.2,1.3 prefs.php,1.2,1.3 preview.php,1.2,1.3 rss.php,1.2,1.3 save.php,1.2,1.3 style.php,1.2,1.3 view.php,1.2,1.3
- Next by Date:
[Phpgroupware-cvs] CVS: wiki/doc cvs-import,NONE,1.1
- Previous by thread:
[Phpgroupware-cvs] CVS: wiki/action admin.php,1.2,1.3 conflict.php,1.2,1.3 diff.php,1.2,1.3 edit.php,1.2,1.3 find.php,1.2,1.3 history.php,1.2,1.3 macro.php,1.2,1.3 prefs.php,1.2,1.3 preview.php,1.2,1.3 rss.php,1.2,1.3 save.php,1.2,1.3 style.php,1.2,1.3 view.php,1.2,1.3
- Next by thread:
[Phpgroupware-cvs] CVS: wiki/doc cvs-import,NONE,1.1
- Index(es):