Lexer support for languages with no spaces

administrator/components/com_banners/models/forms/banner.xml

@@ -59,7 +59,7 @@
 			rows="3" cols="30" filter="raw"
 			label="COM_BANNERS_FIELD_CUSTOMCODE_LABEL" description="COM_BANNERS_FIELD_CUSTOMCODE_DESC" />
 
-		<field name="clickurl" type="url" class="inputbox"
+		<field name="clickurl" type="url" class="inputbox" filter="url"
 				label="COM_BANNERS_FIELD_CLICKURL_LABEL" description="COM_BANNERS_FIELD_CLICKURL_DESC" />
 
 	</fieldset>

administrator/components/com_categories/models/fields/categoryedit.php

@@ -63,7 +63,7 @@ protected function getOptions()
 		$db		= JFactory::getDbo();
 		$query	= $db->getQuery(true);
 
-		$query->select('a.id AS value, a.title AS text, a.level');
+		$query->select('a.id AS value, a.title AS text, a.level, a.published');
 		$query->from('#__categories AS a');
 		$query->join('LEFT', $db->quoteName('#__categories').' AS b ON a.lft > b.lft AND a.rgt < b.rgt');
 
@@ -128,7 +128,14 @@ protected function getOptions()
 							$options[$i]->text = JText::_('JGLOBAL_ROOT_PARENT');
 						}
 				}
-				$options[$i]->text = str_repeat('- ', $options[$i]->level).$options[$i]->text;
+				if ($options[$i]->published == 1)
+				{
+					$options[$i]->text = str_repeat('- ', $options[$i]->level). $options[$i]->text ;
+				}
+				else
+				{
+					$options[$i]->text = str_repeat('- ', $options[$i]->level). '[' .$options[$i]->text . ']';
+				}
 			}
 
 

administrator/components/com_contact/models/forms/contact.xml

@@ -163,6 +163,7 @@
 
 		<field name="webpage"
 			type="url"
+			filter="url"
 			label="COM_CONTACT_FIELD_INFORMATION_WEBPAGE_LABEL"
 			description="COM_CONTACT_FIELD_INFORMATION_WEBPAGE_DESC"
 			class="inputbox"
@@ -531,7 +532,7 @@
 				size="30"
 			/>
 
-			<field name="linka" type="text"
+			<field name="linka" type="url" filter="url"
 				label="COM_CONTACT_FIELD_LINKA_LABEL"
 				description="COM_CONTACT_FIELD_LINKA_DESC"
 				class="inputbox"
@@ -545,7 +546,7 @@
 				size="30"
 			/>
 
-			<field name="linkb" type="text"
+			<field name="linkb" type="url" filter="url"
 				label="COM_CONTACT_FIELD_LINKB_LABEL"
 				description="COM_CONTACT_FIELD_LINKB_DESC"
 				class="inputbox"
@@ -561,7 +562,7 @@
 			/>
 
 			<field name="linkc"
-			type="text"
+				type="url" filter="url"
 				label="COM_CONTACT_FIELD_LINKC_LABEL"
 				description="COM_CONTACT_FIELD_LINKC_DESC"
 				class="inputbox"
@@ -577,7 +578,7 @@
 				/>
 
 			<field name="linkd"
-				type="text"
+				type="url" filter="url"
 				label="COM_CONTACT_FIELD_LINKD_LABEL"
 				description="COM_CONTACT_FIELD_LINKD_DESC"
 				class="inputbox"

administrator/components/com_contact/tables/contact.php

@@ -110,15 +110,6 @@ function check()
 			return false;
 		}
 
