mylesmarkevich/ops-Gazelle
1
0
Fork 0
mirror of https://github.com/OPSnet/Gazelle.git synced 2026-09-28 10:13:43 -04:00
Code Issues Projects Releases Wiki Activity

merge master

Browse Source
This commit is contained in:
itismadness
2017-10-20 10:58:19 +01:00
parent 3d9bfd9211 edf47def2a
commit d631b203da
42 changed files with 706 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/users.class.php
+18 -5
View File
@@ -164,6 +164,7 @@ class Users {
m.IP,
m.CustomPermissions,
m.can_leech AS CanLeech,
m.IRCKey,
i.AuthKey,
i.RatioWatchEnds,
i.RatioWatchDownload,
@@ -178,6 +179,7 @@ class Users {
i.DisablePM,
i.DisableRequests,
i.DisableForums,
i.DisableIRC,
i.DisableTagging," . "
i.SiteOptions,
i.DownloadAlt,
@@ -243,10 +245,10 @@ class Users {
unset($HeavyInfo['CustomForums']['']);
}
$HeavyInfo['SiteOptions'] = unserialize($HeavyInfo['SiteOptions']);
if (!empty($HeavyInfo['SiteOptions'])) {
$HeavyInfo = array_merge($HeavyInfo, $HeavyInfo['SiteOptions']);
}
$HeavyInfo['SiteOptions'] = !empty($HeavyInfo['SiteOptions']) ? unserialize($HeavyInfo['SiteOptions']) : array();
$HeavyInfo['SiteOptions'] = array_merge(static::default_site_options(), $HeavyInfo['SiteOptions']);
$HeavyInfo = array_merge($HeavyInfo, $HeavyInfo['SiteOptions']);
unset($HeavyInfo['SiteOptions']);
G::$DB->set_query_id($QueryID);
@@ -256,6 +258,16 @@ class Users {
return $HeavyInfo;
}
/**
* Default settings to use for SiteOptions
* @return array
*/
public static function default_site_options() {
return array(
'HttpsTracker' => true
);
}
/**
* Updates the site options in the database
*
@@ -279,7 +291,8 @@ class Users {
FROM users_info
WHERE UserID = $UserID");
list($SiteOptions) = G::$DB->next_record(MYSQLI_NUM, false);
$SiteOptions = unserialize($SiteOptions);
$SiteOptions = !empty($SiteOptions) ? unserialize($SiteOptions) : array();
$SiteOptions = array_merge(static::default_site_options(), $SiteOptions);
// Get HeavyInfo
$HeavyInfo = Users::user_heavy_info($UserID);