Jyhem | 1 Apr 15:57 2008
Picon
Picon

SF.net SVN: tikiwiki: [12289] branches/1.10/lang/fr/language.php

Revision: 12289
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12289&view=rev
Author:   Jyhem
Date:     2008-04-01 06:56:56 -0700 (Tue, 01 Apr 2008)

Log Message:
-----------
[FIX] typo

Modified Paths:
--------------
    branches/1.10/lang/fr/language.php

Modified: branches/1.10/lang/fr/language.php
===================================================================
--- branches/1.10/lang/fr/language.php	2008-03-31 20:23:50 UTC (rev 12288)
+++ branches/1.10/lang/fr/language.php	2008-04-01 13:56:56 UTC (rev 12289)
 <at>  <at>  -1725,7 +1725,7  <at>  <at> 
 "Can list mypages" => "Droit de lister les mespages",
 "Can list registered users" => "Droit de lister les utilisateurs enregistrés",
 "Can list trackers" => "Droit de lister les formulaires",
-"Can lock pages" => "Droit de verrrouiler des pages",
+"Can lock pages" => "Droit de verrouiller des pages",
 "Can participate to rating of wiki pages" => "Droit de participer Ă  la notation des pages du wiki",
 "Can play games" => "Droit de jouer aux jeux",
 "Can post in forums" => "Droit de publier dans le forum",

This was sent by the SourceForge.net collaborative development platform, the world's largest Open
Source development site.

(Continue reading)

sylvieg | 1 Apr 16:06 2008
Picon
Picon

SF.net SVN: tikiwiki: [12290] branches/1.10/lib/tikilib.php

Revision: 12290
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12290&view=rev
Author:   sylvieg
Date:     2008-04-01 07:06:48 -0700 (Tue, 01 Apr 2008)

Log Message:
-----------
[FIX]reverse one line 12278 to have back [http://foo.com}foo] - luciash?

Modified Paths:
--------------
    branches/1.10/lib/tikilib.php

Modified: branches/1.10/lib/tikilib.php
===================================================================
--- branches/1.10/lib/tikilib.php	2008-04-01 13:56:56 UTC (rev 12289)
+++ branches/1.10/lib/tikilib.php	2008-04-01 14:06:48 UTC (rev 12290)
 <at>  <at>  -6077,6 +6077,7  <at>  <at> 
 			$link2 = str_replace("/", "\/", preg_quote($link));

 			$pattern = "/(?<!\[)\[$link2\|([^\]\|]+)\|([^\]]+)\]/";
+			$pattern = "/(?<!\[)\[$link2\|([^\]\|]+)([^\]])*\]/";
 			$data = preg_replace($pattern, "<a $class $target href=\"$link\" rel=\"$2
$rel\">$1</a>$ext_icon", $data);
 			$pattern = "/(?<!\[)\[$link2\]/";
 			$data = preg_replace($pattern, "<a $class $target href=\"$link\"
rel=\"$rel\">$link</a>$ext_icon", $data);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open
Source development site.
(Continue reading)

sylvieg | 1 Apr 16:35 2008
Picon
Picon

SF.net SVN: tikiwiki: [12291] branches/1.10/templates/tiki-admin_forums.tpl

Revision: 12291
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12291&view=rev
Author:   sylvieg
Date:     2008-04-01 07:35:15 -0700 (Tue, 01 Apr 2008)

Log Message:
-----------
html

Modified Paths:
--------------
    branches/1.10/templates/tiki-admin_forums.tpl

Modified: branches/1.10/templates/tiki-admin_forums.tpl
===================================================================
--- branches/1.10/templates/tiki-admin_forums.tpl	2008-04-01 14:06:48 UTC (rev 12290)
+++ branches/1.10/templates/tiki-admin_forums.tpl	2008-04-01 14:35:15 UTC (rev 12291)
 <at>  <at>  -395,7 +395,7  <at>  <at> 
 <!--<td style="text-align:right;" class="{cycle advance=false}">{$channels[user].lastPost|tiki_short_datetime}</td>-->
 <td style="text-align:right;" class="{cycle advance=false}">{$channels[user].hits}</td>
 <td class="{cycle}">
-<a class="link" href="tiki-view_forum.php?forumId={$channels[user].forumId}"
title="{tr}View{/tr}">{icon _id='table' </a alt="{tr}View{/tr}"}
+<a class="link" href="tiki-view_forum.php?forumId={$channels[user].forumId}"
title="{tr}View{/tr}">{icon _id='table' alt="{tr}View{/tr}"}

 {if ($tiki_p_admin eq 'y') or (($channels[user].individual eq 'n') and ($tiki_p_admin_forum eq 'y'))
or ($channels[user].individual_tiki_p_admin_forum eq 'y')}
   <a class="link"
href="tiki-admin_forums.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;forumId={$channels[user].forumId}"
(Continue reading)

sylvieg | 1 Apr 17:01 2008
Picon
Picon

SF.net SVN: tikiwiki: [12292] branches/1.10/db/tiki_1.9to1.10.sql

Revision: 12292
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12292&view=rev
Author:   sylvieg
Date:     2008-04-01 08:01:53 -0700 (Tue, 01 Apr 2008)

Log Message:
-----------
[FIX]tiki_p_search for those who did a fresh install when the bug tiki_p_search gives admin perms on tiki
was there

Modified Paths:
--------------
    branches/1.10/db/tiki_1.9to1.10.sql

Modified: branches/1.10/db/tiki_1.9to1.10.sql
===================================================================
--- branches/1.10/db/tiki_1.9to1.10.sql	2008-04-01 14:35:15 UTC (rev 12291)
+++ branches/1.10/db/tiki_1.9to1.10.sql	2008-04-01 15:01:53 UTC (rev 12292)
 <at>  <at>  -1728,3 +1728,6  <at>  <at> 
 INSERT INTO users_grouppermissions(groupName,permName) SELECT distinct 'Registered',
'tiki_p_view_fgal_path' FROM users_permissions WHERE  <at> permexist = 0;
 INSERT INTO users_permissions (permName, permDesc, level, type) VALUES
('tiki_p_view_fgal_explorer', 'Can view file galleries explorer', 'basic', 'file galleries');
 INSERT INTO users_permissions (permName, permDesc, level, type) VALUES ('tiki_p_view_fgal_path',
'Can view file galleries path', 'basic', 'file galleries');
+
+#2008-04-01 sylvieg
+UPDATE users_permissions SET admin=NULL WHERE permName='tiki_p_search';
\ No newline at end of file

(Continue reading)

sylvieg | 1 Apr 17:44 2008
Picon
Picon

SF.net SVN: tikiwiki: [12294] branches/1.10/tiki-list_file_gallery.php

Revision: 12294
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12294&view=rev
Author:   sylvieg
Date:     2008-04-01 08:44:58 -0700 (Tue, 01 Apr 2008)

Log Message:
-----------
[FIX]fgal: fix remove gal

Modified Paths:
--------------
    branches/1.10/tiki-list_file_gallery.php

Modified: branches/1.10/tiki-list_file_gallery.php
===================================================================
--- branches/1.10/tiki-list_file_gallery.php	2008-04-01 15:38:17 UTC (rev 12293)
+++ branches/1.10/tiki-list_file_gallery.php	2008-04-01 15:44:58 UTC (rev 12294)
 <at>  <at>  -424,7 +424,7  <at>  <at> 
 }

 // Process removal of a gallery
