php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-25 08:58:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

MFH

Browse Source
This commit is contained in:
Antony Dovgal
2007-01-16 11:19:10 +00:00
parent 7ad1c3c5f2
commit bd6c862fee
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/pspell/pspell.c
+18 -10
View File
@@ -186,6 +186,7 @@ static PHP_FUNCTION(pspell_new)
* pointing to the location of the dictionaries
*/
if(0 == RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Aspell", &hkey)) {
dwLen = sizeof(aspell_dir) - 1;
RegQueryValueEx(hkey, "", NULL, &dwType, (LPBYTE)&aspell_dir, &dwLen);
RegCloseKey(hkey);
strcpy(data_dir, aspell_dir);
@@ -247,6 +248,7 @@ static PHP_FUNCTION(pspell_new)
if(pspell_error_number(ret) != 0){
php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s ", pspell_error_message(ret));
delete_pspell_manager(ret);
RETURN_FALSE;
}
@@ -289,6 +291,7 @@ static PHP_FUNCTION(pspell_new_personal)
* pointing to the location of the dictionaries
*/
if(0 == RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Aspell", &hkey)) {
dwLen = sizeof(aspell_dir) - 1;
RegQueryValueEx(hkey, "", NULL, &dwType, (LPBYTE)&aspell_dir, &dwLen);
RegCloseKey(hkey);
strcpy(data_dir, aspell_dir);
@@ -304,10 +307,12 @@ static PHP_FUNCTION(pspell_new_personal)
convert_to_string_ex(personal);
if (PG(safe_mode) && (!php_checkuid(Z_STRVAL_PP(personal), NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
delete_pspell_config(config);
RETURN_FALSE;
}
if (php_check_open_basedir(Z_STRVAL_PP(personal) TSRMLS_CC)) {
delete_pspell_config(config);
RETURN_FALSE;
}
@@ -363,6 +368,7 @@ static PHP_FUNCTION(pspell_new_personal)
if(pspell_error_number(ret) != 0){
php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s ", pspell_error_message(ret));
delete_pspell_manager(ret);
RETURN_FALSE;
}
@@ -396,6 +402,7 @@ static PHP_FUNCTION(pspell_new_config)
if(pspell_error_number(ret) != 0){
php_error_docref(NULL TSRMLS_CC, E_WARNING, "PSPELL couldn't open the dictionary. reason: %s ", pspell_error_message(ret));
delete_pspell_manager(ret);
RETURN_FALSE;
}
@@ -641,17 +648,18 @@ static PHP_FUNCTION(pspell_config_create)
/* If aspell was installed using installer, we should have a key
* pointing to the location of the dictionaries
*/
if(0 == RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Aspell", &hkey)) {
RegQueryValueEx(hkey, "", NULL, &dwType, (LPBYTE)&aspell_dir, &dwLen);
RegCloseKey(hkey);
strcpy(data_dir, aspell_dir);
strcat(data_dir, "\\data");
strcpy(dict_dir, aspell_dir);
strcat(dict_dir, "\\dict");
if(0 == RegOpenKey(HKEY_LOCAL_MACHINE, "Software\\Aspell", &hkey)) {
dwLen = sizeof(aspell_dir) - 1;
RegQueryValueEx(hkey, "", NULL, &dwType, (LPBYTE)&aspell_dir, &dwLen);
RegCloseKey(hkey);
strcpy(data_dir, aspell_dir);
strcat(data_dir, "\\data");
strcpy(dict_dir, aspell_dir);
strcat(dict_dir, "\\dict");
pspell_config_replace(config, "data-dir", data_dir);
pspell_config_replace(config, "dict-dir", dict_dir);
}
pspell_config_replace(config, "data-dir", data_dir);
pspell_config_replace(config, "dict-dir", dict_dir);
}
#endif
convert_to_string_ex(language);