Merge branch 'hotfix/N941-2'

application/datatable.class.inc.php

@@ -431,7 +431,7 @@ EOF;
 						}
 						else
 						{
-							$aRow['form::select'] = "<input type=\"checkBox\" $sDisabled class=\"selectList{$this->iListId}\" name=\"selectObject[]\" value=\"".$aObjects[$sAlias]->GetKey()."\"></input>";
+							$aRow['form::select'] = "<input type=\"checkbox\" $sDisabled class=\"selectList{$this->iListId}\" name=\"selectObject[]\" value=\"".$aObjects[$sAlias]->GetKey()."\"></input>";
 						}
 					}
 					foreach($aColumns[$sAlias] as $sAttCode => $aData)
@@ -565,7 +565,7 @@ EOF;
 <<<EOF
 var oTable = $('#{$this->iListId} table.listResults');
 oTable.tableHover();
-oTable.tablesorter( { $sHeaders widgets: ['myZebra', 'truncatedList']} ).tablesorterPager({container: $('#pager{$this->iListId}'), totalRows:$iCount, size: $iPageSize, filter: '$sOQL', extra_params: '$sExtraParams', select_mode: '$sSelectModeJS', displayKey: $sDisplayKey, columns: $sJSColumns, class_aliases: $sJSClassAliases $sCssCount});
+oTable.tablesorter( { $sHeaders widgets: ['myZebra', 'truncatedList']} ).tablesorterPager({container: $('#pager{$this->iListId}'), totalRows:$iCount, size: $iPageSize, filter: '$sOQL', extra_params: '$sExtraParams', select_mode: '$sSelectModeJS', displayKey: $sDisplayKey, table_id: '{$this->iListId}', columns: $sJSColumns, class_aliases: $sJSClassAliases $sCssCount});
 EOF
 		);
 		if ($sFakeSortList != '')

core/asynctask.class.inc.php

