kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-08 18:58:07 +00:00
Code Issues Projects Releases Wiki Activity

Change preferences info.

Browse Source
This commit is contained in:
James Cole
2016-06-23 12:08:14 +02:00
parent 2c826451d1
commit fbf9e00208
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Models/Preference.php
View File

@@ -24,7 +24,6 @@ use Illuminate\Database\Eloquent\Model;
* @property string $name * @property string $name
* @property string $name_encrypted * @property string $name_encrypted
* @property string $data * @property string $data
* @property string $data_encrypted
* @property-read \FireflyIII\User $user * @property-read \FireflyIII\User $user
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereId($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereId($value)
* @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereCreatedAt($value) * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereCreatedAt($value)
@@ -41,7 +40,6 @@ class Preference extends Model
protected $dates = ['created_at', 'updated_at']; protected $dates = ['created_at', 'updated_at'];
protected $fillable = ['user_id', 'data', 'name']; protected $fillable = ['user_id', 'data', 'name'];
protected $hidden = ['data_encrypted', 'name_encrypted'];
/** /**
* @param $value * @param $value
@@ -50,10 +48,7 @@ class Preference extends Model
*/ */
public function getDataAttribute($value) public function getDataAttribute($value)
{ {
if (is_null($this->data_encrypted)) { $data = Crypt::decrypt($value);
return json_decode($value);
}
$data = Crypt::decrypt($this->data_encrypted);
return json_decode($data); return json_decode($data);
} }
@@ -63,8 +58,7 @@ class Preference extends Model
*/ */
public function setDataAttribute($value) public function setDataAttribute($value)
{ {
$this->attributes['data'] = ''; $this->attributes['data'] = Crypt::encrypt(json_encode($value));
$this->attributes['data_encrypted'] = Crypt::encrypt(json_encode($value));
} }
/** /**

4
app/Support/Preferences.php
View File

@@ -69,7 +69,7 @@ class Preferences
return Cache::get($fullName); return Cache::get($fullName);
} }
$preference = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data_encrypted']); $preference = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data']);
if ($preference) { if ($preference) {
Cache::forever($fullName, $preference); Cache::forever($fullName, $preference);
@@ -138,7 +138,7 @@ class Preferences
{ {
$fullName = 'preference' . $user->id . $name; $fullName = 'preference' . $user->id . $name;
Cache::forget($fullName); Cache::forget($fullName);
$pref = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data_encrypted']); $pref = Preference::where('user_id', $user->id)->where('name', $name)->first(['id', 'name', 'data']);
if (!is_null($pref)) { if (!is_null($pref)) {
$pref->data = $value; $pref->data = $value;