Commit fe10708d authored by jan.koester's avatar jan.koester
Browse files

test

parent 90a4f6d4
Loading
Loading
Loading
Loading
+53 −45
Changes for src/authdb.cpp: 53 added lines, 45 removed lines.
Original line number Diff line number Diff line
@@ -458,20 +458,21 @@ namespace authdb {

            for (libhttppp::HttpForm::MultipartForm::Data* curformdat = curform.MultipartFormData.getFormData();
                    curformdat; curformdat = curformdat->nextData()) {

                    AuthData curec(uid);

                    curec.Data->storage=EmptyStorage;

                    for(libhttppp::HttpForm::MultipartForm::Data::ContentDisposition *curdispo=curformdat->getDisposition();
                        curdispo; curdispo=curdispo->nextContentDisposition()
                    ){
                        AuthData curec(uid);


                        if(curformdat->Value.empty() || !curdispo->getValue())
                            continue;

                        data = true;

                        for(libhttppp::HttpForm::MultipartForm::Data::ContentDisposition *curdispo=curformdat->getDisposition();
                            curdispo; curdispo=curdispo->nextContentDisposition()
                        ){

                        std::string key;

                        if(curdispo->getKey())
@@ -483,12 +484,19 @@ namespace authdb {
                                       [](unsigned char c){ return std::tolower(c); });

                        if(key=="name"){
                            strcpy(curec.Data->fieldname,curdispo->getValue());
                        }

                        if(key=="filename"){
                            curec.Data->storage=BinaryStorage;
                        }
                    }

                    if(curec.Data->storage==EmptyStorage){
                        bool numeric=true;

                                    for(auto t=curformdat->Value.begin(); t!=curformdat->Value.end();
                                        ++t){
                                        if(!std::isdigit(*t)){
                        for(auto t : curformdat->Value){
                            if(!std::isdigit(t)){
                                numeric=false;
                                break;
                            }
@@ -498,15 +506,6 @@ namespace authdb {
                            curec.Data->storage=IntStorage;
                        else
                            curec.Data->storage=TextStorage;


                                }
                                strcpy(curec.Data->fieldname,curdispo->getValue());
                            }

                            if(key=="filename"){
                                curec.Data->storage=BinaryStorage;
                            }
                    }

                    if(curec.Data->storage==TextStorage) {
@@ -517,18 +516,21 @@ namespace authdb {
                            std::copy(curformdat->Value.begin(),curformdat->Value.end(),
                                      std::back_inserter(inpw));
                            hash.hash(inpw,pwhash);
                                curec.Data->datasize=pwhash.length();
                            curec.Data->datasize=pwhash.length()+1;
                            curec.Data->data=new char[curec.Data->datasize];
                                memcpy(curec.Data->data,pwhash.c_str(),pwhash.length());
                            std::copy(pwhash.begin(),pwhash.end(),curec.Data->data);
                            curec.Data->data[pwhash.length()]='\0';
                            editrec.append(curec);
                            delete[] curec.Data->data;
                        }else{
                            curec.Data->datasize=curformdat->Value.size();
                            curec.Data->data=new char[curec.Data->datasize];
                                memcpy(curec.Data->data,curformdat->Value.data(),
                                       curformdat->Value.size());
                            }
                            std::copy(curformdat->Value.begin(),
                                        curformdat->Value.end(),curec.Data->data);

                            editrec.append(curec);
                            delete[] curec.Data->data;
                        }
                    }else if(curec.Data->storage==BinaryStorage){
                        curec.Data->datasize=curformdat->Value.size();
                        curec.Data->data=new char[curec.Data->datasize];
@@ -549,7 +551,7 @@ namespace authdb {
                        editrec.append(curec);
                        delete[] (int*)curec.Data->data;
                    }
                    }

            }

            if(data){
@@ -1000,11 +1002,13 @@ VALUEFOUND:
        AuthData *dest=this;

        for(const AuthData *cursrc=&src; cursrc; cursrc=cursrc->next()){
            std::cout << "test" << std::endl;
            memcpy(dest->Data,cursrc->Data,sizeof(AuthData::Record));
            Data->data=new char[cursrc->Data->datasize];
            dest->Data->datasize=cursrc->Data->datasize;
            dest->Data->data=new char[dest->Data->datasize];
            memcpy(dest->Data->data,cursrc->Data->data,cursrc->Data->datasize);
            if(cursrc->next()){
                dest->_next=new AuthData(this->Data->uuid);
                dest->_next=new AuthData(cursrc->Data->uuid);
                dest=dest->_next;
            }
        }
@@ -1025,46 +1029,50 @@ VALUEFOUND:
    };

    AuthData *AuthData::append(const AuthData &src){
        AuthData *curec=this;
        AuthData *curec=this,*next=this;
        if(!curec->_next && curec->Data->datasize==0){
            for(const AuthData *cursrc=&src; cursrc; cursrc=cursrc->next()){
                next->append(*src.Data);
                if(cursrc->next()){
                    next->_next=new AuthData(Data->uuid);
                    next=next->_next;
                }
            }
            return curec;
        }

        while(curec && curec->Data->datasize!=0){
        while(curec){
            if(!curec->_next){
                curec->_next=new AuthData(Data->uuid);
                curec->_next=new AuthData(src);
                curec=curec->_next;
                break;
            }
            curec=curec->_next;
        }

        for(const AuthData *cuxrcrec=&src; cuxrcrec; cuxrcrec=cuxrcrec->next()){
            memcpy(curec->Data,cuxrcrec->Data,sizeof(AuthData::Record));
            curec->Data->data=new char[curec->Data->datasize];
            memcpy(curec->Data->data,cuxrcrec->Data->data,curec->Data->datasize);
            curec->_next=nullptr;
            if(cuxrcrec->next()){
                curec->_next=new AuthData(src.Data->uuid);
                curec=curec->_next;
            }
        };

        }
        return curec;
    }

    AuthData *AuthData::append(const AuthData::Record &src){
        AuthData *curec=this;

        while(curec->Data->datasize!=0){
        if(!curec->_next && curec->Data->datasize==0){
            memcpy(curec->Data,&src,sizeof(AuthData::Record));
            curec->Data->data=new char[curec->Data->datasize];
            memcpy(curec->Data->data,src.data,curec->Data->datasize);
            return curec;
        }

        while(curec){
            if(!curec->_next){
                curec->_next=new AuthData(Data->uuid);
                curec=curec->_next;
                curec->append(src);
                break;
            }
            curec=curec->_next;
        }
        };

        memcpy(curec->Data,&src,sizeof(AuthData::Record));
        curec->Data->data=new char[curec->Data->datasize];
        memcpy(curec->Data->data,src.data,curec->Data->datasize);
        return curec;
    }