-if ( ! empty($_REQUEST['removegal']) && ! empty($galleryId) ) {
+if ( ! empty($_REQUEST['removegal']) ) {
 	check_ticket('fgal');

 	if ( ! ( $gal_info = $filegallib->get_file_gallery_info($_REQUEST['removegal']) ) ) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open
Source development site.

(Continue reading)

sylvieg | 1 Apr 17:38 2008
Picon
Picon

SF.net SVN: tikiwiki: [12293] branches/1.10/comments.php

Revision: 12293
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12293&view=rev
Author:   sylvieg
Date:     2008-04-01 08:38:17 -0700 (Tue, 01 Apr 2008)

Log Message:
-----------
[FIX]forum: the message ... your post will be approved.. was always showing up

Modified Paths:
--------------
    branches/1.10/comments.php

Modified: branches/1.10/comments.php
===================================================================
--- branches/1.10/comments.php	2008-04-01 15:01:53 UTC (rev 12292)
+++ branches/1.10/comments.php	2008-04-01 15:38:17 UTC (rev 12293)
 <at>  <at>  -283,7 +283,7  <at>  <at> 
 	    } else {

 		    $smarty->assign('was_queued', 'n');
-		    $_REQUEST['was_queued'] = 'y';
+		    $_REQUEST['was_queued'] = 'n';

 		    if ( $_REQUEST["comments_threadId"] == 0 ) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open
Source development site.

-------------------------------------------------------------------------
(Continue reading)

sylvieg | 1 Apr 18:10 2008
Picon
Picon

SF.net SVN: tikiwiki: [12295] branches/1.10/templates/comments.tpl

Revision: 12295
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12295&view=rev
Author:   sylvieg
Date:     2008-04-01 09:10:37 -0700 (Tue, 01 Apr 2008)

Log Message:
-----------
[FIX]forum: to have moderator action on selected working on view thread

Modified Paths:
--------------
    branches/1.10/templates/comments.tpl

Modified: branches/1.10/templates/comments.tpl
===================================================================
--- branches/1.10/templates/comments.tpl	2008-04-01 15:44:58 UTC (rev 12294)
+++ branches/1.10/templates/comments.tpl	2008-04-01 16:10:37 UTC (rev 12295)
 <at>  <at>  -134,12 +134,12  <at>  <at> 
 {/if}
 ***}

-</form>

 	{section name=rep loop=$comments_coms}
 		{include file="comment.tpl" comment=$comments_coms[rep]}
 		{if $thread_style != 'commentStyle_plain'}<br />{/if}
 	{/section}
+</form>

 <div class="thread_pagination">
(Continue reading)

sylvieg | 1 Apr 19:55 2008
Picon
Picon

SF.net SVN: tikiwiki: [12296] branches/1.10/lib/setup/polls.php

Revision: 12296
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12296&view=rev
Author:   sylvieg
Date:     2008-04-01 10:55:13 -0700 (Tue, 01 Apr 2008)

Log Message:
-----------
[FIX]poll: limit anonymous vote to one vote per session (better than nothing and better than IP filter

Modified Paths:
--------------
    branches/1.10/lib/setup/polls.php

Modified: branches/1.10/lib/setup/polls.php
===================================================================
--- branches/1.10/lib/setup/polls.php	2008-04-01 16:10:37 UTC (rev 12295)
+++ branches/1.10/lib/setup/polls.php	2008-04-01 17:55:13 UTC (rev 12296)
 <at>  <at>  -18,9 +18,11  <at>  <at> 
 			if ( ! isset($polllib) or ! is_object($polllib) ) {
 				include_once('lib/polls/polllib_shared.php');
 			}
-			$polllib->poll_vote($user, $_REQUEST['polls_pollId'], $_REQUEST['polls_optionId']);
-			// Poll vote must go first, or the new vote will be seen as the previous one.
-			$tikilib->register_user_vote($user, 'poll' . $_REQUEST['polls_pollId'], $_REQUEST['polls_optionId']);
+			if (!$tikilib->user_has_voted($user, 'poll'.$_REQUEST['polls_pollId'])) {
+				$polllib->poll_vote($user, $_REQUEST['polls_pollId'], $_REQUEST['polls_optionId']);
+				// Poll vote must go first, or the new vote will be seen as the previous one.
+				$tikilib->register_user_vote($user, 'poll' . $_REQUEST['polls_pollId'], $_REQUEST['polls_optionId']);
+			}
 		}
(Continue reading)

sylvieg | 1 Apr 22:11 2008
Picon
Picon

SF.net SVN: tikiwiki: [12297] branches/1.10/templates/tiki-view_forum.tpl

Revision: 12297
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12297&view=rev
Author:   sylvieg
Date:     2008-04-01 13:11:00 -0700 (Tue, 01 Apr 2008)

Log Message:
-----------
[MOD]forum: pagination + update icon moderator + fix wiki discussion forum

Modified Paths:
--------------
    branches/1.10/templates/tiki-view_forum.tpl

Modified: branches/1.10/templates/tiki-view_forum.tpl
===================================================================
--- branches/1.10/templates/tiki-view_forum.tpl	2008-04-01 17:55:13 UTC (rev 12296)
+++ branches/1.10/templates/tiki-view_forum.tpl	2008-04-01 20:11:00 UTC (rev 12297)
 <at>  <at>  -12,7 +12,7  <at>  <at> 
 <table width="97%">
 <tr>
 <td>
-{if ($tiki_p_forum_post_topic eq 'y' and $forumId ne $prefs.wiki_forum_id) or $tiki_p_admin_forum
eq 'y'}
+{if ($tiki_p_forum_post_topic eq 'y' and ($prefs.feature_wiki_discuss ne 'y' or $prefs.$forumId ne
$prefs.wiki_forum_id)) or $tiki_p_admin_forum eq 'y'}
 <a class="linkbut"
href="tiki-view_forum.php?openpost=1&amp;forumId={$forum_info.forumId}&amp;comments_threadId=0&amp;comments_threshold={$comments_threshold}&amp;comments_offset={$comments_offset}&amp;thread_sort_mode={$thread_sort_mode}&amp;comments_per_page={$comments_per_page}"
{if !isset($comments_threadId) or $comments_threadId eq
0}onclick="javascript:show('forumpost');return false;"{/if}>
 {tr}New Topic{/tr}</a>
(Continue reading)

sylvieg | 1 Apr 22:22 2008
Picon
Picon

SF.net SVN: tikiwiki: [12298] branches/1.10/tiki-view_forum.php

Revision: 12298
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=12298&view=rev
Author:   sylvieg
Date:     2008-04-01 13:22:22 -0700 (Tue, 01 Apr 2008)

Log Message:
-----------
[MOD]forum: pagination + update icon moderator + fix wiki discussion forum

Modified Paths:
--------------
    branches/1.10/tiki-view_forum.php

Modified: branches/1.10/tiki-view_forum.php
===================================================================
--- branches/1.10/tiki-view_forum.php	2008-04-01 20:11:00 UTC (rev 12297)
+++ branches/1.10/tiki-view_forum.php	2008-04-01 20:22:22 UTC (rev 12298)
 <at>  <at>  -634,23 +634,7  <at>  <at> 
 $smarty->assign('comments_cant', $comments_cant);

 $comments_maxRecords = $_REQUEST["comments_per_page"];
-$comments_cant_pages = ceil($comments_cant / $comments_maxRecords);
-$smarty->assign('comments_cant_pages', $comments_cant_pages);
-$smarty->assign('comments_actual_page', 1 + ($comments_offset / $comments_maxRecords));

-if ($comments_cant > ($comments_offset + $comments_maxRecords)) {
-    $smarty->assign('comments_next_offset', $comments_offset + $comments_maxRecords);
-} else {
-    $smarty->assign('comments_next_offset', -1);
-}
(Continue reading)


Gmane