Changeset 858 in ExiteCMS

Timestamp:

09/29/07 21:51:40 (4 years ago)

Author:

hverton

Message:

Added language selection and language detection
When adding a new member as sponsor, the member will be added to the 'Sponsors' user_group
Added missing index.php to the new cache directories

Location:

trunk

Files:

• . (modified) (1 prop)
• administration/adverts.php (modified) (3 diffs)
• administration/settings_languages.php (modified) (1 diff)
• administration/tools/update_geoip.php (modified) (1 diff)
• administration/upgrade/rev00850.php (modified) (1 diff)
• administration/user_groups.php (modified) (2 diffs)
• edit_profile.php (modified) (2 diffs)
• files/cache/index.php (added)
• files/tplcache/index.php (added)
• includes/core_functions.php (modified) (4 diffs)
• includes/templates/admin.settings_languages.tpl (modified) (1 diff)
• includes/templates/main.edit_profile.tpl (modified) (8 diffs)
• locale/English/admin/settings.php (modified) (1 diff)
• locale/English/admin/user_groups.php (modified) (1 diff)
• locale/English/user_fields.php (modified) (1 diff)

trunk

@@ -1 +1 @@
 Copy of config.php
+config.backup.php
 config.php

@@ -1 +1 @@
 Copy of config.php
+config.backup.php
 config.php

trunk/administration/adverts.php

@@ -84 +84 @@
                                 $action = "list";
                             }