@@ -150,7 +150,7 @@ abstract class AsyncTask extends DBObject
 	public function GetRetryDelay($iErrorCode = null)
 	{
 		$iRetryDelay = 600;
-		$aRetries = MetaModel::GetConfig()->Get('async_task_retries', array());
+		$aRetries = MetaModel::GetConfig()->Get('async_task_retries');
 		if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries))
 		{
 			$aConfig = $aRetries[get_class($this)];
@@ -162,12 +162,13 @@ abstract class AsyncTask extends DBObject
 	public function GetMaxRetries($iErrorCode = null)
 	{
 		$iMaxRetries = 0;
-		$aRetries = MetaModel::GetConfig()->Get('async_task_retries', array());
+		$aRetries = MetaModel::GetConfig()->Get('async_task_retries');
 		if (is_array($aRetries) && array_key_exists(get_class($this), $aRetries))
 		{
 			$aConfig = $aRetries[get_class($this)];
 			$iMaxRetries = $aConfig['max_retries'];
 		}
+		return $iMaxRetries;
 	}
 
 	/**
@@ -380,6 +381,6 @@ class AsyncSendEmail extends AsyncTask
 		case EMAIL_SEND_ERROR:
 			return "Failed: ".implode(', ', $aIssues);
 		}
+		return '';
 	}
 }
-?>

datamodels/2.x/itop-config/config.php

@@ -74,6 +74,17 @@ function TestConfig($sContents, $oP)
 	}
 }
 
+function ConfigCheckDBPassword(iTopWebPage $oP, &$iEditorTopMargin)
+{
+	$bIsWindows = (array_key_exists('WINDIR', $_SERVER) || array_key_exists('windir', $_SERVER));
+	$sDBPwd = MetaModel::GetConfig()->Get('db_pwd');
+	if ($bIsWindows && (strpos($sDBPwd, '%') !== false))
+	{
+		// Unsupported Password
+		$iEditorTopMargin += 5;
+		$oP->add("<div class=\"header_message message_error\">Database password should not contain % character (backups won't work)...</div>");
+	}
+}
 
 /////////////////////////////////////////////////////////////////////
 // Main program
@@ -94,6 +105,7 @@ $oP->add_linked_script(utils::GetCurrentModuleUrl().'/js/ext-searchbox.js');
 try
 {
 	$sOperation = utils::ReadParam('operation', '');
+	$iEditorTopMargin = 0;
 
 	$oP->add("<h1>".Dict::S('config-edit-title')."</h1>");
 
@@ -104,18 +116,20 @@ try
 	else if (MetaModel::GetModuleSetting('itop-config', 'config_editor', '') == 'disabled')
 	{
 		$oP->add("<div class=\"header_message message_info\">iTop interactive edition of the configuration as been disabled. See <tt>'config_editor' => 'disabled'</tt> in the configuration file.</div>");
+		ConfigCheckDBPassword($oP, $iEditorTopMargin);
 	}
 	else
 	{
+		ConfigCheckDBPassword($oP, $iEditorTopMargin);
 		$sConfigFile = APPROOT.'conf/'.utils::GetCurrentEnvironment().'/config-itop.php';
 
-        $iEditorTopMargin = 9;
+        $iEditorTopMargin += 9;
         $sConfig = str_replace("\r\n", "\n", file_get_contents($sConfigFile));
         $sOrginalConfig = $sConfig;
 
         if (!empty($sOperation))
         {
-            $iEditorTopMargin = 14;
+            $iEditorTopMargin += 5;
             $sConfig = utils::ReadParam('new_config', '', false, 'raw_data');
             $sOrginalConfig = utils::ReadParam('prev_config', '', false, 'raw_data');
         }

js/jquery.autocomplete.js

@@ -384,7 +384,7 @@
 					success(term,parsed);
 				}
 				// if an AJAX url has been supplied, try loading the data now
-			} else if( (typeof options.url == "string") && (options.url.length > 0) ){
+			} else if( (typeof options.url == "string") && (options.url.length > 0) && (term.length > 0) ){
 
 				var extraParams = {
 					timestamp: +new Date()
@@ -479,7 +479,7 @@
 		minChars: 1,
 		delay: 400,
 		matchCase: false,
-		matchSubset: true,
+		matchSubset: false,
 		matchContains: false,
 		cacheLength: 100,
 		max: 1000,
@@ -640,7 +640,10 @@
 							});
 						}
 					}
-					return csub;
+					if ( csub.length > 0 ) {
+						return csub;
+					}
+					return null;
 				} else
 				// if the exact item exists, use it
 				if (data[q]){

js/jquery.tablesorter.pager.js

@@ -202,7 +202,8 @@ function sprintf(format, etc) {
 						  end: end,
 						  sort_col: s_col,
 						  sort_order: s_order,
-						  select_mode: c.select_mode,
+						  select_mode: c.select_mode, 
+						  list_id: c.table_id,
 						  display_key: c.displayKey,
 						  columns: c.columns,
 						  class_aliases: c.class_aliases
@@ -448,6 +449,7 @@ function sprintf(format, etc) {
 				filter: '',
 				extra_params: '',
 				select_mode: '',
+				table_id: 0,
 				totalSelected: 0,
 				selectionMode: 'positive',
 				displayKey: true,

setup/setuputils.class.inc.php

@@ -1305,72 +1305,89 @@ EOF
 		$sDBUser = $aParameters['db_user'];
 		$sDBPwd = $aParameters['db_pwd'];
 		$sDBName = $aParameters['db_name'];
-		$sTlsEnabled = (isset($aParameters['db_tls_enabled'])) ? $aParameters['db_tls_enabled'] : null;
-		$sTlsCA = (isset($aParameters['db_tls_ca'])) ? $aParameters['db_tls_ca'] : null;
 
-		$oPage->add_ready_script('oXHRCheckDB = null;');
-
-		$checks = SetupUtils::CheckDbServer($sDBServer, $sDBUser, $sDBPwd, $sTlsEnabled, $sTlsCA);
-
-		if ($checks === false)
+		$bIsWindows = (array_key_exists('WINDIR', $_SERVER) || array_key_exists('windir', $_SERVER));
+		if ($bIsWindows && (strpos($sDBPwd, '%') !== false))
 		{
-			// Connection failed, disable the "Next" button
+			// Unsuported Password, disable the "Next" button
 			$oPage->add_ready_script('$("#wiz_form").data("db_connection", "error");');
-			$oPage->add_ready_script('$("#db_info").html("<img src=\'../images/error.png\'/>&nbsp;No connection to the database...");');
+			$oPage->add_ready_script('$("#db_info").html("<img src=\'../images/error.png\'/>&nbsp;Database password cannot contain % character...");');
 		}
 		else
 		{
-			$aErrors = array();
-			$aWarnings = array();
-			foreach($checks['checks'] as $oCheck)
-			{
-				if ($oCheck->iSeverity == CheckResult::ERROR)
-				{
-					$aErrors[] = $oCheck->sLabel;
-				}
-				else if ($oCheck->iSeverity == CheckResult::WARNING)
-				{
-					$aWarnings[] = $oCheck->sLabel;
-				}
-			}
-			if (count($aErrors) > 0)
-			{
-				$oPage->add_ready_script('$("#wiz_form").data("db_connection", "error");');
-				$oPage->add_ready_script('$("#db_info").html(\'<img src="../images/validation_error.png"/>&nbsp;<b>Error:</b> '.htmlentities(implode('<br/>', $aErrors), ENT_QUOTES, 'UTF-8').'\');');
-			}
-			else if (count($aWarnings) > 0)
-			{
-				$oPage->add_ready_script('$("#wiz_form").data("db_connection", "");');
-				$oPage->add_ready_script('$("#db_info").html(\'<img src="../images/error.png"/>&nbsp;<b>Warning:</b> '.htmlentities(implode('<br/>', $aWarnings), ENT_QUOTES, 'UTF-8').'\');');
-			}
-			else
-			{
-				$oPage->add_ready_script('$("#wiz_form").data("db_connection", "");');
-				$oPage->add_ready_script('$("#db_info").html(\'<img src="../images/validation_ok.png"/>&nbsp;Database server connection Ok.\');');
-			}
+			$sTlsEnabled = (isset($aParameters['db_tls_enabled'])) ? $aParameters['db_tls_enabled'] : null;
+			$sTlsCA = (isset($aParameters['db_tls_ca'])) ? $aParameters['db_tls_ca'] : null;
 
-			if ($checks['databases'] == null)
+			$oPage->add_ready_script('oXHRCheckDB = null;');
+
+			$checks = SetupUtils::CheckDbServer($sDBServer, $sDBUser, $sDBPwd, $sTlsEnabled, $sTlsCA);
+
+			if ($checks === false)
 			{
-				$sDBNameInput = '<input id="db_name" name="db_name" size="15" maxlen="32" value="'.htmlentities($sDBName, ENT_QUOTES, 'UTF-8').'"/><span style="width:20px;" id="v_db_name"></span>';
-				$oPage->add_ready_script('$("#table_info").html(\'<img src="../images/error.png"/>&nbsp;Not enough rights to enumerate the databases\');');
+				// Connection failed, disable the "Next" button
+				$oPage->add_ready_script('$("#wiz_form").data("db_connection", "error");');
+				$oPage->add_ready_script('$("#db_info").html("<img src=\'../images/error.png\'/>&nbsp;No connection to the database...");');
 			}
 			else
 			{
-				$sDBNameInput = '<select id="db_name" name="db_name">';
-				foreach($checks['databases'] as $sDatabaseName)
+				$aErrors = array();
+				$aWarnings = array();
+				foreach ($checks['checks'] as $oCheck)
 				{
-					if ($sDatabaseName != 'information_schema')
+					if ($oCheck->iSeverity == CheckResult::ERROR)
 					{
-						$sEncodedName = htmlentities($sDatabaseName, ENT_QUOTES, 'UTF-8');
-						$sSelected = ($sDatabaseName == $sDBName) ? ' selected ' : '';
-						$sDBNameInput .= '<option value="'.$sEncodedName.'" '.$sSelected.'>'.$sEncodedName.'</option>';
+						$aErrors[] = $oCheck->sLabel;
+					}
+					else
+					{
+						if ($oCheck->iSeverity == CheckResult::WARNING)
+						{
+							$aWarnings[] = $oCheck->sLabel;
+						}
+					}
+				}
+				if (count($aErrors) > 0)
+				{
+					$oPage->add_ready_script('$("#wiz_form").data("db_connection", "error");');
+					$oPage->add_ready_script('$("#db_info").html(\'<img src="../images/validation_error.png"/>&nbsp;<b>Error:</b> '.htmlentities(implode('<br/>', $aErrors), ENT_QUOTES, 'UTF-8').'\');');
+				}
+				else
+				{
+					if (count($aWarnings) > 0)
+					{
+						$oPage->add_ready_script('$("#wiz_form").data("db_connection", "");');
+						$oPage->add_ready_script('$("#db_info").html(\'<img src="../images/error.png"/>&nbsp;<b>Warning:</b> '.htmlentities(implode('<br/>', $aWarnings), ENT_QUOTES, 'UTF-8').'\');');
+					}
+					else
+					{
+						$oPage->add_ready_script('$("#wiz_form").data("db_connection", "");');
+						$oPage->add_ready_script('$("#db_info").html(\'<img src="../images/validation_ok.png"/>&nbsp;Database server connection Ok.\');');
 					}
 				}
-				$sDBNameInput .= '</select>';
-			}
-			$oPage->add_ready_script('$("#db_name_container").html("'.addslashes($sDBNameInput).'");');
-			$oPage->add_ready_script('$("#db_name").bind("click keyup change", function() { $("#existing_db").prop("checked", true); WizardUpdateButtons(); });');
 
+				if ($checks['databases'] == null)
+				{
+					$sDBNameInput = '<input id="db_name" name="db_name" size="15" maxlen="32" value="'.htmlentities($sDBName, ENT_QUOTES, 'UTF-8').'"/><span style="width:20px;" id="v_db_name"></span>';
+					$oPage->add_ready_script('$("#table_info").html(\'<img src="../images/error.png"/>&nbsp;Not enough rights to enumerate the databases\');');
+				}
+				else
+				{
+					$sDBNameInput = '<select id="db_name" name="db_name">';
+					foreach ($checks['databases'] as $sDatabaseName)
+					{
+						if ($sDatabaseName != 'information_schema')
+						{
+							$sEncodedName = htmlentities($sDatabaseName, ENT_QUOTES, 'UTF-8');
+							$sSelected = ($sDatabaseName == $sDBName) ? ' selected ' : '';
+							$sDBNameInput .= '<option value="'.$sEncodedName.'" '.$sSelected.'>'.$sEncodedName.'</option>';
+						}
+					}
+					$sDBNameInput .= '</select>';
+				}
+				$oPage->add_ready_script('$("#db_name_container").html("'.addslashes($sDBNameInput).'");');
+				$oPage->add_ready_script('$("#db_name").bind("click keyup change", function() { $("#existing_db").prop("checked", true); WizardUpdateButtons(); });');
+
+			}
 		}
 		$oPage->add_ready_script('WizardUpdateButtons();');
 	}