headers
sylvieg | 1 Nov 2005 18:30
Picon

tiki/lib/wiki-plugins wikiplugin_split.php,1.23,1.24

Update of /cvsroot/tikiwiki/tiki/lib/wiki-plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3416/lib/wiki-plugins

Modified Files:
	wikiplugin_split.php 
Log Message:
new split param first: first='col': r1c1---r2c1---r3c1 <at>  <at>  <at> r1c2---r2c2 (the editorial way) /
first='line' (default): r1c1---r1c2 <at>  <at>  <at> r2c1---r2c2 (the html table way)

Index: wikiplugin_split.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/wiki-plugins/wikiplugin_split.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- wikiplugin_split.php	16 Oct 2005 14:35:10 -0000	1.23
+++ wikiplugin_split.php	1 Nov 2005 17:30:11 -0000	1.24
 <at>  <at>  -6,16 +6,17  <at>  <at> 
  * \brief {SPLIT} wiki plugin implementation
  * Usage:
  *
- *  {SPLIT(joincols=>[y|n|0|1],fixedsize=>[y|n|0|1],colsize=>size1|size2|...)}
+ *  {SPLIT(joincols=>[y|n|0|1],fixedsize=>[y|n|0|1],colsize=>size1|size2|...,first=>[col|line])}
  *
  * If `joincols' eq true (yes) 'colspan' attribute will be generated if column missed.
  * If `fixedsize' eq true (yes) 'width' attribute will be generated for TDs.
  * Both paramaters have default value 'y'
- *
+ * first='col': r1c1---r2c1---r3c1 <at>  <at>  <at> r1c2---r2c2 (the editorial way)
+ * first='line' (default): r1c1---r1c2 <at>  <at>  <at> r2c1---r2c2 (the html table way)
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 2 Nov 2005 15:53
Picon

tiki/templates tiki-admin_actionlog.tpl,1.6,1.7

Update of /cvsroot/tikiwiki/tiki/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20803/templates

Modified Files:
	tiki-admin_actionlog.tpl 
Log Message:
display 0 if volume is unknown

Index: tiki-admin_actionlog.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin_actionlog.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tiki-admin_actionlog.tpl	26 Oct 2005 20:20:21 -0000	1.6
+++ tiki-admin_actionlog.tpl	2 Nov 2005 14:53:01 -0000	1.7
 <at>  <at>  -130,7 +130,7  <at>  <at> 
 <tr>
 <td class="{cycle advance=false}">{$vol.category}</td>
 {foreach item=type from=$typeVol}
