Index: trunk/tools/phrase_locator.php
===================================================================
diff -u -N -r907 -r912
--- trunk/tools/phrase_locator.php	(.../phrase_locator.php)	(revision 907)
+++ trunk/tools/phrase_locator.php	(.../phrase_locator.php)	(revision 912)
@@ -1,34 +1,26 @@
 <?php
-	// change next 2 lines only
-	define('HOST_PREFIX','alex');
-	define('DB_PREFIX', 'UpG_');
-	
-	// don't change anything here
-	define('DB_USER','dev');
-	define('DB_PASS','dev-25-sql');
-	define('DB_HOST','localhost');
-	define('DB_BASE',HOST_PREFIX.'_in_portal');
-	$dir = '/www/'.HOST_PREFIX.'/in-portal/';
+	require_once 'tool_lib.php';
 	$phrases = Array();
 	
-	scanDir($dir);
+	scanDir(BASE_PATH.'/');
 	
 	function scanDir($FolderPath)
 	{
 		global $phrases;
+		$scan_types=Array('php','js','tpl');
 		$FolderHandle = opendir($FolderPath);
 		if($FolderHandle)
 		{
 			while( false !== ($file = readdir($FolderHandle)) )
 			{
-				if( $file == '.' || $file == '..' ) continue;
+				if($file == '.' || $file == '..') continue;
 				$file = $FolderPath.$file;
 				
 				if( is_dir($file) )
 				{
 					scanDir($file.'/');	
 				}
-				elseif( is_file($file) &&  in_array(substr($file,strrpos($file, '.') + 1), Array('php','js','tpl')) )
+				elseif( is_file($file) && in_array(substr($file,-3),$scan_types) )
 				{
 					$filedata = file_get_contents($file);
 					preg_match_all('/\'(lu_.*|la_.*)\'/U',$filedata,$rets);
@@ -46,30 +38,26 @@
 			closedir($FolderHandle);
 		}
 	}
-	//print_r($phrases);
+	//tool_printPre($phrases);
 	
-	$mysql_link = mysql_connect(DB_HOST,DB_USER,DB_PASS);
-	mysql_select_db(DB_BASE,$mysql_link);
-	
-	$sql = 'SELECT LOWER(Phrase) AS Phrase FROM '.DB_PREFIX.'Phrase WHERE LanguageId = 1';
-	$rs = mysql_query($sql,$mysql_link);
-	while( ($row = mysql_fetch_array($rs)) )
+	$sql = 'SELECT LOWER(Phrase) FROM '.TABLE_PREFIX.'Phrase WHERE LanguageId = 1';
+	$db_phrases=$tool_db->GetCol($sql);
+	foreach ($db_phrases as $phrase)
 	{
-		unset($phrases[ $row['Phrase'] ]); // phrase is translated
+		unset($phrases[$phrase]); // phrase is translated
 	}
-	mysql_free_result($rs);
 	
 	$ret = Array();
 	foreach($phrases as $phrase => $dummy_value)
 	{
 		$ret[] = $phrase;
 	}
 	
-	print_pre($ret);
+	tool_printPre($ret);
 	
-	if( unlink($dir.'new_phrases.txt') )
+	if( unlink(BASE_PATH.'/new_phrases.txt') )
 	{
-		$fp = fopen($dir.'new_phrases.txt','w');
+		$fp = fopen(BASE_PATH.'/new_phrases.txt','w');
 		foreach ($ret as $phrase)
 		{
 			fwrite($fp,$phrase."\n");
@@ -80,9 +68,4 @@
 	{
 		die('Can\'t create file <b>new_phrases.txt</b>');
 	}
-	
-	function print_pre($s)
-	{
-		echo '<pre>',print_r($s,true),'</pre>';
-	}
 ?>
\ No newline at end of file