-                        } 
+                        }
                     } else {
                         $errormessage = $locale['921']; // ad not found in the database
@@ -106 +106 @@
     switch($action) {
         case "add":
-            if (isNum($_POST['new_sponsor'])) $result = dbquery("UPDATE ".$db_prefix."users SET user_sponsor = '1' WHERE user_id = '".$_POST['new_sponsor']."'");
+            if (isNum($_POST['new_sponsor'])) {
+                $result = dbquery("UPDATE ".$db_prefix."users SET user_sponsor = '1' WHERE user_id = '".$_POST['new_sponsor']."'");
+                // add the new sponsor to the sponsors usergroup
+                $result = dbquery("SELECT group_id FROM ".$db_prefix."user_groups WHERE group_ident = 'wE01'");
+                if ($result) {
+                    $data = dbarray($result);
+                    $result = dbquery("SELECT user_groups FROM ".$db_prefix."users WHERE user_id = '".$_POST['new_sponsor']."'");
+                    if ($result) {
+                        $data2 = dbarray($result);
+                        $result = dbquery("UPDATE ".$db_prefix."users SET user_groups = '".$data2['user_groups'].".".$data['group_id']."' WHERE user_id = '".$_POST['new_sponsor']."'");
+                    }
+                }
+            }
             $action = "list";
             break;
@@ -240 +252 @@
             $result = dbquery("DELETE FROM ".$db_prefix."adverts WHERE adverts_userid = '$id'");
             $result = dbquery("UPDATE ".$db_prefix."users SET user_sponsor = '0' WHERE user_id = '$id'");
+
+            // remove the sponsor to the sponsors usergroup
+            $result = dbquery("SELECT group_id FROM ".$db_prefix."user_groups WHERE group_ident = 'wE01'");
+            if ($result) {
+                $group_id = dbarray($result);
+                $group_id = '.'.$group_id['group_id'];
+                $result = dbquery("SELECT user_groups FROM ".$db_prefix."users WHERE user_id = '$id'");
+                if ($result) {
+                    $data2 = dbarray($result);
+                    $result = dbquery("UPDATE ".$db_prefix."users SET user_groups = '".str_replace($group_id, '', $data2['user_groups'])."' WHERE user_id = '$id'");
+                }
+            }
+
             $errortitle = $locale['476'];
             $errormessage = $locale['910'];

trunk/administration/settings_languages.php

@@ -77 +77 @@
 $variables['settings2'] = $settings2;
 
-$variables['locale_files'] = makefilelist(PATH_LOCALE, ".|..", true, "folders");
+$variables['locales'] = array();
+$result = dbquery("SELECT locale_name FROM ".$db_prefix."locale WHERE locale_active = '1' ORDER BY locale_name");
+while ($data = dbarray($result)) {
+    $variables['locales'][] = $data['locale_name'];
+}
 
 // define the admin body panel

trunk/administration/tools/update_geoip.php

@@ -1 +1 @@
 <?php 
-require_once dirname(__FILE__)."/../../maincore.php";
+require_once dirname(__FILE__)."/../../includes/core_functions.php";
 
 // webmaster or CGI tool only!

trunk/administration/upgrade/rev00850.php

@@ -37 +37 @@
 
 // add the language settings admin module to the admin table and give all webmasters access
-$commands[] = array('type' => 'db', 'value' => "INSERT INTO TABLE ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S7', 'settings_lang.gif', 'Language Setiings', 'settings_language.php', '3')");
+$commands[] = array('type' => 'db', 'value' => "INSERT INTO ##PREFIX##admin (admin_rights, admin_image, admin_title, admin_link, admin_page) VALUES ('S7', 'settings_lang.gif', 'Language Setiings', 'settings_language.php', '3')");
 $commands[] = array('type' => 'db', 'value' => "UPDATE ##PREFIX##users SET user_rights = CONCAT(user_rights, '.S7') WHERE user_level = 103");
 

trunk/administration/user_groups.php

@@ -68 +68 @@
         $title = $locale['408'];
         $variables['message'] = $locale['411'];
+    } elseif ($status == "dels") {
+        $title = $locale['408'];
+        $variables['message'] = $locale['419'];
     }
     // define the message panel variables
@@ -200 +203 @@
 } elseif (isset($_POST['delete'])) {
 
+    $result = dbquery("SELECT group_ident FROM ".$db_prefix."user_groups WHERE group_id = '$group_id'");
+    if ($result) {
+        $data = dbarray($result);
+        if ($data['group_ident'] != "") {
+            redirect(FUSION_SELF.$aidlink."&status=dels");
+        }
+    }
     if (dbcount("(*)", "users", "user_groups REGEXP('^\\\.{$group_id}$|\\\.{$group_id}\\\.|\\\.{$group_id}$')") != 0) {
         redirect(FUSION_SELF.$aidlink."&status=deln");

trunk/edit_profile.php

@@ -38 +38 @@
     $error = ""; $set_avatar = "";
     $variables['update_profile'] = true;
-    
+
+    $result = dbquery("SELECT locale_code, locale_name FROM ".$db_prefix."locale WHERE locale_id = '".$_POST['user_locale']."'");
+    if ($data = dbarray($result)) {
+        if ($data['locale_name'] != $settings['locale']) {
+            die('setting locale cookie: '.$data['locale_code']);
+            setcookie("locale", $data['locale_code'], time() + 31536000, "/", "", "0");
+        }
+    }
     $username = trim(eregi_replace(" +", " ", $_POST['user_name']));
     if ($username == "" || $_POST['user_email'] == "" || $_POST['user_fullname'] == "" ) {
@@ -207 +214 @@
 $variables['this_userdata'] = $this_userdata;
 
+$variables['locales'] = array();
+$result = dbquery("SELECT locale_id, locale_name FROM ".$db_prefix."locale WHERE locale_active = '1' ORDER BY locale_name");
+while ($data = dbarray($result)) {
+    $data['selected'] = $data['locale_name'] == $settings['locale'];
+    $variables['locales'][] = $data;
+}
+
 // define the search body panel variables
 $template_panels[] = array('type' => 'body', 'name' => 'edit_profile', 'template' => 'main.edit_profile.tpl', 'locale' => array(PATH_LOCALE.LOCALESET."members-profile.php", PATH_LOCALE.LOCALESET."user_fields.php"));

trunk/includes/core_functions.php

@@ -107 +107 @@
 define ("BASEDIR", strstr(substr(strstr($settings['siteurl'], '://'),3), '/'));
 
+// locale detection - step 1 - check if there's a locale cookie set
+if (isset($_COOKIE['locale'])) {
+    // check if we (still) support this language. If so, update the locale setting
+    $result = dbquery("SELECT * FROM ".$db_prefix."locale WHERE locale_code = '".$_COOKIE['locale']."' AND locale_active = '1'");
+    if ($data = dbarray($result)) {
+        $settings['locale'] = $data['locale_name'];
+        define("LOCALESET", $settings['locale']."/");
+    }
+}
+
+// locale detection - step 2 - check the browsers accepted languages
+if (!defined('LOCALESET') && isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+    // check which languages are supported by the users browser
+    $temp = explode(",", $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+    foreach($temp as $lng) {
+        $thislng = explode(";", $lng);
+        // check if we support this language
+        $result = dbquery("SELECT * FROM ".$db_prefix."locale WHERE locale_code = '".$thislng[0]."' AND locale_active = '1'");
+        if ($data = dbarray($result)) {
+            // if so, set the locale
+            $settings['locale'] = $data['locale_name'];
+            define("LOCALESET", $settings['locale']."/");
+            break;
+        }
+    }
+    // if not found, loop again on languages only
+    if (!defined('LOCALESET')) {
+        foreach($temp as $lng) {
+            $thislng = explode(";", $lng);
+            $thislng = explode("-", $thislng);
+            // check if we support this language
+            $result = dbquery("SELECT * FROM ".$db_prefix."locale WHERE locale_code = '".$thislng[0]."' AND locale_active = '1'");
+            if ($data = dbarray($result)) {
+                // if so, set the locale
+                $settings['locale'] = $data['locale_name'];
+                define("LOCALESET", $settings['locale']."/");
+                break;
+            }
+        }
+    }
+}
+
+// locale detection - step 3 - use the website's default
+if (!defined('LOCALESET')) {
+    define("LOCALESET", $settings['locale']."/");
+}
+
 // URL path definitions relative to BASEDIR
-define("LOCALESET", $settings['locale']."/");
 define("ADMIN", BASEDIR."administration/");
 define("IMAGES", BASEDIR."images/");
@@ -144 +190 @@
 
 // Browser window dimensions (assume 1024x768 if no cookies found)
-define("BROWSER_WIDTH", isset($_COOKIE['width'])?$_COOKIE['width']:1024);
-define("BROWSER_HEIGHT", isset($_COOKIE['height'])?$_COOKIE['height']:768);
+define("BROWSER_WIDTH", isset($_COOKIE['width']) ? $_COOKIE['width'] : 1024);
+define("BROWSER_HEIGHT", isset($_COOKIE['height']) ? $_COOKIE['height'] : 768);
 
 // Initialise the $locale array
@@ -172 +218 @@
 
 // image types we support
-$imagetypes = array(
-    ".bmp",
-    ".gif",
-    ".iff",
-    ".jpg",
-    ".jpeg",
-    ".png",
-    ".psd",
-    ".tiff",
-    ".wbmp"
-);
+$imagetypes = array(".bmp",".gif",".iff",".jpg",".jpeg",".png",".psd",".tiff",".wbmp");
 
 // image types we can generate a thumbnail from
-$thumbtypes = array(
-    ".gif",
-    ".jpg",
-    ".jpeg",
-    ".png",
-);
+$thumbtypes = array(".gif",".jpg",".jpeg",".png",);
 
 // debug function, handy to print a standard debug text
@@ -761 +792 @@
         }
         if ($data['user_status'] == 0) {    
-            if (isset($_POST['remember_me'])) {
-                setcookie("remember_me", "yes", time() + 31536000, "/", "", "0");
-                $cookie_exp = time() + 3600*24*30;
-            } else {
-                setcookie("remember_me", "yes", time() - 7200, "/", "", "0");
-                $cookie_exp = time() + 60*30;
-            }
+            $cookie_exp = time() + 60*30;
             header("P3P: CP='NOI ADM DEV PSAi COM NAV OUR OTRo STP IND DEM'");
             setcookie("userinfo", $cookie_value, $cookie_exp, "/", "", "0");

trunk/includes/templates/admin.settings_languages.tpl

@@ -25 +25 @@
             <td width='50%' class='tbl'>
                 <select name='localeset' class='textbox'>
-                    {foreach from=$locale_files item=file}
+                    {foreach from=$locales item=file}
                     <option value='{$file}'{if $settings2.locale == $file} selected{/if}>{$file}</option>
                     {/foreach}

trunk/includes/templates/main.edit_profile.tpl

@@ -84 +84 @@
                 </td>
                 <td class='tbl'>
-                    <input type='radio' name='user_hide_email' value='1' {if $this_userdata.user_hide_email == "1"}checked{/if} />{$locale.u007}
-                    <input type='radio' name='user_hide_email' value='0' {if $this_userdata.user_hide_email == "0"}checked{/if} />{$locale.u008}
+                    <input type='radio' name='user_hide_email' value='1' {if $this_userdata.user_hide_email == "1"}checked="checked"{/if} />{$locale.u007}
+                    <input type='radio' name='user_hide_email' value='0' {if $this_userdata.user_hide_email == "0"}checked="checked"{/if} />{$locale.u008}
                 </td>
             </tr>
@@ -93 +93 @@
                 </td>
                 <td class='tbl'>
-                    <input type='radio' name='user_newsletters' value='1' {if $this_userdata.user_newsletters == "1"}checked{/if} />{$locale.u037}
-                    <input type='radio' name='user_newsletters' value='2' {if $this_userdata.user_newsletters == "2"}checked{/if} />{$locale.u038}
-                    <input type='radio' name='user_newsletters' value='0' {if $this_userdata.user_newsletters == "0"}checked{/if} />{$locale.u039}
+                    <input type='radio' name='user_newsletters' value='1' {if $this_userdata.user_newsletters == "1"}checked="checked"{/if} />{$locale.u037}
+                    <input type='radio' name='user_newsletters' value='2' {if $this_userdata.user_newsletters == "2"}checked="checked"{/if} />{$locale.u038}
+                    <input type='radio' name='user_newsletters' value='0' {if $this_userdata.user_newsletters == "0"}checked="checked"{/if} />{$locale.u039}
                 </td>
             </tr>
@@ -103 +103 @@
                 </td>
                 <td class='tbl'>
-                    <input type='radio' name='user_forum_fullscreen' value='1' {if $this_userdata.user_forum_fullscreen == "1"}checked{/if} />{$locale.u007}
-                    <input type='radio' name='user_forum_fullscreen' value='0' {if $this_userdata.user_forum_fullscreen == "0"}checked{/if} />{$locale.u008}
+                    <input type='radio' name='user_forum_fullscreen' value='1' {if $this_userdata.user_forum_fullscreen == "1"}checked="checked"{/if} />{$locale.u007}
+                    <input type='radio' name='user_forum_fullscreen' value='0' {if $this_userdata.user_forum_fullscreen == "0"}checked="checked"{/if} />{$locale.u008}
                 </td>
             </tr>
@@ -123 +123 @@
                     {if $field == "D"}
                     <select name='user_day' class='textbox'>
-                        <option> </option>
+                        <option>&nbsp;</option>
                         {section name=d start=1 loop=32}
-                            <option{if $smarty.section.d.index == $user_day} selected{/if}>{$smarty.section.d.index}</option>
+                            <option{if $smarty.section.d.index == $user_day} selected="selected"{/if}>{$smarty.section.d.index}</option>
                         {/section}
                     </select>
                     {elseif $field == "M"}
                     <select name='user_month' class='textbox'>
-                        <option> </option>
+                        <option>&nbsp;</option>
                         {section name=m start=1 loop=13}
-                            <option{if $smarty.section.m.index == $user_month} selected{/if}>{$smarty.section.m.index}</option>
+                            <option{if $smarty.section.m.index == $user_month} selected="selected"{/if}>{$smarty.section.m.index}</option>
                         {/section}
                     </select>
                     {elseif $field == "Y"}
                     <select name='user_year' class='textbox'>
-                        <option> </option>
+                        <option>&nbsp;</option>
                         {section name=y start=1900 loop=$smarty.now|date_format:"%Y"}
-                            <option{if $smarty.section.y.index == $user_year} selected{/if}>{$smarty.section.y.index}</option>
+                            <option{if $smarty.section.y.index == $user_year} selected="selected"{/if}>{$smarty.section.y.index}</option>
                         {/section}
                     </select>
@@ -185 +185 @@
                 <td class='tbl'>
                     <input type='text' name='user_web' value='{$this_userdata.user_web}' maxlength='100' class='textbox' style='width:200px;' />
+                </td>
+            </tr>
+            <tr>
+                <td class='tbl'>
+                    {$locale.u028}
+                </td>
+                <td class='tbl'>
+                    <select name='user_locale' class='textbox' style='width:200px;'>
+                        {section name=locales loop=$locales}
+                            <option value='{$locales[locales].locale_id}'{if $locales[locales].selected} selected="selected"{/if}>{$locales[locales].locale_name}</option>
+                        {/section}
+                    </select>
                 </td>
             </tr>
@@ -206 +218 @@
                     <select name='user_offset' class='textbox'>
                     {section name=offset loop=$settings.timezones}
-                        <option{if $this_userdata.user_offset == $settings.timezones[offset]} selected{/if}>{$settings.timezones[offset]}</option>
+                        <option{if $this_userdata.user_offset == $settings.timezones[offset]} selected="selected"{/if}>{$settings.timezones[offset]}</option>
                     {/section}
                     </select>
@@ -234 +246 @@
                 </td>
                 <td class='tbl'>
-                    <textarea name='user_sig' rows='5' class='textbox' style='width:295px'>{$this_userdata.user_sig}</textarea><br>
-                    <input type='button' value='b' class='button' style='font-weight:bold;width:25px;' onClick="addText('user_sig', '[b]', '[/b]');">
-                    <input type='button' value='i' class='button' style='font-style:italic;width:25px;' onClick="addText('user_sig', '[i]', '[/i]');">
-                    <input type='button' value='u' class='button' style='text-decoration:underline;width:25px;' onClick="addText('user_sig', '[u]', '[/u]');">
-                    <input type='button' value='url' class='button' style='width:30px;' onClick="addText('user_sig', '[url]', '[/url]');">
-                    <input type='button' value='mail' class='button' style='width:35px;' onClick="addText('user_sig', '[mail]', '[/mail]');">
-                    <input type='button' value='img' class='button' style='width:30px;' onClick="addText('user_sig', '[img]', '[/img]');">
-                    <input type='button' value='center' class='button' style='width:45px;' onClick="addText('user_sig', '[center]', '[/center]');">
-                    <input type='button' value='small' class='button' style='width:40px;' onClick="addText('user_sig', '[small]', '[/small]');">
+                    <textarea name='user_sig' rows='5' cols='80' class='textbox' style='width:295px'>{$this_userdata.user_sig}</textarea><br />
+                    <input type='button' value='b' class='button' style='font-weight:bold;width:25px;' onclick="addText('user_sig', '[b]', '[/b]');" />
+                    <input type='button' value='i' class='button' style='font-style:italic;width:25px;' onclick="addText('user_sig', '[i]', '[/i]');" />
+                    <input type='button' value='u' class='button' style='text-decoration:underline;width:25px;' onclick="addText('user_sig', '[u]', '[/u]');" />
+                    <input type='button' value='url' class='button' style='width:30px;' onclick="addText('user_sig', '[url]', '[/url]');" />
+                    <input type='button' value='mail' class='button' style='width:35px;' onclick="addText('user_sig', '[mail]', '[/mail]');" />
+                    <input type='button' value='img' class='button' style='width:30px;' onclick="addText('user_sig', '[img]', '[/img]');" />
+                    <input type='button' value='center' class='button' style='width:45px;' onclick="addText('user_sig', '[center]', '[/center]');" />
+                    <input type='button' value='small' class='button' style='width:40px;' onclick="addText('user_sig', '[small]', '[/small]');" />
                 </td>
             </tr>
@@ -264 +276 @@
     </form>
 {/if}
-{literal}<script language='JavaScript'>
+{literal}<script type='text/javascript'>
 //
 // calculate the offset between browser and server time

trunk/locale/English/admin/settings.php

@@ -15 +15 @@
 $locale['412'] = "Site footer:";
 $locale['413'] = "Site opening page:";
-$locale['414'] = "Site locale:";
+$locale['414'] = "Default site locale:";
 $locale['415'] = "Site theme:";
 $locale['416'] = "Latest News Layout:";

trunk/locale/English/admin/user_groups.php

@@ -20 +20 @@
 $locale['417'] = "No";
 $locale['418'] = "Yes";
+$locale['419'] = "This group is either a built-in group, or belongs to a module. These groups can not be deleted";
 // Edit/Delete Options
 $locale['420'] = "User Groups";

trunk/locale/English/user_fields.php

@@ -27 +27 @@
 $locale['u026'] = "Newsletters format:";
 $locale['u027'] = "Browser Time";
+$locale['u028'] = "Language";
 // profile panel info
 $locale['u030'] = "Panel state:";

@@ -1 +1 @@
 Copy of config.php
+config.backup.php
 config.php