Commit 142b28ff authored by jan.koester's avatar jan.koester
Browse files

test

parent c93d4706
Loading
Loading
Loading
Loading
+14 −11
Original line number Diff line number Diff line
@@ -1178,6 +1178,14 @@ void blogi::Blogi::settingsApi(libhttppp::HttpRequest& curreq,const int tid,cons
    // Remove trailing slash
    if(!apipath.empty() && apipath.back()=='/') apipath.pop_back();

    // Separate query string from path
    std::string apiquerystring;
    size_t qpos = apipath.find('?');
    if(qpos != std::string::npos){
        apiquerystring = apipath.substr(qpos + 1);
        apipath = apipath.substr(0, qpos);
    }

    json_object *jresponse = json_object_new_object();

    if(apipath == "nav"){
@@ -1214,19 +1222,14 @@ void blogi::Blogi::settingsApi(libhttppp::HttpRequest& curreq,const int tid,cons
        } else {
            json_object_object_add(jreq, "command", json_object_new_string("media_list_media"));
            // Parse album_id from query string
            std::string url = curreq.getRequestURL();
            size_t qp = url.find('?');
            if(qp != std::string::npos){
                std::string qs = url.substr(qp + 1);
                size_t ep = qs.find("album_id=");
            size_t ep = apiquerystring.find("album_id=");
            if(ep != std::string::npos){
                    std::string aid = qs.substr(ep + 9);
                std::string aid = apiquerystring.substr(ep + 9);
                size_t amp = aid.find('&');
                if(amp != std::string::npos) aid = aid.substr(0, amp);
                json_object_object_add(jreq, "album_id", json_object_new_string(aid.c_str()));
            }
        }
        }

        uuid::uuid uid(authid.c_str());
        for(const blogi::Plugin::PluginData *curplg=BlogiPlg->getFirstPlugin(); curplg; curplg=curplg->getNextPlg()){