Changeset 1401 in ExiteCMS


Ignore:
Timestamp:
05/15/08 15:10:13 (4 years ago)
Author:
hverton
Message:

fixed typo in the color BBcode parser
fixed failure in parsing URL BBcode when it had a WikiLink match in the URL
fixed bug in groupaccess() causing a query failure for webmasters
fixed not setting the last login date when confirming a registration (which auto logs in the user)
added a "View Posts" button to the forum index and the thread index pages, which gives you a flat list (newest first) with a search option

Location:
trunk
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/files/locales/en.main.global.php

    r1367 r1401  
    33// locale       : English 
    44// locale name  : main.global 
    5 // generated on : Wed Mar 12 2008, 22:22:12 CET 
     5// generated on : Thu May 15 2008, 14:39:50 CEST 
    66// translators  : ExiteCMS team,WanWizard 
    77// ---------------------------------------------------------- 
    … …  
    2828$locale['026'] = "My Recent Threads"; 
    2929$locale['027'] = "My Recent Posts"; 
     30$locale['027a'] = "All Posts"; 
    3031$locale['028'] = "New Posts"; 
    3132$locale['029'] = "Latest News"; 
    … …  
    8081$locale['083'] = "CMS Administration"; 
    8182$locale['084'] = "Logout"; 
    82 $locale['085'] = "%u private "; 
    83 $locale['086'] = "message"; 
    84 $locale['087'] = "messages"; 
    85 $locale['088'] = "post"; 
    86 $locale['089'] = "posts"; 
    87 $locale['090'] = "%u new forum "; 
     83$locale['085'] = "%u private message"; 
     84$locale['086'] = "%u private messages"; 
     85$locale['087'] = "?"; 
     86$locale['088'] = "%u new forum post"; 
     87$locale['089'] = "%u new forum posts"; 
     88$locale['090'] = "Posts"; 
    8889$locale['091'] = "Mark all read"; 
    8990$locale['100'] = "Member Poll"; 

  • trunk/files/locales/en.main.setup.php

    r1367 r1401  
    33// locale       : English 
    44// locale name  : main.setup 
    5 // generated on : Wed Mar 12 2008, 22:22:01 CET 
     5// generated on : Thu May 15 2008, 14:41:03 CEST 
    66// translators  : ExiteCMS team,WanWizard 
    77// ---------------------------------------------------------- 

  • trunk/includes/core_functions.php

    r1359 r1401  
    603603     
    604604    $text = preg_replace('#\[small\](.*?)\[/small\]#si', '<span class=\'small\'>\1</span>', $text); 
    605     $text = preg_replace('#\[color=(\#[0-9a-fA-F]{6}|black|blue|brown|cyan|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|violet|white|yellow)\](.*?)\[/color\]#si', '<span style=\'color:\1\'>\2</span>', $text); 
     605    $text = preg_replace('#\[color=(\#[0-9a-fA-F]{6}|black|blue|brown|cyan|grey|green|lime|maroon|navy|olive|orange|purple|red|silver|violet|white|yellow)\](.*?)\[/color\]#si', '<span style=\'color:\1\'>\2</span>', $text); 
    606606     
    607607    $text = preg_replace('#\[flash width=([0-9]*?) height=([0-9]*?)\]([^\s\'\";:\+]*?)(\.swf)\[/flash\]#si', '<object classid=\'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\' codebase=\'http://active.macromedia.com/flash6/cabs/swflash.cab#version=6,0,0,0\' id=\'\3\4\' width=\'\1\' height=\'\2\'><param name=movie value=\'\3\4\'><param name=\'quality\' value=\'high\'><param name=\'bgcolor\' value=\'#ffffff\'><embed src=\'\3\4\' quality=\'high\' bgcolor=\'#ffffff\' width=\'\1\' height=\'\2\' type=\'application/x-shockwave-flash\' pluginspage=\'http://www.macromedia.com/go/getflashplayer\'></embed></object>', $text); 

  • trunk/includes/forum_functions_include.php

    r1305 r1401  
    383383    if (strlen($rawmsg)) $message .= $rawmsg; 
    384384 
    385     // find remaining URL's in the text, and convert them to a href as well 
    386     $pattern = '#(^|[^\"=]{1})(https?://|ftp://|mailto:|news:)([^(,\s<>\[\]\)]+)([,\s\n<>\)]|$)#sme'; 
    387     $message = preg_replace($pattern,"'$1<a href=\'$2$3\' target=\'_blank\'>'.shortenlink('$2$3',83).'</a>$4'",$message); 
    388     // re-insert the saved url blocks 
    389     foreach($urlblocks as $urlblock) { 
    390         // find the first placeholder 
    391         $i = strpos($message, "{@@**@@}"); 
    392         $message = substr($message, 0, $i).$urlblock.substr($message, $i+8); 
    393     } 
    394  
    395385    // detect and convert wikitags to wiki bbcodes if needed 
    396386    if (isset($settings['wiki_forum_links'])  && $settings['wiki_forum_links']) { 
    … …  
    405395        $message = preg_replace($search, $replace, $message); 
    406396    } 
     397 
     398    // find remaining URL's in the text, and convert them to a href as well 
     399    $pattern = '#(^|[^\"=]{1})(https?://|ftp://|mailto:|news:)([^(,\s<>\[\]\)]+)([,\s\n<>\)]|$)#sme'; 
     400    $message = preg_replace($pattern,"'$1<a href=\'$2$3\' target=\'_blank\'>'.shortenlink('$2$3',83).'</a>$4'",$message); 
     401    // re-insert the saved url blocks 
     402    foreach($urlblocks as $urlblock) { 
     403        // find the first placeholder 
     404        $i = strpos($message, "{@@**@@}"); 
     405        $message = substr($message, 0, $i).$urlblock.substr($message, $i+8); 
     406    } 
     407 
    407408    // parse the smileys in the message 
    408409    if ($smileys) $message = parsesmileys($message); 

  • trunk/includes/templates/forum.index.tpl

    r960 r1401  
    131131            <img src='{$smarty.const.THEME}images/folder.gif' alt='{$locale.561}' style='vertical-align:middle;' /> - {$locale.410} 
    132132        </td> 
     133        <td class='forum' style='vertical-align:bottom;'> 
     134            {buttonlink name=$locale.414 link="viewposts.php"} 
     135        </td> 
    133136        <td align='right' valign='bottom' class='forum'> 
    134137            <form name='searchform' method='post' action='{$smarty.const.BASEDIR}search.php?stype=f'> 

  • trunk/includes/templates/forum.viewforum.tpl

    r1195 r1401  
    192192            {/if} 
    193193        </td> 
    194         {if $smarty.const.iMEMBER && $user_can_post} 
    195             <td align='right'> 
    196             {if $unread_posts} 
    197                 {buttonlink name=$locale.573 link="viewforum.php?action=markallread&amp;forum_id="|cat:$forum_id} 
    198             {/if} 
    199             {buttonlink name=$locale.566 link="post.php?action=newthread&amp;forum_id="|cat:$forum_id} 
    200             </td> 
    201         {/if} 
     194        <td align='right'> 
     195            {buttonlink name=$locale.414 link="viewposts.php?forum_id="|cat:$forum_id} 
     196            {if $smarty.const.iMEMBER && $user_can_post} 
     197                {if $unread_posts} 
     198                    {buttonlink name=$locale.573 link="viewforum.php?action=markallread&amp;forum_id="|cat:$forum_id} 
     199                {/if} 
     200                {buttonlink name=$locale.566 link="post.php?action=newthread&amp;forum_id="|cat:$forum_id} 
     201            {/if} 
     202        </td> 
    202203    </tr> 
    203204</table> 

  • trunk/includes/user_functions.php

    r1352 r1401  
    361361 
    362362    if (iSUPERADMIN) {  
    363         $res .= ($hidden == false?" AND ":"")."($field != '100'"; 
     363        $res .= ($res != ""?" AND ":"")."$field != '100'"; 
     364        return $res; 
    364365    } elseif ($userdata['user_level'] >= 102) {  
    365366        $res .= ($hidden == false?" AND ":"")."($field='0' OR $field='101' OR $field='102'"; 

  • trunk/register.php

    r1360 r1401  
    3838            $user_info = unserialize($data['user_info']); 
    3939            $activation = $settings['admin_activation'] == "1" ? "2" : "0"; 
    40             $result = dbquery("INSERT INTO ".$db_prefix."users (user_name, user_fullname, user_password, user_email, user_hide_email, user_location, user_birthdate, user_aim, user_icq, user_msn, user_yahoo, user_web, user_theme, user_offset, user_avatar, user_sig, user_posts, user_joined, user_lastvisit, user_ip, user_rights, user_groups, user_level, user_status, user_newsletters) VALUES('".$user_info['user_name']."', '".$user_info['user_fullname']."', '".md5(md5($user_info['user_password']))."', '".$user_info['user_email']."', '".$user_info['user_hide_email']."', '', '0000-00-00', '', '', '', '', '', 'Default', '".$user_info['user_offset']."', '', '', '0', '".time()."', '0', '".USER_IP."', '', '', '101', '$activation', '1')"); 
     40            $result = dbquery("INSERT INTO ".$db_prefix."users (user_name, user_fullname, user_password, user_email, user_hide_email, user_location, user_birthdate, user_aim, user_icq, user_msn, user_yahoo, user_web, user_theme, user_offset, user_avatar, user_sig, user_posts, user_joined, user_lastvisit, user_ip, user_rights, user_groups, user_level, user_status, user_newsletters) VALUES('".$user_info['user_name']."', '".$user_info['user_fullname']."', '".md5(md5($user_info['user_password']))."', '".$user_info['user_email']."', '".$user_info['user_hide_email']."', '', '0000-00-00', '', '', '', '', '', 'Default', '".$user_info['user_offset']."', '', '', '0', '".time()."', '".time()."', '".USER_IP."', '', '', '101', '$activation', '1')"); 
    4141            $result = dbquery("DELETE FROM ".$db_prefix."new_users WHERE user_code='$activate'");    
    4242            if ($settings['admin_activation'] == "1") { 
Note: See TracChangeset for help on using the changeset viewer.