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

[<jon...@us...>]

Revision: 35064
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=35064&view=rev
Author:   jonnybradley
Date:     2011-06-26 15:44:32 +0000 (Sun, 26 Jun 2011)

Log Message:
-----------
[MRG] Automatic merge, branches/7.x 35038 to 35061

Modified Paths:
--------------
    trunk/messu-compose.php
    trunk/templates/messu-compose.tpl
    trunk/templates/prefs/shared-flags.tpl
    trunk/templates/wiki-plugins/wikiplugin_trackerlist.tpl
    trunk/tiki-objectpermissions.php
    trunk/tiki-pagehistory.php

Property Changed:
----------------
    trunk/
    trunk/templates/list_file_gallery_content.tpl


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
/branches/6.x:29486-31409,33409
/branches/7.x:33633-35038
/branches/experimental/big-blue-button:26681-26698
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/foreign-storage:34822-34895
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402
/branches/experimental/xajax_removal:31497
/branches/proposals/4.x:24005
   + /branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
/branches/6.x:29486-31409,33409
/branches/7.x:33633-35061
/branches/experimental/big-blue-button:26681-26698
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/foreign-storage:34822-34895
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402
/branches/experimental/xajax_removal:31497
/branches/proposals/4.x:24005

Modified: trunk/messu-compose.php
===================================================================
--- trunk/messu-compose.php	2011-06-26 15:30:23 UTC (rev 35063)
+++ trunk/messu-compose.php	2011-06-26 15:44:32 UTC (rev 35064)
@@ -61,9 +61,9 @@
 		die;
 	}
 	// Parse the to, cc and bcc fields into an array
