Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions lib/Api.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public function getDefaultShare()
$driver = $injector->getInstance('Turba_Factory_Driver');

foreach (Turba::listShares(true) as $uid => $share) {
$params = @unserialize($share->get('params'));
$params = @unserialize($share->get('params'), ['allowed_classes' => false]);
if (!empty($params['source'])) {
try {
if ($driver->create($uid)->checkDefaultShare($share, $cfgSources[$params['source']])) {
Expand Down Expand Up @@ -2053,7 +2053,7 @@ public function listUserGroupObjects()
$contact_shares = $this->listShares(Horde_Perms::SHOW);
}
foreach ($contact_shares as $id => $share) {
$params = @unserialize($share->get('params'));
$params = @unserialize($share->get('params'), ['allowed_classes' => false]);
if ($params['source'] == $key) {
$owners[] = $params['name'];
}
Expand Down Expand Up @@ -2198,7 +2198,7 @@ public function getGroupMembers($gid, $subGroups = false)
return [];
}
[$source, ] = explode(':', $gid);
$members = @unserialize($entry['members']);
$members = @unserialize($entry['members'], ['allowed_classes' => false]);
if (!is_array($members)) {
return [];
}
Expand All @@ -2213,7 +2213,7 @@ public function getGroupMembers($gid, $subGroups = false)
if (strpos($member, ':') !== false) {
[$newSource, $uid] = explode(':', $member);
if (!empty($contact_shares[$newSource])) {
$params = @unserialize($contact_shares[$newSource]->get('params'));
$params = @unserialize($contact_shares[$newSource]->get('params'), ['allowed_classes' => false]);
$newSource = $params['source'];
$member = $uid;
$db[$newSource] = empty($sources[$newSource]['params']['sql'])
Expand Down Expand Up @@ -2286,7 +2286,7 @@ public function addAddressbook($name, array $params = [])
$shareName = $share->getName();

if (!empty($params['synchronize'])) {
$sync = @unserialize($prefs->getValue('sync_books'));
$sync = @unserialize($prefs->getValue('sync_books'), ['allowed_classes' => false]);
$sync[] = $shareName;
$prefs->setValue('sync_books', serialize($sync));
}
Expand All @@ -2306,7 +2306,7 @@ public function removeSyncBook($id)
{
global $prefs;

$sync = @unserialize($prefs->getValue('sync_books'));
$sync = @unserialize($prefs->getValue('sync_books'), ['allowed_classes' => false]);
if (empty($sync) || !in_array($id, $sync, true)) {
return false;
}
Expand Down Expand Up @@ -2423,7 +2423,7 @@ protected function _getSources($sources, $synchronize = false, $end = false)

/* Get default address book from user preferences. */
if ($fromPrefs) {
$sources = @unserialize($GLOBALS['prefs']->getValue('sync_books'));
$sources = @unserialize($GLOBALS['prefs']->getValue('sync_books'), ['allowed_classes' => false]);
} elseif (!is_array($sources)) {
$sources = [$sources];
}
Expand Down
2 changes: 1 addition & 1 deletion lib/Driver.php
Original file line number Diff line number Diff line change
Expand Up @@ -3352,7 +3352,7 @@ public function removeUserData($user)
*/
public function checkDefaultShare(Horde_Share_Object $share, array $srcconfig)
{
$params = @unserialize($share->get('params'));
$params = @unserialize($share->get('params'), ['allowed_classes' => false]);
if (!isset($params['default'])) {
$params['default'] = ($params['name'] == $GLOBALS['registry']->getAuth());
$share->set('params', serialize($params));
Expand Down
2 changes: 1 addition & 1 deletion lib/Driver/Share.php
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public function getName()
*/
protected function _getContactOwner()
{
$params = @unserialize($this->_share->get('params'));
$params = @unserialize($this->_share->get('params'), ['allowed_classes' => false]);
if (!empty($params['name'])) {
return $params['name'];
}
Expand Down
6 changes: 3 additions & 3 deletions lib/Object/Group.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public function addMember($contactId, $sourceId = null)
}

// Explode members.
$members = @unserialize($this->attributes['__members']);
$members = @unserialize($this->attributes['__members'], ['allowed_classes' => false]);
if (!is_array($members)) {
$members = [];
}
Expand All @@ -118,7 +118,7 @@ public function addMember($contactId, $sourceId = null)
*/
public function removeMember($contactId, $sourceId = null)
{
$members = @unserialize($this->attributes['__members']);
$members = @unserialize($this->attributes['__members'], ['allowed_classes' => false]);

if (is_null($sourceId) || $sourceId == $this->getSource()) {
$i = array_search($contactId, $members);
Expand All @@ -142,7 +142,7 @@ public function removeMember($contactId, $sourceId = null)
*/
public function count()
{
$children = @unserialize($this->attributes['__members']);
$children = @unserialize($this->attributes['__members'], ['allowed_classes' => false]);
if (!is_array($children)) {
return 0;
} else {
Expand Down
6 changes: 3 additions & 3 deletions lib/Turba.php
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public static function getDefaultAddressbook()
*/
public static function getPreferredSortOrder()
{
return @unserialize($GLOBALS['prefs']->getValue('sortorder'));
return @unserialize($GLOBALS['prefs']->getValue('sortorder'), ['allowed_classes' => false]);
}

/**
Expand Down Expand Up @@ -581,7 +581,7 @@ public static function getConfigFromShares(array $sources, $owner = false, $opti

$personal |= ($share->get('owner') == $auth_user);

$params = @unserialize($share->get('params'));
$params = @unserialize($share->get('params'), ['allowed_classes' => false]);
if (empty($params['source']) && !empty($all_shares)) {
$params['source'] = $all_shares;
}
Expand Down Expand Up @@ -711,7 +711,7 @@ public static function getSourceFromShare(Horde_Share_Object $share)
// Require a fresh config file.
$cfgSources = self::availableSources();

$params = @unserialize($share->get('params'));
$params = @unserialize($share->get('params'), ['allowed_classes' => false]);
$newConfig = $cfgSources[$params['source']];
$newConfig['params']['config'] = $cfgSources[$params['source']];
$newConfig['params']['config']['params']['share'] = $share;
Expand Down
Loading