Fix ampersand and apostrophe issue

Author: edit4ever

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.module.zap2xml"
        name="zap2xml"
-       version="0.6.5"
+       version="0.6.6"
        provider-name="edit4ever">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>

bin/tv_grab_zap2xml

@@ -51,7 +51,7 @@ do case "$1" in
      ;;
 
    -v | --version )
-     printf "0.6.5\n"
+     printf "0.6.6\n"
      ;;
 
    -c | --capabilities )

default.py

@@ -20,4 +20,5 @@
 import xbmcgui
 
 dialog = xbmcgui.Dialog()
-dialog.ok('', 'This is addon runs from within Tvheadend')
+if dialog.yesno('This is addon runs from within Tvheadend', 'Add your zap2it/screener/tvguide login info in the addon configuration.  Reboot and setup the grabber in tvheadend before enabling the other options.'):
+    xbmc.executebuiltin(Addon.OpenSettings())

zap2xml.py

@@ -1252,9 +1252,9 @@ def enc(strng):
     if "-E" not in options:
         t = unicode(BeautifulStoneSoup(t, convertEntities=BeautifulStoneSoup.ALL_ENTITIES))
         t = re.sub(" \'","\'",t)           #needed to fix screener guide listing error - '
-        t = re.sub("&","&",t)
+#        t = re.sub("&","&",t)
         t = re.sub("\"",""",t)
-        t = re.sub("\'","'",t)
+#        t = re.sub("\'","'",t)
         t = re.sub("<","&lt;",t)
         t = re.sub(">","&gt;",t)
         t = re.sub("``","&quot;",t)             #needed to fix screener guide listing errors