oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rev116, Fix websocket error when writing invalid files on not-owned sites, Fix for stucked notification icon after shutdown

Browse source
This commit is contained in:
HelloZeroNet 2015-04-21 00:35:34 +02:00
parent dc4292e1e3
commit f576527986
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -24,6 +24,7 @@ Decentralized websites using Bitcoin crypto and the BitTorrent network
* Tor network support * Tor network support
* Automatic, uPnP port opening * Automatic, uPnP port opening
* Plugin for multiuser (openproxy) support * Plugin for multiuser (openproxy) support
* Works with any browser/OS
## How does it work? ## How does it work?

2
plugins/Trayicon/lib/notificationicon.py
View file

@ -653,7 +653,7 @@ class NotificationIcon(object):
print "Icon thread stopped, removing icon..." print "Icon thread stopped, removing icon..."
#KillTimer(self._hwnd, self._timerid) #KillTimer(self._hwnd, self._timerid)
Shell_NotifyIcon(NIM_DELETE, ctypes.pointer(iconinfo)) Shell_NotifyIcon(NIM_DELETE, ctypes.cast(ctypes.pointer(iconinfo), ctypes.POINTER(NOTIFYICONDATA)))
ctypes.windll.user32.DestroyWindow(self._hwnd) ctypes.windll.user32.DestroyWindow(self._hwnd)
ctypes.windll.user32.DestroyIcon(self._hicon) ctypes.windll.user32.DestroyIcon(self._hicon)

2
src/Config.py
View file

@ -4,7 +4,7 @@ import ConfigParser
class Config(object): class Config(object):
def __init__(self): def __init__(self):
self.version = "0.2.9" self.version = "0.2.9"
self.rev = 115 self.rev = 116
self.parser = self.createArguments() self.parser = self.createArguments()
argv = sys.argv[:] # Copy command line arguments argv = sys.argv[:] # Copy command line arguments
argv = self.parseConfig(argv) # Add arguments from config file argv = self.parseConfig(argv) # Add arguments from config file

4
src/Content/ContentManager.py
View file

@ -111,7 +111,9 @@ class ContentManager:
def getIncludeInfo(self, inner_path): def getIncludeInfo(self, inner_path):
if not inner_path.endswith("content.json"): # Find the files content.json first if not inner_path.endswith("content.json"): # Find the files content.json first
inner_path = self.getFileInfo(inner_path)["content_inner_path"] file_info = self.getFileInfo(inner_path)
if not file_info: return False # File not found
inner_path = file_info["content_inner_path"]
dirs = inner_path.split("/") # Parent dirs of content.json dirs = inner_path.split("/") # Parent dirs of content.json
inner_path_parts = [dirs.pop()] # Filename relative to content.json inner_path_parts = [dirs.pop()] # Filename relative to content.json
inner_path_parts.insert(0, dirs.pop()) # Dont check in self dir inner_path_parts.insert(0, dirs.pop()) # Dont check in self dir