YunoHost-Apps/z-push_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/z-push_ynh.git synced 2024-09-03 18:05:58 +02:00
Code Issues Activity Actions

Merge pull request #11 from polytan02/master

Browse source 
Fix for potential infinite loop
This commit is contained in:
abeudin 2016-01-05 12:00:13 +01:00
commit faf877a9ca
4 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/install
View file

@ -89,6 +89,6 @@ sudo chmod 644 $finalphpconf
sudo yunohost app setting $app skipped_uris -v "/" sudo yunohost app setting $app skipped_uris -v "/"
# Reload Nginx and regenerate SSOwat conf # Reload Nginx and regenerate SSOwat conf
sudo service php5-fpm restart sudo service php5-fpm reload
sudo service nginx reload sudo service nginx reload
sudo yunohost app ssowatconf sudo yunohost app ssowatconf

2
scripts/remove
View file

@ -10,6 +10,6 @@ sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf
sudo rm -f /etc/php5/fpm/pool.d/$app.conf sudo rm -f /etc/php5/fpm/pool.d/$app.conf
# Restart of services # Restart of services
sudo service php5-fpm restart sudo service php5-fpm reload
sudo service nginx reload sudo service nginx reload
sudo yunohost app ssowatconf sudo yunohost app ssowatconf

4
scripts/upgrade
View file

@ -90,8 +90,6 @@ sudo yunohost app setting $app skipped_uris -v "/"
# Restart of services # Restart of services
sudo service php5-fpm restart sudo service php5-fpm reload
sudo service nginx reload sudo service nginx reload
sudo yunohost app ssowatconf sudo yunohost app ssowatconf

23
sources/backend/imap/imap.php
View file

@ -2075,6 +2075,13 @@ class BackendIMAP extends BackendDiff implements ISearchProvider {
if (!isset($this->permanentStorage->fmFimapFid)) { if (!isset($this->permanentStorage->fmFimapFid)) {
ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendIMAP->getFolderIdFromImapId('%s') IMAP cache folder not found, creating one", $imapid)); ZLog::Write(LOGLEVEL_DEBUG, sprintf("BackendIMAP->getFolderIdFromImapId('%s') IMAP cache folder not found, creating one", $imapid));
// folderId to folderImap mapping
$this->permanentStorage->fmFidFimap = array();
// folderImap to folderId mapping
$this->permanentStorage->fmFimapFid = array();
// folderImap to folderId mapping - lowercase
$this->permanentStorage->fmFimapFidLowercase = array();
$this->GetFolderList(); $this->GetFolderList();
} }
@ -2126,24 +2133,24 @@ class BackendIMAP extends BackendDiff implements ISearchProvider {
// generate folderid and add it to the mapping // generate folderid and add it to the mapping
$folderid = sprintf('%04x%04x', mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff )); $folderid = sprintf('%04x%04x', mt_rand( 0, 0xffff ), mt_rand( 0, 0xffff ));
// folderId to folderImap mapping // // folderId to folderImap mapping
if (!isset($this->permanentStorage->fmFidFimap)) // if (!isset($this->permanentStorage->fmFidFimap))
$this->permanentStorage->fmFidFimap = array(); // $this->permanentStorage->fmFidFimap = array();
$a = $this->permanentStorage->fmFidFimap; $a = $this->permanentStorage->fmFidFimap;
$a[$folderid] = $imapid; $a[$folderid] = $imapid;
$this->permanentStorage->fmFidFimap = $a; $this->permanentStorage->fmFidFimap = $a;
// folderImap to folderid mapping // // folderImap to folderid mapping
if (!isset($this->permanentStorage->fmFimapFid)) // if (!isset($this->permanentStorage->fmFimapFid))
$this->permanentStorage->fmFimapFid = array(); // $this->permanentStorage->fmFimapFid = array();
$b = $this->permanentStorage->fmFimapFid; $b = $this->permanentStorage->fmFimapFid;
$b[$imapid] = $folderid; $b[$imapid] = $folderid;
$this->permanentStorage->fmFimapFid = $b; $this->permanentStorage->fmFimapFid = $b;
if (!isset($this->permanentStorage->fmFimapFidLowercase)) // if (!isset($this->permanentStorage->fmFimapFidLowercase))
$this->permanentStorage->fmFimapFidLowercase = array(); // $this->permanentStorage->fmFimapFidLowercase = array();
$c = $this->permanentStorage->fmFimapFidLowercase; $c = $this->permanentStorage->fmFimapFidLowercase;
$c[strtolower($imapid)] = $folderid; $c[strtolower($imapid)] = $folderid;