-		// check for http, https, ftp on webpage
-		if ((strlen($this->webpage) > 0)
-			&& (stripos($this->webpage, 'http://') === false)
-			&& (stripos($this->webpage, 'https://') === false)
-			&& (stripos($this->webpage, 'ftp://') === false))
-		{
-			$this->webpage = 'http://'.$this->webpage;
-		}
-
 		/** check for valid name */
 		if (trim($this->name) == '') {
 			$this->setError(JText::_('COM_CONTACT_WARNING_PROVIDE_VALID_NAME'));

administrator/components/com_content/models/forms/article.xml

@@ -607,6 +607,7 @@
 				name="urla"
 				type="url"
 				validate="url"
+				filter="url"
 				label="COM_CONTENT_FIELD_URLA_LABEL"
 				description="COM_CONTENT_FIELD_URL_DESC" />
 			<field name="urlatext"
@@ -638,6 +639,7 @@
 				name="urlb"
 				type="url"
 				validate="url"
+				filter="url"
 				label="COM_CONTENT_FIELD_URLB_LABEL"
 				description="COM_CONTENT_FIELD_URL_DESC" />
 			<field name="urlbtext"
@@ -669,6 +671,7 @@
 				name="urlc"
 				type="url"
 				validate="url"
+				filter="url"
 				label="COM_CONTENT_FIELD_URLC_LABEL"
 				description="COM_CONTENT_FIELD_URL_DESC" />
 			<field

administrator/components/com_finder/helpers/indexer/helper.php

@@ -81,44 +81,85 @@ public static function tokenize($input, $lang, $phrase = false)
 		 * Parsing the string input into terms is a multi-step process.
 		 *
 		 * Regexes:
-		 *	1. Remove everything except letters, numbers, quotes, apostrophe, plus, dash, period, and comma.
-		 *	2. Remove plus, dash, period, and comma characters located before letter characters.
-		 *  3. Remove plus, dash, period, and comma characters located after other characters.
-		 *  4. Remove plus, period, and comma characters enclosed in alphabetical characters. Ungreedy.
-		 *  5. Remove orphaned apostrophe, plus, dash, period, and comma characters.
-		 *  6. Remove orphaned quote characters.
-		 *  7. Replace the assorted single quotation marks with the ASCII standard single quotation.
-		 *  8. Remove multiple space characters and replaces with a single space.
+		 *  1. Replace double byte spaces with a single space
+		 *  2. Remove everything except letters, numbers, quotes, apostrophe, plus, dash, period, and comma.
+		 *  3. Remove plus, dash, period, and comma characters located before letter characters.
+		 *  4. Remove plus, dash, period, and comma characters located after other characters.
+		 *  5. Remove plus, period, and comma characters enclosed in alphabetical characters. Ungreedy.
+		 *  6. Remove orphaned apostrophe, plus, dash, period, and comma characters.
+		 *  7. Remove orphaned quote characters.
+		 *  8. Replace the assorted single quotation marks with the ASCII standard single quotation.
+		 *  9. Remove multiple space characters and replaces with a single space.
 		 */
 		$input = JString::strtolower($input);
+		$input = preg_replace('#[^\xE3\x80\x80#s]', ' ', $input);
 		$input = preg_replace('#[^\pL\pM\pN\p{Pi}\p{Pf}\'+-.,]+#mui', ' ', $input);
 		$input = preg_replace('#(^|\s)[+-.,]+([\pL\pM]+)#mui', ' $1', $input);
 		$input = preg_replace('#([\pL\pM\pN]+)[+-.,]+(\s|$)#mui', '$1 ', $input);
 		$input = preg_replace('#([\pL\pM]+)[+.,]+([\pL\pM]+)#muiU', '$1 $2', $input); // Ungreedy
 		$input = preg_replace('#(^|\s)[\'+-.,]+(\s|$)#mui', ' ', $input);
 		$input = preg_replace('#(^|\s)[\p{Pi}\p{Pf}]+(\s|$)#mui', ' ', $input);
 		$input = preg_replace('#[' . $quotes . ']+#mui', '\'', $input);
+
 		$input = preg_replace('#\s+#mui', ' ', $input);
+
 		$input = JString::trim($input);
 
 		// Explode the normalized string to get the terms.
 		$terms = explode(' ', $input);
 
+		// In the future these should be moved to a lexer class.
+
+
 		/*
-		 * If we have Unicode support and are dealing with Chinese text, Chinese
-		 * has to be handled specially because there are not necessarily any spaces
-		 * between the "words". So, we have to test if the words belong to the Chinese
-		 * character set and if so, explode them into single glyphs or "words".
+		 * Chinese, Japanese, Lao, Khmer, Thai, Myanmar and Tibetan have to be handled specially because there are not
+		 * necessarily any spaces between the "words." So, we have to test if the words belong to the specific
+		 * character set and if so, explode them into single glyphs or "words."
+		 * Note: Modern Korean uses spaces so Korean texts do not need to be separated.
 		 */
-		if ($lang === 'zh')
+<<<<<<< HEAD
+		if ($lang === 'ja' || $lang === 'zh' || $lang === 'th'|| $lang === 'km'|| $lang === 'lo'|| $lang === 'my'|| $lang === 'bo' )
+=======
+		if ($lang === 'jp' || $lang === 'zh' || $lang === 'th'|| $lang === 'km'|| $lang === 'lo'|| $lang === 'my'|| $lang === 'bo' )
+>>>>>>> 378b2f1c1bfa8f54cf48d73a923767608a758df6
 		{
-			// Iterate through the terms and test if they contain Chinese.
+			// Iterate through the terms and test if they contain the relevant characters.
 			for ($i = 0, $n = count($terms); $i < $n; $i++)
 			{
 				$charMatches = array();
-				$charCount = preg_match_all('#[\p{Han}]#mui', $terms[$i], $charMatches);
+				if ($lang === 'zh')
+				{
+					$charCount = preg_match_all('#[\x{4E00}-\x{9FCF}]#mui', $terms[$i], $charMatches);
+				}
 
-				// Split apart any groups of Chinese characters.
+				elseif ($lang === 'ja')
+				{
+					// Kanji (Han), Katakana and Hiragana are each checked
+					$charCount = preg_match_all('#[\x{4E00}-\x{9FCF}]#mui', $terms[$i], $charMatches);
+					$charCount += preg_match_all('#[\x{3040-\x{309F}],#mui', $terms[$i], $charMatches);
+					$charCount += preg_match_all('#[\x{30A0}-\x{30FF}]#mui', $terms[$i], $charMatches);
+				}
+				elseif ($lang === 'th')
+				{
+					$charCount = preg_match_all('#[\x{0E00}-\x{0E7F}]#mui', $terms[$i], $charMatches);
+				}
+				elseif ($lang === 'km')
+				{
+					$charCount = preg_match_all('#[\x{1780}-\x{17FF}]#mui', $terms[$i], $charMatches);
+				}
+				elseif ($lang === 'lo')
+				{
+					$charCount = preg_match_all('#[\x{0E80}-\x{30EFF}]#mui', $terms[$i], $charMatches);
+				}
+				elseif ($lang === 'my')
+				{
+					$charCount = preg_match_all('#[\x{1000}-\x{109F}]#mui', $terms[$i], $charMatches);
+				}
+				elseif ($lang === 'bo')
+				{
+					$charCount = preg_match_all('#[\x{0F00}-\x{0FFF}]#mui', $terms[$i], $charMatches);
+				}
+				// Split apart any groups of characters.
 				for ($j = 0; $j < $charCount; $j++)
 				{
 					$tSplit = JString::str_ireplace($charMatches[0][$j], '', $terms[$i], false);

administrator/components/com_modules/models/module.php

@@ -197,7 +197,7 @@ protected function batchCopy($value, $pks, $contexts)
 				$table->position = $position;
 
 				// Alter the title if necessary
-				$data = $this->generateNewTitle($table->title, $table->position);
+				$data = $this->generateNewTitle(0, $table->title, $table->position);
 				$table->title = $data['0'];
 
 				// Reset the ID because we are making a copy
@@ -293,7 +293,7 @@ protected function batchMove($value, $pks, $contexts)
 				$table->position = $position;
 
 				// Alter the title if necessary
-				$data = $this->generateNewTitle($table->title, $table->position);
+				$data = $this->generateNewTitle(0, $table->title, $table->position);
 				$table->title = $data['0'];
 
 				// Unpublish the moved module
@@ -472,14 +472,15 @@ public function duplicate(&$pks)
 	/**
 	 * Method to change the title.
 	 *
+     * @param   integer $category_id  The id of the category. Not used here.
 	 * @param   string  $title     The title.
 	 * @param   string  $position  The position.
 	 *
 	 * @return	array  Contains the modified title.
 	 *
 	 * @since	2.5
 	 */
-	protected function generateNewTitle($title, $position)
+	protected function generateNewTitle($category_id, $title, $position)
 	{
 		// Alter the title & alias
 		$table = $this->getTable();

administrator/components/com_newsfeeds/models/forms/newsfeed.xml

@@ -39,7 +39,7 @@
 			<option value="*">JALL</option>
 		</field>
 
-		<field name="link" type="url" class="inputbox"
+		<field name="link" type="url" filter="url" class="inputbox"
 			size="60" label="COM_NEWSFEEDS_FIELD_LINK_LABEL"
 			description="COM_NEWSFEEDS_FIELD_LINK_DESC" required="true" />
 
@@ -170,7 +170,7 @@
 				view="newsfeed"
 				useglobal="true"
 				/>
-			
+
 			<field name="feed_display_order" type="list"
 				label="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_LABEL"
 				description="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_DESC"

administrator/components/com_plugins/models/forms/plugin.xml

@@ -19,7 +19,7 @@
 		<field
 			name="enabled"
 			type="list"
-			label="JENABLED"
+			label="JSTATUS"
 			description="COM_PLUGINS_FIELD_ENABLED_DESC"
 			class="inputbox"
 			size="1"

administrator/components/com_plugins/views/plugins/tmpl/default.php

@@ -58,7 +58,7 @@
 					<?php echo JHtml::_('grid.sort', 'COM_PLUGINS_NAME_HEADING', 'name', $listDirn, $listOrder); ?>
 				</th>
 				<th width="5%">
-					<?php echo JHtml::_('grid.sort', 'JENABLED', 'enabled', $listDirn, $listOrder); ?>
+					<?php echo JHtml::_('grid.sort', 'JSTATUS', 'enabled', $listDirn, $listOrder); ?>
 				</th>
 				<th width="10%">
 					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ORDERING', 'ordering', $listDirn, $listOrder); ?>

administrator/components/com_weblinks/models/forms/weblink.xml

@@ -20,6 +20,7 @@
 		</field>
 
 		<field name="url" type="url" class="inputbox"
+			filter="url"
 			size="40" label="COM_WEBLINKS_FIELD_URL_LABEL"
 			description="COM_WEBLINKS_FIELD_URL_DESC" required="true" />
 

administrator/components/com_weblinks/tables/weblink.php

@@ -105,14 +105,6 @@ public function check()
 			return false;
 		}
 
-		// check for http, https, ftp on webpage
-		if ((stripos($this->url, 'http://') === false)
-			&& (stripos($this->url, 'https://') === false)
-			&& (stripos($this->url, 'ftp://') === false))
-		{
-			$this->url = 'http://'.$this->url;
-		}
-
 		// check for existing name
 		$query = 'SELECT id FROM #__weblinks WHERE title = '.$this->_db->Quote($this->title).' AND catid = '.(int) $this->catid;
 		$this->_db->setQuery($query);

administrator/language/en-GB/en-GB.com_modules.ini

@@ -12,7 +12,7 @@ COM_MODULES_BATCH_POSITION_LABEL="Set Position"
 COM_MODULES_BATCH_POSITION_NOCHANGE="Keep original Position"
 COM_MODULES_BATCH_POSITION_NOPOSITION="No Module Position"
 COM_MODULES_BATCH_OPTIONS="Batch process the selected modules"
-COM_MODULES_BATCH_TIP="If choosing to copy a module, any other actions selected will be applied to the copied module. Otherwise, all actions are applied to the selected module."
+COM_MODULES_BATCH_TIP="If choosing to copy a module, any other actions selected will be applied to the copied module. Otherwise, all actions are applied to the selected module. When copying and not changing position, it is nevertheless necessary to select 'Keep Original Position' in the dropdown"
 COM_MODULES_CHANGE_POSITION_BUTTON="Select position"
 COM_MODULES_CHANGE_POSITION_TITLE="Change position"
 COM_MODULES_CONFIGURATION="Module Manager Options"

administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini

@@ -35,6 +35,8 @@ PLG_RECAPTCHA_ERROR_INVALID_REFERRER="reCAPTCHA API keys are tied to a specific
 PLG_RECAPTCHA_ERROR_RECAPTCHA_NOT_REACHABLE="Unable to contact the reCAPTCHA verify server."
 
 ; Uncomment(remove the ";" from the beginning of the line) the following lines if reCAPTCHA is not available in your language
+; When uncommenting, do NOT translate PLG_RECAPTCHA_CUSTOM_LANG
+; As of 01/01/2012, the following languages do not need translation: en, nl, fr, de, pt, ru, es, tr
 ;PLG_RECAPTCHA_CUSTOM_LANG="true"
 ;PLG_RECAPTCHA_INSTRUCTIONS_VISUAL="Type the two words:"
 ;PLG_RECAPTCHA_INSTRUCTIONS_AUDIO="Type what you hear:"

administrator/manifests/files/joomla.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extension version="2.5" type="file" method="upgrade">
 	<name>files_joomla</name>
-	<author>Joomla!</author>
+	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2012 Open Source Matters. All rights reserved</copyright>

administrator/manifests/libraries/joomla.xml

@@ -7,7 +7,7 @@
 	<creationDate>2008</creationDate>
 	<copyright>Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<author>Joomla</author>
+	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>http://www.joomla.org</authorUrl>
 	<packager>Joomla!</packager>

administrator/manifests/packages/pkg_joomla.xml

@@ -7,7 +7,7 @@
 	<creationDate>2006</creationDate>
 	<copyright>Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<author>Joomla!</author>
+	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>http://www.joomla.org</authorUrl>
 	<packager>Joomla!</packager>

installation/CHANGELOG

@@ -22,10 +22,19 @@ Legend:
 # -> Issue Fix
 $ -> Language fix or change
 + -> Addition
-^ -> Change
+^^ -> Change
 - -> Removed
 ! -> Note
 
+19-Jan-2012 Jean-Marie Simonet
+ #$ [#27747] Strict standards: Module manager. Thanks Nikolai
+ ^ [#27563] Author tag in xml. Thanks Brian
+ # [#27467] Use the new url filtering for fields. Thanks Elin.
+ ^ [#27767] Inconsistency of "Status" translation in plugin and user manager.
+ # [#27771] Indicate unpublished categories in category edit drop down. Thanks Elin.
+
+-------------------- 2.5.0 RC1 Release [18-Jan-2012] ------------------
+
 18-Jan-2012 Christophe Demko
  ^ Forgot some code in [#27696] Add a context to onGetIcon event
  + Adding indonesian flag in mod_language
@@ -34,8 +43,10 @@ $ -> Language fix or change
  # [#27760] 500 error in Template Manager - DB specific. Thanks Sudhi
  # [#27649] unique identifier it convert into corresponding text. Thanks Sudhi.
  $ Updating installation ini file bn-BD
-
--------------------- 2.5.0 RC1 Release [18-Jan-2012] ------------------
+ # [#27768] reCaptcha always shows up in english. Thanks Rouven
+ # [#27764] server not found error in Extension Manager - DB specific. Thanks Sudhi
+ $ Adding comment in en-GB.plg_captcha_recaptcha.ini
+ # [#27754] 404 category not found - due to syntax change in platform
 
 18-Jan-2012 Mark Dexter
  ^ Sample data changes (Elin Waring)