mose | 1 Jul 18:56 2007
Picon
Picon

tiki/db tiki-1.10-mysql.sql, 1.54, 1.55 tiki-1.10-mysqli.sql, 1.1, 1.2 tiki-1.10-oci8.sql, 1.45, 1.46 tiki-1.10-pgsql.sql, 1.45, 1.46 tiki-1.10-sqlite.sql, 1.45, 1.46 tiki-1.10-sybase.sql, 1.44, 1.45 tiki.sql, 1.405, 1.406 tiki_1.9to1.10.sql, 1.168, 1.169

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

Modified Files:
	tiki-1.10-mysql.sql tiki-1.10-mysqli.sql tiki-1.10-oci8.sql 
	tiki-1.10-pgsql.sql tiki-1.10-sqlite.sql tiki-1.10-sybase.sql 
	tiki.sql tiki_1.9to1.10.sql 
Log Message:
[MOD] newsletters: new field, author

Index: tiki-1.10-mysql.sql
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/db/tiki-1.10-mysql.sql,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- tiki-1.10-mysql.sql	26 May 2007 11:18:52 -0000	1.54
+++ tiki-1.10-mysql.sql	1 Jul 2007 16:56:01 -0000	1.55
 <at>  <at>  -1308,6 +1308,7  <at>  <at> 
   show_modified char(1) default NULL,
   show_author char(1) default NULL,
   show_creator char(1) default NULL,
+  subgal_conf varchar(200) default NULL,
   PRIMARY KEY  (galleryId)
 ) TYPE=MyISAM AUTO_INCREMENT=1 ;
 # --------------------------------------------------------
 <at>  <at>  -2037,6 +2038,7  <at>  <at> 
   section varchar(255) default NULL,
   perm varchar(255) default NULL,
   groupname varchar(255) default NULL,
(Continue reading)

tombombadilom | 1 Jul 18:59 2007
Picon
Picon

tiki/templates tiki-admin_newsletters.tpl, 1.28, 1.29

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

Modified Files:
	tiki-admin_newsletters.tpl 
Log Message:
added creator field to newsletters 

Index: tiki-admin_newsletters.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-admin_newsletters.tpl,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- tiki-admin_newsletters.tpl	8 Jun 2007 10:56:54 -0000	1.28
+++ tiki-admin_newsletters.tpl	1 Jul 2007 16:59:15 -0000	1.29
 <at>  <at>  -20,6 +20,7  <at>  <at> 
 {/if}
 <form action="tiki-admin_newsletters.php" method="post">
 <input type="hidden" name="nlId" value="{$info.nlId|escape}" />
+<input type="hidden" name="author" value="{$user|escape}" />
 <table class="normal">
 <tr><td class="formcolor">{tr}Name{/tr}:</td><td class="formcolor"><input type="text"
name="name" value="{$info.name|escape}" /></td></tr>
 <tr><td class="formcolor">{tr}Description{/tr}:</td><td class="formcolor"><textarea
name="description" rows="4" cols="40">{$info.description|escape}</textarea></td></tr>
 <at>  <at>  -63,6 +64,7  <at>  <at> 
 <td class="heading"><a class="tableheading"
href="tiki-admin_newsletters.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'nlId_desc'}nlId_asc{else}nlId_desc{/if}">{tr}ID{/tr}</a></td>
 <td class="heading"><a class="tableheading"
(Continue reading)

tombombadilom | 1 Jul 18:59 2007
Picon
Picon

tiki tiki-admin_newsletters.php,1.17,1.18

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

Modified Files:
	tiki-admin_newsletters.php 
Log Message:
added creator field to newsletters 

Index: tiki-admin_newsletters.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-admin_newsletters.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- tiki-admin_newsletters.php	6 Mar 2007 19:29:46 -0000	1.17
+++ tiki-admin_newsletters.php	1 Jul 2007 16:59:15 -0000	1.18
 <at>  <at>  -114,7 +114,7  <at>  <at> 
 		$_REQUEST["allowTxt"] = 'n';
 	}

