headers
toggg | 2 Oct 2005 18:51
Picon

tiki/lib/pear/Text/Wiki/Parse/Tiki Plugin.php,1.1,1.2

Update of /cvsroot/tikiwiki/tiki/lib/pear/Text/Wiki/Parse/Tiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29807

Modified Files:
	Plugin.php 
Log Message:
backport from pear : > is already > , too much greedy on the non quoted args (merci sylvieg)

Index: Plugin.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/pear/Text/Wiki/Parse/Tiki/Plugin.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Plugin.php	30 Jul 2005 14:37:15 -0000	1.1
+++ Plugin.php	30 Sep 2005 20:19:44 -0000	1.2
 <at>  <at>  -49,7 +49,7  <at>  <at> 
      *  <at> access public
      *  <at> var string
      */
-    var $regexArgs =  '#(\w+?)=>?("[^"]+"|\'[^\']+\'|[^"\'][^,]+)#';
+    var $regexArgs = '#(\w+?)=(?:>|&gt;)?([^"\'][^,]+?|"[^"]+"|\'[^\']+\')#';

     /**
     *

-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
(Continue reading)

Permalink | Reply | 0 comments |
headers
michael_davey | 2 Oct 2005 21:16
Picon

tiki/lib/articles artlib.php,1.40.2.10,1.40.2.11

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

Modified Files:
      Tag: BRANCH-1-9
	artlib.php 
Log Message:
Bug tw#349 last_insert_id() is mysql-specific (reported by Thrain)
fix contributed by: mo0co0 (edgar)

Index: artlib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/articles/artlib.php,v
retrieving revision 1.40.2.10
retrieving revision 1.40.2.11
diff -u -d -r1.40.2.10 -r1.40.2.11
--- artlib.php	5 May 2005 08:55:15 -0000	1.40.2.10
+++ artlib.php	2 Oct 2005 19:14:09 -0000	1.40.2.11
 <at>  <at>  -149,8 +149,9  <at>  <at> 
 			$result = $this->query($query,array($title,$authorName,(int)
$topicId,$useImage,$imgname,(int) $imgsize,$imgtype,
 	$imgdata,(int) $publishDate,(int) $expireDate, (int)
$now,$heading,$body,$hash,$user,0,0,0,(int) $size,$topicName,(int) $image_x,
 	(int) $image_y,$type,(float) $rating,$isfloat,$topline, $subtitle, $linkto, $image_caption, $lang));
-			$query = "select `subId` from `tiki_submissions` where `subId`=last_insert_id()";
-			$id = $this->getOne($query);
+			// Fixed query. -edgar
+			$query = "select max(`subId`) from `tiki_submissions` where `created` = ? and `title`=? and `hash`=?";
+			$id = $this->getOne($query, array( (int) $now, $title, $hash ) );
 		}
(Continue reading)

Permalink | Reply | 0 comments |
headers
michael_davey | 2 Oct 2005 21:40
Picon

tiki tiki-editpage.php,1.120,1.121

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

Modified Files:
	tiki-editpage.php 
Log Message:
use accesslib

Index: tiki-editpage.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-editpage.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- tiki-editpage.php	30 Sep 2005 14:11:51 -0000	1.120
+++ tiki-editpage.php	2 Oct 2005 19:37:04 -0000	1.121
 <at>  <at>  -13,13 +13,8  <at>  <at> 
 include_once ('lib/structures/structlib.php');
 include_once ('lib/notifications/notificationlib.php');

-
-if ($feature_wiki != 'y') {
-  $smarty->assign('msg', tra("This feature is disabled").": feature_wiki");
-
-  $smarty->display("error.tpl");
-  die;
-}
+$access->check_feature('feature_wiki');
+$access->check_permission('tiki_p_edit');
(Continue reading)

Permalink | Reply | 0 comments |
headers
toggg | 2 Oct 2005 22:16
Picon

tiki/lib/pear/Text/Wiki/Parse/Tiki Plugin.php,1.2,1.3

Update of /cvsroot/tikiwiki/tiki/lib/pear/Text/Wiki/Parse/Tiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24671

Modified Files:
	Plugin.php 
Log Message:
Back from pear: ~np~ , ~pp~ , <pre> and plugins now done the same "round"

Index: Plugin.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/pear/Text/Wiki/Parse/Tiki/Plugin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Plugin.php	30 Sep 2005 20:19:44 -0000	1.2
+++ Plugin.php	1 Oct 2005 15:54:35 -0000	1.3
 <at>  <at>  -38,9 +38,9  <at>  <at> 
      *  <at> var string
      */
     var $conf = array (
-    	'file_prefix' => 'wikiplugin_',
-    	'file_extension' => '.php',
-    	'file_path' => 'lib/wiki-plugins/'
+        'file_prefix' => 'wikiplugin_',
+        'file_extension' => '.php',
+        'file_path' => 'lib/wiki-plugins/'
     );

     /**
 <at>  <at>  -62,9 +62,10  <at>  <at>
(Continue reading)

Permalink | Reply | 0 comments |
headers
ang23 | 2 Oct 2005 22:25
Picon

tiki/templates module.tpl,1.12.2.10,1.12.2.11

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

Modified Files:
      Tag: BRANCH-1-9
	module.tpl 
Log Message:
div class="box-{$module_name|escape}" for css style-ability

Index: module.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/module.tpl,v
retrieving revision 1.12.2.10
retrieving revision 1.12.2.11
diff -u -d -r1.12.2.10 -r1.12.2.11
--- module.tpl	25 Feb 2005 13:55:16 -0000	1.12.2.10
+++ module.tpl	2 Oct 2005 15:39:11 -0000	1.12.2.11
 <at>  <at>  -1,7 +1,7  <at>  <at> 
 {* $Header$ *}
 {* Module layout with controls *}

-<div class="box {$module_name}">
+<div class="box-{$module_name|escape}">
 <div class="box-title">{if $user and $user_assigned_modules == 'y' and $no_module_controls ne 'y' and
$feature_modulecontrols eq 'y'}
 <table class="box-title">
   <tr>

-------------------------------------------------------
This SF.Net email is sponsored by:
(Continue reading)

Permalink | Reply | 0 comments |
headers
michael_davey | 2 Oct 2005 23:58
Picon

tiki/lib/notifications notificationlib.php,1.18,1.19

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

Modified Files:
	notificationlib.php 
Log Message:
fix kludge by using an additional db column

Index: notificationlib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/notifications/notificationlib.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- notificationlib.php	6 Sep 2005 17:50:21 -0000	1.18
+++ notificationlib.php	1 Oct 2005 15:34:39 -0000	1.19
 <at>  <at>  -16,8 +16,6  <at>  <at> 
   exit;
 }

-include_once('lib/registration/registrationlib.php'); // kludge - need to work out how to do reflection
-
 // callback_type is 1, 3 or 5 - all other values are reserved
 define ("TIKI_CALLBACK_EARLY", 1);
 define ("TIKI_CALLBACK_STANDARD", 3);
 <at>  <at>  -154,6 +152,7  <at>  <at> 

 		$continue = true;
                 while ($continue && $res = $result->fetchRow()) {
+			include_once( $res['file'] );
(Continue reading)

Permalink | Reply | 0 comments |
headers
michael_davey | 3 Oct 2005 00:14
Picon

tiki/db tiki-1.10-mysql.sql,1.20,1.21 tiki-1.10-oci8.sql,1.16,1.17 tiki-1.10-pgsql.sql,1.16,1.17 tiki-1.10-sqlite.sql,1.16,1.17 tiki-1.10-sybase.sql,1.16,1.17 tiki.sql,1.276,1.277 tiki_1.9to1.10.sql,1.45,1.46

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

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 tiki.sql 
	tiki_1.9to1.10.sql 
Log Message:
additional column for tiki_events table: file to include

Index: tiki-1.10-mysql.sql
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/db/tiki-1.10-mysql.sql,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- tiki-1.10-mysql.sql	27 Sep 2005 22:05:24 -0000	1.20
+++ tiki-1.10-mysql.sql	1 Oct 2005 13:58:30 -0000	1.21
 <at>  <at>  -4957,7 +4957,7  <at>  <at> 
 # Table structure for table tiki_events
 #
 # Creation: Aug 26, 2005 at 06:59 AM - mdavey
-# Last update: Aug 26, 2005 at 06:59 AM - mdavey
+# Last update: Sep 31, 2005 at 12:29 PM - mdavey
 #

 DROP TABLE IF EXISTS `tiki_events`;
 <at>  <at>  -4965,16 +4965,17  <at>  <at> 
   `callback_type` int(1) NOT NULL default '3',
   `order` int(2) NOT NULL default '50',
(Continue reading)

Permalink | Reply | 0 comments |
headers
toggg | 3 Oct 2005 00:52
Picon

tiki/templates tiki-view_tracker_item.tpl,1.76.2.49,1.76.2.50

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

Modified Files:
      Tag: BRANCH-1-9
	tiki-view_tracker_item.tpl 
Log Message:
Distinguish status for edit now named "edstatus" from the list selection one.
Thanks to the brazilian team for this bug tracking !

Index: tiki-view_tracker_item.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-view_tracker_item.tpl,v
retrieving revision 1.76.2.49
retrieving revision 1.76.2.50
diff -u -d -r1.76.2.49 -r1.76.2.50
--- tiki-view_tracker_item.tpl	19 Sep 2005 16:34:36 -0000	1.76.2.49
+++ tiki-view_tracker_item.tpl	2 Oct 2005 08:25:08 -0000	1.76.2.50
 <at>  <at>  -315,7 +315,7  <at>  <at> 
 {if $tracker_info.showStatus eq 'y' or $tiki_p_admin_trackers eq 'y'}
 <tr class="formcolor"><td>{tr}Status{/tr}</td>
 <td>
-<select name="status">
+<select name="edstatus">
 {foreach key=st item=stdata from=$status_types}
 <option value="{$st}"{if $item_info.status eq $st} selected="selected"{/if}
 style="background-image:url('{$stdata.image}');background-repeat:no-repeat;padding-left:17px;">{$stdata.label}</option>

-------------------------------------------------------
This SF.Net email is sponsored by:
(Continue reading)

Permalink | Reply | 0 comments |
headers
mose | 3 Oct 2005 01:02
Picon

tiki/doc/devtools sharetikidev.sh,NONE,1.1.2.1 sharetiki.sh,1.2,1.2.4.1

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

Modified Files:
      Tag: BRANCH-1-9
	sharetiki.sh 
Added Files:
      Tag: BRANCH-1-9
	sharetikidev.sh 
Log Message:
updated sharetiki scripts

--- NEW FILE: sharetikidev.sh ---
#!/bin/bash

# $Header: /cvsroot/tikiwiki/tiki/doc/devtools/Attic/sharetikidev.sh,v 1.1.2.1 2005/10/02
12:57:31 mose Exp $
# that script prepares a dump of tiki for selective duplication
# tested on debian only for now
# 
# mose <at> tw.o

RHOST="dev.tikiwiki.org"
RTIKI="/usr/local/tikidev"
RTMPDIR="/tmp"
ARCHDIR="/usr/local/tikidev/duplidev"
VIRTUAL="dev.tikiwiki.org"

OLDIR=`pwd`
(Continue reading)

Permalink | Reply | 0 comments |
headers
michael_davey | 3 Oct 2005 02:03
Picon

_mods/features/solve/lib vtigerregistrationlib.php,1.4,1.5

Update of /cvsroot/tikiwiki/_mods/features/solve/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20682

Modified Files:
	vtigerregistrationlib.php 
Log Message:
add globals

Index: vtigerregistrationlib.php
===================================================================
RCS file: /cvsroot/tikiwiki/_mods/features/solve/lib/vtigerregistrationlib.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vtigerregistrationlib.php	28 Sep 2005 13:33:08 -0000	1.4
+++ vtigerregistrationlib.php	1 Oct 2005 15:32:42 -0000	1.5
 <at>  <at>  -7,6 +7,7  <at>  <at> 
  *  <at> license http://www.gnu.org/copyleft/lgpl.html GNU/LGPL
  */

+global $access;
 $access->check_script($_SERVER["SCRIPT_NAME"],basename(__FILE__));

 require_once ('tiki-setup.php');
 <at>  <at>  -146,6 +147,7  <at>  <at> 

 } // class

+global $dbTiki;
 $vtigerregistrationlib = new VtigerRegistrationLib($dbTiki);
(Continue reading)

Permalink | Reply | 0 comments |

Gmane