Changeset 407

Show
Ignore:
Timestamp:
07/09/09 05:13:23 (12 years ago)
Author:
kovell
Message:

Feed syndication supports http password protected sites (by Icebreaker)

Location:
dev
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • dev/common/admin/admin_feedsyndication.php

    r390 r407  
    1919$page->setCachable(false); 
    2020$page->setAdmin(); 
    21  
    22 $validurl = "/^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}((:[0-9]{1,5})?\/.*)?$/i"; 
     21$validurl = "/^(http|https):\/\/([A-Za-z0-9_]{1,8}(:[A-Za-z0-9_]{1,8})?@)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}((:[0-9]{1,5})?\/.*)?$/i"; 
    2322$html .= "<script language=\"JavaScript\">function checkAll(checkname, exby) {for (i = 0; i < checkname.length; i++)checkname[i].checked = exby.checked? true:false}</script>"; 
    2423$html .= "<table class=kb-subtable>"; 

  • dev/common/includes/class.http.php

    r191 r407  
    104104                          .'Host: '.$this->url['host'].$lf 
    105105                          .'Connection: close'.$lf; 
     106                if (0 &&count($this->url['user']) && count($this->url['pass'])) 
     107                { 
     108                        $base64 = base64_encode($this->url['user'].':'.$this->url['pass']); 
     109                        $request_string .=      'Authorization: Basic '.$base64.$lf.$lf; 
     110                } 
    106111        if (count($this->headers)) 
    107112        { 

  • dev/common/includes/globals.php

    r406 r407  
    77else 
    88{ 
    9         $svn_rev = '406'; 
     9        $svn_rev = '407'; 
    1010} 
    1111define('SVN_REV', $svn_rev); 

  • dev/cron/cron_fetcher.php

    r400 r407  
    3030$config = new Config(KB_SITE); 
    3131 
    32 $validurl = "/^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}((:[0-9]{1,5})?\/.*)?$/i"; 
     32$validurl = "/^(http|https):\/\/([A-Za-z0-9_]{1,8}(:[A-Za-z0-9_]{1,8})?@)?[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}((:[0-9]{1,5})?\/.*)?$/i"; 
    3333 
    3434// load the config from the database