-	$arr_to = preg_split('/\s*(?<!\\\);\s*/', $_REQUEST['to']);
-	$arr_cc = preg_split('/\s*(?<!\\\);\s*/', $_REQUEST['cc']);
-	$arr_bcc = preg_split('/\s*(?<!\\\);\s*/', $_REQUEST['bcc']);
+	$arr_to = preg_split('/\s*(?<!\\\)[;,]\s*/', $_REQUEST['to']);
+	$arr_cc = preg_split('/\s*(?<!\\\)[;,]\s*/', $_REQUEST['cc']);
+	$arr_bcc = preg_split('/\s*(?<!\\\)[;,]\s*/', $_REQUEST['bcc']);
 	if ($prefs['user_selector_realnames_messu'] == 'y') {
 		$groups = '';
 		$arr_to = $userlib->find_best_user($arr_to, $groups, 'login');


Property changes on: trunk/templates/list_file_gallery_content.tpl
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/3.0/templates/list_file_gallery_content.tpl:16998-18916
/branches/4.x/templates/list_file_gallery_content.tpl:22817-23908
/branches/5.x/templates/list_file_gallery_content.tpl:26025-26523,26527-28378
/branches/6.x/templates/list_file_gallery_content.tpl:29486-31409,33409
/branches/7.x/templates/list_file_gallery_content.tpl:33633-35038
/branches/experimental/big-blue-button/templates/list_file_gallery_content.tpl:26681-26698
/branches/experimental/declfilter/templates/list_file_gallery_content.tpl:15787-16031
/branches/experimental/edit_fixup/templates/list_file_gallery_content.tpl:20923-21573
/branches/experimental/kaltura_integration_two/templates/list_file_gallery_content.tpl:20962-22011
/branches/experimental/moz-metrics/templates/list_file_gallery_content.tpl:23452-23480
/branches/experimental/ui-revamp2/templates/list_file_gallery_content.tpl:16728-16731,16999-17002
/branches/experimental/wysiwyg_ckeditor_update/templates/list_file_gallery_content.tpl:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402
/branches/experimental/xajax_removal/templates/list_file_gallery_content.tpl:31497
/branches/proposals/4.x/templates/list_file_gallery_content.tpl:24005
/trunk/list_file_gallery_content.tpl:34698-34699
   + /branches/3.0/templates/list_file_gallery_content.tpl:16998-18916
/branches/4.x/templates/list_file_gallery_content.tpl:22817-23908
/branches/5.x/templates/list_file_gallery_content.tpl:26025-26523,26527-28378
/branches/6.x/templates/list_file_gallery_content.tpl:29486-31409,33409
/branches/7.x/templates/list_file_gallery_content.tpl:33633-35061
/branches/experimental/big-blue-button/templates/list_file_gallery_content.tpl:26681-26698
/branches/experimental/declfilter/templates/list_file_gallery_content.tpl:15787-16031
/branches/experimental/edit_fixup/templates/list_file_gallery_content.tpl:20923-21573
/branches/experimental/kaltura_integration_two/templates/list_file_gallery_content.tpl:20962-22011
/branches/experimental/moz-metrics/templates/list_file_gallery_content.tpl:23452-23480
/branches/experimental/ui-revamp2/templates/list_file_gallery_content.tpl:16728-16731,16999-17002
/branches/experimental/wysiwyg_ckeditor_update/templates/list_file_gallery_content.tpl:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402
/branches/experimental/xajax_removal/templates/list_file_gallery_content.tpl:31497
/branches/proposals/4.x/templates/list_file_gallery_content.tpl:24005
/trunk/list_file_gallery_content.tpl:34698-34699

Modified: trunk/templates/messu-compose.tpl
===================================================================
--- trunk/templates/messu-compose.tpl	2011-06-26 15:30:23 UTC (rev 35063)
+++ trunk/templates/messu-compose.tpl	2011-06-26 15:44:32 UTC (rev 35064)
@@ -34,7 +34,7 @@
 			<tr>
 				<td>
 					<label for="mess-composeto">{tr}To:{/tr}</label>
-					{help url="Inter-User+Messages#Composing_messages" desc="{tr}To:{/tr}{tr}Multiple addresses can be separated with semicolons (\";\"){/tr}"}
+					{help url="Inter-User+Messages#Composing_messages" desc="{tr}To:{/tr}{tr}Multiple addresses can be separated with semicolons (\";\"){/tr} {tr}or commas (\",\"){/tr}"}
 				</td>
 				<td>
 					<input type="text" name="to" id="mess-composeto" value="{$to|escape}" class="username" size="80" />
@@ -45,7 +45,7 @@
 			<tr>
 				<td>
 					<label for="mess-composecc">{tr}CC:{/tr}</label>
-					{help url="Inter-User+Messages#Composing_messages" desc="{tr}CC:{/tr}{tr}Multiple addresses can be separated with semicolons (\";\"){/tr}"}
+					{help url="Inter-User+Messages#Composing_messages" desc="{tr}CC:{/tr}{tr}Multiple addresses can be separated with semicolons (\";\"){/tr} {tr}or commas (\",\"){/tr}"}
 				</td>
 				<td>
 					<input type="text" name="cc" id="mess-composecc" value="{$cc|escape}" class="username" size="80" />
@@ -54,7 +54,7 @@
 			<tr>
 				<td>
 					<label for="mess-composebcc">{tr}BCC:{/tr}</label>
-					{help url="Inter-User+Messages#Composing_messages" desc="{tr}BCC:{/tr}{tr}Multiple addresses can be separated with semicolons (\";\"){/tr}"}
+					{help url="Inter-User+Messages#Composing_messages" desc="{tr}BCC:{/tr}{tr}Multiple addresses can be separated with semicolons (\";\"){/tr} {tr}or commas (\",\"){/tr}"}
 				</td>
 				<td>
 					<input type="text" name="bcc" id="mess-composebcc" value="{$bcc|escape}" class="username" size="80" />

Modified: trunk/templates/prefs/shared-flags.tpl
===================================================================
--- trunk/templates/prefs/shared-flags.tpl	2011-06-26 15:30:23 UTC (rev 35063)
+++ trunk/templates/prefs/shared-flags.tpl	2011-06-26 15:44:32 UTC (rev 35064)
@@ -21,12 +21,13 @@
 {jq}
 $('.pref-reset')
 	.change( function() {
+		var c = $(this).attr('checked') === "checked";
 		var $el = $(this).closest('.adminoptionbox').find('input:not(:hidden),select,textarea')
-			.not('.system').attr( 'disabled', $(this).attr('checked') ? "disabled" : "" )
-			.css("opacity", $(this).attr('checked') ? .6 : 1 );
+			.not('.system').attr( 'disabled', c )
+			.css("opacity", c ? .6 : 1 );
 		var defval = $("#" + $(this).val() + "_default").val();
 		if ($el.attr("type") == "checkbox") {
-			$el.attr('checked', $(this).attr('checked') ? (defval == "y" ? "checked" : "") : ($el.attr('checked') ? "" : "checked" ));
+			$el.attr('checked', defval === "y" ? c : !c);
 		} else {
 			var temp = $("[name=" + $(this).val() + "]").val();
 			$el.val( defval );

Modified: trunk/templates/wiki-plugins/wikiplugin_trackerlist.tpl
===================================================================
--- trunk/templates/wiki-plugins/wikiplugin_trackerlist.tpl	2011-06-26 15:30:23 UTC (rev 35063)
+++ trunk/templates/wiki-plugins/wikiplugin_trackerlist.tpl	2011-06-26 15:44:32 UTC (rev 35064)
@@ -40,7 +40,7 @@
 		{initials_filter_links _initial='tr_initial'}
 	{/if}
 
-	{if $checkbox && $items|@count gt 0 && empty($tpl)}<form method="post" action="{if empty($checkbox.action)}#{else}$checkbox.action{/if}">{/if}
+	{if $checkbox && $items|@count gt 0 && empty($tpl)}<form method="post" action="{if empty($checkbox.action)}#{else}{$checkbox.action}{/if}">{/if}
 
 	{if $trackerlistmapview}
 		{wikiplugin _name="googlemap" name=$trackerlistmapname type="objectlist" width="400" height="400"}{/wikiplugin}

Modified: trunk/tiki-objectpermissions.php
===================================================================
--- trunk/tiki-objectpermissions.php	2011-06-26 15:30:23 UTC (rev 35063)
+++ trunk/tiki-objectpermissions.php	2011-06-26 15:44:32 UTC (rev 35064)
@@ -444,48 +444,32 @@
 		}
 	}
 
-	$js .= <<< JS
-\$('input[name="perm[$groupName][]"]').eachAsync({
+	$js .= "
+\$('input[name=\"perm[$groupName][]\"]').eachAsync({
 			delay: 10,
 			bulk: 0,
-JS;
+";
 	if ($i == count($groupNames)-1) {
-		$js .= <<< JS
-
+		$js .= "
 			end: function () {
 				\$('#perms_busy').hide();
 			},
-JS;
+";
 	}
-	$js .= <<< JS
-
+	$js .= "
 			loop: function() { 		// each one of this group
 
-	if (\$(this).attr('checked')) {
-		\$('input[value="'+\$(this).val()+'"]').					// other checkboxes of same value (perm)
-			filter('$beneficiaries').									// which inherit from this
-			attr('checked',\$(this).attr('checked')).					// check and disable
-			attr('disabled',\$(this).attr('checked') ? 'disabled' : '');
-	}
-		
 	\$(this).change( function() {									// bind click event
-	
-		if (\$(this).attr('checked')) {
-			\$('input[value="'+\$(this).val()+'"]').			// same...
-				filter('$beneficiaries').
-				attr('checked','checked').							// check?
-				attr('disabled','disabled');						// disable
-		} else {
-			\$('input[value="'+\$(this).val()+'"]').			// same...
-				filter('$beneficiaries').
-				attr('checked','').									// check?
-				attr('disabled','');								// disable
+		var c = \$(this).attr('checked') === 'checked';
+		\$('input[value=\"'+\$(this).val()+'\"]').			// same...
+			filter('$beneficiaries').
+			attr('checked', c).		// check?
+			attr('disabled', c);		// disable
+	}).change();
 }
-	});
-			}
 });
 
-JS;
+";
 	$i++;
 }	// end of for $groupNames loop
 

Modified: trunk/tiki-pagehistory.php
===================================================================
--- trunk/tiki-pagehistory.php	2011-06-26 15:30:23 UTC (rev 35063)
+++ trunk/tiki-pagehistory.php	2011-06-26 15:44:32 UTC (rev 35064)
@@ -397,21 +397,13 @@
 		\$("input[name=newver]").each(function () {
 			ver2 = parseInt(\$(this).val(), 10);
 			if (ver2 == 0) { ver2 = $current_version; }
-			if (ver2 <= ver) {
-				\$(this).attr("disabled", "disabled");
-			} else {
-				\$(this).attr("disabled", "");
-			}
+			\$(this).attr("disabled", (ver2 <= ver));
 		});
 	} else if (\$(this).attr("name") == "newver") {
 		\$("input[name=oldver]").each(function () {
 			ver2 = parseInt(\$(this).val(), 10);
 			if (ver2 == 0) { ver2 = $current_version; }
-			if (ver2 >= ver) {
-				\$(this).attr("disabled", "disabled");
-			} else {
-				\$(this).attr("disabled", "");
-			}
+			\$(this).attr("disabled", (ver2 >= ver));
 		});
 	}
 });


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