-<td class="{cycle advance=false}">{*
{$vol[$type].add}-{$vol[$type].del}-{$vol[$type].dif}*** *}{math equation="round(a/b)"
a=$vol[$type].add b=1024}</td><td class="{cycle advance=false}">{math equation="round(a/b)"
a=$vol[$type].del b=1024}</td><td class="{cycle advance=false}">{math equation="round(a/b)"
a=$vol[$type].dif b=1024}</td>
+<td class="{cycle advance=false}">{*
{$vol[$type].add}-{$vol[$type].del}-{$vol[$type].dif}*** *}{if $vol[$type].add}{math
equation="round(a/b)" a=$vol[$type].add b=1024}{else}0{/if}</td><td class="{cycle
advance=false}">{if $vol[$type].del}{math equation="round(a/b)" a=$vol[$type].del
b=1024}{else}0{/if}</td><td class="{cycle advance=false}">{if $vol[$type].dif}{math
(Continue reading)

Permalink | Reply | 0 comments |
headers
amette | 2 Nov 2005 16:43
Picon

tiki tiki-view_articles.php,1.22.2.10,1.22.2.11 tiki-view_tracker_item.php,1.69.2.57,1.69.2.58 tiki-edit_article.php,1.44.2.9,1.44.2.10 tiki-admin_content_templates.php,1.11.2.6,1.11.2.7 tiki-calendar.php,1.38.2.42,1.38.2.43 tiki-view_blog.php,1.39.2.8,1.39.2.9 tiki-editpage.php,1.89.2.47,1.89.2.48 tiki-admin_modules.php,1.33.2.7,1.33.2.8 tiki-articles_rss.php,1.23.2.9,1.23.2.10 tiki-user_tasks.php,1.15.2.50,1.15.2.51 tiki-index.php,1.113.2.44,1.113.2.45

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30705

Modified Files:
      Tag: BRANCH-1-9
	tiki-view_articles.php tiki-view_tracker_item.php 
	tiki-edit_article.php tiki-admin_content_templates.php 
	tiki-calendar.php tiki-view_blog.php tiki-editpage.php 
	tiki-admin_modules.php tiki-articles_rss.php 
	tiki-user_tasks.php tiki-index.php 
Log Message:
Rollback of htmlspecialchar()ing the parse_data-input - stupid idea in the first place :(

Index: tiki-view_articles.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-view_articles.php,v
retrieving revision 1.22.2.10
retrieving revision 1.22.2.11
diff -u -d -r1.22.2.10 -r1.22.2.11
--- tiki-view_articles.php	11 Oct 2005 21:58:25 -0000	1.22.2.10
+++ tiki-view_articles.php	2 Nov 2005 15:42:50 -0000	1.22.2.11
 <at>  <at>  -122,7 +122,7  <at>  <at> 

 $temp_max = count($listpages["data"]);
 for ($i = 0; $i < $temp_max; $i++) {
-	$listpages["data"][$i]["parsed_heading"] = $tikilib->parse_data(htmlspecialchars($listpages["data"][$i]["heading"]));
+	$listpages["data"][$i]["parsed_heading"] = $tikilib->parse_data($listpages["data"][$i]["heading"]);
 	$comments_prefix_var='article:';
 	$comments_object_var=$listpages["data"][$i]["articleId"];
 	$comments_objectId = $comments_prefix_var.$comments_object_var;
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 2 Nov 2005 19:25
Picon

tiki/templates tiki-admin_actionlog.tpl,1.7,1.8

Update of /cvsroot/tikiwiki/tiki/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10370/templates

Modified Files:
	tiki-admin_actionlog.tpl 
Log Message:
separate added bytes and deleted bytes + actions can be recorded and not viewed

Index: tiki-admin_actionlog.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin_actionlog.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tiki-admin_actionlog.tpl	2 Nov 2005 14:53:01 -0000	1.7
+++ tiki-admin_actionlog.tpl	2 Nov 2005 18:24:04 -0000	1.8
 <at>  <at>  -5,10 +5,13  <at>  <at> 
 <h2>{tr}Setting{/tr}</h2>
 <form method="post" action="tiki-admin_actionlog.php">
 <table class="smallnormal">
-<tr><th class="heading">{tr}status{/tr}</th><th class="heading">{tr}action{/tr}</th><th class="heading">{tr}type{/tr}</th></tr>
+<tr><th class="heading">{tr}recorded{/tr}</th><th class="heading">{tr}viewed{/tr}</th><th
class="heading">{tr}action{/tr}</th><th class="heading">{tr}type{/tr}</th></tr>
 {cycle values="even,odd" print=false}
 {section name=ix loop=$actionlogConf}
-<tr><td class="{cycle advance=false}"><input type="checkbox" name="{$actionlogConf[ix].code}"
{if $actionlogConf[ix].status eq 'y'}checked="checked"{/if} /></td><td class="{cycle
advance=false}">{tr}{$actionlogConf[ix].action}{/tr}</td><td class="{cycle}">{tr}{$actionlogConf[ix].objectType}{/tr}</td></tr>
+<tr><td class="{cycle advance=false}"><input type="checkbox" name="{$actionlogConf[ix].code}"
{if $actionlogConf[ix].status eq 'y' or $actionlogConf[ix].status eq 'v'}checked="checked"{/if} /></td>
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 2 Nov 2005 19:24
Picon

tiki/lib/diff renderer_bytes.php,1.1,1.2

Update of /cvsroot/tikiwiki/tiki/lib/diff
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10150/lib/diff

Modified Files:
	renderer_bytes.php 
Log Message:
separate added bytes and deleted bytes + actions can be recorded and not viewed + post message volume

Index: renderer_bytes.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/diff/renderer_bytes.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- renderer_bytes.php	19 Sep 2005 13:57:01 -0000	1.1
+++ renderer_bytes.php	2 Nov 2005 18:23:33 -0000	1.2
 <at>  <at>  -19,7 +19,7  <at>  <at> 
         $this->_delBytes = 0;
     }
     function _endDiff() {
-        return '+'.$this->_addBytes.'-'.$this->_delBytes;
+        return 'add='.$this->_addBytes.'&amp;del='.$this->_delBytes;
     }

     function _blockHeader($xbeg, $xlen, $ybeg, $ylen)

-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 2 Nov 2005 19:25
Picon

tiki/lib/filegals filegallib.php,1.33,1.34

Update of /cvsroot/tikiwiki/tiki/lib/filegals
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10150/lib/filegals

Modified Files:
	filegallib.php 
Log Message:
separate added bytes and deleted bytes + actions can be recorded and not viewed + post message volume

Index: filegallib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/filegals/filegallib.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- filegallib.php	28 Oct 2005 15:44:44 -0000	1.33
+++ filegallib.php	2 Nov 2005 18:23:33 -0000	1.34
 <at>  <at>  -78,7 +78,7  <at>  <at> 
 		global $feature_actionlog;
 		if ($feature_actionlog == 'y') {
 			global $logslib; include_once('lib/logs/logslib.php');
-			$logslib->add_action('Uploaded', $galleryId, 'file gallery', "fileId=$fileId&amp;bytes=+$size");
+			$logslib->add_action('Uploaded', $galleryId, 'file gallery', "fileId=$fileId&amp;add=$size");
 		}

 		//Watches

-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 2 Nov 2005 19:24
Picon

tiki messu-broadcast.php,1.25,1.26 messu-compose.php,1.30,1.31 tiki-admin_actionlog.php,1.7,1.8

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10150

Modified Files:
	messu-broadcast.php messu-compose.php tiki-admin_actionlog.php 
Log Message:
separate added bytes and deleted bytes + actions can be recorded and not viewed + post message volume

Index: messu-broadcast.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/messu-broadcast.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- messu-broadcast.php	15 Sep 2005 14:52:33 -0000	1.25
+++ messu-broadcast.php	2 Nov 2005 18:23:32 -0000	1.26
 <at>  <at>  -150,7 +150,7  <at>  <at> 
 	$smarty->assign('message', $message);

 	if ($feature_actionlog == 'y') {
-		$logslib->add_action('Posted', '', 'message');
+		$logslib->add_action('Posted', '', 'message', 'add='.strlen($_REQUEST['body']));
 	}
 }
 ask_ticket('messu-broadcast');