-	$sid = $nllib->replace_newsletter($_REQUEST["nlId"], $_REQUEST["name"],
$_REQUEST["description"], $_REQUEST["allowUserSub"], $_REQUEST["allowAnySub"],
$_REQUEST["unsubMsg"], $_REQUEST["validateAddr"],$_REQUEST["allowTxt"]);
+	$sid = $nllib->replace_newsletter($_REQUEST["nlId"], $_REQUEST["name"],
$_REQUEST["description"], $_REQUEST["allowUserSub"], $_REQUEST["allowAnySub"],
$_REQUEST["unsubMsg"], $_REQUEST["validateAddr"],$_REQUEST["allowTxt"],$_REQUEST["author"]);
 	/*
 	$cat_type='newsletter';
 	$cat_objid = $sid;

(Continue reading)

tombombadilom | 1 Jul 19:03 2007
Picon
Picon

tiki/lib/newsletters nllib.php,1.56,1.57

Update of /cvsroot/tikiwiki/tiki/lib/newsletters
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17005/lib/newsletters

Modified Files:
	nllib.php 
Log Message:
added creator field in newsletters

Index: nllib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/newsletters/nllib.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- nllib.php	12 Feb 2007 09:36:48 -0000	1.56
+++ nllib.php	1 Jul 2007 17:02:58 -0000	1.57
 <at>  <at>  -13,14 +13,14  <at>  <at> 
 		parent::TikiLib($db);
 	}

-	function replace_newsletter($nlId, $name, $description, $allowUserSub, $allowAnySub,
$unsubMsg, $validateAddr) {
+	function replace_newsletter($nlId, $name, $description, $allowUserSub, $allowAnySub,
$unsubMsg, $validateAddr, $author) {
 		if ($nlId) {
 			$query = "update `tiki_newsletters` set `name`=?, `description`=?, `allowUserSub`=?,
`allowAnySub`=?, `unsubMsg`=?, `validateAddr`=?  where `nlId`=?";
 			$result = $this->query($query, array($name,$description,$allowUserSub,$allowAnySub,$unsubMsg,$validateAddr,(int)$nlId));
 		} else {
-			$query = "insert into
(Continue reading)

sampaioprimo | 1 Jul 23:11 2007
Picon
Picon

tiki/templates tiki-edit_submission.tpl,1.49,1.50

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

Modified Files:
	tiki-edit_submission.tpl 
Log Message:
fix position of freetags include

Index: tiki-edit_submission.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-edit_submission.tpl,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- tiki-edit_submission.tpl	27 Jun 2007 19:15:18 -0000	1.49
+++ tiki-edit_submission.tpl	1 Jul 2007 21:11:34 -0000	1.50
 <at>  <at>  -143,12 +143,12  <at>  <at> 
 &nbsp;{$siteTimeZone}
 </span>
 </td></tr>
+{include file=freetag.tpl}
 </table>
 {if $tiki_p_use_HTML eq 'y'}
 <div align="center">{tr}Allow HTML{/tr}: <input type="checkbox" name="allowhtml" {if $allowhtml eq 'y'}checked="checked"{/if}/></div>
 {/if}

-{include file=freetag.tpl}

 <div align="center">
 <input type="submit" class="wikiaction" name="preview" value="{tr}preview{/tr}" />
(Continue reading)

tombombadilom | 2 Jul 03:34 2007
Picon
Picon

tiki/lib/newsletters nllib.php,1.57,1.58

Update of /cvsroot/tikiwiki/tiki/lib/newsletters
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3044/lib/newsletters

Modified Files:
	nllib.php 
Log Message:
added author list 

Index: nllib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/newsletters/nllib.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- nllib.php	1 Jul 2007 17:02:58 -0000	1.57
+++ nllib.php	2 Jul 2007 01:34:42 -0000	1.58
 <at>  <at>  -34,6 +34,57  <at>  <at> 
 		$result = $this->query($query,array((int)$nlId));
 	}

+	function list_author_newsletters($offset=0, $maxRecords=-1, $sort_mode, $find='', $update='',
$perms='',$userName) {
+		global $user, $tikilib;
+		$bindvars = array();
+		if ($find) {
+			$findesc = '%' . $find . '%';
+			$mid = " where (`name` like ? or `description` like ?) and `author` =?";
+			$bindvars[] = $findesc;
+			$bindvars[] = $findesc;
+			$bindvars[] = $userName;
(Continue reading)

sampaioprimo | 2 Jul 06:13 2007
Picon
Picon

tiki/templates freetag.tpl,1.4,1.5

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

Modified Files:
	freetag.tpl 
Log Message:
[FIX] only show freetag.tpl if user has perm

Index: freetag.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/freetag.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- freetag.tpl	4 Dec 2006 11:00:25 -0000	1.4
+++ freetag.tpl	2 Jul 2007 04:13:18 -0000	1.5
 <at>  <at>  -1,4 +1,4  <at>  <at> 
-{if $feature_freetags eq 'y'}
+{if $feature_freetags eq 'y' && $tiki_p_freetags_tag eq 'y'}

 <script type="text/javascript">
 {literal}

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
sampaioprimo | 2 Jul 06:27 2007
Picon
Picon

tiki/lib/categories categlib.php,1.105,1.106

Update of /cvsroot/tikiwiki/tiki/lib/categories
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12754

Modified Files:
	categlib.php 
Log Message:
[FIX] itemId should be modified not objectId when approving an article

Index: categlib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/categories/categlib.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- categlib.php	21 Jun 2007 13:07:34 -0000	1.105
+++ categlib.php	2 Jul 2007 04:27:54 -0000	1.106
 <at>  <at>  -1126,7 +1126,7  <at>  <at> 
 	return $forbidden;
     }
 	function approve_submission($subId, $articleId) {
-		$query = "update `tiki_objects` set `type`= ?, `objectId`= ?, `href`=? where `objectId` = ? and
`type`= ?";
+		$query = "update `tiki_objects` set `type`= ?, `itemId`= ?, `href`=? where `itemId` = ? and `type`= ?";
 		$this->query($query, array('article', (int)$articleId,
"tiki-read_article.php?articleId=$articleId", (int)$subId, 'submission'));
 	}
 	/* build the portion of list join if filter by category

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
(Continue reading)

sylvieg | 2 Jul 13:05 2007
Picon
Picon

tiki tiki-view_tracker.php,1.72.2.73,1.72.2.74

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

Modified Files:
      Tag: BRANCH-1-9
	tiki-view_tracker.php 
Log Message:
[FIX]tracker: move the assign of fields after collecting info on tracker, because the collection can
reassign fields->should fix the rating sort on dev.tw

Index: tiki-view_tracker.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-view_tracker.php,v
retrieving revision 1.72.2.73
retrieving revision 1.72.2.74
diff -u -d -r1.72.2.73 -r1.72.2.74
--- tiki-view_tracker.php	21 Jun 2007 11:05:43 -0000	1.72.2.73
+++ tiki-view_tracker.php	2 Jul 2007 11:05:37 -0000	1.72.2.74
 <at>  <at>  -532,8 +532,6  <at>  <at> 
 	}
 }

-$smarty->assign_by_ref('fields', $fields["data"]);
-
 if (!isset($_REQUEST["sort_mode"])) {
 	if (isset($tracker_info['defaultOrderKey'])) {
 		if ($tracker_info['defaultOrderKey'] == -1)
 <at>  <at>  -687,6 +685,7  <at>  <at> 
 ******************** */
 $smarty->assign('trackerId', $_REQUEST["trackerId"]);
(Continue reading)

sylvieg | 2 Jul 15:35 2007
Picon
Picon

tiki tiki-view_tracker.php,1.131,1.132

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

Modified Files:
	tiki-view_tracker.php 
Log Message:
Instant-Auto-Merge from BRANCH-1-9 to HEAD

Index: tiki-view_tracker.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-view_tracker.php,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- tiki-view_tracker.php	29 Jun 2007 16:33:41 -0000	1.131
+++ tiki-view_tracker.php	2 Jul 2007 13:35:13 -0000	1.132
 <at>  <at>  -624,8 +624,6  <at>  <at> 
 	}
 }

-$smarty->assign_by_ref('fields', $fields["data"]);
-
 if (!isset($_REQUEST["sort_mode"])) {
 	if (isset($tracker_info['defaultOrderKey'])) {
 		if ($tracker_info['defaultOrderKey'] == -1)
 <at>  <at>  -661,9 +659,13  <at>  <at> 
 } else {
 	$offset = $_REQUEST["offset"];
 }
-
(Continue reading)


Gmane