diff --git a/wrenchboard/src/shared_tool/media.cc b/wrenchboard/src/shared_tool/media.cc index 23860825..46628694 100644 --- a/wrenchboard/src/shared_tool/media.cc +++ b/wrenchboard/src/shared_tool/media.cc @@ -115,8 +115,9 @@ long WrenchSaveStoredMedia(CVars in, CVars &out) { REQ_STRING(in, "uid", 3, 150, "(.*)"); REQ_STRING(in, "profile", 5, 40, "(.*)"); pgsql_exec("UPDATE members SET profile_pic='%s' " - " WHERE uid='%s'",in["profile"].c_str(), in["file_uid"].c_str()); - snprintf(vname, sizeof (vname), "SELECT * FROM members WHERE uid ='%s'", in["file_uid"].c_str()); + " WHERE uid='%s'",in["profile"].c_str(), in["uid"].c_str()); + out["save_status"] ="completed"; + snprintf(vname, sizeof (vname), "SELECT * FROM members WHERE uid ='%s'", in["uid"].c_str()); break; case WRENCH_FILE_MYFILE: @@ -135,7 +136,23 @@ long WrenchSaveStoredMedia(CVars in, CVars &out) { case WRENCH_FILE_FAMILY: REQ_STRING(in, "uid", 3, 150, "(.*)"); REQ_STRING(in, "family_uid", 5, 40, "(.*)"); - snprintf(vname, sizeof (vname), "SELECT * FROM members_family WHERE uid ='%s'", in["family_uid"].c_str()); + CVars fm; + if (load_db_record(fm, "SELECT f.uid, f.family_member_id, mm.uid FROM members_family f " + " LEFT JOIN members mm ON mm.id = f.member_id " + " WHERE mm.uid ='%s' AND f.uid='%s' ", in["uid"].c_str(), in["family_uid"].c_str()) > 0){ + + if ( fm["family_member_id"].Long() > 0){ + pgsql_exec("UPDATE members SET profile_pic='%s' " + " WHERE uid='%s'",in["profile"].c_str(), fm["family_member_id"].Long()); + out["save_status"] ="completed"; + snprintf(vname, sizeof (vname), "SELECT * FROM members WHERE id ='%s'", fm["family_member_id"].Long()); + } + else{ + out["error"] ="account_not_found"; + } + + } + break; } diff --git a/www-api/app/Controllers/WrenchMedia.php b/www-api/app/Controllers/WrenchMedia.php index 8f4665e5..3bde41f4 100644 --- a/www-api/app/Controllers/WrenchMedia.php +++ b/www-api/app/Controllers/WrenchMedia.php @@ -33,10 +33,11 @@ class WrenchMedia extends BaseController return $endpoints; } - const WRENCH_FILE_PROFILE = 100; + const WRENCH_FILE_PROFILE = 100; const WRENCH_FILE_MYFILE = 200; - const WRENCH_FILE_CONTRACTS = 300; + const WRENCH_FILE_CONTRACTS = 300; const WRENCH_FILE_FAMILY = 400; + const WRENCH_FILE_JOBS = 500; public function apigate(){ log_message('critical', "Media gate Path GATE 001"); @@ -72,6 +73,7 @@ class WrenchMedia extends BaseController #define WRENCH_FILE_MYFILE 200 #define WRENCH_FILE_CONTRACTS 300 #define WRENCH_FILE_FAMILY 400 + #define WRENCH_FILE_JOBS 500 */ /* @@ -93,11 +95,6 @@ class WrenchMedia extends BaseController exit(); - //We can check cache for the file or - // OR - // WE need to ask backend for this file now / - // $call_backend = true; - $data = [ 'action' => WRENCHBOARD_GET_MEDIA, 'sessionid' => $sessionId, @@ -111,20 +108,21 @@ class WrenchMedia extends BaseController $ret = $wrenchboard->wrenchboard_api($data, $out); $out['internal_return'] = $ret; } -//print_r($out); -///opt/wrenchboard/TEST/PROFILE/dfc9d601-780f-4d78-839f-422f0928f911/PORTRAIT/ + + + switch($supportedSections[$fileSection]){ - case 'profile': + case WRENCH_FILE_PROFILE: ///opt/wrenchboard/TEST/PROFILE/3119b744-42ad-4834-bb83-b737588754ca/PORTRAIT $selectedFile = $this->savePath.'PROFILE/'.$out["member_uid"]."/PORTRAIT/". $out["saved_file_name"]; break; - case 'family': + case WRENCH_FILE_FAMILY: ///opt/wrenchboard/TEST/PROFILE/3119b744-42ad-4834-bb83-b737588754ca/FAMILY/3119b744-42ad-4834-bb83-b737588754ca/ $selectedFile = $this->savePath.'PROFILE/'.$out["member_uid"]."/FAMILY/family_uid/". $out["saved_file_name"]; break; - case 'myfile': + case WRENCH_FILE_MYFILE: $selectedFile = $this->savePath.'PROFILE/'.$out["member_uid"]."/MYFILES/". $out["saved_file_name"]; break; }