Changeset 1408 in ExiteCMS


Ignore:
Timestamp:
05/15/08 22:25:54 (4 years ago)
Author:
hverton
Message:

Merged trunk revisions 1342:1407 into the PLi-Fusion branch

Location:
branches/PLi-Fusion
Files:
35 edited
4 copied

Legend:

Unmodified
Added
Removed

  • branches/PLi-Fusion/administration/forums.php

    r1227 r1408  
    221221            $result = dbquery(" 
    222222                SELECT DISTINCT u.user_id, u.user_level, u.user_groups  
    223                 FROM ".$db_prefix"threads_read tr 
     223                FROM ".$db_prefix."threads_read tr 
    224224                LEFT JOIN ".$db_prefix."users u ON u.user_id = tr.user_id 
    225225                WHERE tr.thread_id = '".$thread_id."' 

  • branches/PLi-Fusion/administration/index.php

    r1335 r1408  
    109109$variables['statistics']['members_deleted'] = dbcount("(user_id)", "users", "user_status='3'"); 
    110110$variables['statistics']['comments'] = dbcount("(comment_id)", "comments"); 
    111 $variables['statistics']['shouts'] = dbcount("(shout_id)", "shoutbox"); 
     111if (dbtable_exists($db_prefix."shoutbox")) { 
     112    $variables['statistics']['shouts'] = dbcount("(shout_id)", "shoutbox"); 
     113} else { 
     114    $variables['statistics']['shouts'] = 0; 
     115} 
    112116$variables['statistics']['posts'] = dbcount("(post_id)", "posts"); 
    113117 

  • branches/PLi-Fusion/administration/settings_messages.php

    r1227 r1408  
    3232 
    3333if (isset($_POST['saveoptions'])) { 
     34    // validate the input 
     35    $pm_inbox = (isset($_POST['pm_inbox']) && isNum($_POST['pm_inbox'])) ? $_POST['pm_inbox'] : 25; 
     36    $pm_sentbox = (isset($_POST['pm_sentbox']) && isNum($_POST['pm_sentbox'])) ? $_POST['pm_sentbox'] : 25; 
     37    $pm_savebox = (isset($_POST['pm_savebox']) && isNum($_POST['pm_savebox'])) ? $_POST['pm_savebox'] : 100; 
     38    $pm_inbox_group = (isset($_POST['pm_inbox_group']) && isNum($_POST['pm_inbox_group'])) ? $_POST['pm_inbox_group'] : 101; 
     39    $pm_sentbox_group = (isset($_POST['pm_sentbox_group']) && isNum($_POST['pm_sentbox_group'])) ? $_POST['pm_sentbox_group'] : 101; 
     40    $pm_savebox_group = (isset($_POST['pm_savebox_group']) && isNum($_POST['pm_savebox_group'])) ? $_POST['pm_savebox_group'] : 101; 
     41    $pm_send2group = (isset($_POST['pm_send2group']) && isNum($_POST['pm_send2group'])) ? $_POST['pm_send2group'] : 103; 
     42    $pm_hide_rcpts = (isset($_POST['pm_hide_rcpts']) && isNum($_POST['pm_hide_rcpts'])) ? $_POST['pm_hide_rcpts'] : 0; 
    3443    // update the mailbox sizes 
    35     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$_POST['pm_inbox']."' WHERE cfg_name = 'pm_inbox'"); 
    36     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$_POST['pm_sentbox']."' WHERE cfg_name = 'pm_sentbox'"); 
    37     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$_POST['pm_savebox']."' WHERE cfg_name = 'pm_savebox'"); 
    38     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$_POST['pm_send2group']."' WHERE cfg_name = 'pm_send2group'"); 
    39     $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$_POST['pm_hide_rcpts']."' WHERE cfg_name = 'pm_hide_rcpts'"); 
     44    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$pm_inbox."' WHERE cfg_name = 'pm_inbox'"); 
     45    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$pm_sentbox."' WHERE cfg_name = 'pm_sentbox'"); 
     46    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$pm_savebox."' WHERE cfg_name = 'pm_savebox'"); 
     47    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$pm_inbox_group."' WHERE cfg_name = 'pm_inbox_group'"); 
     48    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$pm_sentbox_group."' WHERE cfg_name = 'pm_sentbox_group'"); 
     49    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$pm_savebox_group."' WHERE cfg_name = 'pm_savebox_group'"); 
     50    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$pm_send2group."' WHERE cfg_name = 'pm_send2group'"); 
     51    $result = dbquery("UPDATE ".$db_prefix."configuration SET cfg_value = '".$pm_hide_rcpts."' WHERE cfg_name = 'pm_hide_rcpts'"); 
    4052    // update the global pm settings 
    4153    dbquery("UPDATE ".$db_prefix."pm_config SET pmconfig_email_notify = '".$_POST['pm_email_notify']."', pmconfig_read_notify = '".$_POST['pm_read_notify']."', pmconfig_save_sent = '".$_POST['pm_save_sent']."', pmconfig_auto_archive = '".$_POST['pm_auto_archive']."', pmconfig_view = '".$_POST['pm_view']."' WHERE user_id='0'"); 
    … …  
    5062$data = dbarray(dbquery("SELECT * FROM ".$db_prefix."configuration WHERE cfg_name = 'pm_savebox'")); 
    5163$variables['pm_savebox'] = $data['cfg_value']; 
     64$data = dbarray(dbquery("SELECT * FROM ".$db_prefix."configuration WHERE cfg_name = 'pm_inbox_group'")); 
     65$variables['pm_inbox_group'] = $data['cfg_value']; 
     66$data = dbarray(dbquery("SELECT * FROM ".$db_prefix."configuration WHERE cfg_name = 'pm_sentbox_group'")); 
     67$variables['pm_sentbox_group'] = $data['cfg_value']; 
     68$data = dbarray(dbquery("SELECT * FROM ".$db_prefix."configuration WHERE cfg_name = 'pm_savebox_group'")); 
     69$variables['pm_savebox_group'] = $data['cfg_value']; 
    5270$data = dbarray(dbquery("SELECT * FROM ".$db_prefix."configuration WHERE cfg_name = 'pm_send2group'")); 
    5371$variables['pm_send2group'] = $data['cfg_value']; 

  • branches/PLi-Fusion/administration/tools/language_pack_English.php

    r1343 r1408  
    969969        $localestrings['720'] = "Enable group messages for:"; 
    970970        $localestrings['721'] = "Show all recipients of a message:"; 
     971        $localestrings['722'] = "No Inbox message limit for:"; 
     972        $localestrings['723'] = "No Outbox message limit for:"; 
     973        $localestrings['724'] = "No Archive message limit for:"; 
     974        $localestrings['725'] = "- no one -"; 
    971975        $localestrings['750'] = "Save Settings"; 
    972976        $localestrings['751'] = "<< Prev"; 
    … …  
    21252129        $localestrings['412'] = "Page: "; 
    21262130        $localestrings['413'] = "RSS Feed"; 
     2131        $localestrings['414'] = "View all posts"; 
    21272132        $localestrings['430'] = "download(s)"; 
    21282133        $localestrings['450'] = "View Forum"; 
    … …  
    23152320        $localestrings['472']['12'] = "violet"; 
    23162321        $localestrings['472']['13'] = "black"; 
    2317         $localestrings['472']['14'] = "gray"; 
     2322        $localestrings['472']['14'] = "grey"; 
    23182323        $localestrings['472']['15'] = "silver"; 
    23192324        $localestrings['472']['16'] = "white"; 
    … …  
    24912496        $localestrings['026'] = "My Recent Threads"; 
    24922497        $localestrings['027'] = "My Recent Posts"; 
     2498        $localestrings['027a'] = "All Posts"; 
    24932499        $localestrings['028'] = "New Posts"; 
    24942500        $localestrings['029'] = "Latest News"; 
    … …  
    25432549        $localestrings['083'] = "CMS Administration"; 
    25442550        $localestrings['084'] = "Logout"; 
    2545         $localestrings['085'] = "%u private "; 
    2546         $localestrings['086'] = "message"; 
    2547         $localestrings['087'] = "messages"; 
    2548         $localestrings['088'] = "post"; 
    2549         $localestrings['089'] = "posts"; 
    2550         $localestrings['090'] = "%u new forum "; 
     2551        $localestrings['085'] = "%u private message"; 
     2552        $localestrings['086'] = "%u private messages"; 
     2553        $localestrings['087'] = "Downloads"; 
     2554        $localestrings['088'] = "%u new forum post"; 
     2555        $localestrings['089'] = "%u new forum posts"; 
     2556        $localestrings['090'] = "Posts"; 
    25512557        $localestrings['091'] = "Mark all read"; 
    25522558        $localestrings['100'] = "Member Poll"; 
    … …  
    26202626        $localestrings['408'] = "Send me a new password"; 
    26212627        $localestrings['409'] = "New password for "; 
    2622         $localestrings['410'] = "Hello [USER_NAME],\n\nYou have or someone has requested a new password to access your [SITENAME] account.\n\nTo change your password please click the following link:\n\n[NEW_PASS_LINK]\n\nRegards,\n[SITEUSERNAME]"; 
    2623         $localestrings['411'] = "Hello [USER_NAME],\n\nYour new password to access your [SITENAME] account is:\n\n[NEW_PASS]\n\nRegards,\n[SITEUSERNAME]"; 
     2628        $localestrings['410'] = "Hello [USERNAME],\n\nYou have or someone has requested a new password to access your [SITENAME] account.\n\nTo change your password please click the following link:\n\n[NEW_PASS_LINK]\n\nRegards,\n[SITEUSERNAME]"; 
     2629        $localestrings['411'] = "Hello [USERNAME],\n\nYour new password to access your [SITENAME] account is:\n\n[NEW_PASS]\n\nRegards,\n[SITEUSERNAME]"; 
    26242630        load_localestrings($localestrings, LP_LOCALE, "main.lostpassword", $step); 
    26252631 
    … …  
    28672873        $localestrings['414'] = "Email address %s does not exist<br>(according to the mailserver %s)."; 
    28682874        $localestrings['449'] = "Welcome to %s"; 
    2869         $localestrings['450'] = "Hello [USER_NAME],\n\nWelcome to [SITENAME]. Here are your login details:\n\nUsername: [USERNAME]\nFullname: [FULLNAME]\nPassword: [PASSWORD]\n\nPlease activate your account via the following link:\n"; 
     2875        $localestrings['450'] = "Hello [USERNAME],\n\nWelcome to [SITENAME]. Here are your login details:\n\nUsername: [USERNAME]\nFullname: [FULLNAME]\nPassword: [PASSWORD]\n\nPlease activate your account via the following link:\n"; 
    28702876        $localestrings['451'] = "Registration complete"; 
    28712877        $localestrings['452'] = "You can now log in."; 
    … …  
    31353141        $localestrings['u901'] = "Full Name"; 
    31363142        load_localestrings($localestrings, LP_LOCALE, "main.user_fields", $step); 
    3137  
    3138         $localestrings = array(); 
    3139         $localestrings['400'] = "Webshop"; 
    3140         $localestrings['410'] = "Select your shop. The shop currently selected is highlighted"; 
    3141         $localestrings['411'] = "<b>Note:</b><br /> 
    3142                 <img src='".THEME."images/bullet.gif' /> If you don't live in these area's of the world, check out all shops to see which one has the best delivery fees for your country <br /> 
    3143                 <img src='".THEME."images/bullet.gif' /> Sometimes the shop has session issues. If the shop doesn't display as expected, click on the 'Shop' button to reload the shop<br /> 
    3144                 <img src='".THEME."images/bullet.gif' /> Every shop uses different suppliers. Not all products are available in all shops 
    3145         "; 
    3146         load_localestrings($localestrings, LP_LOCALE, "main.webshop", $step); 
    3147  
    31483143        return ""; 
    31493144    } 
    … …  
    31823177if (!defined('LP_CHARSET')) define('LP_CHARSET', "iso-8859-1"); 
    31833178if (!defined('LP_VERSION')) define('LP_VERSION', "7.10"); 
    3184 if (!defined('LP_DATE')) define('LP_DATE', "1204579858"); 
    3185 $lp_date = "1204579858"; 
     3179if (!defined('LP_DATE')) define('LP_DATE', "1210855263"); 
     3180$lp_date = "1210855263"; 
    31863181 
    31873182/*---------------------------------------------------+ 
    … …  
    32413236    // install the language pack 
    32423237    if ($step == "install" || $step == "upgrade") { 
    3243         if ($step == "install") { 
     3238        if ($step == "install" || defined('CMS_SETUP_LOAD')) { 
    32443239            $result = dbquery("INSERT INTO ".$db_prefix."locale (locale_code, locale_name, locale_locale, locale_charset, locale_active) VALUES ('".LP_LOCALE."', '".LP_LANGUAGE."', '".LP_LOCALES."', '".LP_CHARSET."', 1)"); 
    32453240        } 

  • branches/PLi-Fusion/administration/tools/language_pack_Nederlands.php

    r1343 r1408  
    969969        $localestrings['720'] = "Sta berichten naar groepen toe voor:"; 
    970970        $localestrings['721'] = "Toon alle ontvangers van een bericht:"; 
     971        $localestrings['722'] = "Geen maximum op de Inbox voor:"; 
     972        $localestrings['723'] = "Geen maximum op de Outbox voor:"; 
     973        $localestrings['724'] = "Geen maxumum op het Archief voor:"; 
     974        $localestrings['725'] = "- niemand -"; 
    971975        $localestrings['750'] = "Instellingen bewaren"; 
    972976        $localestrings['751'] = "<< Vorige"; 
    … …  
    21252129        $localestrings['412'] = "Pagina: "; 
    21262130        $localestrings['413'] = "RSS Feed"; 
     2131        $localestrings['414'] = "Bekijk alle berichten"; 
    21272132        $localestrings['430'] = "download(s)"; 
    21282133        $localestrings['450'] = "Bekijk forum"; 
    … …  
    24912496        $localestrings['026'] = "Mijn recente topics"; 
    24922497        $localestrings['027'] = "Mijn recente berichten"; 
     2498        $localestrings['027a'] = "Alle berichten"; 
    24932499        $localestrings['028'] = "Nieuwe berichten"; 
    24942500        $localestrings['029'] = "Laatste nieuws"; 
    … …  
    25432549        $localestrings['083'] = "CMS Administratie"; 
    25442550        $localestrings['084'] = "Afmelden"; 
    2545         $localestrings['085'] = "%u privé "; 
    2546         $localestrings['086'] = "bericht"; 
    2547         $localestrings['087'] = "berichten"; 
    2548         $localestrings['088'] = " bericht"; 
    2549         $localestrings['089'] = "e berichten"; 
    2550         $localestrings['090'] = "%u nieuw"; 
     2551        $localestrings['085'] = "%u privé bericht"; 
     2552        $localestrings['086'] = "%u privé berichten"; 
     2553        $localestrings['087'] = "Downloads"; 
     2554        $localestrings['088'] = "%u nieuw bericht"; 
     2555        $localestrings['089'] = "%u nieuwe berichten"; 
     2556        $localestrings['090'] = "Berichten"; 
    25512557        $localestrings['091'] = "Alles gelezen"; 
    25522558        $localestrings['100'] = "Leden Poll"; 
    … …  
    25572563        $localestrings['105'] = "Stemmen: "; 
    25582564        $localestrings['106'] = "Gestart: "; 
    2559         $localestrings['107'] = "Geeindid: "; 
     2565        $localestrings['107'] = "Geeindigd: "; 
    25602566        $localestrings['108'] = "Poll Archief"; 
    25612567        $localestrings['109'] = "Selecteer de poll die u wilt bekijken uit de lijst:"; 
    … …  
    26202626        $localestrings['408'] = "Send me a new password"; 
    26212627        $localestrings['409'] = "Nieuw wachtwoord voor "; 
    2622         $localestrings['410'] = "Hallo [USER_NAME],\n\nU of iemand anders heeft een nieuw wachtwoord aangevraagd voor toegang tot [SITENAME].\n\nOm het wachtwoord aan te passen, klik op deze link:\n\n[NEW_PASS_LINK]\n\nMet vriendelijke groeten,\n[SITEUSERNAME]"; 
    2623         $localestrings['411'] = "Hallo [USER_NAME],\n\nUw nieuwe wachtwoord om aan te melden op [SITENAME] is:\n\n[NEW_PASS]\n\nMet vriendelijke groeten,\n[SITEUSERNAME]"; 
     2628        $localestrings['410'] = "Hallo [USERNAME],\n\nU of iemand anders heeft een nieuw wachtwoord aangevraagd voor toegang tot [SITENAME].\n\nOm het wachtwoord aan te passen, klik op deze link:\n\n[NEW_PASS_LINK]\n\nMet vriendelijke groeten,\n[SITEUSERNAME]"; 
     2629        $localestrings['411'] = "Hallo [USERNAME],\n\nUw nieuwe wachtwoord om aan te melden op [SITENAME] is:\n\n[NEW_PASS]\n\nMet vriendelijke groeten,\n[SITEUSERNAME]"; 
    26242630        load_localestrings($localestrings, LP_LOCALE, "main.lostpassword", $step); 
    26252631 
    … …  
    28072813        $localestrings['624'] = "Opties bewaard"; 
    28082814        $localestrings['625'] = "Er is een nieuw privé bericht voor u op %s"; 
    2809         $localestrings['626'] = ",\nU hebt een nieuw privé bericht ontvangen op %1\$s. U kunt dit bericht lezen op %2\$spm.php\n\nU kunt verdere notificaties uitschakelen via het optie paneel in het privé berichten scherm indien u niet langer prijs stelt op deze berichten."; 
     2815        $localestrings['626'] = ",\nU hebt een nieuw privé bericht ontvangen op %2\$s van '%1\$s'. U kunt dit bericht lezen op %3\$spm.php\n\nU kunt verdere notificaties uitschakelen via het optie paneel in het privé berichten scherm indien u niet langer prijs stelt op deze berichten."; 
    28102816        $localestrings['627'] = "Fout"; 
    28112817        $localestrings['628'] = "Privé bericht kan niet verzonden worden. De inbox van de ontvanger is vol."; 
    … …  
    28672873        $localestrings['414'] = "Volgens de mailserver %2\$s bestaat het email adres %1\$s niet."; 
    28682874        $localestrings['449'] = "Welkom op %s"; 
    2869         $localestrings['450'] = "Hallo [USER_NAME],\n\nWelkom op [SITENAME]. Hier zijn uw aanmeldgegevens:\n\nGebruikersnaam: [USERNAME]\nVolledige naam: [FULLNAME]\nWachtwoord: [PASSWORD]\n\nKlik op deze link om uw aanmelding te activeren:\n"; 
     2875        $localestrings['450'] = "Hallo [USERNAME],\n\nWelkom op [SITENAME]. Hier zijn uw aanmeldgegevens:\n\nGebruikersnaam: [USERNAME]\nVolledige naam: [FULLNAME]\nWachtwoord: [PASSWORD]\n\nKlik op deze link om uw aanmelding te activeren:\n"; 
    28702876        $localestrings['451'] = "Registratie compleet"; 
    28712877        $localestrings['452'] = "U kunt u nu aanmelden."; 
    … …  
    30003006        $localestrings['463'] = "Blokkeren"; 
    30013007        $localestrings['464'] = "Commentaar"; 
    3002         $localestrings['465'] = "Dynamische pagina's"; 
     3008        $localestrings['465'] = "Dynamische pagina\'s"; 
    30033009        $localestrings['466'] = "Database backup"; 
    30043010        $localestrings['467'] = "Download categorieen"; 
    … …  
    30643070        $localestrings['552'] = "Beveiliging"; 
    30653071        $localestrings['553'] = "Software"; 
    3066         $localestrings['554'] = "Thema's"; 
     3072        $localestrings['554'] = "Thema\'s"; 
    30673073        $localestrings['555'] = "Windows"; 
    30683074        $localestrings['560'] = "Sorry, maar het door u gevraagde document kan niet op de server gevonden worden."; 
    … …  
    30713077        $localestrings['563'] = "De beste kans om te vinden wat je zoek is te starten op onze home pagina, (<a href=\"/\">klik hier om daar na toe te gaan</a>), de opties in het menu te bekijken, of gebruik te maken van de zoek optie in het menu."; 
    30723078        $localestrings['564'] = "Als dat geen resultaat mocht opleveren, en u weet zeker dat het document dat u zoekt op deze website te vinden moet zijn, stuur dat een website beheerder een privé bericht (alleen voor geregistreerde gebruikers)."; 
    3073         $localestrings['580'] = "De installatie is klaar, ExiteCMS is nu klaar voor gebruik.<br>\n<a href='index.php'>Klik hier</a> om naar uw ExiteCMS powered website te gaan.<br>\n<b>Opmerking:</b> voor uw veiligheid kunt u het best nu het bestand setup.php van uw server verwijderen<br>\en de rechten op het bestand config op alleen lezen zetten (chmod 644).<br><br>\nWij danken u voor uw keuze voor ExiteCMS."; 
     3079        $localestrings['580'] = "De installatie is klaar, ExiteCMS is nu klaar voor gebruik.<br>\n<a href='index.php'>Klik hier</a> om naar uw ExiteCMS powered website te gaan.<br>\n<b>Opmerking:</b> voor uw veiligheid kunt u het best nu het bestand setup.php van uw server verwijderen<br>\nen de rechten op het bestand config op alleen lezen zetten (chmod 644).<br><br>\nWij danken u voor uw keuze voor ExiteCMS."; 
    30743080        $localestrings['title'] = "ExiteCMS Setup"; 
    30753081        load_localestrings($localestrings, LP_LOCALE, "main.setup", $step); 
    … …  
    31713177if (!defined('LP_CHARSET')) define('LP_CHARSET', "iso-8859-1"); 
    31723178if (!defined('LP_VERSION')) define('LP_VERSION', "7.10"); 
    3173 if (!defined('LP_DATE')) define('LP_DATE', "1204579862"); 
    3174 $lp_date = "1204579862"; 
     3179if (!defined('LP_DATE')) define('LP_DATE', "1210855268"); 
     3180$lp_date = "1210855268"; 
    31753181 
    31763182/*---------------------------------------------------+ 
    … …  
    32303236    // install the language pack 
    32313237    if ($step == "install" || $step == "upgrade") { 
    3232         if ($step == "install") { 
     3238        if ($step == "install" || defined('CMS_SETUP_LOAD')) { 
    32333239            $result = dbquery("INSERT INTO ".$db_prefix."locale (locale_code, locale_name, locale_locale, locale_charset, locale_active) VALUES ('".LP_LOCALE."', '".LP_LANGUAGE."', '".LP_LOCALES."', '".LP_CHARSET."', 1)"); 
    32343240        } 

  • branches/PLi-Fusion/administration/upgrade/rev01070.php

    r1124 r1408  
    4242  locales_key varchar(25) NOT NULL default '', 
    4343  locales_value TEXT NOT NULL default '', 
    44   locales_datestamp INT(10) UNSIGNED NOT NULL default '', 
     44  locales_datestamp INT(10) UNSIGNED NOT NULL default 0, 
    4545  PRIMARY KEY  (locales_id) 
    4646) ENGINE=MyISAM;"); 

  • branches/PLi-Fusion/administration/upgrade/rev01308.php

    r1335 r1408  
    3030 
    3131// update the threads_read table 
    32 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."threads_read CHANGE thread_page thread_first_read INT(10) UNSIGNED NOT NULL DEFAULT '9999999999'"); 
    33 $commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."threads_read CHANGE thread_last_read thread_last_read INT(10) UNSIGNED NOT NULL DEFAULT '0'"); 
     32$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."threads_read CHANGE thread_page thread_first_read INT(10) UNSIGNED NOT NULL DEFAULT 4294967295"); 
     33$commands[] = array('type' => 'db', 'value' => "ALTER TABLE ".$db_prefix."threads_read CHANGE thread_last_read thread_last_read INT(10) UNSIGNED NOT NULL DEFAULT 0"); 
    3434 
    3535?> 

  • branches/PLi-Fusion/feeds.php

    r1227 r1408  
    5555//      $channel['lastBuildDate'] = ""; 
    5656        $channel['generator'] = "ExiteCMS RSS Feed Generator v1.0"; 
    57         $channel['webMaster'] = $settings['siteemail']; 
     57        $channel['webMaster'] = $settings['siteemail']." (Feed Manager)"; 
    5858        $channels[] = $channel; 
    5959        $channel_count = count($channels); 
    … …  
    7272            $item['description'] = "<![CDATA[ ".(strlen($data['post_message']) > 500 ? (substr($data['post_message'],0,496)." ...") : $data['post_message'])." ]]>"; 
    7373            $item['pubDate'] = strftime("%a, %d %b %G %T %z", $data['post_datestamp']); 
    74 //          $item['guid'] = ""; 
     74            $item['guid'] = $item['link'];  // make the guid equal to the link, we don't have a need for permalinks 
    7575            $feed[] = $item; 
    7676        } 
    … …  
    8989header("Content-type: text/xml; charset=".$settings['charset']); 
    9090echo "<?xml version=\"1.0\" encoding=\"".$settings['charset']."\"?>\n"; 
    91 echo "<rss version=\"2.0\">\n"; 
     91echo "<rss version=\"2.0\" xmlns:atom=\"http://www.w3.org/2005/Atom\">\n"; 
    9292 
    9393// loop through the channels 
    … …  
    9595    // opening: channel information 
    9696    echo "\t<channel>\n"; 
     97    // atom backlink to the channel 
     98    echo "\t\t<atom:link href=\"".$settings['siteurl'].FUSION_SELF."?".FUSION_QUERY."\" rel=\"self\" type=\"application/rss+xml\" />\n"; 
    9799    foreach ($channel as $tag => $value) { 
    98100        echo "\t\t<".$tag.">".$value."</".$tag.">\n"; 

  • branches/PLi-Fusion/files/locales/en.main.global.php

    r1343 r1408  
    33// locale       : English 
    44// locale name  : main.global 
    5 // generated on : Mon Mar 3 2008, 22:47:24 CET 
     5// generated on : Thu May 15 2008, 22:16:36 CEST 
    66// ---------------------------------------------------------- 
    77$locale['001'] = "Navigation"; 
    … …  
    2727$locale['026'] = "My Recent Threads"; 
    2828$locale['027'] = "My Recent Posts"; 
     29$locale['027a'] = "All Posts"; 
    2930$locale['028'] = "New Posts"; 
    3031$locale['029'] = "Latest News"; 
    … …  
    7980$locale['083'] = "CMS Administration"; 
    8081$locale['084'] = "Logout"; 
    81 $locale['085'] = "%u private "; 
    82 $locale['086'] = "message"; 
    83 $locale['087'] = "messages"; 
    84 $locale['088'] = "post"; 
    85 $locale['089'] = "posts"; 
    86 $locale['090'] = "%u new forum "; 
     82$locale['085'] = "%u private message"; 
     83$locale['086'] = "%u private messages"; 
     84$locale['087'] = "Downloads"; 
     85$locale['088'] = "%u new forum post"; 
     86$locale['089'] = "%u new forum posts"; 
     87$locale['090'] = "Posts"; 
    8788$locale['091'] = "Mark all read"; 
    8889$locale['100'] = "Member Poll"; 

  • branches/PLi-Fusion/files/locales/en.main.setup.php

    r1192 r1408  
    33// locale       : English 
    44// locale name  : main.setup 
    5 // generated on : Wed Nov 28 2007, 19:16:14 CET 
     5// generated on : Thu May 15 2008, 14:41:03 CEST 
    66// translators  : ExiteCMS team,WanWizard 
    77// ---------------------------------------------------------- 
    … …  
    4949$locale['471'] = "Images"; 
    5050$locale['472'] = "Modules & Plugins"; 
    51 $locale['473'] = "x"; 
     51$locale['473'] = "Blogs"; 
    5252$locale['474'] = "Members"; 
    5353$locale['475'] = "News"; 

  • branches/PLi-Fusion/forum/viewthread.php

    r1343 r1408  
    325325        $data['group_names'] = array(); 
    326326        $data['group_names'][] = array('type' => 'U', 'level' => $data['user_level'], 'name' => getuserlevel($data['user_level'])); 
    327         if ($data['user_groups'] != "") { 
    328             $gresult = dbquery("SELECT group_name, group_forumname, group_color FROM ".$db_prefix."user_groups WHERE group_id IN (".str_replace('.', ',', substr($data['user_groups'],1)).") AND group_visible & 2"); 
    329             $grecs = dbrows($gresult); 
    330             while ($gdata = dbarray($gresult)) { 
    331                 $data['group_names'][] = array('type' => 'G', 'color' => $gdata['group_color'], 'name' => $gdata['group_forumname']==""?$gdata['group_name']:$gdata['group_forumname']); 
     327 
     328        if ($data['user_groups']) { 
     329            $groups = (strpos($data['user_groups'], ".") == 0 ? explode(".", substr($data['user_groups'], 1)) : explode(".", $data['user_groups'])); 
     330            foreach ($groups as $group) { 
     331                // check if this groups has subgroups. If so, add them to the array 
     332                getsubgroups($group); 
     333            } 
     334            for ($i = 0;$i < count($groups);$i++) { 
     335                $gresult = dbquery("SELECT group_name, group_forumname, group_color FROM ".$db_prefix."user_groups WHERE group_id='".$groups[$i]."' AND group_visible & 2"); 
     336                if(dbrows($gresult)) { 
     337                    $gdata = dbarray($gresult); 
     338                    $data['group_names'][] = array('type' => 'G', 'color' => $gdata['group_color'], 'name' => $gdata['group_forumname']==""?$gdata['group_name']:$gdata['group_forumname']); 
     339                } 
    332340            } 
    333341        } 

  • branches/PLi-Fusion/includes/core_functions.php

    r1335 r1408  
    4949// prevent any possible XSS attacks via $_GET. 
    5050foreach ($_GET as $check_url) { 
    51     if ((eregi("<[^>]*script*\"?[^>]*>", $check_url)) || (eregi("<[^>]*object*\"?[^>]*>", $check_url)) || 
    52         (eregi("<[^>]*iframe*\"?[^>]*>", $check_url)) || (eregi("<[^>]*applet*\"?[^>]*>", $check_url)) || 
    53         (eregi("<[^>]*meta*\"?[^>]*>", $check_url)) || (eregi("<[^>]*style*\"?[^>]*>", $check_url)) || 
    54         (eregi("<[^>]*form*\"?[^>]*>", $check_url)) || (eregi("\([^>]*\"?[^)]*\)", $check_url))) { 
    55     die (); 
     51    // deal with array's in GET parameters 
     52    if (is_array($check_url)) { 
     53        foreach ($check_url as $url_parts) { 
     54            if ((eregi("<[^>]*script*\"?[^>]*>", $url_parts)) || (eregi("<[^>]*object*\"?[^>]*>", $url_parts)) || 
     55                    (eregi("<[^>]*iframe*\"?[^>]*>", $url_parts)) || (eregi("<[^>]*applet*\"?[^>]*>", $url_parts)) || 
     56                    (eregi("<[^>]*meta*\"?[^>]*>", $url_parts)) || (eregi("<[^>]*style*\"?[^>]*>", $url_parts)) || 
     57                    (eregi("<[^>]*form*\"?[^>]*>", $url_parts)) || (eregi("\([^>]*\"?[^)]*\)", $url_parts))) { 
     58                die (); 
     59            } 
     60        } 
     61    } else { 
     62        if ((eregi("<[^>]*script*\"?[^>]*>", $check_url)) || (eregi("<[^>]*object*\"?[^>]*>", $check_url)) || 
     63                (eregi("<[^>]*iframe*\"?[^>]*>", $check_url)) || (eregi("<[^>]*applet*\"?[^>]*>", $check_url)) || 
     64                (eregi("<[^>]*meta*\"?[^>]*>", $check_url)) || (eregi("<[^>]*style*\"?[^>]*>", $check_url)) || 
     65                (eregi("<[^>]*form*\"?[^>]*>", $check_url)) || (eregi("\([^>]*\"?[^)]*\)", $check_url))) { 
     66            die (); 
     67        } 
    5668    } 
    5769} 
    … …  
    524536} 
    525537 
     538// internal function: preg_replace_callback for parseubb, to validate the URL found in [url] 
     539function _parseubb_checkurl($matches) { 
     540 
     541    // if it's a old-style bbcode (not [url=][/url] but [url][/url]), convert it before checking 
     542    if (empty($matches[2])) { 
     543        $matches[2] = $matches[3]; 
     544    } 
     545 
     546    // Build the regex to check the URL 
     547    $scheme = "(https?|s?ftp|mailto|svn|cvs|callto|mms|skype)\:\/\/";           // SCHEMES supported 
     548    $urlregex = "^(".$scheme.")?";                                              // make the scheme optional 
     549    $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)?";   // USERID + PASSWORD (optional) 
     550    $urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";                           // HOSTNAME or IP 
     551    $urlregex .= "(\:[0-9]{2,5})?";                                             // PORT (optional) 
     552    $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/?";                                 // PATH (optional) 
     553    $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@/&%=+\$_.-]*)?";                     // GET querystring (optional) 
     554    $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)?\$";                               // ANCHOR (optional) 
     555 
     556    // validate the URL (in $matches[1]) 
     557    if (eregi($urlregex, $matches[2])) { 
     558        // check if the URL is prefixed. If not, assume http:// 
     559        if (!eregi("^(".$scheme."){1}", $matches[2])) { 
     560            $matches[2] = "http://".$matches[2]; 
     561        } 
     562        // return the html for the URL bbcode 
     563        return "<a href='".$matches[2]."' alt='' target='_blank'>".$matches[3]."</a>"; 
     564    } else { 
     565        // make the bbcode passed harmless 
     566        return stripinput($matches[0]); 
     567    } 
     568} 
     569 
    526570// Parse bbcode into HTML code 
    527571function parseubb($text) { 
    … …  
    550594    // correct illegal [url=] BBcode 
    551595    $text = str_replace("[url=]", "[url]", $text); 
    552          
    553     $text = preg_replace('#\[url\]([\r\n]*)(http://|ftp://|https://|ftps://)([^\s\'\";\+]*?)([\r\n]*)\[/url\]#si', '<a href=\'\2\3\' target=\'_blank\'>\2\3</a>', $text); 
    554     $text = preg_replace('#\[url\]([\r\n]*)([^\s\'\";\+]*?)([\r\n]*)\[/url\]#si', '<a href=\'http://\2\' target=\'_blank\'>\2</a>', $text); 
    555     $text = preg_replace('#\[url=([\r\n]*)(http://|ftp://|https://|ftps://)([^\'\";]*?)\](.*?)([\r\n]*)\[/url\]#si', '<a href=\'\2\3\' target=\'_blank\'>\4</a>', $text); 
    556     $text = preg_replace('#\[url=([\r\n]*)([^\s\'\";\+]*?)\](.*?)([\r\n]*)\[/url\]#si', '<a href=\'http://\2\' target=\'_blank\'>\3</a>', $text); 
    557  
     596 
     597    // convert URL bbcode, strip non-valid URL's 
     598    $text = preg_replace_callback('#\[url(=)?(.*?)\](.*?)([\r\n]*)\[/url\]#si', '_parseubb_checkurl', $text); 
     599 
     600    // convert mail bbcode 
    558601    $text = preg_replace('#\[mail\]([\r\n]*)([^\s\'\";:\+]*?)([\r\n]*)\[/mail\]#si', '<a href=\'mailto:\2\'>\2</a>', $text); 
    559602    $text = preg_replace('#\[mail=([\r\n]*)([^\s\'\";:\+]*?)\](.*?)([\r\n]*)\[/mail\]#si', '<a href=\'mailto:\2\'>\3</a>', $text); 
    560603     
    561604    $text = preg_replace('#\[small\](.*?)\[/small\]#si', '<span class=\'small\'>\1</span>', $text); 
    562     $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); 
    563606     
    564607    $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); 

  • branches/PLi-Fusion/includes/db_functions.php

    r1335 r1408  
    4242            $isUserQuery = true; 
    4343            $query = str_replace(" ".$db_prefix.$usertable, " ".$user_db_name.".".$user_db_prefix.$usertable, $query); 
     44            $query = str_replace("=".$db_prefix.$usertable, "=".$user_db_name.".".$user_db_prefix.$usertable, $query); 
    4445        } 
    4546    } 

  • branches/PLi-Fusion/includes/dbsetup_include.php

    r1227 r1408  
    22//---------------------------------------------------------- 
    33// ExiteCMS file : dbsetup_include.php 
    4 // Date generated  : `08/02/2008 00:24` 
     4// Date generated  : `10/03/2008 22:38` 
    55//---------------------------------------------------------- 
    66 
    7 define('CMS_VERSION', '7.00'); 
    8 define('CMS_REVISION', '1223'); 
     7define('CMS_VERSION', '7.10'); 
     8define('CMS_REVISION', '1350'); 
    99 
    1010if ($step == 1) { 
    … …  
    160160 
    161161// 
    162 // Code to create table `captcha` 
    163 // 
    164 $result = dbquery("DROP TABLE IF EXISTS ".$db_prefix."captcha"); 
    165 $result = dbquery("CREATE TABLE IF NOT EXISTS ".$db_prefix."captcha ( 
    166   `captcha_datestamp` int(10) unsigned NOT NULL default '0', 
    167   `captcha_ip` varchar(20) NOT NULL default '', 
    168   `captcha_encode` varchar(32) NOT NULL default '', 
    169   `captcha_string` varchar(15) NOT NULL default '' 
    170 ) ENGINE=MYISAM;"); 
    171 if (!$result) { 
    172     $fail = "1"; 
    173     $failed[] = "captcha : ".mysql_error(); 
    174 } 
    175  
    176 // 
    177162// Code to create table `comments` 
    178163// 
    … …  
    202187  `cfg_name` varchar(50) NOT NULL default '', 
    203188  `cfg_value` text NOT NULL, 
     189  `cfg_timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, 
    204190  PRIMARY KEY  (`cfg_id`) 
    205191) ENGINE=MYISAM;"); 
    … …  
    209195} else { 
    210196    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('admin_activation', '0')"); 
    211     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('article_localisation', 'multiple')"); 
     197    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('article_localisation', 'none')"); 
    212198    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('attachmax', '10485760')"); 
    213199    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('attachments', '1')"); 
    214     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('attachtypes', '.exe,.com,.bat,.js,.htm,.html,.shtml,.php,.php3,.esml,.psd,.mvi')"); 
     200    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('attachtypes', '.exe,.com,.bat,.js,.htm,.html,.shtml,.php,.php3')"); 
    215201    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('bad_words', '')"); 
    216202    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('bad_words_enabled', '0')"); 
    … …  
    218204    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('blogs_indexage', '90')"); 
    219205    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('blogs_indexsize', '5')"); 
    220     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('counter', '518')"); 
    221     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('country', 'nl')"); 
     206    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('counter', '0')"); 
     207    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('country', 'gb')"); 
    222208    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('debug_querylog', '')"); 
    223209    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('description', 'ExiteCMS, a light-weight CMS system, wriiten in PHP, and using MySQL and the Smarty template engine')"); 
    224210    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('display_validation', '1')"); 
    225211    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('download_columns', '1')"); 
    226     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('download_localisation', 'multiple')"); 
     212    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('download_localisation', 'none')"); 
    227213    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('email_verification', '1')"); 
    228214    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('enable_registration', '1')"); 
    … …  
    230216    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('folderhotlevel', '20')"); 
    231217    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('footer', '')"); 
    232     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('forumdate', '%d/%m/%Y %H:%M')"); 
     218    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('forumdate', '%m/%d/%Y %H:%M')"); 
    233219    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('forum_flags', '1')"); 
    234220    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('forum_max_h', '600')"); 
    235221    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('forum_max_w', '600')"); 
    236     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('guestposts', '0')"); 
     222    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('guestposts', '1')"); 
    237223    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('hide_webmaster', '0')"); 
    238224    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('keywords', 'ExiteCMS, CMS, Smarty, MySQL, PHP, Open-Source')"); 
    239225    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('locale', 'English')"); 
     226    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('login_expire', '7200')"); 
     227    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('login_extended_expire', '604800')"); 
    240228    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('longdate', '%m/%d/%Y %H:%M:%S')"); 
    241229    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('maintenance', '0')"); 
    242     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('maintenance_color', '#CF8E91')"); 
     230    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('maintenance_color', '#A19BCF')"); 
    243231    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('maintenance_message', '')"); 
    244     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('max_users', '5')"); 
     232    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('max_users', '0')"); 
    245233    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('max_users_datestamp', '1193029685')"); 
    246234    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('navbar_range', '5')"); 
    247     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('newsletter_email', 'noreply@exite.eu')"); 
     235    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('newsletter_email', '')"); 
    248236    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('news_columns', '1')"); 
    249237    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('news_headline', '1')"); 
    250238    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('news_items', '3')"); 
    251239    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('news_latest', '0')"); 
    252     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('news_localisation', 'multiple')"); 
     240    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('news_localisation', 'none')"); 
    253241    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('numofshouts', '5')"); 
    254242    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('numofthreads', '20')"); 
    255243    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('opening_page', 'news.php')"); 
    256     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('panels_localisation', 'multiple')"); 
     244    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('panels_localisation', 'none')"); 
    257245    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('photo_h', '300')"); 
    258246    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('photo_max_b', '150000')"); 
    … …  
    262250    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('pm_hide_rcpts', '1')"); 
    263251    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('pm_inbox', '25')"); 
     252    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('pm_inbox_group', '103')"); 
    264253    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('pm_savebox', '100')"); 
     254    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('pm_savebox_group', '0')"); 
    265255    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('pm_send2group', '103')"); 
    266256    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('pm_sentbox', '25')"); 
     257    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('pm_sentbox_group', '103')"); 
    267258    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('remote_stats', '0')"); 
    268     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('revision', '1223')"); 
     259    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('revision', '1350')"); 
    269260    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('session_gc_divisor', '100')"); 
    270     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('session_gc_maxlifetime', '43200')"); 
     261    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('session_gc_maxlifetime', '604800')"); 
    271262    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('session_gc_probability', '1')"); 
    272263    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('session_name', 'ExiteCMSid')"); 
    273264    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('shortdate', '%m/%d/%Y')"); 
    274265    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('siteemail', 'exitecms@exite.eu')"); 
    275     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('siteintro', '<center>\r\n<b>This website is under construction at the moment!</b><br /><br />We are currently preparing the release of version 7.0. The release date has been set for October 27th, providing no last-minute showstoppers pop up.<br /><br />\r\nExiteCMS v7.0 ©2007 Exite BV.</center>')"); 
    276     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('sitelinks_localisation', 'multiple')"); 
    277     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('sitename', 'ExiteCMS Support Site')"); 
     266    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('siteintro', '<center>\r\n<b>This website is under construction at the moment!</b><br /><br />\r\nExiteCMS v7.1 ©2008 Exite BV.</center>')"); 
     267    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('sitelinks_localisation', 'none')"); 
     268    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('sitename', 'New ExiteCMS Website')"); 
    278269    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('siteurl', '/')"); 
    279270    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('siteusername', 'webmaster')"); 
    … …  
    293284    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('unread_threshold', '90')"); 
    294285    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('validation_method', 'image')"); 
    295     $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('version', '7.00')"); 
     286    $result = dbquery("INSERT INTO ".$db_prefix."configuration (cfg_name, cfg_value) VALUES('version', '7.10')"); 
    296287} 
    297288 
    … …  
    917908  `forum_id` smallint(5) NOT NULL default '0', 
    918909  `thread_id` mediumint(8) NOT NULL default '0', 
    919   `thread_page` smallint(5) NOT NULL default '0', 
    920   `thread_last_read` int(10) NOT NULL default '0', 
     910  `thread_first_read` int(10) unsigned NOT NULL default '4294967295', 
     911  `thread_last_read` int(10) unsigned NOT NULL default '0', 
    921912  PRIMARY KEY  (`user_id`,`forum_id`,`thread_id`) 
    922913) ENGINE=MYISAM;"); 
    … …  
    987978  `user_newsletters` tinyint(1) unsigned NOT NULL default '1', 
    988979  `user_sponsor` tinyint(1) unsigned NOT NULL default '0', 
     980  `user_posts_unread` tinyint(1) NOT NULL default '1', 
    989981  `user_cc_code` char(2) NOT NULL default '', 
    990982  PRIMARY KEY  (`user_id`) 

  • branches/PLi-Fusion/includes/font2image.php

    r1343 r1408  
    11<?php 
    22/* 
    3     Dynamic Heading Generator 
    4     Original code by Stewart Rosenberger, http://www.stewartspeak.com/headings/ 
    5  
    6     Converted by WanWizard to work in am ExiteCMS environment 
    7  
    8     usage: $image_resource = font2image($f2i_array); 
    9  
    10     $f2i_array = array(); 
    11     $f2i_array['image'] = "png";                       // Type of image to generate. If not specified, defaults to PNG 
    12     $f2i_array['font_text'] = "Text to convert";       // Text to convert to an image. Required. 
    13     $f2i_array['font_file'] = "font2use.ttf";          // FQN of the TTF font file to use. Required. 
    14     $f2i_array['font_size'] = 10;                      // Font size. Optional. Valid values are 4 to 96. Default = 10. 
    15     $f2i_array['font_color'] = "#000000";              // Font color (html style). Default = black. 
    16     $f2i_array['font_spacing'] = false;                // Use the standard font spacing. Default = false.  
    17                                                        // Disables kerning, outline and shadows!! 
    18     $f2i_array['font_kerning'] = 0;                    // Additional space between characters in pixels. Default = 0, Max = 20. 
    19     $f2i_array['background_color'] = "#FFFFFF";        // Image background color (html style). Default = white. 
    20     $f2i_array['background_shadow_color'] = "#000000"; // Image shadow background color for a 3D look (html style). Default black. 
    21     $f2i_array['background_shadow_width'] = 0;         // Width of the background shadow of the image. Default = 0, Max = 10. 
    22     $f2i_array['outline_color'] = "";                  // Outline color (html style). If not specified, width is set to 0. 
    23     $f2i_array['outline_width'] = 0;                   // Width of the outline of the character in pixels. Default = 0, Max = 10. 
    24     $f2i_array['shadow_color'] = "";                   // Shadow color (html style). If not specified, width is set to 0. 
    25     $f2i_array['shadow_width'] = 0;                    // Width of the shadow of the character in pixels. Default = 0, Max = 10. 
    26     $f2i_array['background_transparent'] = false;      // Should the background color be marked transparent? Boolean, default = false; 
    27     $f2i_array['background_transparent_color'] = "";   // Optional. If defined, this color will be used for transparancy instead of  
    28                                                        // the specified background color. Required if a background shadow is defined 
    29     $f2i_array['cache_images'] = false;                // Cache the image after generation? Boolean, default = false. 
    30     $f2i_array['cache_folder'] = "";                   // Directory to store the cached images in. 
    31                                                        // If not defined or not valid, cache_images will be set to false. 
    32     $f2i_array['cache_prefix'] = false;                // If defined, this will be prepended to the filename of the cached file     
    33     $f2i_array['cache_hash'] = false;                  // Boolean. If false, the text will be used as filename, otherwise a hash is calculated     
    34  
    35     Notes: 
    36     * if the background has a shadow, background transparency is used to create the 3D effect. The text background 
    37       itself can therefore not be transparent. 
     3    Original code by Stewart Rosenberger, http://www.stewartspeak.com/headings/ 
     4     
     5    Converted and extended by WanWizard to work in am ExiteCMS environment 
     6     
     7    usage: $image_resource = font2image($f2i_array); 
     8     
     9    $f2i_array = array(); 
     10    $f2i_array['image'] = "png";                       // Type of image to generate. If not specified, defaults to PNG 
     11    $f2i_array['font_text'] = "Text to convert";       // Text to convert to an image. Required. 
     12    $f2i_array['font_file'] = "font2use.ttf";          // FQN of the TTF font file to use. Required. 
     13    $f2i_array['font_size'] = 10;                      // Font size. Optional. Valid values are 4 to 96. Default = 10. 
     14    $f2i_array['font_color'] = "#000000";              // Font color (html style). Default = black. 
     15    $f2i_array['font_spacing'] = false;                // Use the standard font spacing. Default = false.  
     16                                                       // Disables kerning, outline and shadows!! 
     17    $f2i_array['font_kerning'] = 0;                    // Additional space between characters in pixels. Default = 0, Max = 20. 
     18    $f2i_array['background_color'] = "#FFFFFF";        // Image background color (html style). Default = white. 
     19    $f2i_array['background_shadow_color'] = "#000000"; // Image shadow background color for a 3D look (html style). Default black. 
     20    $f2i_array['background_shadow_width'] = 0;         // Width of the background shadow of the image. Default = 0, Max = 10. 
     21    $f2i_array['outline_color'] = "";                  // Outline color (html style). If not specified, width is set to 0. 
     22    $f2i_array['outline_width'] = 0;                   // Width of the outline of the character in pixels. Default = 0, Max = 10. 
     23    $f2i_array['shadow_color'] = "";                   // Shadow color (html style). If not specified, width is set to 0. 
     24    $f2i_array['shadow_width'] = 0;                    // Width of the shadow of the character in pixels. Default = 0, Max = 10. 
     25    $f2i_array['background_transparent'] = false;      // Should the background color be marked transparent? Boolean, default = false; 
     26    $f2i_array['background_transparent_color'] = "";   // Optional. If defined, this color will be used for transparancy instead of  
     27                                                       // the specified background color. Required if a background shadow is defined 
     28    $f2i_array['cache_images'] = false;                // Cache the image after generation? Boolean, default = false. 
     29    $f2i_array['cache_folder'] = "";                   // Directory to store the cached images in. 
     30                                                       // If not defined or not valid, cache_images will be set to false. 
     31    $f2i_array['cache_prefix'] = false;                // If defined, this will be prepended to the filename of the cached file     
     32    $f2i_array['cache_hash'] = false;                  // Boolean. If false, the text will be used as filename, otherwise a hash is calculated     
     33    $f2i_array['return_link'] = false;                 // If true, the function returns a relative link to the cached image instead of the 
     34                                                       // image itself. If true, cache_images MUST be set to true as well!!! 
     35     
     36    Notes: 
     37    * if the background has a shadow, background transparency is used to create the 3D effect. The text background 
     38      itself can therefore not be transparent. 
    3839 
    3940*/ 
    40 if (!defined("INIT_CMS_OK")) { header("Location: ../index.php"); exit; }  
     41if (eregi("font2image.php", $_SERVER['PHP_SELF']) || !defined('INIT_CMS_OK')) die(); 
    4142 
    4243function font2image($font2image) { 
    … …  
    9394    if (!isset($font2image['background_transparent'])) $font2image['background_transparent'] = false; 
    9495    if (!isset($font2image['cache_images'])) $font2image['cache_images'] = false; 
     96    if (!isset($font2image['return_link'])) $font2image['return_link'] = false; 
    9597    if (!isset($font2image['cache_folder'])) $font2image['cache_images'] = false; 
    96     if ($font2image['cache_folder'] !="" && !is_dir($font2image['cache_folder'])) fatal_error('Cache folder does not exist.'); 
     98    if ($font2image['cache_folder'] !="" && !is_dir($font2image['cache_folder'])) fatal_error("Cache folder does not exist."); 
    9799    if (!isset($font2image['cache_prefix']) || $font2image['cache_prefix'] == false) $font2image['cache_prefix'] = ""; 
    98100    if (!isset($font2image['cache_hash'])) $font2image['cache_hash'] = false; 
     101    if ($font2image['return_link'] && !$font2image['cache_images']) fatal_error("Can't link without cache."); 
    99102 
    100103    if (!isset($font2image['font_spacing'])) $font2image['font_spacing'] = false; 
    … …  
    121124    } 
    122125 
     126    // Create the filename for this image, use hash if requested 
     127    if ($font2image['cache_hash']) { 
     128        $hash = ""; 
     129        foreach ($font2image as $element) { 
     130            $hash .= $element; 
     131        } 
     132        $hash = md5($hash); 
     133    } else { 
     134        $hash = str_replace(' ', '_', $font2image['font_text']); 
     135    } 
     136    $cache_filename = $font2image['cache_folder'] . '/' . $font2image['cache_prefix'] . $hash . '.' . $font2image['image'] ; 
     137     
    123138    // Do we have caching enabled for this image? 
    124139    if ($font2image['cache_images']) { 
    125140        // look for cached copy, if it exists, convert it to a resource and return it 
    126         if ($font2image['cache_hash']) { 
    127             $hash = ""; 
    128             foreach ($font2image as $element) { 
    129                 $hash .= $element; 
    130             } 
    131             $hash = md5($hash); 
    132         } else { 
    133             $hash = str_replace(' ', '_', $font2image['font_text']); 
    134         } 
    135         $cache_filename = $font2image['cache_folder'] . '/' . $font2image['cache_prefix'] . $hash . '.' . $font2image['image'] ; 
    136141        if($font2image['cache_images'] && is_readable($cache_filename)) { 
    137142            // convert the file to a resource 
    … …  
    140145                fatal_error("Cached image file '".$cache_filename."' is not a valid ".strtoupper($font2image['image'])." image!"); 
    141146            } 
    142             switch ($font2image['image']) { 
    143                 case "png": 
    144                     $image = imagecreatefrompng($cache_filename); 
    145                     break; 
    146                 case "jpg": 
    147                     $image = imagecreatefromjpeg($cache_filename); 
    148                     break; 
    149                 case "gif": 
    150                     $image = imagecreatefromgif($cache_filename); 
    151                     break; 
     147            if ($font2image['return_link']) { 
     148                // check if the cache path is inside the webroot 
     149                if (substr($cache_filename,0,strlen(PATH_ROOT)) != PATH_ROOT) { 
     150                    fatal_error("Cached image is not inside the webroot!"); 
     151                } else { 
     152                    return substr($cache_filename, strlen(PATH_ROOT)-1); 
     153                } 
     154            } else { 
     155                switch ($font2image['image']) { 
     156                    case "png": 
     157                        $image = imagecreatefrompng($cache_filename); 
     158                        break; 
     159                    case "jpg": 
     160                        $image = imagecreatefromjpeg($cache_filename); 
     161                        break; 
     162                    case "gif": 
     163                        $image = imagecreatefromgif($cache_filename); 
     164                        break; 
     165                } 
     166                return $image; 
    152167            } 
    153             return $image; 
    154168        } 
    155169    } 
    … …  
    182196        fatal_error('The server could not create this image.') ; 
    183197    } 
    184  
    185198    // give the image a background color 
    186199    if (isset($font2image['background_transparent_color'])) { 
    … …  
    191204    $font2image['background_transparent_color'] = @ImageColorAllocate($image, $background_rgb['red'], $background_rgb['green'], $background_rgb['blue']) ; 
    192205    imagefill($image, 0,0, $font2image['background_transparent_color']); 
     206    // set transparency 
     207    if ($font2image['background_transparent']) { 
     208        ImageColorTransparent($image, $font2image['background_transparent_color']) ; 
     209    } 
     210    // background color and background shadow color 
    193211    $background_rgb = hex_to_rgb($font2image['background_shadow_color']) ; 
    194212    $font2image['background_shadow_color'] = @ImageColorAllocate($image, $background_rgb['red'], $background_rgb['green'], $background_rgb['blue']) ; 
    … …  
    250268    } 
    251269 
    252     // set transparency 
    253     if ($font2image['background_transparent']) { 
    254         ImageColorTransparent($image, $font2image['background_transparent_color']) ; 
    255     } 
    256  
    257270    // write it to the cache directory if needed 
    258271    if ($font2image['cache_images']) { 
    … …  
    269282        } 
    270283    } 
    271 //  imagePNG($image);die(); 
    272     return $image; 
     284    if ($font2image['return_link']) { 
     285        // check if the cache path is inside the webroot 
     286        if (substr($cache_filename,0,strlen(PATH_ROOT)) != PATH_ROOT) { 
     287            fatal_error("Cached image is not inside the webroot!"); 
     288        } else { 
     289            return substr($cache_filename, strlen(PATH_ROOT)-1); 
     290        } 
     291    } else { 
     292        return $image; 
     293    } 
    273294} 
    274295 

  • branches/PLi-Fusion/includes/forum_functions_include.php

    r1335 r1408  
    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); 

  • branches/PLi-Fusion/includes/photo_functions_include.php

    r863 r1408  
    1818     
    1919    global $settings; 
    20      
     20 
     21    // give this process plenty of memory to handle large images 
     22    ini_set('memory_limit', '64M'); 
     23         
    2124    if ($filetype == 1) { $origimage = imagecreatefromgif($origfile); } 
    2225    elseif ($filetype == 2) { $origimage = imagecreatefromjpeg($origfile); } 

  • branches/PLi-Fusion/includes/templates/admin.404pages.tpl

    r1335 r1408  
    4242                    <br /> 
    4343                    <textarea name='page_content' cols='95' rows='20' class='{if $settings.tinymce_enabled != 1}textbox{/if}' style='width:100%; height:{math equation='x/2' format="%u" x=$smarty.const.BROWSER_HEIGHT}px'>{$page_content}</textarea> 
     44                </td> 
    4445            </tr> 
    4546            {if $settings.tinymce_enabled != 1} 

  • branches/PLi-Fusion/includes/templates/admin.download_cats.tpl

    r1192 r1408  
    186186            <a href='{$smarty.const.FUSION_SELF}{$aidlink}&amp;step=delete&amp;cat_id={$cats[dc].download_cat_id}&amp;cat_locale={$cat_locale}'><img src='{$smarty.const.THEME}images/page_delete.gif' alt='{$locale.504}' title='{$locale.504}' /></a> 
    187187        </td> 
    188 </tr> 
     188    </tr> 
    189189{sectionelse} 
    190190    <tr> 

  • branches/PLi-Fusion/includes/templates/admin.settings_messages.tpl

    r864 r1408  
    3636        <tr> 
    3737            <td class='tbl' width='50%'> 
     38                {$locale.722} 
     39            </td> 
     40            <td class='tbl' width='50%'> 
     41                <select name='pm_inbox_group' class='textbox'> 
     42                <option value='0'{if $pm_inbox_group == 0} selected="selected"{/if}>{$locale.725}</option> 
     43                {section name=id loop=$usergroups} 
     44                    <option value='{$usergroups[id].0}'{if $usergroups[id].0 == $pm_inbox_group} selected="selected"{/if}>{$usergroups[id].1}</option> 
     45                {/section} 
     46                </select> 
     47            </td> 
     48        </tr> 
     49        <tr> 
     50            <td class='tbl' width='50%'> 
    3851                {$locale.702} 
    3952                <br /> 
    … …  
    4659        <tr> 
    4760            <td class='tbl' width='50%'> 
     61                {$locale.723} 
     62            </td> 
     63            <td class='tbl' width='50%'> 
     64                <select name='pm_sentbox_group' class='textbox'> 
     65                <option value='0'{if $pm_sentbox_group == 0} selected="selected"{/if}>{$locale.725}</option> 
     66                {section name=id loop=$usergroups} 
     67                    <option value='{$usergroups[id].0}'{if $usergroups[id].0 == $pm_sentbox_group} selected="selected"{/if}>{$usergroups[id].1}</option> 
     68                {/section} 
     69                </select> 
     70            </td> 
     71        </tr> 
     72        <tr> 
     73            <td class='tbl' width='50%'> 
    4874                {$locale.703} 
    4975                <br /> 
    … …  
    5278            <td class='tbl' width='50%'> 
    5379                <input type='text' name='pm_savebox' maxlength='4' class='textbox' style='width:40px;' value='{$pm_savebox}' /> 
     80            </td> 
     81        </tr> 
     82        <tr> 
     83            <td class='tbl' width='50%'> 
     84                {$locale.724} 
     85            </td> 
     86            <td class='tbl' width='50%'> 
     87                <select name='pm_savebox_group' class='textbox'> 
     88                <option value='0'{if $pm_savebox_group == 0} selected="selected"{/if}>{$locale.725}</option> 
     89                {section name=id loop=$usergroups} 
     90                    <option value='{$usergroups[id].0}'{if $usergroups[id].0 == $pm_savebox_group} selected="selected"{/if}>{$usergroups[id].1}</option> 
     91                {/section} 
     92                </select> 
    5493            </td> 
    5594        </tr> 
    … …  
    72111                    <option value='1' {if $pm_hide_rcpts == "1"} selected="selected"{/if}>{$locale.509}</option> 
    73112                    <option value='0' {if $pm_hide_rcpts == "0"} selected="selected"{/if}>{$locale.508}</option> 
    74                 </select> 
    75             </td> 
    76         </tr> 
    77         <tr> 
    78             <td class='tbl' width='50%'> 
    79                 {$locale.715} 
    80             </td> 
    81             <td class='tbl' width='50%'> 
    82                 <select name='pm_read_notify' class='textbox'> 
    83                     <option value='0' {if $pm_read_notify == "0"} selected="selected"{/if}>{$locale.509}</option> 
    84                     <option value='1' {if $pm_read_notify == "1"} selected="selected"{/if}>{$locale.508}</option> 
    85113                </select> 
    86114            </td> 
    … …  
    110138        <tr> 
    111139            <td class='tbl' width='50%'> 
     140                {$locale.720} 
     141            </td> 
     142            <td class='tbl' width='50%'> 
     143                <select name='pm_send2group' class='textbox'> 
     144                {section name=id loop=$usergroups} 
     145                    <option value='{$usergroups[id].0}'{if $usergroups[id].0 == $pm_send2group} selected="selected"{/if}>{$usergroups[id].1}</option> 
     146                {/section} 
     147                </select> 
     148            </td> 
     149        </tr> 
     150        <tr> 
     151            <td class='tbl' align='center' colspan='2'> 
     152                <br /> 
     153            </td> 
     154        </tr>    
     155        <tr> 
     156            <td class='tbl2' align='center' colspan='2'> 
     157                {$locale.708} 
     158            </td> 
     159        </tr> 
     160        <tr> 
     161            <td class='tbl' width='50%'> 
     162                {$locale.715} 
     163            </td> 
     164            <td class='tbl' width='50%'> 
     165                <select name='pm_read_notify' class='textbox'> 
     166                    <option value='0' {if $pm_read_notify == "0"} selected="selected"{/if}>{$locale.509}</option> 
     167                    <option value='1' {if $pm_read_notify == "1"} selected="selected"{/if}>{$locale.508}</option> 
     168                </select> 
     169            </td> 
     170        </tr> 
     171        <tr> 
     172            <td class='tbl' width='50%'> 
     173                {$locale.709} 
     174            </td> 
     175            <td class='tbl' width='50%'> 
     176                <select name='pm_email_notify' class='textbox'> 
     177                    <option value='0' {if $pm_email_notify == "0"} selected="selected"{/if}>{$locale.509}</option> 
     178                    <option value='1' {if $pm_email_notify == "1"} selected="selected"{/if}>{$locale.508}</option> 
     179                </select> 
     180            </td> 
     181        </tr> 
     182        <tr> 
     183            <td class='tbl' width='50%'> 
     184                {$locale.710} 
     185            </td> 
     186            <td class='tbl' width='50%'> 
     187                <select name='pm_save_sent' class='textbox'> 
     188                    <option value='0' {if $pm_save_sent == "0"} selected="selected"{/if}>{$locale.509}</option> 
     189                    <option value='1' {if $pm_save_sent == "1"} selected="selected"{/if}>{$locale.508}</option> 
     190                </select> 
     191            </td> 
     192        </tr> 
     193        <tr> 
     194            <td class='tbl' width='50%'> 
    112195                {$locale.717} 
    113196            </td> 
    … …  
    120203        </tr> 
    121204        <tr> 
    122             <td class='tbl' width='50%'> 
    123                 {$locale.720} 
    124             </td> 
    125             <td class='tbl' width='50%'> 
    126                 <select name='pm_send2group' class='textbox'> 
    127                 {section name=id loop=$usergroups} 
    128                     <option value='{$usergroups[id].0}'{if $usergroups[id].0 == $pm_send2group} selected="selected"{/if}>{$usergroups[id].1}</option> 
    129                 {/section} 
    130                 </select> 
    131             </td> 
    132         </tr> 
    133         <tr> 
    134             <td class='tbl' align='center' colspan='2'> 
    135                 <br /> 
    136             </td> 
    137         </tr>    
    138         <tr> 
    139             <td class='tbl2' align='center' colspan='2'> 
    140                 {$locale.708} 
    141             </td> 
    142         </tr> 
    143         <tr> 
    144             <td class='tbl' width='50%'> 
    145                 {$locale.709} 
    146             </td> 
    147             <td class='tbl' width='50%'> 
    148                 <select name='pm_email_notify' class='textbox'> 
    149                     <option value='0' {if $pm_email_notify == "0"} selected="selected"{/if}>{$locale.509}</option> 
    150                     <option value='1' {if $pm_email_notify == "1"} selected="selected"{/if}>{$locale.508}</option> 
    151                 </select> 
    152             </td> 
    153         </tr> 
    154         <tr> 
    155             <td class='tbl' width='50%'> 
    156                 {$locale.710} 
    157             </td> 
    158             <td class='tbl' width='50%'> 
    159                 <select name='pm_save_sent' class='textbox'> 
    160                     <option value='0' {if $pm_save_sent == "0"} selected="selected"{/if}>{$locale.509}</option> 
    161                     <option value='1' {if $pm_save_sent == "1"} selected="selected"{/if}>{$locale.508}</option> 
    162                 </select> 
    163             </td> 
    164         </tr> 
    165         <tr> 
    166205            <td align='center' colspan='2' class='tbl'> 
    167206                <span class='small2'>{$locale.711}</span> 

  • branches/PLi-Fusion/includes/templates/forum.index.tpl

    r960 r1408  
    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'> 

  • branches/PLi-Fusion/includes/templates/forum.post.tpl

    r1227 r1408  
    138138                        {/section} 
    139139                        <td class='tbl1'> 
    140                             <input type='submit' name='upload' value='{$locale.471}' class='button' /> 
    141140                            <input type='file' name='attach' class='textbox' style='width:200px;' /> 
    142141                            <br /><br /> 
    … …  
    146145                            <br /> 
    147146                            <textarea name='attach_comment' cols='50' rows='2' class='textbox'>{$comments}</textarea> 
     147                            <br /> 
     148                            <input type='submit' name='upload' value='{$locale.471}' class='button' /> 
    148149                        </td> 
    149150                    </tr> 

  • branches/PLi-Fusion/includes/templates/forum.renderpost.tpl

    r1192 r1408  
    4646                {buttonlink name=$locale.568 link="post.php?action=edit&amp;forum_id="|cat:$forum_id|cat:"&amp;thread_id="|cat:$posts[pid].thread_id|cat:"&amp;post_id="|cat:$posts[pid].post_id} 
    4747            {/if} 
    48             {if $smarty.const.SHOW_REPLY_BUTTON && !$thread.thread_locked} 
     48            {if $smarty.const.SHOW_REPLY_BUTTON && (!$thread.thread_locked || $smarty.const.iMOD)} 
    4949                {if $smarty.const.REPLY_AS_QUOTE} 
    5050                    {buttonlink name=$locale.575 link="post.php?action=quote&amp;forum_id="|cat:$forum_id|cat:"&amp;thread_id="|cat:$posts[pid].thread_id|cat:"&amp;reply_id="|cat:$posts[pid].post_id} 
    … …  
    5353                {/if} 
    5454            {/if} 
    55             {if $smarty.const.SHOW_QUOTE_BUTTON && !$thread.thread_locked} 
     55            {if $smarty.const.SHOW_QUOTE_BUTTON && (!$thread.thread_locked || $smarty.const.iMOD)} 
    5656                {buttonlink name=$locale.569 link="post.php?action=quote&amp;forum_id="|cat:$forum_id|cat:"&amp;thread_id="|cat:$posts[pid].thread_id|cat:"&amp;reply_id="|cat:$posts[pid].post_id} 
    5757            {/if} 

  • branches/PLi-Fusion/includes/templates/forum.viewforum.tpl

    r1227 r1408  
    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> 

  • branches/PLi-Fusion/includes/templates/main.pm.options.tpl

    r1124 r1408  
    4141</table> 
    4242<form name='options_form' method='post' action='{$smarty.const.FUSION_SELF}?folder=options'> 
    43     <table align='center' cellpadding='0' cellspacing='1' class='tbl' width='500px'> 
     43    <table align='center' cellpadding='0' cellspacing='1' class='tbl' width='500'> 
    4444        <tr> 
    4545            <td align='right' class='tbl1' width='70%'> 
    … …  
    4848            <td class='tbl1' width='30%'> 
    4949                <select name='pm_email_notify' class='textbox'> 
    50                     <option value='1'{if $user_options.pmconfig_email_notify == "1"} selected{/if}>{$locale.631}</option> 
    51                     <option value='0'{if $user_options.pmconfig_email_notify == "0"} selected{/if}>{$locale.632}</option> 
     50                    <option value='1'{if $user_options.pmconfig_email_notify == "1"} selected='selected'{/if}>{$locale.631}</option> 
     51                    <option value='0'{if $user_options.pmconfig_email_notify == "0"} selected='selected'{/if}>{$locale.632}</option> 
    5252                </select> 
    5353            </td> 
    … …  
    5959            <td class='tbl1' width='30%'> 
    6060                <select name='pm_read_notify' class='textbox'> 
    61                     <option value='1'{if $user_options.pmconfig_read_notify == "1"} selected{/if}>{$locale.631}</option> 
    62                     <option value='0'{if $user_options.pmconfig_read_notify == "0"} selected{/if}>{$locale.632}</option> 
     61                    <option value='1'{if $user_options.pmconfig_read_notify == "1"} selected='selected'{/if}>{$locale.631}</option> 
     62                    <option value='0'{if $user_options.pmconfig_read_notify == "0"} selected='selected'{/if}>{$locale.632}</option> 
    6363                </select> 
    6464            </td> 
    … …  
    7070            <td class='tbl1' width='30%'> 
    7171                <select name='pm_save_sent' class='textbox'> 
    72                     <option value='1'{if $user_options.pmconfig_save_sent == "1"} selected{/if}>{$locale.631}</option> 
    73                     <option value='0'{if $user_options.pmconfig_save_sent == "0"} selected{/if}>{$locale.632}</option> 
     72                    <option value='1'{if $user_options.pmconfig_save_sent == "1"} selected='selected'{/if}>{$locale.631}</option> 
     73                    <option value='0'{if $user_options.pmconfig_save_sent == "0"} selected='selected'{/if}>{$locale.632}</option> 
    7474                </select> 
    7575            </td> 
    … …  
    107107            <td class='tbl1' width='30%'> 
    108108                <select name='pm_view' class='textbox'> 
    109                     <option value='0'{if $user_options.pmconfig_view == "0"} selected{/if}>{$locale.639}</option> 
    110                     <option value='1'{if $user_options.pmconfig_view == "1"} selected{/if}>{$locale.640}</option> 
     109                    <option value='0'{if $user_options.pmconfig_view == "0"} selected='selected'{/if}>{$locale.639}</option> 
     110                    <option value='1'{if $user_options.pmconfig_view == "1"} selected='selected'{/if}>{$locale.640}</option> 
    111111                </select> 
    112112            </td> 
    … …  
    115115            <td align='center' colspan='2' class='tbl1'> 
    116116                <br /> 
    117                 <input type='hidden' name='update_type' value='{$update_type}'> 
    118                 <input type='submit' name='save_options' value='{$locale.623}' class='button'> 
     117                <input type='hidden' name='update_type' value='{$update_type}' /> 
     118                <input type='submit' name='save_options' value='{$locale.623}' class='button' /> 
    119119            </td> 
    120120        </tr> 

  • branches/PLi-Fusion/includes/templates/main.pm.renderpm.tpl

    r1227 r1408  
    1515{*                                                                         *} 
    1616{***************************************************************************} 
    17     <a name='view_{$messages[id].pmindex_id}'></a> 
    1817    {if !$smarty.section.id.first && !$is_inline} 
    1918    <tr> 
    … …  
    2423    <tr> 
    2524        <td width='140' class='tbl_top_left'> 
     25            <a name='view_{$messages[id].pmindex_id}'></a> 
    2626            <b>{$locale.422} 
    2727            {if $is_preview || $messages[id].pmindex_user_id != $messages[id].pmindex_to_id} 
    … …  
    6161        <td align='center' width='10' class='tbl_top_right'>         
    6262            {if !$is_preview} 
    63             <input type='checkbox' name='check_mark[]' value='{$messages[id].pmindex_id}'> 
     63            <input type='checkbox' name='check_mark[]' value='{$messages[id].pmindex_id}' /> 
    6464            {/if} 
    6565        </td> 

  • branches/PLi-Fusion/includes/templates/main.pm.tpl

    r1192 r1408  
    5151    </tr> 
    5252</table> 
    53 {if $totals.inbox == $global_options.pm_inbox || $totals.outbox == $global_options.pm_sentbox || $totals.archive == $global_options.pm_savebox} 
     53{assign var=hadbreak value=0} 
     54{if !$global_options.pm_inbox_group && $totals.inbox == $global_options.pm_inbox} 
    5455    <br /> 
    55     {if $totals.inbox == $global_options.pm_inbox} 
    56         <div class='infobar' style='font-weight:bold;color:red;text-align:center;'>{$locale.488}</div> 
    57     {/if} 
    58     {if $totals.outbox == $global_options.pm_sentbox && $user_options.pmconfig_save_sent} 
    59         <div class='infobar' style='font-weight:bold;color:red;text-align:center;'>{$locale.489}</div> 
    60     {/if} 
    61     {if $totals.archive == $global_options.pm_savebox} 
    62         <div class='infobar' style='font-weight:bold;color:red;text-align:center;'>{$locale.490}</div> 
    63     {/if} 
     56    {assign var=hadbreak value=1} 
     57    <div class='infobar' style='font-weight:bold;color:red;text-align:center;'>{$locale.488}</div> 
     58{/if} 
     59{if !$global_options.pm_sentbox_group && $totals.outbox == $global_options.pm_sentbox && $user_options.pmconfig_save_sent} 
     60    {if !$hadbreak} 
     61        <br /> 
     62        {assign var=hadbreak value=1} 
     63    {/if} 
     64    <div class='infobar' style='font-weight:bold;color:red;text-align:center;'>{$locale.489}</div> 
     65{/if} 
     66{if !$global_options.pm_savebox_group && $totals.archive == $global_options.pm_savebox} 
     67    {if !$hadbreak} 
     68        <br /> 
     69        {assign var=hadbreak value=1} 
     70    {/if} 
     71    <div class='infobar' style='font-weight:bold;color:red;text-align:center;'>{$locale.490}</div> 
    6472{/if} 
    6573<form name='pm_form' method='post' action='{$smarty.const.FUSION_SELF}?folder={$folder}'> 
    … …  
    8088                        <input type='submit' name='multi_unread' value='{$locale.415}' class='button' /> 
    8189                    {/if} 
    82                     {if $folder != $locale.404 && $global_options.pm_savebox > $totals.archive} 
     90                    {if $folder != $locale.404 && ($global_options.pm_savebox > $totals.archive || $global_options.pm_savebox_group)} 
    8391                        <input type='submit' name='multi_archive' value='{$locale.448}' class='button' /> 
    8492                    {/if} 
    8593                    {if $folder == $locale.404} 
    86                         {if ($messages[id].pmindex_user_id == $messages[id].pmindex_to_id && $global_options.pm_inbox > $totals.inbox) || ($messages[id].pmindex_user_id != $messages[id].pmindex_to_id && $global_options.pm_sentbox > $totals.outbox)} 
     94                        {if ($messages[id].pmindex_user_id == $messages[id].pmindex_to_id && ($global_options.pm_inbox > $totals.inbox || $global_options.pm_inbox_group)) || ($messages[id].pmindex_user_id != $messages[id].pmindex_to_id && ($global_options.pm_sentbox > $totals.outbox || $global_options.pm_sentbox_group))} 
    8795                            <input type='submit' name='multi_restore' value='{$locale.412}' class='button' /> 
    8896                        {/if} 
    … …  
    135143    {if $messages[id].pmindex_id == $view_id} 
    136144    <tr> 
    137         <td colspan='4' class='tbl2'> 
     145        <td colspan='5' class='tbl2'> 
    138146            <table cellpadding='0' cellspacing='0' width='100%' class='tbl-border'> 
    139147                {assign var='is_inline' value=true} 
    … …  
    225233                    <input type='submit' name='multi_unread' value='{$locale.415}' class='button' /> 
    226234                {/if} 
    227                 {if $folder != $locale.404 && $global_options.pm_savebox > $totals.archive} 
     235                {if $folder != $locale.404 && ($global_options.pm_savebox > $totals.archive || $global_options.pm_savebox_group)} 
    228236                    <input type='submit' name='multi_archive' value='{$locale.448}' class='button' /> 
    229237                {/if} 
    230238                {if $folder == $locale.404} 
    231                     {if ($messages[id].pmindex_user_id == $messages[id].pmindex_to_id && $global_options.pm_inbox > $totals.inbox) || ($messages[id].pmindex_user_id != $messages[id].pmindex_to_id && $global_options.pm_sentbox > $totals.outbox)} 
     239                    {if ($messages[id].pmindex_user_id == $messages[id].pmindex_to_id && ($global_options.pm_inbox > $totals.inbox || $global_options.pm_inbox_group)) || ($messages[id].pmindex_user_id != $messages[id].pmindex_to_id && ($global_options.pm_sentbox > $totals.outbox || $global_options.pm_sentbox_group))} 
    232240                        <input type='submit' name='multi_restore' value='{$locale.412}' class='button' /> 
    233241                    {/if} 

  • branches/PLi-Fusion/includes/user_functions.php

    r1343 r1408  
    4242 
    4343// Login code  
    44 if (isset($_POST['login'])) { 
    45     $user_pass = md5($_POST['user_pass']); 
     44if (isset($_POST['login']) && isset($_POST['user_name']) && isset($_POST['user_pass'])) { 
     45    $user_pass = md5(md5($_POST['user_pass'])); 
    4646    $user_name = preg_replace(array("/\=/","/\#/","/\sOR\s/"), "", stripinput($_POST['user_name'])); 
    47     // double hashed passwords as of revision 954 
    48     if ($settings['revision'] >= 954) { 
    49         $user_pass = md5($user_pass); 
    50     } 
    5147    $result = dbquery("SELECT * FROM ".$db_prefix."users WHERE user_name='$user_name' AND user_password='".$user_pass."'"); 
    5248    if (dbrows($result) != 0) { 
    … …  
    8581        } 
    8682    } else { 
    87         redirect(BASEDIR."setuser.php?error=3"); 
     83        redirect(BASEDIR."setuser.php?error=3", "script"); 
    8884        exit; 
    8985    } 
    … …  
    365361 
    366362    if (iSUPERADMIN) {  
    367         $res .= ($hidden == false?" AND ":"")."($field != '100'"; 
     363        $res .= ($res != ""?" AND ":"")."$field != '100'"; 
     364        return $res; 
    368365    } elseif ($userdata['user_level'] >= 102) {  
    369366        $res .= ($hidden == false?" AND ":"")."($field='0' OR $field='101' OR $field='102'"; 

  • branches/PLi-Fusion/lostpassword.php

    r1124 r1408  
    4141            for ($i=0;$i<=7;$i++) { $new_pass .= chr(rand(97, 122)); } 
    4242            $mailbody = str_replace("[NEW_PASS]", $new_pass, $locale['411']); 
    43             $mailbody = str_replace("[USER_NAME]", $data['user_name'], $mailbody); 
     43            $mailbody = str_replace("[USERNAME]", $data['user_name'], $mailbody); 
    4444            $mailbody = str_replace("[SITENAME]", $settings['sitename'], $mailbody); 
    4545            $mailbody = str_replace("[SITEUSERNAME]", $settings['siteusername'], $mailbody); 

  • branches/PLi-Fusion/modules/user_info_panel/templates/modules.user_info_panel.tpl

    r1343 r1408  
    3434        <hr /> 
    3535        <div id='countdown' style='text-align:center'> 
    36             Login session ends on {$login_expiry|date_format:"subheaderdate"} 
     36            Login session ends on<br />{$login_expiry|date_format:"subheaderdate"} 
    3737        </div> 
    3838    {/if} 
    … …  
    4040        <hr /> 
    4141        <div style='text-align:center'> 
    42             <b><a href='{$smarty.const.BASEDIR}pm.php?action=show_new' class='side'>{$new_pm_msg|string_format:$locale.085}{if $new_pm_msg == 1}{$locale.086}{else}{$locale.087}{/if}</a></b> 
     42            <b><a href='{$smarty.const.BASEDIR}pm.php?action=show_new' class='side'>{if $new_pm_msg == 1}{$new_pm_msg|string_format:$locale.085}{else}{$new_pm_msg|string_format:$locale.086}{/if}</a></b> 
    4343        </div> 
    4444    {/if} 
    … …  
    4747        <div style='text-align:center'> 
    4848            {if $new_posts_panel} 
    49                 <a href='{$smarty.const.MODULES}forum_threads_list_panel/new_posts.php' class='side'><b>{$new_post_msg|string_format:$locale.090}{if $new_post_msg == 1}{$locale.088}{else}{$locale.089}{/if}</b></a> 
     49                <a href='{$smarty.const.MODULES}forum_threads_list_panel/new_posts.php' class='side'><b>{if $new_post_msg == 1}{$new_post_msg|string_format:$locale.088}{else}{$new_post_msg|string_format:$locale.089}{/if}</b></a> 
    5050                <hr /> 
    5151                {buttonlink name=$locale.091 link=$smarty.const.MODULES|cat:"forum_threads_list_panel/new_posts.php?markasread="|cat:$user_id} 
    5252            {else} 
    53                 <b>{$new_post_msg|string_format:$locale.090}{if $new_post_msg == 1}{$locale.088}{else}{$locale.089}{/if}</b> 
     53                <b>{if $new_post_msg == 1}{$new_post_msg|string_format:$locale.088}{else}{$new_post_msg|string_format:$locale.089}{/if}</b> 
    5454            {/if} 
    5555        </div> 

  • branches/PLi-Fusion/modules/user_info_panel/user_info_panel.php

    r1343 r1408  
    6464$variables['loginerror'] = isset($loginerror) ? $loginerror : ""; 
    6565$variables['remember_me'] = isset($_SESSION['remember_me']) ? $_SESSION['remember_me'] : "no"; 
    66 $variables['login_expiry']  = (iADMIN && isset($_SESSION['login_expire'])) ? $_SESSION['login_expire'] : ""; 
     66$variables['login_expiry']  = (iADMIN && isset($_SESSION['login_expire'])) ? time_system2local($_SESSION['login_expire']) : ""; 
    6767 
    6868$template_variables['modules.user_info_panel'] = $variables; 

  • branches/PLi-Fusion/pm.php

    r1227 r1408  
    300300 
    301301    // check if we need to make room in the outbox of the sender 
    302     if ($totals['outbox'] >= $global_options['pm_sentbox']) { 
    303         $limit = $totals['outbox'] - $global_options['pm_sentbox'] + 1; 
    304         $result = dbquery( 
    305             "SELECT * FROM ".$db_prefix."pm m, ".$db_prefix."pm_index i  
    306             WHERE m.pm_id = i.pm_id AND i.pmindex_user_id = '".$userdata['user_id']."' AND i.pmindex_folder = '1' 
    307             ORDER BY m.pm_datestamp LIMIT ".$limit 
    308             ); 
    309         while ($data = dbarray($result)) { 
    310             deletemessage($data['pmindex_id'], $userdata['user_id']); 
     302    if (!$global_options['pm_sentbox_group']) { 
     303        if ($totals['outbox'] >= $global_options['pm_sentbox']) { 
     304            $limit = $totals['outbox'] - $global_options['pm_sentbox'] + 1; 
     305            $result = dbquery( 
     306                "SELECT * FROM ".$db_prefix."pm m, ".$db_prefix."pm_index i  
     307                WHERE m.pm_id = i.pm_id AND i.pmindex_user_id = '".$userdata['user_id']."' AND i.pmindex_folder = '1' 
     308                ORDER BY m.pm_datestamp LIMIT ".$limit 
     309                ); 
     310            while ($data = dbarray($result)) { 
     311                deletemessage($data['pmindex_id'], $userdata['user_id']); 
     312            } 
    311313        } 
    312314    } 
    … …  
    383385    foreach($message['user_ids'] as $user) { 
    384386        // check if this recipient has room in his inbox. If not, create it 
    385         $inbox_total = dbcount("(pmindex_id)", "pm_index", "pmindex_user_id = '".$user['user_id']."' AND pmindex_folder = '0'"); 
    386         if ($inbox_total >= $global_options['pm_inbox']) { 
    387             $limit = $inbox_total - $global_options['pm_inbox'] + 1; 
    388             $result = dbquery( 
    389                 "SELECT * FROM ".$db_prefix."pm m, ".$db_prefix."pm_index i  
    390                 WHERE m.pm_id = i.pm_id AND i.pmindex_user_id = '".$user['user_id']."' AND i.pmindex_folder = '0' 
    391                 ORDER BY m.pm_datestamp LIMIT ".$limit 
    392                 ); 
    393             while ($data = dbarray($result)) { 
    394                 deletemessage($data['pmindex_id'], $user['user_id']); 
     387        if (!$global_options['pm_inbox_group']) { 
     388            $inbox_total = dbcount("(pmindex_id)", "pm_index", "pmindex_user_id = '".$user['user_id']."' AND pmindex_folder = '0'"); 
     389            if ($inbox_total >= $global_options['pm_inbox']) { 
     390                $limit = $inbox_total - $global_options['pm_inbox'] + 1; 
     391                $result = dbquery( 
     392                    "SELECT * FROM ".$db_prefix."pm m, ".$db_prefix."pm_index i  
     393                    WHERE m.pm_id = i.pm_id AND i.pmindex_user_id = '".$user['user_id']."' AND i.pmindex_folder = '0' 
     394                    ORDER BY m.pm_datestamp LIMIT ".$limit 
     395                    ); 
     396                while ($data = dbarray($result)) { 
     397                    deletemessage($data['pmindex_id'], $user['user_id']); 
     398                } 
    395399            } 
    396400        } 
    … …  
    455459$global_options['pm_sentbox'] = $settings['pm_sentbox']; 
    456460$global_options['pm_savebox'] = $settings['pm_savebox']; 
     461$global_options['pm_inbox_group'] = ($settings['pm_inbox_group'] && checkgroup($settings['pm_inbox_group'])); 
     462$global_options['pm_sentbox_group'] = ($settings['pm_sentbox_group'] && checkgroup($settings['pm_sentbox_group'])); 
     463$global_options['pm_savebox_group'] = ($settings['pm_savebox_group'] && checkgroup($settings['pm_savebox_group'])); 
    457464$global_options['pm_send2group'] = $settings['pm_send2group']; 
    458465$global_options['pm_hide_rcpts'] = $settings['pm_hide_rcpts']; 
    … …  
    609616    // move the selected messages to the arhive folder 
    610617    if ($msg_ids && $check_count > 0) { 
    611         if ($global_options['pm_savebox'] == "0" || ($totals['archive'] + $check_count) <= $global_options['pm_savebox']) { 
     618        if ($global_options['pm_savebox'] == "0" || ($totals['archive'] + $check_count) <= $global_options['pm_savebox'] || $global_options['pm_savebox_group']) { 
    612619            $result = dbquery("UPDATE ".$db_prefix."pm_index SET pmindex_folder='2' WHERE pmindex_id IN(".$msg_ids.") AND pmindex_user_id='".$userdata['user_id']."' AND pmindex_read_datestamp != '0'"); 
    613620        } else { 
    … …  
    628635                if ($data['pmindex_user_id'] == $data['pmindex_to_id']) { 
    629636                    // restore to inbox 
    630                     if ($global_options['pm_inbox'] == "0" || $totals['inbox'] < $global_options['pm_inbox']) { 
     637                    if ($global_options['pm_inbox'] == "0" || $totals['inbox'] < $global_options['pm_inbox'] || $global_options['pm_inbox_group']) { 
    631638                        $result = dbquery("UPDATE ".$db_prefix."pm_index SET pmindex_folder='0' WHERE pmindex_id = '".$msg_id."' AND pmindex_user_id='".$userdata['user_id']."'"); 
    632639                        $totals['inbox'] = dbcount("(pmindex_id)", "pm_index", "pmindex_user_id = '".$userdata['user_id']."' AND pmindex_folder = '0'"); 
    … …  
    637644                } else { 
    638645                    // restore to outbox 
    639                     if ($global_options['pm_sentbox'] == "0" || $totals['outbox'] < $global_options['pm_sentbox']) { 
     646                    if ($global_options['pm_sentbox'] == "0" || $totals['outbox'] < $global_options['pm_sentbox'] || $global_options['pm_sentbox_group']) { 
    640647                        $result = dbquery("UPDATE ".$db_prefix."pm_index SET pmindex_folder='1' WHERE pmindex_id = '".$msg_id."' AND pmindex_user_id='".$userdata['user_id']."'"); 
    641648                        $totals['outbox'] = dbcount("(pmindex_id)", "pm_index", "pmindex_user_id = '".$userdata['user_id']."' AND pmindex_folder = '1'"); 
    … …  
    699706} elseif ($action == "archive") { 
    700707 
    701     if ($global_options['pm_savebox'] == "0" || $totals['archive'] < $global_options['pm_savebox']) { 
     708    if ($global_options['pm_savebox'] == "0" || $totals['archive'] < $global_options['pm_savebox'] || $global_options['pm_savebox_group']) { 
    702709        $result = dbquery("UPDATE ".$db_prefix."pm_index SET pmindex_folder='2' WHERE pmindex_id = '".$msg_id."' AND pmindex_user_id='".$userdata['user_id']."'"); 
    703710    } else { 
    … …  
    713720        if ($data['pmindex_user_id'] == $data['pmindex_to_id']) { 
    714721            // restore to inbox 
    715             if ($global_options['pm_inbox'] == "0" || $totals['inbox'] < $global_options['pm_inbox']) { 
     722            if ($global_options['pm_inbox'] == "0" || $totals['inbox'] < $global_options['pm_inbox'] || $global_options['pm_inbox_group']) { 
    716723                $result = dbquery("UPDATE ".$db_prefix."pm_index SET pmindex_folder='0' WHERE pmindex_id = '".$msg_id."' AND pmindex_user_id='".$userdata['user_id']."'"); 
    717724            } else { 
    … …  
    720727        } else { 
    721728            // restore to outbox 
    722             if ($global_options['pm_sentbox'] == "0" || $totals['outbox'] < $global_options['pm_sentbox']) { 
     729            if ($global_options['pm_sentbox'] == "0" || $totals['outbox'] < $global_options['pm_sentbox'] || $global_options['pm_sentbox_group']) { 
    723730                $result = dbquery("UPDATE ".$db_prefix."pm_index SET pmindex_folder='1' WHERE pmindex_id = '".$msg_id."' AND pmindex_user_id='".$userdata['user_id']."'"); 
    724731            } else { 

  • branches/PLi-Fusion/register.php

    r1335 r1408  
    1515require_once dirname(__FILE__)."/includes/core_functions.php"; 
    1616require_once PATH_INCLUDES."theme_functions.php"; 
     17require_once PATH_INCLUDES."dns_functions.php"; 
    1718 
    1819// temp storage for template variables 
    … …  
    3738            $user_info = unserialize($data['user_info']); 
    3839            $activation = $settings['admin_activation'] == "1" ? "2" : "0"; 
    39             $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')"); 
    4041            $result = dbquery("DELETE FROM ".$db_prefix."new_users WHERE user_code='$activate'");    
    4142            if ($settings['admin_activation'] == "1") { 
    … …  
    134135            require_once PATH_INCLUDES."secureimage-1.0.3/securimage.php"; 
    135136            $securimage = new Securimage(); 
    136             if ($securimage->check($_POST['captcha_code']) == false) { 
     137            if (!isset($_POST['captcha_code']) || $securimage->check($_POST['captcha_code']) == false) { 
    137138                // the code was incorrect 
    138139                $error .= $locale['410']."<br />\n"; 

  • branches/PLi-Fusion/search.php

    r1124 r1408  
    4646$variables['rowstart'] = $rowstart; 
    4747 
     48// do we have a localized menu? If so, select only the current locale 
     49switch ($settings['sitelinks_localisation']) { 
     50    case "none": 
     51        $where = ""; 
     52        break; 
     53    case "single": 
     54        $where = ""; 
     55        break; 
     56    case "multiple": 
     57        if (isset($link_locale)) { 
     58            $result = dbquery("SELECT * FROM ".$db_prefix."locale WHERE locale_code = '".stripinput($link_locale)."' AND locale_active = '1' LIMIT 1"); 
     59            if (!dbrows($result)) unset($link_locale); 
     60        } 
     61        if (!isset($link_locale)) $link_locale = $settings['locale_code']; 
     62        $variables['link_locale'] = $link_locale; 
     63        $where = "AND link_locale = '".$link_locale."' "; 
     64        break; 
     65} 
     66 
    4867// get the available options from the database 
    49 $result = dbquery("SELECT * FROM ".$db_prefix."site_links WHERE link_position<='2' ORDER BY link_order"); 
     68$result = dbquery("SELECT * FROM ".$db_prefix."site_links WHERE link_position<='2' ".$where."ORDER BY link_order"); 
    5069$variables['links'] = array(); 
    5170if (dbrows($result) != 0) { 
    … …  
    91110        case "f":   // forums 
    92111            $result = dbquery( 
    93                 "SELECT tp.*, tf.*, tu.user_id,user_name, 
    94                 MATCH(post_subject, post_message) AGAINST ('$stext' IN BOOLEAN MODE) AS score 
     112                "SELECT tp.*, tf.*, tu.user_id,user_name, fa.attach_id, 
     113                MATCH(tp.post_subject, tp.post_message, fa.attach_name, fa.attach_realname, fa.attach_comment) AGAINST ('$stext' IN BOOLEAN MODE) AS score 
    95114                FROM ".$db_prefix."posts tp 
    96115                INNER JOIN ".$db_prefix."forums tf USING(forum_id) 
    97116                INNER JOIN ".$db_prefix."users tu ON tp.post_author=tu.user_id 
    98                 WHERE ".groupaccess('forum_access')." AND MATCH(post_subject, post_message) AGAINST ('$stext' IN BOOLEAN MODE) 
     117                LEFT JOIN ".$db_prefix."forum_attachments fa ON tp.post_id=fa.post_id 
     118                WHERE ".groupaccess('forum_access')." AND MATCH(tp.post_subject, tp.post_message, fa.attach_name, fa.attach_realname, fa.attach_comment) AGAINST ('$stext' IN BOOLEAN MODE) 
    99119                ORDER BY score DESC, post_datestamp DESC" 
    100120            ); 

  • branches/PLi-Fusion/setup.php

    r1227 r1408  
    291291            // add records to the admin table 
    292292            $commands = array(); 
    293             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('A',  'articles.gif', '".$locale['462']."', 'articles.php', 1)"); 
    294             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('AC', 'article_cats.gif', '".$locale['461']."', 'article_cats.php', 1)"); 
    295             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('AD', 'admins.gif', '".$locale['460']."', 'administrators.php', 2)"); 
    296             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('B',  'blacklist.gif', '".$locale['463']."', 'blacklist.php', 2)"); 
    297             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('BG',  'blogs.gif', '".$locale['473']."', 'blogs.php', 1)"); 
    298             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('C',  '', '".$locale['464']."', 'reserved', 2)"); 
    299             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('CP', 'c-pages.gif', '".$locale['465']."', 'custom_pages.php', 1)"); 
    300             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('D',  'dl.gif', '".$locale['468']."', 'downloads.php', 1)"); 
    301             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('DB', 'db_backup.gif', '".$locale['466']."', 'db_backup.php', 3)"); 
    302             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('DC', 'dl_cats.gif', '".$locale['467']."', 'download_cats.php', 1)"); 
    303             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('F',  'forums.gif', '".$locale['470']."', 'forums.php', 1)"); 
    304             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('FQ', 'faq.gif', '".$locale['469']."', 'faq.php', 1)"); 
    305             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('I',  'modules.gif', '".$locale['472']."', 'modules.php', 3)"); 
    306             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('IM', 'images.gif', '".$locale['471']."', 'images.php', 1)"); 
    307             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('IP', '', '".$locale['473']."', 'reserved', 3)"); 
    308             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('M',  'members.gif', '".$locale['474']."', 'members.php', 2)"); 
    309             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('N',  'news.gif', '".$locale['475']."', 'news.php', 1)"); 
    310             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('NC', 'news_cats.gif', '".$locale['494']."', 'news_cats.php', 1)"); 
    311             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('P',  'panels.gif', '".$locale['476']."', 'panels.php', 3)"); 
    312             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('PI', 'phpinfo.gif', '".$locale['478']."', 'phpinfo.php', 3)"); 
    313             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('PO', 'polls.gif', '".$locale['479']."', 'forum_polls.php', 1)"); 
    314             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S1', 'settings.gif', '".$locale['487']."', 'settings_main.php', 3)"); 
    315             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S2', 'settings_time.gif', '".$locale['488']."', 'settings_time.php', 3)"); 
    316             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S3', 'settings_forum.gif', '".$locale['489']."', 'settings_forum.php', 3)"); 
    317             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S4', 'registration.gif', '".$locale['490']."', 'settings_registration.php', 3)"); 
    318             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S6', 'settings_misc.gif', '".$locale['492']."', 'settings_misc.php', 3)"); 
    319             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S7', 'settings_pm.gif', '".$locale['493']."', 'settings_messages.php', 3)"); 
    320             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S8', 'settings_lang.gif', '".$locale['459']."', 'settings_languages.php', 3)"); 
    321             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('SL', 'site_links.gif', '".$locale['481']."', 'site_links.php', 3)"); 
    322             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('T',  'tools.gif', '".$locale['495']."', 'tools.php', 3)"); 
    323             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('U',  'upgrade.gif', '".$locale['483']."', 'upgrade.php', 3)"); 
    324             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('UG', 'user_groups.gif', '".$locale['484']."', 'user_groups.php', 2)"); 
    325             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('UR', 'submissions.gif', '".$locale['496']."', 'redirects.php', 1)"); 
     293            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('A',  'articles.gif', '".addslashes($locale['462'])."', 'articles.php', 1)"); 
     294            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('AC', 'article_cats.gif', '".addslashes($locale['461'])."', 'article_cats.php', 1)"); 
     295            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('AD', 'admins.gif', '".addslashes($locale['460'])."', 'administrators.php', 2)"); 
     296            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('B',  'blacklist.gif', '".addslashes($locale['463'])."', 'blacklist.php', 2)"); 
     297            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('BG',  'blogs.gif', '".addslashes($locale['473'])."', 'blogs.php', 1)"); 
     298            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('C',  '', '".addslashes($locale['464'])."', 'reserved', 2)"); 
     299            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('CP', 'c-pages.gif', '".addslashes($locale['465'])."', 'custom_pages.php', 1)"); 
     300            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('D',  'dl.gif', '".addslashes($locale['468'])."', 'downloads.php', 1)"); 
     301            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('DB', 'db_backup.gif', '".addslashes($locale['466'])."', 'db_backup.php', 3)"); 
     302            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('DC', 'dl_cats.gif', '".addslashes($locale['467'])."', 'download_cats.php', 1)"); 
     303            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('F',  'forums.gif', '".addslashes($locale['470'])."', 'forums.php', 1)"); 
     304            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('FQ', 'faq.gif', '".addslashes($locale['469'])."', 'faq.php', 1)"); 
     305            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('I',  'modules.gif', '".addslashes($locale['472'])."', 'modules.php', 3)"); 
     306            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('IM', 'images.gif', '".addslashes($locale['471'])."', 'images.php', 1)"); 
     307            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('IP', '', '".addslashes($locale['473'])."', 'reserved', 3)"); 
     308            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('M',  'members.gif', '".addslashes($locale['474'])."', 'members.php', 2)"); 
     309            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('N',  'news.gif', '".addslashes($locale['475'])."', 'news.php', 1)"); 
     310            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('NC', 'news_cats.gif', '".addslashes($locale['494'])."', 'news_cats.php', 1)"); 
     311            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('P',  'panels.gif', '".addslashes($locale['476'])."', 'panels.php', 3)"); 
     312            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('PI', 'phpinfo.gif', '".addslashes($locale['478'])."', 'phpinfo.php', 3)"); 
     313            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('PO', 'polls.gif', '".addslashes($locale['479'])."', 'forum_polls.php', 1)"); 
     314            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S1', 'settings.gif', '".addslashes($locale['487'])."', 'settings_main.php', 3)"); 
     315            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S2', 'settings_time.gif', '".addslashes($locale['488'])."', 'settings_time.php', 3)"); 
     316            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S3', 'settings_forum.gif', '".addslashes($locale['489'])."', 'settings_forum.php', 3)"); 
     317            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S4', 'registration.gif', '".addslashes($locale['490'])."', 'settings_registration.php', 3)"); 
     318            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S6', 'settings_misc.gif', '".addslashes($locale['492'])."', 'settings_misc.php', 3)"); 
     319            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S7', 'settings_pm.gif', '".addslashes($locale['493'])."', 'settings_messages.php', 3)"); 
     320            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S8', 'settings_lang.gif', '".addslashes($locale['459'])."', 'settings_languages.php', 3)"); 
     321            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('SL', 'site_links.gif', '".addslashes($locale['481'])."', 'site_links.php', 3)"); 
     322            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('T',  'tools.gif', '".addslashes($locale['495'])."', 'tools.php', 3)"); 
     323            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('U',  'upgrade.gif', '".addslashes($locale['483'])."', 'upgrade.php', 3)"); 
     324            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('UG', 'user_groups.gif', '".addslashes($locale['484'])."', 'user_groups.php', 2)"); 
     325            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('UR', 'submissions.gif', '".addslashes($locale['496'])."', 'redirects.php', 1)"); 
    326326            $result = dbcommands($commands, $db_prefix); 
    327327 
    328328            // add the default 404 page to the custom pages table 
    329329            $commands = array(); 
    330             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##custom_pages (page_title, page_access, page_content, page_allow_comments, page_allow_ratings) VALUES ('404 Error Page', 0, '".mysql_escape_string("<table border=\"0\" cellspacing=\"0\" cellpadding=\"5\" width=\"100%\" align=\"center\"> <tbody><tr><td width=\"10\"> </td><td><div align=\"center\"><font size=\"6\"><span class=\"shoutboxname\"><br />404 - Page Not Found</span><br /></font></div><br /><br /><hr width=\"90%\" size=\"2\" /><br /><br /><div align=\"center\">".$locale['560']."<br /></div><br /><div align=\"center\">".$locale['561']."<br /></div><br /><div align=\"center\">".$locale['562']."<br /></div><br /><br /><hr width=\"90%\" size=\"2\" /><br /><br /><div align=\"center\">".$locale['563']."<br /></div><br /><div align=\"center\">".$locale['564']."</div></td><td width=\"10\"> </td></tr></tbody></table><br />")."', 0, 0)"); 
     330            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##custom_pages (page_title, page_access, page_content, page_allow_comments, page_allow_ratings) VALUES ('404 Error Page', 0, '".mysql_escape_string("<table border=\"0\" cellspacing=\"0\" cellpadding=\"5\" width=\"100%\" align=\"center\"> <tbody><tr><td width=\"10\"> </td><td><div align=\"center\"><font size=\"6\"><span class=\"shoutboxname\"><br />404 - Page Not Found</span><br /></font></div><br /><br /><hr width=\"90%\" size=\"2\" /><br /><br /><div align=\"center\">".addslashes($locale['560'])."<br /></div><br /><div align=\"center\">".addslashes($locale['561'])."<br /></div><br /><div align=\"center\">".addslashes($locale['562'])."<br /></div><br /><br /><hr width=\"90%\" size=\"2\" /><br /><br /><div align=\"center\">".addslashes($locale['563'])."<br /></div><br /><div align=\"center\">".addslashes($locale['564'])."</div></td><td width=\"10\"> </td></tr></tbody></table><br />")."', 0, 0)"); 
    331331            $commands[] = array('type' => 'db', 'value' => "UPDATE ##PREFIX##custom_pages SET page_id = 0"); 
    332332            $result = dbcommands($commands, $db_prefix); 
    … …  
    351351            // add the default news categories  
    352352            $commands = array(); 
    353             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['540']."', 'bugs.gif')"); 
    354             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['541']."', 'downloads.gif')"); 
    355             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['542']."', 'games.gif')"); 
    356             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['543']."', 'graphics.gif')"); 
    357             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['544']."', 'hardware.gif')"); 
    358             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['545']."', 'journal.gif')"); 
    359             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['546']."', 'members.gif')"); 
    360             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['547']."', 'mods.gif')"); 
    361             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['548']."', 'movies.gif')"); 
    362             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['549']."', 'network.gif')"); 
    363             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['550']."', 'news.gif')"); 
    364             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['552']."', 'security.gif')"); 
    365             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['553']."', 'software.gif')"); 
    366             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['554']."', 'themes.gif')"); 
    367             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".$locale['555']."', 'windows.gif')"); 
     353            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['540'])."', 'bugs.gif')"); 
     354            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['541'])."', 'downloads.gif')"); 
     355            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['542'])."', 'games.gif')"); 
     356            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['543'])."', 'graphics.gif')"); 
     357            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['544'])."', 'hardware.gif')"); 
     358            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['545'])."', 'journal.gif')"); 
     359            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['546'])."', 'members.gif')"); 
     360            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['547'])."', 'mods.gif')"); 
     361            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['548'])."', 'movies.gif')"); 
     362            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['549'])."', 'network.gif')"); 
     363            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['550'])."', 'news.gif')"); 
     364            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['552'])."', 'security.gif')"); 
     365            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['553'])."', 'software.gif')"); 
     366            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['554'])."', 'themes.gif')"); 
     367            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##news_cats (news_cat_name, news_cat_image) VALUES ('".addslashes($locale['555'])."', 'windows.gif')"); 
    368368            $result = dbcommands($commands, $db_prefix); 
    369369     
    … …  
    377377            // and activate the panels of these modules 
    378378            $commands = array(); 
    379             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##panels (panel_name, panel_filename, panel_side, panel_order, panel_type, panel_access, panel_display, panel_status) VALUES ('".$locale['520']."', 'main_menu_panel', '1', '1', 'file', '0', '0', '1')"); 
    380             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##panels (panel_name, panel_filename, panel_side, panel_order, panel_type, panel_access, panel_display, panel_status) VALUES ('".$locale['524']."', 'welcome_message_panel', '2', '1', 'file', '0', '0', '1')"); 
    381             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##panels (panel_name, panel_filename, panel_side, panel_order, panel_type, panel_access, panel_display, panel_status) VALUES ('".$locale['526']."', 'user_info_panel', '4', 1, 'file', '0', '0', '1')"); 
     379            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##panels (panel_name, panel_filename, panel_side, panel_order, panel_type, panel_access, panel_display, panel_status) VALUES ('".addslashes($locale['520'])."', 'main_menu_panel', '1', '1', 'file', '0', '0', '1')"); 
     380            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##panels (panel_name, panel_filename, panel_side, panel_order, panel_type, panel_access, panel_display, panel_status) VALUES ('".addslashes($locale['524'])."', 'welcome_message_panel', '2', '1', 'file', '0', '0', '1')"); 
     381            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##panels (panel_name, panel_filename, panel_side, panel_order, panel_type, panel_access, panel_display, panel_status) VALUES ('".addslashes($locale['526'])."', 'user_info_panel', '4', 1, 'file', '0', '0', '1')"); 
    382382            $result = dbcommands($commands, $db_prefix); 
    383383 
    384384            // add the default menu links  
    385385            $commands = array(); 
    386             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".$locale['500']."', 'index.php', '0', '1', '0', '1', 'main_menu_panel')"); 
    387             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".$locale['501']."', 'article_cats.php', '0', '1', '0', '2', 'main_menu_panel')"); 
    388             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".$locale['502']."', 'downloads.php', '0', '1', '0', '3', 'main_menu_panel')"); 
    389             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".$locale['503']."', 'faq.php', '0', '1', '0', '4', 'main_menu_panel')"); 
    390             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".$locale['504']."', 'forum/index.php', '0', '1', '0', '5', 'main_menu_panel')"); 
    391             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".$locale['505']."', 'news_cats.php', '0', '1', '0', '6', 'main_menu_panel')"); 
    392             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".$locale['473']."', 'blogs.php', '0', '1', '0', '7', 'main_menu_panel')"); 
    393             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".$locale['506']."', 'contact.php', '0', '1', '0', '8', 'main_menu_panel')"); 
    394             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".$locale['507']."', 'search.php', '0', '1', '0', '9', 'main_menu_panel')"); 
    395             $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".$locale['508']."', 'register.php', '100', '2', '0', '10', 'main_menu_panel')"); 
     386            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['500'])."', 'index.php', '0', '1', '0', '1', 'main_menu_panel')"); 
     387            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['501'])."', 'article_cats.php', '0', '1', '0', '2', 'main_menu_panel')"); 
     388            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['502'])."', 'downloads.php', '0', '1', '0', '3', 'main_menu_panel')"); 
     389            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['503'])."', 'faq.php', '0', '1', '0', '4', 'main_menu_panel')"); 
     390            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['504'])."', 'forum/index.php', '0', '1', '0', '5', 'main_menu_panel')"); 
     391            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['505'])."', 'news_cats.php', '0', '1', '0', '6', 'main_menu_panel')"); 
     392            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['473'])."', 'blogs.php', '0', '1', '0', '7', 'main_menu_panel')"); 
     393            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['506'])."', 'contact.php', '0', '1', '0', '8', 'main_menu_panel')"); 
     394            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['507'])."', 'search.php', '0', '1', '0', '9', 'main_menu_panel')"); 
     395            $commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##site_links (link_name, link_url, link_visibility, link_position, link_window, link_order, panel_name) VALUES ('".addslashes($locale['508'])."', 'register.php', '100', '2', '0', '10', 'main_menu_panel')"); 
    396396            $result = dbcommands($commands, $db_prefix); 
    397397 
Note: See TracChangeset for help on using the changeset viewer.