Changeset 1885 in ExiteCMS


Ignore:
Timestamp:
10/20/08 00:59:18 (3 years ago)
Author:
hverton
Message:

removed the v7.1 batch upgrade module. Not needed for v7.2
fixed lots of small issues that surfaced while testing installation and upgrades of v7.2
several small layout and consistency fixes

Location:
trunk
Files:
1 deleted
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/administration/articles.php

    r1158 r1885  
    7474    // if not, ask the user to define those first 
    7575    $variables['message'] = $locale['518']."<br />".$locale['519']."<br /><a href='article_cats.php".$aidlink."'>".$locale['520']."</a>".$locale['521']; 
    76     $variables['bold'] = true; 
    7776    $template_panels[] = array('type' => 'body', 'name' => 'admin.article.no_cats', 'title' => $locale['517'], 'template' => '_message_table_panel.tpl', 'locale' => "admin.news-articles"); 
    7877    $template_variables['admin.article.no_cats'] = $variables; 

  • trunk/administration/downloads.php

    r1530 r1885  
    118118} 
    119119 
    120 $result = dbquery("SELECT * FROM ".$db_prefix."download_cats LIMIT 1"); 
    121 if (dbrows($result) != 0) { 
    122     $variables['cats_found'] = true;     
    123     if ($step == "delete") { 
    124         $result = dbquery("DELETE FROM ".$db_prefix."downloads WHERE download_id='$download_id'"); 
    125         if (dbcount("(*)", "downloads", "download_cat=$download_cat_id") == 0) { 
    126             redirect(FUSION_SELF.$aidlink."&cat_locale=$cat_locale"); 
    127         } else { 
    128             redirect(FUSION_SELF.$aidlink."&download_cat_id=$download_cat_id&cat_locale=$cat_locale"); 
    129         } 
    130     } 
    131     if (isset($_POST['save_download'])) { 
    132         $download_title = stripinput($_POST['download_title']); 
    133         $download_description = addslash($_POST['download_description']); 
    134         $download_url = stripinput($_POST['download_url']); 
    135         $download_external = (isset($_POST['download_external']) && isNum($_POST['download_external'])) ? $_POST['download_external'] : 0; 
    136         $download_license = stripinput($_POST['download_license']); 
    137         $download_os = stripinput($_POST['download_os']); 
    138         $download_version = stripinput($_POST['download_version']); 
    139         $download_filesize = stripinput($_POST['download_filesize']); 
    140         if ($step == "edit") { 
    141             $download_datestamp = isset($_POST['update_datestamp']) ? ", download_datestamp='".time()."'" : ""; 
    142             $result = dbquery("UPDATE ".$db_prefix."downloads SET download_title='$download_title', download_description='$download_description', download_url='$download_url', download_cat='$download_cat', download_license='$download_license', download_os='$download_os', download_version='$download_version', download_filesize='$download_filesize'".$download_datestamp.",download_external='".$download_external."' WHERE download_id='$download_id'"); 
    143             redirect(FUSION_SELF.$aidlink."&download_cat_id=$download_cat&cat_locale=$cat_locale"); 
    144         } else { 
    145             $result = dbquery("INSERT INTO ".$db_prefix."downloads (download_title, download_description, download_url, download_cat, download_license, download_os, download_version, download_filesize, download_datestamp, download_count, download_external) VALUES ('$download_title', '$download_description', '$download_url', '$download_cat', '$download_license', '$download_os', '$download_version', '$download_filesize', '".time()."', '0', '$download_external')"); 
    146             redirect(FUSION_SELF.$aidlink."&download_cat_id=$download_cat&cat_locale=$cat_locale"); 
    147         } 
    148     } 
     120$variables['cats_found'] = true;     
     121if ($step == "delete") { 
     122    $result = dbquery("DELETE FROM ".$db_prefix."downloads WHERE download_id='$download_id'"); 
     123    if (dbcount("(*)", "downloads", "download_cat=$download_cat_id") == 0) { 
     124        redirect(FUSION_SELF.$aidlink."&cat_locale=$cat_locale"); 
     125    } else { 
     126        redirect(FUSION_SELF.$aidlink."&download_cat_id=$download_cat_id&cat_locale=$cat_locale"); 
     127    } 
     128} 
     129if (isset($_POST['save_download'])) { 
     130    $download_title = stripinput($_POST['download_title']); 
     131    $download_description = addslash($_POST['download_description']); 
     132    $download_url = stripinput($_POST['download_url']); 
     133    $download_external = (isset($_POST['download_external']) && isNum($_POST['download_external'])) ? $_POST['download_external'] : 0; 
     134    $download_license = stripinput($_POST['download_license']); 
     135    $download_os = stripinput($_POST['download_os']); 
     136    $download_version = stripinput($_POST['download_version']); 
     137    $download_filesize = stripinput($_POST['download_filesize']); 
    149138    if ($step == "edit") { 
    150         $result = dbquery("SELECT * FROM ".$db_prefix."downloads WHERE download_id='$download_id'"); 
    151         $data = dbarray($result); 
    152         $download_title = $data['download_title']; 
    153         $download_description = stripslashes($data['download_description']); 
    154         $download_url = $data['download_url']; 
    155         $download_license = $data['download_license']; 
    156         $download_os = $data['download_os']; 
    157         $download_version = $data['download_version']; 
    158         $download_filesize = $data['download_filesize']; 
    159         $download_external = $data['download_external']; 
    160         $formaction = FUSION_SELF.$aidlink."&amp;step=edit&amp;download_cat_id=$download_cat_id&amp;download_id=$download_id"; 
    161         $title = $locale['470']; 
     139        $download_datestamp = isset($_POST['update_datestamp']) ? ", download_datestamp='".time()."'" : ""; 
     140        $result = dbquery("UPDATE ".$db_prefix."downloads SET download_title='$download_title', download_description='$download_description', download_url='$download_url', download_cat='$download_cat', download_license='$download_license', download_os='$download_os', download_version='$download_version', download_filesize='$download_filesize'".$download_datestamp.",download_external='".$download_external."' WHERE download_id='$download_id'"); 
     141        redirect(FUSION_SELF.$aidlink."&download_cat_id=$download_cat&cat_locale=$cat_locale"); 
    162142    } else { 
    163         $download_title = ""; 
    164         $download_description = ""; 
    165         $download_url = ""; 
    166         $download_license = ""; 
    167         $download_os = ""; 
    168         $download_version = ""; 
    169         $download_filesize = ""; 
    170         $download_external = 0; 
    171         $formaction = FUSION_SELF.$aidlink; 
    172         $title = $locale['471']; 
    173     } 
    174     $variables['cats'] = array(); 
    175     $variables['download_cats'] = array(); 
    176     $result2 = dbquery("SELECT * FROM ".$db_prefix."download_cats WHERE download_cat_id > 0 ".($where==""?"":("AND ".$where))." ORDER BY download_cat_id*10000+download_parent"); 
    177     while ($data2 = dbarray($result2)) { 
    178         $variables['download_cats'][$data2['download_cat_id']] = $data2['download_cat_name']; 
    179         $data2['selected'] = ($step == "edit" && $data['download_cat'] == $data2['download_cat_id']); 
    180         $variables['cats'][] = $data2; 
    181     } 
    182  
    183     // build the download tree 
    184     $variables['tree'] = array(); 
    185     $variables['tree'][] = array('node' => 'P', 'nestlevel' => -1, 'name' => $locale['455'], 'id' => 0); 
    186     // Download root first 
    187     $result = dbquery("SELECT * FROM ".$db_prefix."downloads WHERE download_cat = '0' ORDER BY download_id DESC"); 
    188     if ($rows = dbrows($result)) { 
    189         $row = 1; 
    190         while ($data = dbarray($result)) { 
    191             $variables['tree'][] = array('node' => 'D', 'first' => ($row == 1), 'last' => ($row == $rows), 'cat_id' => 0, 'url' => $data['download_url'], 'name' => $data['download_title'], 'id' => $data['download_id']); 
    192         } 
     143        $result = dbquery("INSERT INTO ".$db_prefix."downloads (download_title, download_description, download_url, download_cat, download_license, download_os, download_version, download_filesize, download_datestamp, download_count, download_external) VALUES ('$download_title', '$download_description', '$download_url', '$download_cat', '$download_license', '$download_os', '$download_version', '$download_filesize', '".time()."', '0', '$download_external')"); 
     144        redirect(FUSION_SELF.$aidlink."&download_cat_id=$download_cat&cat_locale=$cat_locale"); 
     145    } 
     146} 
     147if ($step == "edit") { 
     148    $result = dbquery("SELECT * FROM ".$db_prefix."downloads WHERE download_id='$download_id'"); 
     149    $data = dbarray($result); 
     150    $download_title = $data['download_title']; 
     151    $download_description = stripslashes($data['download_description']); 
     152    $download_url = $data['download_url']; 
     153    $download_license = $data['download_license']; 
     154    $download_os = $data['download_os']; 
     155    $download_version = $data['download_version']; 
     156    $download_filesize = $data['download_filesize']; 
     157    $download_external = $data['download_external']; 
     158    $formaction = FUSION_SELF.$aidlink."&amp;step=edit&amp;download_cat_id=$download_cat_id&amp;download_id=$download_id"; 
     159    $title = $locale['470']; 
     160} else { 
     161    $download_title = ""; 
     162    $download_description = ""; 
     163    $download_url = ""; 
     164    $download_license = ""; 
     165    $download_os = ""; 
     166    $download_version = ""; 
     167    $download_filesize = ""; 
     168    $download_external = 0; 
     169    $formaction = FUSION_SELF.$aidlink; 
     170    $title = $locale['471']; 
     171} 
     172$variables['cats'] = array(); 
     173$variables['download_cats'] = array(); 
     174$result2 = dbquery("SELECT * FROM ".$db_prefix."download_cats WHERE download_cat_id > 0 ".($where==""?"":("AND ".$where))." ORDER BY download_cat_id*10000+download_parent"); 
     175while ($data2 = dbarray($result2)) { 
     176    $variables['download_cats'][$data2['download_cat_id']] = $data2['download_cat_name']; 
     177    $data2['selected'] = ($step == "edit" && $data['download_cat'] == $data2['download_cat_id']); 
     178    $variables['cats'][] = $data2; 
     179} 
     180 
     181// build the download tree 
     182$variables['tree'] = array(); 
     183$variables['tree'][] = array('node' => 'P', 'nestlevel' => -1, 'name' => $locale['455'], 'id' => 0); 
     184 
     185// Download root first 
     186$result = dbquery("SELECT * FROM ".$db_prefix."downloads WHERE download_cat = '0' ORDER BY download_id DESC"); 
     187if ($rows = dbrows($result)) { 
     188    $row = 1; 
     189    while ($data = dbarray($result)) { 
     190        $variables['tree'][] = array('node' => 'D', 'first' => ($row == 1), 'last' => ($row == $rows), 'cat_id' => 0, 'url' => $data['download_url'], 'name' => $data['download_title'], 'id' => $data['download_id']); 
     191    } 
     192} else { 
     193    // no downloads in this category 
     194    $variables['tree'][] = array('node' => 'E', 'name' => $locale['505'], 'id' => 0); 
     195} 
     196// Then recurse through the download categories 
     197$result = dbquery("SELECT * FROM ".$db_prefix."download_cats WHERE download_cat_id > 0  ".($where==""?"":("AND ".$where))." AND download_parent = 0 ORDER BY download_datestamp DESC"); 
     198while($data = dbarray($result)) { 
     199    recurse_dc($data['download_cat_id'], 0); 
     200} 
     201 
     202// get all downloads from the database 
     203$variables['barfiles'] = array(); 
     204$result = dbquery("SELECT * FROM ".$db_prefix."downloads ORDER BY download_id DESC"); 
     205while($data = dbarray($result)) { 
     206    // skip all downloads from filtered categories 
     207    if (!isset($variables['download_cats'][$data['download_cat']])) continue; 
     208    if ($data['download_cat']) { 
     209        $data['download_cat_name'] = $variables['download_cats'][$data['download_cat']]; 
    193210    } else { 
    194         // no downloads in this category 
    195         $variables['tree'][] = array('node' => 'E', 'name' => $locale['505'], 'id' => 0); 
    196     } 
    197     // Then recurse through the download categories 
    198     $result = dbquery("SELECT * FROM ".$db_prefix."download_cats WHERE download_cat_id > 0  ".($where==""?"":("AND ".$where))." AND download_parent = 0 ORDER BY download_datestamp DESC"); 
    199     while($data = dbarray($result)) { 
    200         recurse_dc($data['download_cat_id'], 0); 
    201     } 
    202  
    203     // get all downloads from the database 
    204     $variables['barfiles'] = array(); 
    205     $result = dbquery("SELECT * FROM ".$db_prefix."downloads ORDER BY download_id DESC"); 
    206     while($data = dbarray($result)) { 
    207         // skip all downloads from filtered categories 
    208         if (!isset($variables['download_cats'][$data['download_cat']])) continue; 
    209         if ($data['download_cat']) { 
    210             $data['download_cat_name'] = $variables['download_cats'][$data['download_cat']]; 
    211         } else { 
    212             $data['download_cat_name'] = $locale['455']; 
    213         } 
    214         $variables['barfiles'][] = $data; 
    215     } 
    216  
    217     // template variables 
    218     $variables['step'] = $step; 
    219     $variables['formaction'] = $formaction.($cat_locale==""?"":("&amp;cat_locale=".$cat_locale)); 
    220     $variables['download_cat_id'] = $download_cat_id; 
    221     $variables['download_title'] = $download_title; 
    222     $variables['download_description'] = $download_description; 
    223     $variables['download_url'] = $download_url; 
    224     $variables['download_license'] = $download_license; 
    225     $variables['download_os'] = $download_os; 
    226     $variables['download_version'] = $download_version; 
    227     $variables['download_filesize'] = $download_filesize; 
    228     $variables['download_external'] = $download_external; 
    229  
    230 } else { 
    231     $title = $locale['500']; 
    232     $variables['cats_found'] = false;    
    233 } 
     211        $data['download_cat_name'] = $locale['455']; 
     212    } 
     213    $variables['barfiles'][] = $data; 
     214} 
     215 
     216// template variables 
     217$variables['step'] = $step; 
     218$variables['formaction'] = $formaction.($cat_locale==""?"":("&amp;cat_locale=".$cat_locale)); 
     219$variables['download_cat_id'] = $download_cat_id; 
     220$variables['download_title'] = $download_title; 
     221$variables['download_description'] = $download_description; 
     222$variables['download_url'] = $download_url; 
     223$variables['download_license'] = $download_license; 
     224$variables['download_os'] = $download_os; 
     225$variables['download_version'] = $download_version; 
     226$variables['download_filesize'] = $download_filesize; 
     227$variables['download_external'] = $download_external; 
    234228 
    235229// panel definitions 

  • trunk/administration/forums.php

    r1491 r1885  
    357357        $variables['cat_opts'] = array(); 
    358358        $result2 = dbquery("SELECT * FROM ".$db_prefix."forums WHERE forum_cat='0' ORDER BY forum_order"); 
     359        // disable the forum add/edit panel if no categories are present 
     360        if (dbrows($result2) == 0) $variables['show_forum_panel'] = false; 
    359361        while ($data2 = dbarray($result2)) { 
    360362            $data2['selected'] = ($action == "edit" && $t == "forum" && $data2['forum_id'] == $forum_cat); 

  • trunk/administration/tools/language_pack_English.php

    r1883 r1885  
    30343034        $localestrings['ac04'] = "Installed Modules"; 
    30353035        $localestrings['ac05'] = "Webmaster Toolbox"; 
     3036        $localestrings['banned'] = "The website administrator has banned your IP address\nfrom accessing this website"; 
    30363037        $localestrings['https'] = "This website allows only logins secured by HTTPS"; 
    30373038        $localestrings['sysusr'] = "Automatic Post"; 
    … …  
    37463747if (!defined('LP_COUNTRIES')) define('LP_COUNTRIES', "us|gb|ca|au|nz|in|za|ir|mt|hk|pr"); 
    37473748if (!defined('LP_VERSION')) define('LP_VERSION', "7.20"); 
    3748 if (!defined('LP_DATE')) define('LP_DATE', "1224441621"); 
     3749if (!defined('LP_DATE')) define('LP_DATE', "1224445621"); 
    37493750$lp_date = LP_DATE; 
    37503751 

  • trunk/administration/tools/language_pack_Nederlands.php

    r1883 r1885  
    30343034        $localestrings['ac04'] = "Optionele Modules"; 
    30353035        $localestrings['ac05'] = "Gereedschapskist"; 
     3036        $localestrings['banned'] = "De website beheerder heeft uw IP adres\nde toegang tot deze website ontzegd"; 
    30363037        $localestrings['https'] = "Deze website staat alleen via HTTPS beveiligde logins toe"; 
    30373038        $localestrings['sysusr'] = "Automatisch Bericht"; 
    … …  
    37463747if (!defined('LP_COUNTRIES')) define('LP_COUNTRIES', "nl|be|sr|aw|an"); 
    37473748if (!defined('LP_VERSION')) define('LP_VERSION', "7.20"); 
    3748 if (!defined('LP_DATE')) define('LP_DATE', "1224441624"); 
     3749if (!defined('LP_DATE')) define('LP_DATE', "1224445625"); 
    37493750$lp_date = LP_DATE; 
    37503751 

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

    r1883 r1885  
    33// locale       : English 
    44// locale name  : main.global 
    5 // generated on : Sun Oct 19 2008, 20:40:16 CEST 
     5// generated on : Sun Oct 19 2008, 21:41:38 CEST 
    66// translators  : ExiteCMS team,WanWizard 
    77// ---------------------------------------------------------- 
    … …  
    141141$locale['ac04'] = "Installed Modules"; 
    142142$locale['ac05'] = "Webmaster Toolbox"; 
     143$locale['banned'] = "The website administrator has banned your IP address %s\nfrom accessing this website"; 
    143144$locale['https'] = "This website allows only logins secured by HTTPS"; 
    144145$locale['sysusr'] = "Automatic Post"; 

  • trunk/includes/class.smtp.php

    r1845 r1885  
    116116 
    117117    #connect to the smtp server 
    118     $this->smtp_conn = fsockopen($host,    # the host of the server 
     118    $this->smtp_conn = @fsockopen($host,    # the host of the server 
    119119                                 $port,    # the port to use 
    120120                                 $errno,   # error number if any 

  • trunk/includes/dbsetup_include.php

    r1884 r1885  
    22//---------------------------------------------------------- 
    33// ExiteCMS file : dbsetup_include.php 
    4 // Date generated  : `19/10/2008 20:58` 
     4// Date generated  : `19/10/2008 21:05` 
    55//---------------------------------------------------------- 
    66 
    … …  
    10961096    $failed[] = "search : ".mysql_error(); 
    10971097} else { 
    1098     $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_core, search_name, search_title, search_version, search_active, search_visibility, search_fulltext, search_order) VALUES(1, 'forumposts', 'src512', '1.0.0', 1, 101, '1', '1')"); 
    1099     $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_core, search_name, search_title, search_version, search_active, search_visibility, search_fulltext, search_order) VALUES(1, 'news', 'src511', '1.0.0', 1, 101, '1', '2')"); 
    1100     $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_core, search_name, search_title, search_version, search_active, search_visibility, search_fulltext, search_order) VALUES(1, 'articles', 'src510', '1.0.0', 1, 101, '1', '3')"); 
    1101     $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_core, search_name, search_title, search_version, search_active, search_visibility, search_fulltext, search_order) VALUES(1, 'forumattachments', 'src513', '1.0.0', 1, 101, '1', '5')"); 
    1102     $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_core, search_name, search_title, search_version, search_active, search_visibility, search_fulltext, search_order) VALUES(1, 'downloads', 'src514', '1.0.0', 1, 101, '1', '6')"); 
    1103     $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_core, search_name, search_title, search_version, search_active, search_visibility, search_fulltext, search_order) VALUES(1, 'members', 'src515', '1.0.0', 1, 101, '0', '7')"); 
    1104     $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_core, search_name, search_title, search_version, search_active, search_visibility, search_fulltext, search_order) VALUES(1, 'pm', 'src518', '1.0.0', 1, 101, '1', '10')"); 
     1098    $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_core, search_name, search_title, search_version, search_active, search_visibility, search_fulltext, search_order) VALUES(1, 'forumposts', 'src512', '1.0.0', 1, '0', '1', '1')"); 
     1099    $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_core, search_name, search_title, search_version, search_active, search_visibility, search_fulltext, search_order) VALUES(1, 'news', 'src511', '1.0.0', 1, '0', '1', '2')"); 
     1100    $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_core, search_name, search_title, search_version, search_active, search_visibility, search_fulltext, search_order) VALUES(1, 'articles', 'src510', '1.0.0', 1, '0', '1', '3')"); 
     1101    $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_core, search_name, search_title, search_version, search_active, search_visibility, search_fulltext, search_order) VALUES(1, 'forumattachments', 'src513', '1.0.0', 1, '0', '1', '5')"); 
     1102    $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_core, search_name, search_title, search_version, search_active, search_visibility, search_fulltext, search_order) VALUES(1, 'downloads', 'src514', '1.0.0', 1, '0', '1', '6')"); 
     1103    $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_core, search_name, search_title, search_version, search_active, search_visibility, search_fulltext, search_order) VALUES(1, 'members', 'src515', '1.0.0', 1, '0', '0', '7')"); 
     1104    $result = dbquery("INSERT INTO ".$db_prefix."search (search_mod_core, search_name, search_title, search_version, search_active, search_visibility, search_fulltext, search_order) VALUES(1, 'pm', 'src518', '1.0.0', 1, '0', '1', '10')"); 
    11051105} 
    11061106 

  • trunk/includes/forum_functions_include.php

    r1801 r1885  
    688688 
    689689    // wiki links 
    690     $text = preg_replace('#\[wiki\](.*?)\[/wiki\]#si', '<a href="'.BASEDIR.'modules/wiki/index.php?wakka=\1" class="wiki_link" title="'.$settings['wiki_wakka_name'].'">\1</a>', $text);  
     690    if (isset($settings['wiki_forum_links'])  && $settings['wiki_forum_links']) { 
     691        $text = preg_replace('#\[wiki\](.*?)\[/wiki\]#si', '<a href="'.BASEDIR.'modules/wiki/index.php?wakka=\1" class="wiki_link" title="'.$settings['wiki_wakka_name'].'">\1</a>', $text);  
     692    } 
    691693 
    692694    // youtube bbcode 

  • trunk/includes/templates/admin.activation.tpl

    r1856 r1885  
    4646            <td class='{cycle values='tbl1,tbl2'}' style='text-align:center;width:1%;white-space:nowrap;'> 
    4747                {if $settings.email_activation == 1} 
    48                     {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=activate&amp;user_code="|cat:$newusers[id].user_code image="page_green.gif" alt="$locale.406 title=$locale.406}&nbsp; 
    49                     {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=delete&amp;user_code="|cat:$newusers[id].user_code image="page_delete.gif" alt="$locale.407 title=$locale.407} 
     48                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=activate&amp;user_xcode="|cat:$newusers[id].user_code image="page_green.gif" alt="$locale.406 title=$locale.406}&nbsp; 
     49                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=delete&amp;user_xcode="|cat:$newusers[id].user_code image="page_delete.gif" alt="$locale.407 title=$locale.407} 
    5050                {else} 
    51                     {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=activate&amp;user_code="|cat:$newusers[id].user_code image="page_green.gif" alt="$locale.406 title=$locale.406}&nbsp; 
    52                     {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=delete&amp;user_code="|cat:$newusers[id].user_code image="page_delete.gif" alt="$locale.407 title=$locale.407} 
     51                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=activate&amp;user_id="|cat:$newusers[id].user_id image="page_green.gif" alt="$locale.406 title=$locale.406}&nbsp; 
     52                    {imagelink link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=delete&amp;user_id="|cat:$newusers[id].user_id image="page_delete.gif" alt="$locale.407 title=$locale.407} 
    5353                {/if} 
    5454            </td> 

  • trunk/includes/templates/admin.downloads.tpl

    r1530 r1885  
    148148{/if} 
    149149<br /> 
    150 <table align='center' cellpadding='0' cellspacing='0' width='400'> 
    151150{section name=id loop=$tree} 
    152151    {if $smarty.section.id.first} 
     152    <table align='center' cellpadding='0' cellspacing='0' width='400'> 
    153153    <tr> 
    154154        <td class='tbl2'> 
    … …  
    220220    {/if} 
    221221    {if $smarty.section.id.last} 
    222     {/if} 
    223 {sectionelse} 
    224     <tr> 
    225         <td align='center'> 
    226             <br /> 
    227             {$locale.506} 
    228             <br /><br /> 
    229             <a href='download_cats.php{$aidlink}'>{$locale.507} 
    230             <br /><br /> 
    231         </td> 
    232     </tr> 
     222    </table> 
     223    <div style='text-align:center;'> 
     224        <br /> 
     225        {buttonlink name=$locale.516 link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=add"|cat:$url_locale} 
     226    </div> 
     227    {/if} 
    233228{/section} 
    234 </table> 
    235 <div style='text-align:center;'> 
    236     <br /> 
    237     {buttonlink name=$locale.516 link=$smarty.const.FUSION_SELF|cat:$aidlink|cat:"&amp;step=add"|cat:$url_locale} 
    238 </div> 
    239229{include file="_closetable.tpl"} 
    240230<script type='text/javascript'> 
    … …  
    247237{* End of template                                                         *} 
    248238{***************************************************************************} 
    249 {if !$cats_found} 
    250 <center> 
    251     {$locale.508} 
    252     <br /> 
    253     {$locale.509} 
    254     <br /><br /> 
    255     <a href='download_cats.php{$aidlink}'>{$locale.510}</a>{$locale.511} 
    256 </center> 
    257 {else} 
    258 {/if} 

  • trunk/includes/templates/main.albums.list.tpl

    r1846 r1885  
    172172        <center> 
    173173            <br /> 
    174             <b>{$locale.401}</b> 
    175             <br /> 
     174            {$locale.401} 
     175            <br /><br /> 
    176176        </center> 
    177177    {/section} 

  • trunk/includes/templates/main.article_cats.tpl

    r1145 r1885  
    8181    <center> 
    8282        <br /> 
    83         <b>{$locale.407}</b> 
     83        {$locale.407} 
    8484        <br /><br /> 
    8585    </center> 

  • trunk/includes/templates/main.downloads.tpl

    r1787 r1885  
    137137        <center> 
    138138            <br /> 
    139             <b>{$locale.431}</b> 
     139            {$locale.431} 
    140140            <br /><br /> 
    141141        </center> 

  • trunk/includes/templates/main.news_cats.tpl

    r976 r1885  
    4949                        <center> 
    5050                            <br /> 
    51                             <b>{$locale.404}</b> 
     51                            {$locale.404} 
    5252                            <br /><br /> 
    5353                        </center> 

  • trunk/includes/user_functions.php

    r1858 r1885  
    2121$sub_ip1 = substr(USER_IP,0,strlen(USER_IP)-strlen(strrchr(USER_IP,"."))); 
    2222$sub_ip2 = substr($sub_ip1,0,strlen($sub_ip1)-strlen(strrchr($sub_ip1,"."))); 
    23 if (dbcount("(*)", "blacklist", "blacklist_ip='".USER_IP."' OR blacklist_ip='$sub_ip1' OR blacklist_ip='$sub_ip2'")) { 
    24     header("Location: http://en.wikipedia.org/wiki/IP_blocking"); exit; 
     23if (FUSION_SELF != "setuser.php" && dbcount("(*)", "blacklist", "blacklist_ip='".USER_IP."' OR blacklist_ip='$sub_ip1' OR blacklist_ip='$sub_ip2'")) { 
     24    redirect(BASEDIR."setuser.php?error=6"); 
     25    exit; 
    2526} 
    2627 

  • trunk/register.php

    r1802 r1885  
    7777        } 
    7878         
     79        $email_domain = substr(strrchr($email, "@"), 1); 
    7980        if (CHECK_EMAIL) { 
    80             $email_domain = substr(strrchr($email, "@"), 1); 
    8181            if (CMS_getmxrr($email_domain, $mxhosts)) { 
    8282                // Get the hostname the MX record points to 
    … …  
    246246    // define the body panel variables 
    247247    $variables['message'] = $locale['507']; 
    248     $variables['bold'] = true; 
    249248    $template_panels[] = array('type' => 'body', 'title' => $locale['400'], 'name' => 'register.disabled', 'template' => '_message_table_panel.tpl'); 
    250249    $template_variables['register.disabled'] = $variables; 

  • trunk/setuser.php

    r1858 r1885  
    250250        $refresh = 99999; 
    251251        break; 
     252    case 6: 
     253        $message['line2'] =  "<font style='color:red;font-weight:bold'>".($locale['banned'])."</font>"; 
     254        // get the reason for this ban 
     255        $sub_ip1 = substr(USER_IP,0,strlen(USER_IP)-strlen(strrchr(USER_IP,"."))); 
     256        $sub_ip2 = substr($sub_ip1,0,strlen($sub_ip1)-strlen(strrchr($sub_ip1,"."))); 
     257        $result = dbquery("SELECT * FROM ".$db_prefix."blacklist WHERE blacklist_ip='".USER_IP."' OR blacklist_ip='$sub_ip1' OR blacklist_ip='$sub_ip2'"); 
     258        if (dbrows($result)) { 
     259            $data = dbarray($result); 
     260            $message['line4'] =  "<b>".$locale['180'].":<br /><font style='color:red;'>".($data['blacklist_reason'])."</font></b>"; 
     261        } 
     262        $refresh = 99999; 
     263        break; 
    252264    default: 
    253265        // unknown result code 
Note: See TracChangeset for help on using the changeset viewer.