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

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

Revision: 40766
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=40766&view=rev
Author:   jonnybradley
Date:     2012-04-05 17:31:06 +0000 (Thu, 05 Apr 2012)
Log Message:
-----------
[MRG] Automatic merge, branches/9.x 40700 to 40765

Modified Paths:
--------------
    trunk/_htaccess
    trunk/installer/tiki-installer.php
    trunk/lib/core/Services/Tracker/Controller.php
    trunk/lib/trackers/trackerlib.php
    trunk/lib/wiki-plugins/wikiplugin_trackerlist.php
    trunk/templates/modules/mod-login_box.tpl
    trunk/templates/tiki-login.tpl
    trunk/templates/tracker/import_items.tpl

Property Changed:
----------------
    trunk/


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-36216,36238,36257,36453
/branches/8.x:37900-39390,39479
/branches/9.x:40481-40700
/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-36216,36238,36257,36453
/branches/8.x:37900-39390,39479
/branches/9.x:40481-40765
/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/_htaccess
===================================================================
--- trunk/_htaccess	2012-04-05 17:15:24 UTC (rev 40765)
+++ trunk/_htaccess	2012-04-05 17:31:06 UTC (rev 40766)
@@ -82,6 +82,10 @@
 <IfModule mod_rewrite.c>
 RewriteEngine On
 
+# Rewrite rules to maintain any hard-coded URLs following http://dev.tiki.org/ImgDirectoryRevamp
+RewriteRule ^pics/(.*)$ img//$1
+RewriteRule ^images/(.*)$ img/icons//$1
+
 # Apache does not pass Authorization header to CGI scripts
 # Rewrite rules for passing authorisation in CGI or FGI mode
 RewriteCond %{HTTP:Authorization} ^(.*)

Modified: trunk/installer/tiki-installer.php
===================================================================
--- trunk/installer/tiki-installer.php	2012-04-05 17:15:24 UTC (rev 40765)
+++ trunk/installer/tiki-installer.php	2012-04-05 17:31:06 UTC (rev 40766)
@@ -836,7 +836,7 @@
 	//
 	// TODO: Perform up-to-date check as in the SEFURL admin panel
 	// TODO: Equivalent for IIS
-	if ( strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false && !file_exists('.htaccess') && !@symlink('_htaccess', '.htaccess') && ! @copy('_htaccess', '.htaccess')) {
+	if ( strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false && !file_exists('.htaccess') && function_exists('symlink') && !@symlink('_htaccess', '.htaccess') && ! @copy('_htaccess', '.htaccess')) {
 		$smarty->assign('htaccess_error', 'y');
 	}
 }

Modified: trunk/lib/core/Services/Tracker/Controller.php
===================================================================
--- trunk/lib/core/Services/Tracker/Controller.php	2012-04-05 17:15:24 UTC (rev 40765)
+++ trunk/lib/core/Services/Tracker/Controller.php	2012-04-05 17:31:06 UTC (rev 40766)
@@ -1032,6 +1032,7 @@
 			return array(
 				'trackerId' => $trackerId,
 				'return' => $count,
+				'importfile' => $_FILES['importfile']['name'],
 			);
 		}
 		

Modified: trunk/lib/trackers/trackerlib.php
===================================================================
--- trunk/lib/trackers/trackerlib.php	2012-04-05 17:15:24 UTC (rev 40765)
+++ trunk/lib/trackers/trackerlib.php	2012-04-05 17:31:06 UTC (rev 40766)
@@ -707,7 +707,7 @@
 				$options = preg_split('/,/', $myfield["options"]);
 				foreach ($tmp as $key=>$value) {
 					if ($is_date) $value=$this->date_format("%e/%m/%y", $value);
-					if ($is_trackerlink) {
+					if ($is_trackerlink && $options[3]) {	// If $options[3] is empty, concat_item_from_fieldslist returns nothing
 						$value=$this->concat_item_from_fieldslist($options[0], $value, $options[3]);
 					}
 					if (!empty($res[$key])) {

Modified: trunk/lib/wiki-plugins/wikiplugin_trackerlist.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackerlist.php	2012-04-05 17:15:24 UTC (rev 40765)
+++ trunk/lib/wiki-plugins/wikiplugin_trackerlist.php	2012-04-05 17:31:06 UTC (rev 40766)
@@ -686,6 +686,18 @@
 				),
 				'default' => '',
 			),
+			'periodType' => array(
+				'required' => false,
+				'name' => tr('Period type'),
+				'description' => tr('Time period after creattion or after modification'),
+				'filter' => 'word',
+				'options' => array(
+					array('text' => '', 'value' => ''),
+					array('text' => tr('Creation'), 'value' => 'c'),
+					array('text' => tr('Modification'), 'value' => 'm'),
+				),
+				'default' => '',
+			),
 		)
 	);
 }
@@ -829,10 +841,17 @@
 				default:
     				break;
 			}
-			
-			if (is_int($periodUnit)) {
+
+			if (!isset($periodType)) {
+				$periodType = 'c';
+			}
+
+			if (is_int($periodUnit) && ($periodType == 'm' ) ) {
 				$filter['lastModifAfter'] = $tikilib->now - ($periodQuantity * $periodUnit);
 				$filter['lastModifBefore'] = $tikilib->now;
+			} elseif (is_int($periodUnit)) { # case for periodType beig c or anything else (therefore, set as case for default)
+				$filter['createdAfter'] = $tikilib->now - ($periodQuantity * $periodUnit);
+				$filter['createdBefore'] = $tikilib->now;
 			}
 		}
 

