VDR Portal | VDR News | [Announce] Fritz-Plugin 1.1.6

- changes in libfritz++ * Removed the default of countryCode = "49" if Tools::GetLocationSettings() fails. This task is handed over to the caller, see next. * Added new parameters to Config::Setup() to give default values for countryCode and regionCode. The default parameters are used, when auto-detection in Tools::GetLocationSettings() fails. The new parameter locationSettingsDetected indicates whether auto-detection was successful. In this case, the given default values are overwritten to give the caller access to the new values. * Fixed naming of local phonebook. The recommended name is now localphonebook.csv, the old name localfonbuch.csv is still accepted. The directory remains $vdrconfigdir/plugins/fritzbox/. - added new setup options for country code and region code. If the plugin is unable to detect these automatically (e.g., with some older Fritz!Boxes) the values are taken from these setup options. (reported by Ronny [30])

code:

1:
2:
3:
4:
5:
6:
7:
8:
9:
10:
11:
12:
13:
14:
15:
16:
17:
18:
19:
20:
21:
22:
23:
24:
25:
26:
27:
28:
29:
30:
31:
32:
33:
34:
35:
36:
37:
38:
39:
40:
41:
42:
43:
44:
45:
46:
47:
48:
49:
50:
51:
52:


FonbookEntry &OertlichesFonbook::ResolveToName(FonbookEntry &fe) {
std::string number = fe.getNumber();
// resolve only german phone numbers
if (Tools::NormalizeNumber(number).find("0049") != 0) {
fe.setName(number);
fe.setType(FonbookEntry::TYPE_NONE);
return fe;
}
std::string msg;
std::string name;
try {
*dsyslog << __FILE__ << ": sending reverse lookup request for " << Tools::NormalizeNumber(number) << " to www.dasoertliche.de" << std::endl;
std::string host = "www.dasoertliche.de";
tcpclient::HttpClient tc(host, PORT_WWW);
// tc << "GET /?id=9999999999999999999999&form_name=detail&lastFormName=search_inv&ph=" << Tools::NormalizeNumber(number) << "&recFrom=1&hitno=0&zvo_ok=1&page=TREFFERLISTE&context=TREFFERLISTE&action=TEILNEHMER&detvert_ok=1 HTTP/1.1nHost: www.dasoertliche.denAccept-Charset: ISO-8859-1nUser-Agent: Lynx/2.8.5nConnection: closenn0";
tc << "GET /Controller?ciid=&district=&kgs=&plz=&zvo_ok=&form_name=search_inv&buc=&kgs=&buab=&zbuab=&ph=" << Tools::NormalizeNumber(number) << "&image= HTTP/1.1nHost: www.dasoertliche.denAccept-Charset: ISO-8859-1nUser-Agent: Lynx/2.8.5nConnection: closenn0";
tc >> msg;
} catch (tcpclient::TcpException te) {
*esyslog << __FILE__ << ": Exception - " << te.what() << std::endl;
fe.setName(number);
fe.setType(FonbookEntry::TYPE_NONE);
return fe;
}
// parse answer
// size_t start = msg.find("<div class="detail_top">");
size_t start = msg.find("class="preview">");
if (start == std::string::npos) {
*isyslog << __FILE__ << ": no entry found." << std::endl;
fe.setName(number);
fe.setType(FonbookEntry::TYPE_NONE);
return fe;
}
// add the length of search pattern
// start += 24;
start += 16;
size_t stop = msg.find("<", start);
name = msg.substr(start, stop - start);
// convert the string from latin1 to current system character table
CharSetConv *conv = new CharSetConv("ISO-8859-1", CharSetConv::SystemCharacterTable());
const char *s_converted = conv->Convert(name.c_str());
name = s_converted;
delete (conv);
*isyslog << __FILE__ << ": resolves to " << name.c_str() << std::endl;
fe.setName(name);
fe.setType(FonbookEntry::TYPE_NONE);
return fe;
}