headers
sylvieg | 5 Apr 2006 00:16
Picon

tiki/db tiki_1.9to1.10.sql,1.83,1.84 tiki.sql,1.315,1.316

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

Modified Files:
	tiki_1.9to1.10.sql tiki.sql 
Log Message:
current contributions are kept in comments logs to see the right contributions if comment edited

Index: tiki_1.9to1.10.sql
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/db/tiki_1.9to1.10.sql,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- tiki_1.9to1.10.sql	28 Mar 2006 07:41:46 -0000	1.83
+++ tiki_1.9to1.10.sql	4 Apr 2006 22:16:06 -0000	1.84
 <at>  <at>  -523,7 +523,6  <at>  <at> 
 INSERT IGNORE INTO tiki_preferences(name,value) VALUES
('feature_contribution_mandatory_comment', 'n');

 #2006-03-12 lfagundes
-DROP TABLE IF EXISTS tiki_page_drafts;
 CREATE TABLE tiki_page_drafts (
   user varchar(40) NOT NULL,
   pageName varchar(255) NOT NULL,
 <at>  <at>  -541,3 +540,12  <at>  <at> 

 #2006-03-28
 INSERT IGNORE INTO tiki_preferences(name,value) VALUES ('feature_wiki_replace', 'n');
+
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 5 Apr 2006 00:16
Picon

tiki/lib/contribution contributionlib.php,1.5,1.6

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

Modified Files:
	contributionlib.php 
Log Message:
current contributions are kept in comments logs to see the right contributions if comment edited

Index: contributionlib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/contribution/contributionlib.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- contributionlib.php	13 Mar 2006 13:48:20 -0000	1.5
+++ contributionlib.php	4 Apr 2006 22:16:06 -0000	1.6
 <at>  <at>  -47,22 +47,23  <at>  <at> 
 	}
 	function assign_contributions($contributions, $itemId, $objectType, $description, $name, $href) {
 		global $objectlib; include_once('lib/objectlib.php');
-		if (($objectId = $objectlib->get_object_id($objectType, $itemId)) == 0)
+		if (($objectId = $objectlib->get_object_id($objectType, $itemId)) == 0) {
 			$objectId = $objectlib->insert_object($objectType, $itemId, $description, $name, $href);
-		else {
+		} else {
 			$query = 'delete from `tiki_contributions_assigned` where `objectId`=?';
 			$this->query($query, array((int)$objectId));
 		}
-		$query = 'insert `tiki_contributions_assigned` (`contributionId`, `objectId`) values(?,?)';
 		if (!empty($contributions)) {
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 5 Apr 2006 00:16
Picon

tiki/lib commentslib.php,1.137,1.138

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

Modified Files:
	commentslib.php 
Log Message:
current contributions are kept in comments logs to see the right contributions if comment edited

Index: commentslib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/commentslib.php,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- commentslib.php	10 Mar 2006 16:06:26 -0000	1.137
+++ commentslib.php	4 Apr 2006 22:16:07 -0000	1.138
 <at>  <at>  -1776,7 +1776,7  <at>  <at> 
 	$this->query($query, array( (int) $threadId ) );
     }

-    function update_comment($threadId, $title, $comment_rating, $data, $type = 'n', $summary = '',
$smiley = '', $objectId='') {
+    function update_comment($threadId, $title, $comment_rating, $data, $type = 'n', $summary = '',
$smiley = '', $objectId='', $contributions='') {
 	global $feature_actionlog, $feature_contribution;
 	if ($feature_actionlog == 'y') {
 		$object = explode( ":", $objectId, 2);
 <at>  <at>  -1785,20 +1785,24  <at>  <at> 
 		$bytes = diff2($comment['data'] , $data, 'bytes');
 		global $logslib; include_once('lib/logs/logslib.php');
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 5 Apr 2006 00:16
Picon

tiki comments.php,1.63,1.64 tiki-view_forum.php,1.99,1.100

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

Modified Files:
	comments.php tiki-view_forum.php 
Log Message:
current contributions are kept in comments logs to see the right contributions if comment edited

Index: comments.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/comments.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- comments.php	16 Mar 2006 15:58:31 -0000	1.63
+++ comments.php	4 Apr 2006 22:16:07 -0000	1.64
 <at>  <at>  -190,7 +190,7  <at>  <at> 
 			$user,
 			$_REQUEST["comments_title"],
 			$_REQUEST["comments_data"],
-			$message_id, $in_reply_to );
+			$message_id, 'n', '', '', $in_reply_to, isset($_REQUEST['contributions'])?
$_REQUEST['contributions']: '');
 		if ($object[0] != "forum") {
 			$smarty->assign("comments_parentId", 0); // to display all the comments
 			$_REQUEST["comments_parentId"] = 0;
 <at>  <at>  -203,15 +203,11  <at>  <at> 
 			|| (($tiki_p_forum_post == 'y' || $tiki_p_admin_forum == 'y') && isset($forum_mode) && $forum_mode
== 'y' )
 			|| ($commentslib->user_can_edit_post($user, $_REQUEST["comments_threadId"]))) {
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 5 Apr 2006 00:16
Picon

tiki/lib/logs logslib.php,1.17,1.18

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

Modified Files:
	logslib.php 
Log Message:
current contributions are kept in comments logs to see the right contributions if comment edited

Index: logslib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/logs/logslib.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- logslib.php	26 Mar 2006 15:56:38 -0000	1.17
+++ logslib.php	4 Apr 2006 22:16:05 -0000	1.18
 <at>  <at>  -91,8 +91,9  <at>  <at> 

 	/* action = "Updated", "Created", "Removed", "Viewed", "Removed version $version", "Changed actual
version to $version"
 	 * type = 'wiki page', 'category', 'article', 'image gallery', 'tracker', 'forum thread'
+	 * TODO: merge $param and $contributions together into a hash and but everything in actionlog_params
 	*/
-	function add_action($action, $object, $objectType='wiki page', $param='', $who='', $ip='',
$client='', $date='') {
+	function add_action($action, $object, $objectType='wiki page', $param='', $who='', $ip='',
$client='', $date='', $contributions='') {
 		global $user, $feature_categories;
 		if ($objectType == 'wiki page' && $action != 'Viewed')
 			$logObject = true; // to have the tiki_my_edit, history and mod-last_modif_pages
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 5 Apr 2006 00:16
Picon

tiki/templates tiki-admin_actionlog.tpl,1.12,1.13

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

Modified Files:
	tiki-admin_actionlog.tpl 
Log Message:
current contributions are kept in comments logs to see the right contributions if comment edited

Index: tiki-admin_actionlog.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin_actionlog.tpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tiki-admin_actionlog.tpl	26 Mar 2006 15:56:38 -0000	1.12
+++ tiki-admin_actionlog.tpl	4 Apr 2006 22:16:07 -0000	1.13
 <at>  <at>  -98,8 +98,8  <at>  <at> 
 {if $feature_contribution eq 'y'}
 <td class="{cycle advance=false}">
 {section name=iy loop=$actionlogs[ix].contributions}
-{if !$smarty.section.iy.first}<br />{/if}
-{$actionlogs[ix].contributions[iy].name}
+{if !$smarty.section.iy.first}, {/if}
+{$actionlogs[ix].contributions[iy]}
 {/section}
 </td>
 {/if}

-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 5 Apr 2006 17:58
Picon

tiki/db tiki-1.10-mysql.sql,1.30,1.31 tiki-1.10-oci8.sql,1.26,1.27 tiki-1.10-pgsql.sql,1.26,1.27 tiki-1.10-sqlite.sql,1.26,1.27 tiki-1.10-sybase.sql,1.26,1.27

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

Modified Files:
	tiki-1.10-mysql.sql tiki-1.10-oci8.sql tiki-1.10-pgsql.sql 
	tiki-1.10-sqlite.sql tiki-1.10-sybase.sql 
Log Message:
sync

Index: tiki-1.10-mysql.sql
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/db/tiki-1.10-mysql.sql,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- tiki-1.10-mysql.sql	28 Mar 2006 07:41:45 -0000	1.30
+++ tiki-1.10-mysql.sql	5 Apr 2006 15:58:34 -0000	1.31
 <at>  <at>  -324,6 +324,14  <at>  <at> 
   categId int(12) NOT NULL default '0',
   PRIMARY KEY  (actionId)
 ) TYPE=MyISAM;
+
+DROP TABLE IF EXISTS tiki_actionlog_params;
+CREATE TABLE tiki_actionlog_params (
+  actionId int(8) NOT NULL,
+  name varchar(40) NOT NULL,
+  value text,
+  KEY  (actionId)
+) TYPE=MyISAM;
 # --------------------------------------------------------
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 5 Apr 2006 17:53
Picon

tiki/lib tikilib.php,1.637,1.638

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

Modified Files:
	tikilib.php 
Log Message:
not to have quoted lines without cr counted

Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.637
retrieving revision 1.638
diff -u -d -r1.637 -r1.638
--- tikilib.php	20 Mar 2006 04:45:52 -0000	1.637
+++ tikilib.php	5 Apr 2006 15:53:25 -0000	1.638
 <at>  <at>  -6618,7 +6618,7  <at>  <at> 
 		global $feature_use_quoteplugin;
 		$data = preg_replace('/{QUOTE\([^\)]*\)}.*{QUOTE}/Ui', '', $data);
 		if ($feature_use_quoteplugin != 'y') {
-			$data = preg_replace('/^>.*\\n/m', '', $data);
+			$data = preg_replace('/^>.*\\n?/m', '', $data);
 		}
 		return strlen($data);
 	}

-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 5 Apr 2006 22:09
Picon

tiki comments.php,1.64,1.65

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

Modified Files:
	comments.php 
Log Message:
missed up with param order

Index: comments.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/comments.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- comments.php	4 Apr 2006 22:16:07 -0000	1.64
+++ comments.php	5 Apr 2006 20:09:06 -0000	1.65
 <at>  <at>  -190,7 +190,7  <at>  <at> 
 			$user,
 			$_REQUEST["comments_title"],
 			$_REQUEST["comments_data"],
-			$message_id, 'n', '', '', $in_reply_to, isset($_REQUEST['contributions'])?
$_REQUEST['contributions']: '');
+			$message_id, $in_reply_to, 'n', '', '', isset($_REQUEST['contributions'])?
$_REQUEST['contributions']: '');
 		if ($object[0] != "forum") {
 			$smarty->assign("comments_parentId", 0); // to display all the comments
 			$_REQUEST["comments_parentId"] = 0;

-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
(Continue reading)

Permalink | Reply | 0 comments |
headers
sylvieg | 5 Apr 2006 22:45
Picon

tiki/lib/logs logslib.php,1.18,1.19

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

Modified Files:
	logslib.php 
Log Message:
readable date in export

Index: logslib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/logs/logslib.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- logslib.php	4 Apr 2006 22:16:05 -0000	1.18
+++ logslib.php	5 Apr 2006 20:45:28 -0000	1.19
 <at>  <at>  -481,7 +481,7  <at>  <at> 
 		return $vol;
 	}
 	function export($actionlogs, $unit = 'b') {
-	$csv = "user,date,action,type,object,category,unit,+,-<br />";
+	$csv = "user,date,time,action,type,object,category,unit,+,-<br />";
 	foreach ($actionlogs as $action) {
 		if (!isset($action['object']))
 			$action['object'] = '';
 <at>  <at>  -492,7 +492,7  <at>  <at> 
 		if (!isset($action['del']))
 			$action['del'] = '';

-		$csv.= '"'.$action['user'].'","'.$action['lastModif'].'","'.$action['action'].'","'.$action['objectType'].'","'.$action['object'].'","'
(Continue reading)

Permalink | Reply | 0 comments |

Gmane