Modified: trunk/templates/modules/mod-login_box.tpl
===================================================================
--- trunk/templates/modules/mod-login_box.tpl	2012-04-05 17:15:24 UTC (rev 40765)
+++ trunk/templates/modules/mod-login_box.tpl	2012-04-05 17:31:06 UTC (rev 40766)
@@ -9,7 +9,8 @@
 		$('.divCapson', $(el).parents('div:first')).hide();
 	}
 }
-
+{/jq}
+{jq}
 //We were having problems with the menu disapearing when you selected an input, this prevents the menu from going away once you have put focus on an input
 var hasFocus = false;
 var loginPopup = $('.siteloginbar_popup .cssmenu_horiz')
@@ -26,8 +27,9 @@
 	.blur(function() {
 		hasFocus = false;
 	});
-
-$("form[name=loginbox]").submit( function () {
+{/jq}
+{jq}
+$("#loginbox-{{$module_logo_instance}}").submit( function () {
 	if ($("#login-user_{{$module_logo_instance}}").val() && $("#login-pass_{{$module_logo_instance}}").val()) {
 		return true;
 	} else {
@@ -102,7 +104,7 @@
 		{/if}
 	{else}
 		{assign var='close_tags' value=''}
-		<form name="loginbox" action="{if $prefs.https_login eq 'encouraged' || $prefs.https_login eq 'required' || $prefs.https_login eq 'force_nocheck'}{$base_url_https}{/if}{$prefs.login_url}"
+		<form name="loginbox" id="loginbox-{$module_logo_instance}" action="{if $prefs.https_login eq 'encouraged' || $prefs.https_login eq 'required' || $prefs.https_login eq 'force_nocheck'}{$base_url_https}{/if}{$prefs.login_url}"
 				method="post" {if $prefs.feature_challenge eq 'y'}onsubmit="doChallengeResponse()"{/if}
 				{if $prefs.desactive_login_autocomplete eq 'y'} autocomplete="off"{/if}> 
 		{if $prefs.feature_challenge eq 'y'}

Modified: trunk/templates/tiki-login.tpl
===================================================================
--- trunk/templates/tiki-login.tpl	2012-04-05 17:15:24 UTC (rev 40765)
+++ trunk/templates/tiki-login.tpl	2012-04-05 17:31:06 UTC (rev 40766)
@@ -1,3 +1,3 @@
 <div align="center">
-{include file='modules/mod-login_box.tpl'}
+{include file='modules/mod-login_box.tpl' module_logo_instance='tiki-login'}
 </div>

Modified: trunk/templates/tracker/import_items.tpl
===================================================================
--- trunk/templates/tracker/import_items.tpl	2012-04-05 17:15:24 UTC (rev 40765)
+++ trunk/templates/tracker/import_items.tpl	2012-04-05 17:31:06 UTC (rev 40766)
@@ -3,6 +3,7 @@
 		{include file="tracker_actions.tpl"}
 	</div>
 	{remarksbox type="note" title="{tr}Confirmation{/tr}"}
+		<p>{tr _0=$importfile}Imported file '%0'{/tr}</p>
 		<p>{tr _0=$return}Import completed with '%0'{/tr}</p>
 	{/remarksbox}
 {/if}
@@ -14,11 +15,11 @@
 			<li>{tr}Auto-incremented itemid fields shall be included with no matter what values{/tr}</li>
 		</ul>
 	{/remarksbox}
-	<label>
+	<label style="display: block">
 		{tr}File{/tr}
 		<input type="file" name="importfile" />
 	</label>
-	<label>
+	<label style="display: block">
 		{tr}Date format{/tr}
 		<select name="dateFormat">
 			<option value="yyyy-mm-dd">{tr}year{/tr}-{tr}month{/tr}-{tr}day{/tr}(2008-01-31)</option>
@@ -27,26 +28,26 @@
 			<option value="">{tr}UNIX Timestamp{/tr}</option>
 		</select>
 	</label>
-	<label>
+	<label style="display: block">
 		{tr}Character encoding{/tr}
 		<select name="encoding">
 			<option value="UTF-8" selected="selected">{tr}UTF-8{/tr}</option>
 			<option value="ISO-8859-1">{tr}ISO-8859-1{/tr}</option>
 		</select>
 	</label>
-	<label>
+	<label style="display: block">
 		{tr}Separator{/tr}
 		<input type="text" name="separator" value="," size="2" />
 	</label>
-	<label>
+	<label style="display: block">
 		<input type="checkbox" name="add_items" value="1" />
 		{tr}Create as new items{/tr}
 	</label>
-	<label>
+	<label style="display: block">
 		<input type="checkbox" name="updateLastModif" checked="checked" value="1" />
 		{tr}Update lastModif date if updating items (status and created are updated only if the fields are specified in the csv){/tr}
 	</label>
-	<label>
+	<label style="display: block">
 		<input type="checkbox" name="convertItemLinkValues" value="1" />
 		{tr}Convert values of ItemLink type fields from the value in the CSV file to the itemId of the linked item. Requires the linked item to be correctly set up in advance.{/tr}
 	</label>

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