WebSVN – tpanel – Diff – /trunk/src/tconfig.cpp



 
string TConfig::getApp(const string& id)
{
    DECL_TRACER("TConfig::getApp(const string& id)");
 
#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
    if (localSettings.apps.empty())
        return string();
 
    vector<_APPS_t>::iterator iter;
 
    for (iter = localSettings.apps.begin(); iter != localSettings.apps.end(); ++iter)
    {
        if (iter->appID == id)
            return iter->path;
    }
#endif
    return string();
}
 
bool TConfig::saveSettings()
{

        lines += string("SIP_IPV4=") + (localSettings.sip_ipv4 ? "true" : "false") + "\n";
        lines += string("SIP_IPV6=") + (localSettings.sip_ipv6 ? "true" : "false") + "\n";
        lines += string("SIP_IPHONE=") + (localSettings.sip_iphone ? "true" : "false") + "\n";
        lines += "SIP_FIREWALL=" + sipFirewallToString(localSettings.sip_firewall) + "\n";
        lines += string("SIP_ENABLED=") + (localSettings.sip_enabled ? "true" : "false") + "\n";
 
#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
        if (!localSettings.apps.empty())
        {
            vector<_APPS_t>::iterator iter;
 
            for (iter = localSettings.apps.begin(); iter != localSettings.apps.end(); ++iter)
                lines += "APP=" + iter->appID + ";" + iter->path + "\n";
        }
#endif
        file.write(lines.c_str(), lines.size());
        file.close();
        MSG_INFO("Actual log level: " << localSettings.logLevel);
 
        if (mTemporary)

                localSettings.sip_iphone = isTrue(right);
            else if (caseCompare(left, "SIP_FIREWALL") == 0 && !right.empty())
                localSettings.sip_firewall = sipFirewallStrToEnum(right);
            else if (caseCompare(left, "SIP_ENABLED") == 0 && !right.empty())
                localSettings.sip_enabled = isTrue(right);
#if !defined(__ANDROID__) && !(defined(__APPLE__) && (TARGET_OS_IOS || TARGET_OS_SIMULATOR))
            else if (caseCompare(left, "APP") == 0 && !right.empty())
            {
                _APPS_t app;
                vector<string> parts = StrSplit(right, ";");
 

                    app.appID = parts[0];
                    app.path = parts[1];
                    localSettings.apps.push_back(app);
                }
            }
#endif
        }
    }
 
    fs.close();
    mInitialized = true;

        MSG_INFO("    SIP IPv4:     " << (localSettings.sip_ipv4 ? "YES" : "NO"));
        MSG_INFO("    SIP IPv6:     " << (localSettings.sip_ipv6 ? "YES" : "NO"));
        MSG_INFO("    SIP Int.Phone:" << (localSettings.sip_iphone ? "YES" : "NO"));
        MSG_INFO("    SIP firewall: " << sipFirewallToString(localSettings.sip_firewall));
        MSG_INFO("    SIP enabled:  " << (localSettings.sip_enabled ? "YES" : "NO"));
 
#if !defined(__ANDROID__) && !(defined(__APPLE__) && (TARGET_OS_IOS || TARGET_OS_SIMULATOR))
        if (!localSettings.apps.empty())
        {
            vector<_APPS_t>::iterator iter;
 
            for (iter = localSettings.apps.begin(); iter != localSettings.apps.end(); ++iter)
            {
                MSG_INFO("    Appl.:        " << iter->appID << "; " << iter->path);
            }
        }
#endif
    }
 
    localSettings_temp = localSettings;
#endif
    return true;

