xen216 | 1 Jul 01:31 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[35152] trunk

Revision: 35152
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35152&view=rev
Author:   xen216
Date:     2011-06-30 23:31:51 +0000 (Thu, 30 Jun 2011)

Log Message:
-----------
[NEW] ability to categorize group webmail accounts

Modified Paths:
--------------
    trunk/templates/tiki-webmail.tpl
    trunk/tiki-webmail.php

Modified: trunk/templates/tiki-webmail.tpl
===================================================================
--- trunk/templates/tiki-webmail.tpl	2011-06-30 22:34:26 UTC (rev 35151)
+++ trunk/templates/tiki-webmail.tpl	2011-06-30 23:31:51 UTC (rev 35152)
 <at>  <at>  -268,6 +268,10  <at>  <at> 
 									</td>
 								</tr>
 							{/if}
+
+							{if $tiki_p_admin_group_webmail eq 'y'}
+								{include file='categorize.tpl'}
+							{/if}
 		
 							<tr>
 								<td>{tr}Auto-refresh page time{/tr}</td>

(Continue reading)

xen216 | 1 Jul 02:21 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[35153] trunk/tiki-webmail.php

Revision: 35153
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35153&view=rev
Author:   xen216
Date:     2011-07-01 00:21:00 +0000 (Fri, 01 Jul 2011)

Log Message:
-----------
[FIX] ensure script exection stops after redirect in handleWebmailRedirect function. removed other
extra returns and exits

Modified Paths:
--------------
    trunk/tiki-webmail.php