Index: messu-compose.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/messu-compose.php,v
retrieving revision 1.30
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 2 Nov 2005 19:25
Picon

tiki/lib/logs logslib.php,1.12,1.13

Update of /cvsroot/tikiwiki/tiki/lib/logs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10150/lib/logs

Modified Files:
	logslib.php 
Log Message:
separate added bytes and deleted bytes + actions can be recorded and not viewed + post message volume

Index: logslib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/logs/logslib.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- logslib.php	26 Oct 2005 20:20:23 -0000	1.12
+++ logslib.php	2 Nov 2005 18:23:33 -0000	1.13
 <at>  <at>  -136,7 +136,18  <at>  <at> 
 			return true; // for previous compatibility - the new action are added with a if ($feature..)
 		$logActions = $this->get_all_actionlog_conf();
 		foreach ($logActions as $conf) {
-			if ($conf['action'] == $action && $conf['objectType'] == $objectType && $conf['status'] == 'y')
+			if ($conf['action'] == $action && $conf['objectType'] == $objectType && ($conf['status'] == 'y' ||
$conf['status'] == 'v'))
+				return true;
+		}
+		return false;
+	}
+	function action_is_viewed($action, $objectType) {
+		global $feature_actionlog;
+		if ($feature_actionlog != 'y')
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 2 Nov 2005 19:25
Picon

tiki/lib commentslib.php,1.126,1.127 tikilib.php,1.620,1.621

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10150/lib

Modified Files:
	commentslib.php tikilib.php 
Log Message:
separate added bytes and deleted bytes + actions can be recorded and not viewed + post message volume

Index: commentslib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/commentslib.php,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- commentslib.php	26 Oct 2005 20:20:22 -0000	1.126
+++ commentslib.php	2 Nov 2005 18:23:32 -0000	1.127
 <at>  <at>  -1686,7 +1686,7  <at>  <at> 
 			include_once('lib/diff/difflib.php');
 			$bytes = diff2($comment['data'] , $data, 'bytes');
 			global $logslib; include_once('lib/logs/logslib.php');
-			$logslib->add_action('Updated', $object[1], $object[0], "comments_parentId=$threadId&amp;bytes=$bytes#threadId$threadId");
+			$logslib->add_action('Updated', $object[1], $object[0], "comments_parentId=$threadId&amp;$bytes#threadId$threadId");
 		}
 	}
 	$query = "update `tiki_comments` set `title`=?, `comment_rating`=?,
 <at>  <at>  -1828,7 +1828,7  <at>  <at> 
 	global $feature_actionlog;
 	if ($feature_actionlog == 'y' && $object[0] == 'forum') {
 		global $logslib; include_once('lib/logs/logslib.php');
-		$logslib->add_action(($parentId == 0)? 'Posted': 'Replied', $object[1], $object[0], 'comments_parentId='.$threadId.'&amp;bytes=+'.strlen($data));
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 3 Nov 2005 15:08
Picon

tiki comments.php,1.31.2.40,1.31.2.41

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4276

Modified Files:
      Tag: BRANCH-1-9
	comments.php 
Log Message:
tracker395: new post subject set after a post + all comments shown after a post

Index: comments.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/comments.php,v
retrieving revision 1.31.2.40
retrieving revision 1.31.2.41
diff -u -d -r1.31.2.40 -r1.31.2.41
--- comments.php	28 Oct 2005 18:07:22 -0000	1.31.2.40
+++ comments.php	3 Nov 2005 14:06:32 -0000	1.31.2.41
 <at>  <at>  -196,10 +196,12  <at>  <at> 
 			$_REQUEST["comments_title"],
 			$_REQUEST["comments_data"],
 			$message_id, $in_reply_to );
-		if ($object[0] != "forum")
+		if ($object[0] != "forum") {
 			$smarty->assign("comments_parentId", 0); // to display all the comments
-		$_REQUEST["comments_reply_threadId"] = 0;
-		$smarty->assign("comments_reply_threadId", 0); // without the flag
+			$_REQUEST["comments_parentId"] = 0;
+		}
+		$_REQUEST["comments_reply_threadId"] = $_REQUEST["comments_parentId"]; // to have the right re:
+		$smarty->assign("comments_reply_threadId", $_REQUEST["comments_parentId"]); // without the flag
(Continue reading)

Permalink | Reply | 0 comments |

Gmane