Rev 480	Rev 482
Line 1248...	Line 1248...
1248		1248
1249	`string TConfig::getApp(const string& id)`	1249	`string TConfig::getApp(const string& id)`
1250	`{`	1250	`{`
1251	`DECL_TRACER("TConfig::getApp(const string& id)");`	1251	`DECL_TRACER("TConfig::getApp(const string& id)");`
1252		1252
-		1253	`#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)`
1253	`if (localSettings.apps.empty())`	1254	`if (localSettings.apps.empty())`
1254	`return string();`	1255	`return string();`
1255		1256
1256	`vector<_APPS_t>::iterator iter;`	1257	`vector<_APPS_t>::iterator iter;`
1257		1258
1258	`for (iter = localSettings.apps.begin(); iter != localSettings.apps.end(); ++iter)`	1259	`for (iter = localSettings.apps.begin(); iter != localSettings.apps.end(); ++iter)`
1259	`{`	1260	`{`
1260	`if (iter->appID == id)`	1261	`if (iter->appID == id)`
1261	`return iter->path;`	1262	`return iter->path;`
1262	`}`	1263	`}`
1263		1264	`#endif`
1264	`return string();`	1265	`return string();`
1265	`}`	1266	`}`
1266		1267
1267	`bool TConfig::saveSettings()`	1268	`bool TConfig::saveSettings()`
1268	`{`	1269	`{`
Line 1328...	Line 1329...
1328	`lines += string("SIP_IPV4=") + (localSettings.sip_ipv4 ? "true" : "false") + "\n";`	1329	`lines += string("SIP_IPV4=") + (localSettings.sip_ipv4 ? "true" : "false") + "\n";`
1329	`lines += string("SIP_IPV6=") + (localSettings.sip_ipv6 ? "true" : "false") + "\n";`	1330	`lines += string("SIP_IPV6=") + (localSettings.sip_ipv6 ? "true" : "false") + "\n";`
1330	`lines += string("SIP_IPHONE=") + (localSettings.sip_iphone ? "true" : "false") + "\n";`	1331	`lines += string("SIP_IPHONE=") + (localSettings.sip_iphone ? "true" : "false") + "\n";`
1331	`lines += "SIP_FIREWALL=" + sipFirewallToString(localSettings.sip_firewall) + "\n";`	1332	`lines += "SIP_FIREWALL=" + sipFirewallToString(localSettings.sip_firewall) + "\n";`
1332	`lines += string("SIP_ENABLED=") + (localSettings.sip_enabled ? "true" : "false") + "\n";`	1333	`lines += string("SIP_ENABLED=") + (localSettings.sip_enabled ? "true" : "false") + "\n";`
1333		-
-		1334	`#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)`
1334	`if (!localSettings.apps.empty())`	1335	`if (!localSettings.apps.empty())`
1335	`{`	1336	`{`
1336	`vector<_APPS_t>::iterator iter;`	1337	`vector<_APPS_t>::iterator iter;`
1337		1338
1338	`for (iter = localSettings.apps.begin(); iter != localSettings.apps.end(); ++iter)`	1339	`for (iter = localSettings.apps.begin(); iter != localSettings.apps.end(); ++iter)`
1339	`lines += "APP=" + iter->appID + ";" + iter->path + "\n";`	1340	`lines += "APP=" + iter->appID + ";" + iter->path + "\n";`
1340	`}`	1341	`}`
1341		1342	`#endif`
1342	`file.write(lines.c_str(), lines.size());`	1343	`file.write(lines.c_str(), lines.size());`
1343	`file.close();`	1344	`file.close();`
1344	`MSG_INFO("Actual log level: " << localSettings.logLevel);`	1345	`MSG_INFO("Actual log level: " << localSettings.logLevel);`
1345		1346
1346	`if (mTemporary)`	1347	`if (mTemporary)`
Line 2327...	Line 2328...
2327	`localSettings.sip_iphone = isTrue(right);`	2328	`localSettings.sip_iphone = isTrue(right);`
2328	`else if (caseCompare(left, "SIP_FIREWALL") == 0 && !right.empty())`	2329	`else if (caseCompare(left, "SIP_FIREWALL") == 0 && !right.empty())`
2329	`localSettings.sip_firewall = sipFirewallStrToEnum(right);`	2330	`localSettings.sip_firewall = sipFirewallStrToEnum(right);`
2330	`else if (caseCompare(left, "SIP_ENABLED") == 0 && !right.empty())`	2331	`else if (caseCompare(left, "SIP_ENABLED") == 0 && !right.empty())`
2331	`localSettings.sip_enabled = isTrue(right);`	2332	`localSettings.sip_enabled = isTrue(right);`
-		2333	`#if !defined(__ANDROID__) && !(defined(__APPLE__) && (TARGET_OS_IOS \|\| TARGET_OS_SIMULATOR))`
2332	`else if (caseCompare(left, "APP") == 0 && !right.empty())`	2334	`else if (caseCompare(left, "APP") == 0 && !right.empty())`
2333	`{`	2335	`{`
2334	`_APPS_t app;`	2336	`_APPS_t app;`
2335	`vector<string> parts = StrSplit(right, ";");`	2337	`vector<string> parts = StrSplit(right, ";");`
2336		2338
Line 2339...	Line 2341...
2339	`app.appID = parts[0];`	2341	`app.appID = parts[0];`
2340	`app.path = parts[1];`	2342	`app.path = parts[1];`
2341	`localSettings.apps.push_back(app);`	2343	`localSettings.apps.push_back(app);`
2342	`}`	2344	`}`
2343	`}`	2345	`}`
-		2346	`#endif`
2344	`}`	2347	`}`
2345	`}`	2348	`}`
2346		2349
2347	`fs.close();`	2350	`fs.close();`
2348	`mInitialized = true;`	2351	`mInitialized = true;`
Line 2414...	Line 2417...
2414	`MSG_INFO(" SIP IPv4: " << (localSettings.sip_ipv4 ? "YES" : "NO"));`	2417	`MSG_INFO(" SIP IPv4: " << (localSettings.sip_ipv4 ? "YES" : "NO"));`
2415	`MSG_INFO(" SIP IPv6: " << (localSettings.sip_ipv6 ? "YES" : "NO"));`	2418	`MSG_INFO(" SIP IPv6: " << (localSettings.sip_ipv6 ? "YES" : "NO"));`
2416	`MSG_INFO(" SIP Int.Phone:" << (localSettings.sip_iphone ? "YES" : "NO"));`	2419	`MSG_INFO(" SIP Int.Phone:" << (localSettings.sip_iphone ? "YES" : "NO"));`
2417	`MSG_INFO(" SIP firewall: " << sipFirewallToString(localSettings.sip_firewall));`	2420	`MSG_INFO(" SIP firewall: " << sipFirewallToString(localSettings.sip_firewall));`
2418	`MSG_INFO(" SIP enabled: " << (localSettings.sip_enabled ? "YES" : "NO"));`	2421	`MSG_INFO(" SIP enabled: " << (localSettings.sip_enabled ? "YES" : "NO"));`
2419		-
-		2422	`#if !defined(__ANDROID__) && !(defined(__APPLE__) && (TARGET_OS_IOS \|\| TARGET_OS_SIMULATOR))`
2420	`if (!localSettings.apps.empty())`	2423	`if (!localSettings.apps.empty())`
2421	`{`	2424	`{`
2422	`vector<_APPS_t>::iterator iter;`	2425	`vector<_APPS_t>::iterator iter;`
2423		2426
2424	`for (iter = localSettings.apps.begin(); iter != localSettings.apps.end(); ++iter)`	2427	`for (iter = localSettings.apps.begin(); iter != localSettings.apps.end(); ++iter)`
2425	`{`	2428	`{`
2426	`MSG_INFO(" Appl.: " << iter->appID << "; " << iter->path);`	2429	`MSG_INFO(" Appl.: " << iter->appID << "; " << iter->path);`
2427	`}`	2430	`}`
2428	`}`	2431	`}`
-		2432	`#endif`
2429	`}`	2433	`}`
2430		2434
2431	`localSettings_temp = localSettings;`	2435	`localSettings_temp = localSettings;`
2432	`#endif`	2436	`#endif`
2433	`return true;`	2437	`return true;`

Subversion Repositories tpanel

(root)/trunk/src/tconfig.cpp – Rev 480 → 482