Modified: trunk/tiki-webmail.php
===================================================================
--- trunk/tiki-webmail.php	2011-06-30 23:31:51 UTC (rev 35152)
+++ trunk/tiki-webmail.php	2011-07-01 00:21:00 UTC (rev 35153)
 <at>  <at>  -19,6 +19,7  <at>  <at> 

 function handleWebmailRedirect($inUrl) {		// AJAX_TODO
 	header ('location: tiki-webmail.php?'.$inUrl);
+	exit;
 }

 $access->check_user($user);
 <at>  <at>  -40,12 +41,10  <at>  <at> 
 		{
 			if ($acct['flagsPublic'] == 'y' && !$objectperms->admin_group_webmail) {
 				handleWebmailRedirect('locSection=settings&msg=' . tra('You do not have permission to admin the
(Continue reading)

xen216 | 1 Jul 03:45 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[35154] trunk/tiki-webmail.php

Revision: 35154
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35154&view=rev
Author:   xen216
Date:     2011-07-01 01:45:25 +0000 (Fri, 01 Jul 2011)

Log Message:
-----------
[FIX] removed unnecessary include

Modified Paths:
--------------
    trunk/tiki-webmail.php

Modified: trunk/tiki-webmail.php
===================================================================
--- trunk/tiki-webmail.php	2011-07-01 00:21:00 UTC (rev 35153)
+++ trunk/tiki-webmail.php	2011-07-01 01:45:25 UTC (rev 35154)
 <at>  <at>  -645,7 +645,6  <at>  <at> 
 	$cat_objid = (int) $_REQUEST['accountId'];
 	$categories = array();
 	$cat_object_exists = (bool) $_REQUEST['accountId'];
-	include_once ('lib/categories/categlib.php');
 	include_once ('categorize_list.php');

 	if (!empty($_REQUEST['accountId'])) {

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

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

lindonb | 1 Jul 03:51 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[35155] branches/7.x/lib/logs/logslib.php

Revision: 35155
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35155&view=rev
Author:   lindonb
Date:     2011-07-01 01:51:32 +0000 (Fri, 01 Jul 2011)

Log Message:
-----------
[FIX] Check http_user_agent for client also when logging an action. Many items in action log were not
showing a client.

Modified Paths:
--------------
    branches/7.x/lib/logs/logslib.php

Modified: branches/7.x/lib/logs/logslib.php
===================================================================
--- branches/7.x/lib/logs/logslib.php	2011-07-01 01:45:25 UTC (rev 35154)
+++ branches/7.x/lib/logs/logslib.php	2011-07-01 01:51:32 UTC (rev 35155)
 <at>  <at>  -156,7 +156,11  <at>  <at> 
 			$ip = $this->get_ip_address();
 		}
 		if ($client == '') {
-			$client = NULL;
+			if (!empty($_SERVER['HTTP_USER_AGENT'])) {
+				$client = substr($_SERVER['HTTP_USER_AGENT'],0,200);
+			} else {
+				$client = NULL;
+			}
 		} else {
 			$client = substr($client,0,200);
(Continue reading)

lindonb | 1 Jul 03:59 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[35156] branches/proposals/6.x/lib/logs/logslib.php

Revision: 35156
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35156&view=rev
Author:   lindonb
Date:     2011-07-01 01:59:57 +0000 (Fri, 01 Jul 2011)

Log Message:
-----------
[bp/r35155][FIX] Check http_user_agent for client also when logging an action. Many items in action log
were not showing a client.

Modified Paths:
--------------
    branches/proposals/6.x/lib/logs/logslib.php

Modified: branches/proposals/6.x/lib/logs/logslib.php
===================================================================
--- branches/proposals/6.x/lib/logs/logslib.php	2011-07-01 01:51:32 UTC (rev 35155)
+++ branches/proposals/6.x/lib/logs/logslib.php	2011-07-01 01:59:57 UTC (rev 35156)
 <at>  <at>  -156,7 +156,11  <at>  <at> 
 			$ip = $this->get_ip_address();
 		}
 		if ($client == '') {
-			$client = NULL;
+			if (!empty($_SERVER['HTTP_USER_AGENT'])) {
+				$client = substr($_SERVER['HTTP_USER_AGENT'],0,200);
+			} else {
+				$client = NULL;
+			}
 		} else {
 			$client = substr($client,0,200);
(Continue reading)

Stephane Casset | 1 Jul 08:05 2011

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[35151] branches/proposals/6.x/lib/setup/prefs.php

Le Thu, Jun 30, 2011 at 10:34:27PM +0000, marclaporte <at> users.sourceforge.net écrivait :
> Revision: 35151
>           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35151&view=rev
> Author:   marclaporte
> Date:     2011-06-30 22:34:26 +0000 (Thu, 30 Jun 2011)
> 
> Log Message:
> -----------
> [bp/r35100] [MOD] change default for wiki_edit_icons_toggle as
> discussed at http://thread.gmane.org/gmane.comp.cms.tiki.devel/20948 

+1

> Modified Paths:
> --------------
>     branches/proposals/6.x/lib/setup/prefs.php
> 
> Modified: branches/proposals/6.x/lib/setup/prefs.php
> ===================================================================
> --- branches/proposals/6.x/lib/setup/prefs.php	2011-06-30 22:00:09 UTC (rev 35150)
> +++ branches/proposals/6.x/lib/setup/prefs.php	2011-06-30 22:34:26 UTC (rev 35151)
>  <at>  <at>  -181,7 +181,7  <at>  <at> 
>  		'wikiapproval_combine_freetags' => 'n',
>  		'wiki_edit_section' => 'y',
>  		'wiki_edit_section_level' => '0',
> -		'wiki_edit_icons_toggle' => 'y',
> +		'wiki_edit_icons_toggle' => 'n',
>  		'wiki_edit_plugin' => 'y',
>  		'wiki_validate_plugin' => 'y',
>  		'wiki_edit_minor' => 'n',
(Continue reading)

Stephane Casset | 1 Jul 08:07 2011

Re: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[35156] branches/proposals/6.x/lib/logs/logslib.php

Le Fri, Jul 01, 2011 at 01:59:57AM +0000, lindonb <at> users.sourceforge.net écrivait :
> Revision: 35156
>           http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35156&view=rev
> Author:   lindonb
> Date:     2011-07-01 01:59:57 +0000 (Fri, 01 Jul 2011)
> 
> Log Message:
> -----------
> [bp/r35155][FIX] Check http_user_agent for client also when logging an
> action. Many items in action log were not showing a client.

+1

> Modified Paths:
> --------------
>     branches/proposals/6.x/lib/logs/logslib.php
> 
> Modified: branches/proposals/6.x/lib/logs/logslib.php
> ===================================================================
> --- branches/proposals/6.x/lib/logs/logslib.php	2011-07-01 01:51:32 UTC (rev 35155)
> +++ branches/proposals/6.x/lib/logs/logslib.php	2011-07-01 01:59:57 UTC (rev 35156)
>  <at>  <at>  -156,7 +156,11  <at>  <at> 
>  			$ip = $this->get_ip_address();
>  		}
>  		if ($client == '') {
> -			$client = NULL;
> +			if (!empty($_SERVER['HTTP_USER_AGENT'])) {
> +				$client = substr($_SERVER['HTTP_USER_AGENT'],0,200);
> +			} else {
> +				$client = NULL;
(Continue reading)

sylvieg | 1 Jul 16:10 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[35157] branches/7.x/lib/prefs/fgal.php

Revision: 35157
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35157&view=rev
Author:   sylvieg
Date:     2011-07-01 14:10:08 +0000 (Fri, 01 Jul 2011)

Log Message:
-----------
[FIX]fgal: more precise explanation for fgal_keep_fileId

Modified Paths:
--------------
    branches/7.x/lib/prefs/fgal.php

Modified: branches/7.x/lib/prefs/fgal.php
===================================================================
--- branches/7.x/lib/prefs/fgal.php	2011-07-01 01:59:57 UTC (rev 35156)
+++ branches/7.x/lib/prefs/fgal.php	2011-07-01 14:10:08 UTC (rev 35157)
 <at>  <at>  -160,8 +160,8  <at>  <at> 
 			'type' => 'text',
 		),
 		'fgal_keep_fileId' => array(
-			'name' => tra('Keep fileId for archives'),
-			'description' => tra('Keep always the same fileId when replacing a file with archive'),
+			'name' => tra('Keep the same fileId for the latest version of a file'),
+			'description' => tra('If checked, the fileId of the latest version of a file stays the same. Link to a
file will always give you the latest version. If not checked, the fileId is attached to the file for ever,
link to file will give you the precise version of a file'),
 			'type' => 'flag',
 		),
 		'fgal_show_thumbactions' => array(
(Continue reading)

jonnybradley | 1 Jul 21:03 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[35158] branches/7.x/templates/modules/mod-search.tpl

Revision: 35158
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35158&view=rev
Author:   jonnybradley
Date:     2011-07-01 19:03:17 +0000 (Fri, 01 Jul 2011)

Log Message:
-----------
[FIX] search module: Try and get exact page title again when picked off autocomplete list (not 100% still)

Modified Paths:
--------------
    branches/7.x/templates/modules/mod-search.tpl

Modified: branches/7.x/templates/modules/mod-search.tpl
===================================================================
--- branches/7.x/templates/modules/mod-search.tpl	2011-07-01 14:10:08 UTC (rev 35157)
+++ branches/7.x/templates/modules/mod-search.tpl	2011-07-01 19:03:17 UTC (rev 35158)
 <at>  <at>  -61,6 +61,7  <at>  <at> 
 						   name = "go" value = "{$smod_params.go_submit}"
 							title="{tr}Search{/tr}|{tr}Go directly to a page, or search in page titles if exact match is not found.{/tr}"
 							onclick = "$('#search-module-form{$search_mod_usage_counter}').attr('action',
'{$smod_params.go_action}').attr('page_selected','');" />
+					<input type="hidden" name="exact_match" value="" />
 				{/if}
 			{if $smod_params.show_edit_button eq 'y' and $tiki_p_edit eq 'y'}
 					<input type = "submit" class = "wikiaction tips{if $smod_params.default_button eq 'edit'} button_default{/if}"
 <at>  <at>  -97,7 +98,7  <at>  <at> 
     {/jq}
 	{if $smod_params.use_autocomplete eq 'y'}
 		{capture name="selectFn"}select: function(event, item) {ldelim}
(Continue reading)

jonnybradley | 1 Jul 21:10 2011
Picon
Picon

[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[35159] branches/7.x/lib/

Revision: 35159
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35159&view=rev
Author:   jonnybradley
Date:     2011-07-01 19:10:32 +0000 (Fri, 01 Jul 2011)

Log Message:
-----------
[REL] unfix ckeditor revision for forthcoming update

Property Changed:
----------------
    branches/7.x/lib/


Property changes on: branches/7.x/lib
___________________________________________________________________
Modified: svn:externals
   - adodb	-r34668 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/third_party/adodb
smarty	-r34668 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/third_party/smarty
jscalendar	-r34668 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/third_party/jscalendar
htmlpurifier	-r34668 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/third_party/htmlpurifier
pclzip	-r34668 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/third_party/pclzip
jquery	https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/third_party/jquery
phpcas	-r23921 https://source.jasig.org/cas-clients/phpcas/branches/1.1-stable/source/
ezcomponents	-r34668 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/third_party/ezcomponents
ckeditor	-r34668 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/third_party/ckeditor
codemirror	-r34668 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/third_party/codemirror
svg-edit	http://svg-edit.googlecode.com/svn/trunk/editor/
mobileesp	-r34668 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/third_party/mobileESP
html5shim	-r34668 https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/third_party/html5shim
(Continue reading)


Gmane