Changeset 1595 for branches

Show
Ignore:
Timestamp:
10/04/06 06:55:02 (2 years ago)
Author:
mdodoo
Message:

Partial sync with trunk. Only up to changeset [1542].

Location:
branches/multiuser
Files:
21 modified

Legend:

Unmodified
Added
Removed

  • branches/multiuser/admin/channels.php

    r1530 r1595  
    9898    $sql = "select " 
    9999           ." c.id, c.title, c.url, c.siteurl, d.name, c.descr, c.parent, c.icon, c.mode, c.daterefreshed " 
    100            ." from " .getTable("channels") ." c, " . getTable("folders") ." d " 
    101            ." where d.id = c.parent "; 
     100           ." from " .getTable("channels") ." c " 
     101           ." inner join " . getTable("folders") ." d " 
     102           ."   on d.id = c.parent "; 
    102103 
    103104    if (getConfig('rss.config.absoluteordering')) { 
    … …  
    123124        // get feed's tags 
    124125        $tags = ""; 
    125         $sql2 = "select t.id, t.tag from " . getTable('tag') . " t, " 
    126                 . getTable('metatag') . " m where t.id = m.tid " 
    127                 . "and m.ttype = 'channel' and m.fid = $id"; 
     126        $sql2 = "select t.id, t.tag from " . getTable('tag') . " t " 
     127                . "inner join " . getTable('metatag') . " m " 
     128                . "  on m.tid = t.id " 
     129                . "where m.ttype = 'channel' and m.fid = $id"; 
    128130        $res2 = rss_query($sql2); 
    129131 
    … …  
    747749 
    748750function channel_edit_form($cid) { 
    749     $sql = "select id, title, url, siteurl, parent, descr, icon, mode from " .getTable("channels") ." where id=$cid"; 
     751    $sql = "select id, title, url, siteurl, parent, descr, icon, mode, daterefreshed, dateadded from " .getTable("channels") ." where id=$cid"; 
    750752    $res = rss_query($sql); 
    751     list ($id, $title, $url, $siteurl, $parent, $descr, $icon,$mode) = rss_fetch_row($res); 
     753    list ($id, $title, $url, $siteurl, $parent, $descr, $icon, $mode, $daterefreshed, $dateadded) = rss_fetch_row($res); 
    752754    // get tags 
    753     $sql = "select t.tag from " . getTable('tag')." t, " . getTable('metatag') 
    754            . " m where t.id = m.tid and m.ttype = 'channel' and m.fid = $cid"; 
     755    $sql = "select t.tag from " . getTable('tag')." t "  
     756         . "  inner join " . getTable('metatag') . " m " 
     757         . "    on m.tid = t.id " 
     758         . "where m.ttype = 'channel' and m.fid = $cid"; 
    755759    $res = rss_query($sql); 
    756760    $tags = ""; 
    … …  
    763767 
    764768    echo "<form method=\"post\" action=\"" .$_SERVER['PHP_SELF'] ."#fa$cid\" id=\"channeledit\">\n"; 
    765     echo "<fieldset id=\"channeleditfs\">" 
    766     ."<p>"; 
     769    echo "<fieldset id=\"channeleditfs\">"; 
     770    // Timestamps 
     771    if(!empty($daterefreshed)) { 
     772      echo "<p><label>" . LBL_ADDED . ": " . date("M-d-Y H:i", strtotime($dateadded)) . "</label></p>" 
     773                    ."<p><label>" . LBL_LAST_UPDATE . ": ".date("M-d-Y H:i", strtotime($daterefreshed))."</label></p>\n"; 
     774    } else { 
     775      echo "<p><label>" . LBL_ADDED . ": " . date("M-d-Y H:i", strtotime($dateadded)) . "</label></p>" 
     776                    ."<p><label>" . LBL_LAST_UPDATE . ": " . LBL_FOOTER_LAST_MODIF_NEVER . "</label></p>\n"; 
     777    } 
    767778    // Item name 
    768     echo "<label for=\"c_name\">". LBL_ADMIN_CHANNEL_NAME ."</label>\n" 
     779    echo "<p><label for=\"c_name\">". LBL_ADMIN_CHANNEL_NAME ."</label>\n" 
    769780    ."<input type=\"text\" id=\"c_name\" name=\"c_name\" value=\"$title\" />" 
    770781    ."<input type=\"hidden\" name=\"".CST_ADMIN_DOMAIN."\" value=\"". CST_ADMIN_DOMAIN_CHANNEL."\" />\n" 

  • branches/multiuser/admin/items.php

    r1530 r1595  
    9696                break; 
    9797            } 
    98             $sql = " from ".getTable('item') ." i INNER JOIN " .getTable('channels') . " c ON c.id=i.cid " 
     98            $sql = " from ".getTable('item') ." i inner join " .getTable('channels') . " c on c.id=i.cid " 
    9999                   ." where 1=1 "; 
    100100 
    … …  
    131131                    } 
    132132 
    133                     $tsql = " select distinct fid from ". getTable('metatag') . " m, " 
    134                             . getTable('tag') . " t" 
    135                             ." where m.tid=t.id and t.tag in ('" 
     133                    $tsql = " select distinct fid from ". getTable('metatag') . " m " 
     134                            . " inner join " . getTable('tag') . " t" 
     135                            . "   on t.id = m.tid " 
     136                            . " where t.tag in ('" 
    136137                            . implode("', '", $trimmed_exclude_tags) ."')"; 
    137138                } 
    … …  
    151152                //delete the tags for these items 
    152153                $sqlids = "select distinct i.id,i.cid " . $sql 
    153                           . " and i.cid=c.id order by i.cid, i.id desc"; 
     154                          . " order by i.cid, i.id desc"; 
    154155 
    155156 

  • branches/multiuser/cls/channels.php

    r1541 r1595  
    9090            //$this->rlink = getPath().preg_replace("/[^a-zA-Z0-9_]/", "_", $title)."/"; 
    9191            /* EXPERIMENTAL! */ 
    92             $this->rlink = getPath() . utf8_uri_encode(preg_replace('/[\s&\/]/','_',$title)) . "/"; 
     92            $this->rlink = getPath() . utf8_uri_encode(preg_replace('/[\s&\/\+]/','_',$title)) . "/"; 
    9393        } else { 
    9494            $this->rlink = getPath()."feed.php?channel=$id"; 

  • branches/multiuser/cls/wrappers/item.php

    r1493 r1595  
    7272    return $url; 
    7373  } 
    74   return rss_item_pl_url(); 
     74  return "http://" . $_SERVER['HTTP_HOST'] . rss_item_pl_url(); 
    7575} 
    7676 

  • branches/multiuser/extlib/rss_dbcache.inc

    r1353 r1595  
    148148            return $cid; // should always be positive 
    149149        } else { 
     150            if ( MAGPIE_DEBUG ) { 
    150151            $this->error("Cache unable translate to cid: $url"); 
    151             return 0; 
     152          } 
     153          return 0; 
    152154        } 
    153155    } 

  • branches/multiuser/intl/cn_s.php

    r1530 r1595  
    334334读的条目做)'); 
    335335define ('LBL_FLAG','已标记'); 
    336  
     336define ('LBL_ADDED', 'Added'); 
    337337?> 

  • branches/multiuser/intl/cn_t.php

    r1493 r1595  
    336336define ('LBL_STATE_FLAG','暙蚘 (為最埌閱讀的條目做)'); 
    337337define ('LBL_FLAG','已暙蚘'); 
    338  
     338define ('LBL_ADDED', 'Added'); 
    339339?> 

  • branches/multiuser/intl/de.php

    r1502 r1595  
    295295define ('LBL_MARK_FOLDER_READ_ALL',"Markiere diesen Ordner als gelesen"); 
    296296define ('LBL_MARK_CATEGORY_READ_ALL',"Markiere diese Kategorie als gelesen"); 
     297define ('LBL_ADDED', 'Added'); 
    297298?> 

  • branches/multiuser/intl/dk.php

    r1493 r1595  
    293293define ('LBL_MARK_FOLDER_READ_ALL',"Mark This Folder as Read"); 
    294294define ('LBL_MARK_CATEGORY_READ_ALL',"Mark This Category as Read"); 
     295define ('LBL_ADDED', 'Added'); 
    295296?> 

  • branches/multiuser/intl/en.php

    r1533 r1595  
    293293.' href="http://plugins.gregarius.net/">Plugin Repository</a>.</p>'); 
    294294 
    295 define ('LBL_LAST_UPDATE','Last update'); 
     295define ('LBL_LAST_UPDATE','Last Update'); 
    296296define ('LBL_ADMIN_DOMAIN_THEMES_LBL','themes'); 
    297297define ('LBL_ADMIN_THEMES','Themes'); 
    … …  
    304304define ('LBL_STATE_FLAG','Flag (Flags an item for later reading)'); 
    305305define ('LBL_FLAG','Flagged'); 
     306define ('LBL_ADDED', 'Added'); 
    306307 
    307308define('LBL_ADMIN_USERS','Users'); 

  • branches/multiuser/intl/es.php

    r1502 r1595  
    296296define ('LBL_STATE_FLAG','Marca (Marca un item para leerlo m&aacute;s tarde)'); 
    297297define ('LBL_FLAG','Marcado'); 
     298define ('LBL_ADDED', 'Added'); 
    298299?> 

  • branches/multiuser/intl/fr.php

    r1493 r1595  
    299299define ('LBL_MARK_FOLDER_READ_ALL',"Marquer ce r&eacute;pertoire comme lu"); 
    300300define ('LBL_MARK_CATEGORY_READ_ALL',"Marquer cette cat&eacute;gorie comme lu"); 
     301define ('LBL_ADDED', 'Added'); 
    301302?> 

  • branches/multiuser/intl/he.php

    r1493 r1595  
    300300define ('LBL_STATE_FLAG','אח׹ כך (סמן ךשומה לק׹יאה אח׹ כך)'); 
    301301define ('LBL_FLAG','אח׹ כך'); 
     302define ('LBL_ADDED', 'Added'); 
    302303 
    303304?> 

  • branches/multiuser/intl/it.php

    r1502 r1595  
    304304define ('LBL_MARK_FOLDER_READ_ALL',"Marca tutti gli elementi di questa cartella come letti"); 
    305305define ('LBL_MARK_CATEGORY_READ_ALL',"Marca tutti gli elementi di questa categoria come letti"); 
     306define ('LBL_ADDED', 'Added'); 
    306307?> 

  • branches/multiuser/intl/ja.php

    r1502 r1595  
    316316define ('LBL_STATE_FLAG','フラグ(埌で読むために蚘事にフラグを぀ける)'); 
    317317define ('LBL_FLAG','フラグが぀いおいたす'); 
     318define ('LBL_ADDED', 'Added'); 
    318319 
    319320?> 

  • branches/multiuser/intl/pt_BR.php

    r1502 r1595  
    298298define ('LBL_MARK_FOLDER_READ_ALL',"Marcar esta pasta como lida"); 
    299299define ('LBL_MARK_CATEGORY_READ_ALL',"Marcar esta categoria como lida"); 
     300define ('LBL_ADDED', 'Added'); 
    300301?> 

  • branches/multiuser/intl/pt_PT.php

    r1493 r1595  
    311311define ('LBL_STATE_FLAG','Marcar (Marca um item para leitura posterior)'); 
    312312define ('LBL_FLAG','Marcado'); 
     313define ('LBL_ADDED', 'Added'); 
    313314 
    314315?> 

  • branches/multiuser/intl/ru.php

    r1493 r1595  
    317317 
    318318define ('LBL_MARK_CATEGORY_READ_ALL',"Mark This Category as Read"); 
     319define ('LBL_ADDED', 'Added'); 
    319320?> 

  • branches/multiuser/intl/sv.php

    r1493 r1595  
    310310define ('LBL_MARK_FOLDER_READ_ALL',"Mark This Folder as Read"); 
    311311define ('LBL_MARK_CATEGORY_READ_ALL',"Mark This Category as Read"); 
     312define ('LBL_ADDED', 'Added'); 
    312313?> 

  • branches/multiuser/plugins/urlfilter.php

    r1513 r1595  
    3131/// Author: Marco Bonetti 
    3232/// Description: This plugin will try to make ugly URL links look better 
    33 /// Version: 1.7 
     33/// Version: 1.8 
    3434 
    3535/** 
    … …  
    4040    $match = '#<a[^>]+?href="(.*?)">\\1</a>#im'; 
    4141    // matches non-linkified URLs 
    42     $match2 = '#[^>"\'](http[^\s$]+)[\s$]?#im'; 
     42    $match2 = '#[^>"\'/=\?](http[^\s$]+)[\s$]?#im'; 
    4343    $ret= preg_replace_callback($match, '__filter_callback', $in); 
    4444    $ret2= preg_replace_callback($match2,'__filter_callback', $ret); 

  • branches/multiuser/util.php

    r1530 r1595  
    540540            $sql = "insert into ".getTable("channels") 
    541541                   ." (title, url, siteurl, parent, descr, dateadded, icon, position, mode, daterefreshed)" 
    542                    ." values ('$title', '$urlDB', '$siteurl', $folderid, '$descr', now(), '$icon', $np, $mode, 1)"; 
     542                   ." values ('$title', '$urlDB', '$siteurl', $folderid, '$descr', now(), '$icon', $np, $mode, '0000-00-00 00:00:00')"; 
    543543 
    544544            rss_query($sql);