Changeset 21736222d28bb65d6716bbc27adaf3e4d6eb94bc

Show
Ignore:
Timestamp:
03/24/08 11:47:30 (10 months ago)
Author:
KRKeegan <-NOSPAM-kevin@krkeegan.com>
git-committer:
KRKeegan <-NOSPAM-kevin@krkeegan.com> 1206377250 -0700
git-parent:

[3bff7f3b2f7f068949d58c1eeca23c081dbbe428]

git-author:
KRKeegan <-NOSPAM-kevin@krkeegan.com> 1206377250 -0700
Message:

Fix no folder in query bug

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • plugins/admin/admin.py

    r3bff7f3 r2173622  
    328328                else: 
    329329                    togo_path = "" 
     330        folder = '' 
     331        if 'Folder' in query: 
     332            folder += str(query['Folder'][0]) 
    330333        if tivo_mak != "" and togo_path != "": 
    331334            parse_url = urlparse(str(query['Url'][0])) 
     
    346349            t.container = cname 
    347350            t.time = '3' 
    348             t.url = '/TiVoConnect?Command=NPL&Container=' + cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + query['Folder'][0] 
     351            t.url = '/TiVoConnect?Command=NPL&Container=' + cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + folder 
    349352            t.text = '<h3>Transfer Initiated.</h3>  <br>You selected transfer has been initiated.'+\ 
    350                      '<br> The <a href="/TiVoConnect?Command=NPL&Container='+ cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + query['Folder'][0] +'"> ToGo</a> page will reload in 3 seconds.' 
     353                     '<br> The <a href="/TiVoConnect?Command=NPL&Container='+ cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + folder +'"> ToGo</a> page will reload in 3 seconds.' 
    351354            handler.wfile.write(t) 
    352355        else: 
     
    356359            t.container = cname 
    357360            t.time = '10' 
    358             t.url = '/TiVoConnect?Command=NPL&Container=' + cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + query['Folder'][0] 
     361            t.url = '/TiVoConnect?Command=NPL&Container=' + cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + folder 
    359362            t.text = '<h3>Missing Data.</h3>  <br>You must set both "tivo_mak" and "togo_path" before using this function.'+\ 
    360                      '<br> The <a href="/TiVoConnect?Command=NPL&Container='+ cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + query['Folder'][0] +'"> ToGo</a> page will reload in 10 seconds.' 
     363                     '<br> The <a href="/TiVoConnect?Command=NPL&Container='+ cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + folder +'"> ToGo</a> page will reload in 10 seconds.' 
    361364            handler.wfile.write(t) 
    362365 
     
    364367        parse_url = urlparse(str(query['Url'][0])) 
    365368        theurl = 'http://' + parse_url[1].split(':')[0] + parse_url[2] + "?" + parse_url[4] 
     369        folder = '' 
     370        if 'Folder' in query: 
     371            folder += str(query['Folder'][0]) 
    366372         
    367373        status[theurl]['running'] = False 
     
    374380        t.container = cname 
    375381        t.time = '3' 
    376         t.url = '/TiVoConnect?Command=NPL&Container=' + cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + query['Folder'][0] 
     382        t.url = '/TiVoConnect?Command=NPL&Container=' + cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + folder 
    377383        t.text = '<h3>Transfer Stopped.</h3>  <br>Your transfer has been stopped.'+\ 
    378                  '<br> The <a href="/TiVoConnect?Command=NPL&Container='+ cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + query['Folder'][0] +'"> ToGo</a> page will reload in 3 seconds.' 
     384                 '<br> The <a href="/TiVoConnect?Command=NPL&Container='+ cname + '&TiVo=' + query['TiVo'][0] + '&Folder=' + folder +'"> ToGo</a> page will reload in 3 seconds.' 
    379385        handler.wfile.write(t) 
    380386