Changeset 8


Ignore:
Timestamp:
Apr 1, 2007, 2:06:13 PM (11 years ago)
Author:
julian
Message:
Location:
trunk
Files:
20 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/core/Functions.class.php

    r6 r8  
    261261    public static function getAuthData(&$forumData,$authNames) {
    262262        $authData = array();
    263         $auth = Factory::singleton('Auth');
    264 
    265         if($auth->isLoggedIn() == 0) {
     263        $Auth = Factory::singleton('Auth');
     264
     265        if($Auth->isLoggedIn() == 0) {
    266266            foreach($authNames AS $curAuth)
    267267                $authData[$curAuth] = isset($forumData[$curAuth.'Guests']) ? $forumData[$curAuth.'Guests'] : 0;
     
    270270        }
    271271        elseif($Auth->getValue('userIsAdmin') == 1 || $Auth->getValue('userIsSupermod') == 1) {
    272             foreach($AuthNames AS $curAuth)
     272            foreach($authNames AS $curAuth)
    273273                $authData[$curAuth] = 1;
    274274
     
    278278        $authNamesI = implode(', ',$authNames);
    279279
    280         $db = Factory::singleton('DB');
    281 
    282         $db->query("SELECT $authNamesI FROM ".TBLPFX."forums_auth WHERE forumID='".$forumData['forumID']."' AND authType='".AUTH_TYPE_USER."' AND authID='$userID'");
    283         if($db->getAffectedRows() == 1) return $db->fetchArray();
    284 
    285         $db->query("SELECT GroupID FROM ".TBLPFX."groups_members WHERE MemberID='$UserID'");
    286         if($db->getAffectedRows() > 0) {
    287             $GroupIDs = $db->Raw2FVArray();
    288 
    289             $db->query("SELECT $AuthNamesI FROM ".TBLPFX."forums_auth WHERE ForumID='".$ForumData['ForumID']."' AND AuthType='".AUTH_TYPE_GROUP."' AND AuthID IN ('".implode("','",$GroupIDs)."')");
    290             if($db->getAffectedRows() > 0) {
    291                 $GroupsAuthData = $db->Raw2Array();
     280        $DB = Factory::singleton('DB');
     281
     282        $DB->query("SELECT $authNamesI FROM ".TBLPFX."forums_auth WHERE forumID='".$forumData['forumID']."' AND authType='".AUTH_TYPE_USER."' AND authID='$userID'");
     283        if($DB->getAffectedRows() == 1) return $DB->fetchArray();
     284
     285        $DB->query("SELECT GroupID FROM ".TBLPFX."groups_members WHERE MemberID='$UserID'");
     286        if($DB->getAffectedRows() > 0) {
     287            $GroupIDs = $DB->Raw2FVArray();
     288
     289            $DB->query("SELECT $AuthNamesI FROM ".TBLPFX."forums_auth WHERE ForumID='".$ForumData['ForumID']."' AND AuthType='".AUTH_TYPE_GROUP."' AND AuthID IN ('".implode("','",$GroupIDs)."')");
     290            if($DB->getAffectedRows() > 0) {
     291                $GroupsAuthData = $DB->Raw2Array();
    292292                foreach($AuthNames AS $curAuth) {
    293293                    $AuthData[$curAuth] = $ForumData['Members'.$curAuth];
  • trunk/modules/Cache.class.php

    r6 r8  
    104104        if(file_exists('cache/PPics.cache.php') == TRUE)
    105105            include('cache/PPics.cache.php');
    106         else return $$this->setPPicsData();
     106        else return $this->setPPicsData();
    107107
    108108        return $pPicsData;
  • trunk/modules/EditProfile.class.php

    r6 r8  
    55        'Auth',
    66        'Config',
     7        'Constants',
    78        'DB',
    89        'Language',
     10        'Navbar',
    911        'Template',
    1012        'PageParts'
     
    1921        //add_navbar_items(array($this->modules['Language']->getString('User_administration'],"index.php?action=editprofile&$mYSID"));
    2022
    21         switch(@$_GET['Mode']) {
     23        switch(@$_GET['mode']) {
    2224            default:
    23                 $p = Functions::getSGValues($_POST['p'],array('UserEmail','UserSignature'),'',Functions::addSlashes($this->modules['Auth']->getUserData()));
    24                 $p = array_merge($p,Functions::getSGValues($_POST['p'],array('UserOldPassword','UserNewPassword','UserNewPasswordConfirmation'),''));
     25                $p = Functions::getSGValues($_POST['p'],array('userEmail','userSignature'),'',Functions::addSlashes($this->modules['Auth']->getUserData()));
     26                $p = array_merge($p,Functions::getSGValues($_POST['p'],array('userOldPassword','userNewPassword','userNewPasswordConfirmation'),''));
    2527
    2628                $error = '';
    2729
    2830                if(isset($_GET['Doit'])) {
    29                     if(Functions::verifyEmail($p['UserEmail']) == FALSE) $error = $this->modules['Language']->getString('error_bad_email');
    30                     elseif(trim($p['UserNewPassword']) != '' && Functions::getSaltedHash($p['UserOldPassword'],$this->modules['Auth']->getValue('UserPasswordSalt')) != $this->modules['Auth']->getValue('user_pw')) $error = $this->modules['Language']->getString('error_wrong_password');
    31                     elseif(trim($p['UserNewPassword']) != '' && $p['UserNewPassword'] != $p['UserNewPasswordConfirmation']) $error = $this->modules['Language']->getString('error_pws_no_match');
     31                    if(!Functions::verifyEmail($p['userEmail'])) $error = $this->modules['Language']->getString('error_bad_email');
     32                    elseif(trim($p['userNewPassword']) != '' && Functions::getSaltedHash($p['userOldPassword'],$this->modules['Auth']->getValue('userPasswordSalt')) != $this->modules['Auth']->getValue('user_pw')) $error = $this->modules['Language']->getString('error_wrong_password');
     33                    elseif(trim($p['userNewPassword']) != '' && $p['userNewPassword'] != $p['userNewPasswordConfirmation']) $error = $this->modules['Language']->getString('error_pws_no_match');
    3234                    else {
    3335                        $this->modules['DB']->query("
     
    3537                                ".TBLPFX."users
    3638                            SET
    37                                 UserEmail='".$p['UserEmail']."',
    38                                 UserSignature='".$p['UserSignature']."'
     39                                userEmail='".$p['userEmail']."',
     40                                userSignature='".$p['userSignature']."'
    3941                            WHERE
    40                                 UserID='".USERID."'
     42                                userID='".USERID."'
    4143                        ");
    4244
     
    4951                                    ".TBLPFX."users
    5052                                SET
    51                                     UserPassword='".$newPasswordEncrypted."',
    52                                     UserPasswordSalt='".$newPasswordSalt."'
    53                                 WHERE UserID='".USERID."'
     53                                    userPassword='".$newPasswordEncrypted."',
     54                                    userPasswordSalt='".$newPasswordSalt."'
     55                                WHERE userID='".USERID."'
    5456                            ");
    5557                            $this->modules['Auth']->setSessionUserPassword($newPasswordEncrypted);
    5658                        }
    5759
    58                         $nAVBAR->addElements('left',array($this->modules['Language']->getString('Profile_saved'),''));
     60                        $this->modules['Navbar']->addElements('left',array($this->modules['Language']->getString('Profile_saved'),''));
    5961
    6062                        include_once('pheader.php');
     
    6466                }
    6567
    66                 $this->modules['PageParts']->printStdHeader();
    67 
    6868                $this->modules['Template']->assign(array(
    6969                    'p'=>Functions::HTMLSpecialChars(Functions::StripSlashes($p)),
    70                     'Error'=>$error
    71                 ));
    72 
    73                 $this->modules['Template']->display('EditProfileGeneral.tpl');
    74 
    75                 $this->modules['PageParts']->printStdTail();
     70                    'error'=>$error
     71                ));
     72
     73                $this->modules['PageParts']->printPage('EditProfileGeneral.tpl');
    7674                break;
    7775
     
    8684                // Jetzt werde die eventuell vorhandenen Profildaten geladen
    8785                $fieldsData = array();
    88                 $this->modules['DB']->query("SELECT FieldID,FieldValue FROM ".TBLPFX."profile_fields_data WHERE UserID='".USERID."'");
     86                $this->modules['DB']->query("SELECT fieldID,fieldValue FROM ".TBLPFX."profile_fields_data WHERE userID='".USERID."'");
    8987                while($curData = $this->modules['DB']->fetchArray())
    90                     $fieldsData[$curData['FieldID']] = $curData['FieldValue'];
     88                    $fieldsData[$curData['fieldID']] = $curData['fieldValue'];
    9189
    9290
     
    9492                $p = array();
    9593                foreach($profileFields AS $curField) {
    96                     switch($curField['FieldType']) {
    97                         case PROFILE_FIELD_TYPE_TEXT:         $p['FieldsData'][$curField['FieldID']] = isset($_POST['p']['FieldsData'][$curField['FieldID']]) ? $_POST['p']['FieldsData'][$curField['FieldID']] : (isset($fieldsData[$curField['FieldID']]) ? addslashes($fieldsData[$curField['FieldID']]) : ''); break;
    98                         case PROFILE_FIELD_TYPE_TEXTAREA:     $p['FieldsData'][$curField['FieldID']] = isset($_POST['p']['FieldsData'][$curField['FieldID']]) ? $_POST['p']['FieldsData'][$curField['FieldID']] : (isset($fieldsData[$curField['FieldID']]) ? addslashes($fieldsData[$curField['FieldID']]) : ''); break;
    99                         case PROFILE_FIELD_TYPE_SELECTSINGLE: $p['FieldsData'][$curField['FieldID']] = isset($_POST['p']['FieldsData'][$curField['FieldID']]) ? intval($_POST['p']['FieldsData'][$curField['FieldID']]) : (isset($fieldsData[$curField['FieldID']]) ? $fieldsData[$curField['FieldID']] : ''); break;
    100                         case PROFILE_FIELD_TYPE_SELECTMULTI:  $p['FieldsData'][$curField['FieldID']] = (isset($_POST['p']['FieldsData'][$curField['FieldID']]) == TRUE && is_array($_POST['p']['FieldsData'][$curField['FieldID']]) == TRUE) ? $_POST['p']['FieldsData'][$curField['FieldID']] : (isset($fieldsData[$curField['FieldID']]) ? explode(',',$fieldsData[$curField['FieldID']]) : array()); break;
    101                     }
    102                 }
    103 
    104                 if(isset($_GET['Doit'])) {
    105                     $field_missing = FALSE;
     94                    switch($curField['fieldType']) {
     95                        case PROFILE_FIELD_TYPE_TEXT:         $p['fieldsData'][$curField['fieldID']] = isset($_POST['p']['FieldsData'][$curField['fieldID']]) ? $_POST['p']['FieldsData'][$curField['fieldID']] : (isset($fieldsData[$curField['fieldID']]) ? addslashes($fieldsData[$curField['fieldID']]) : ''); break;
     96                        case PROFILE_FIELD_TYPE_TEXTAREA:     $p['fieldsData'][$curField['fieldID']] = isset($_POST['p']['FieldsData'][$curField['fieldID']]) ? $_POST['p']['FieldsData'][$curField['fieldID']] : (isset($fieldsData[$curField['fieldID']]) ? addslashes($fieldsData[$curField['fieldID']]) : ''); break;
     97                        case PROFILE_FIELD_TYPE_SELECTSINGLE: $p['fieldsData'][$curField['fieldID']] = isset($_POST['p']['FieldsData'][$curField['fieldID']]) ? intval($_POST['p']['FieldsData'][$curField['fieldID']]) : (isset($fieldsData[$curField['fieldID']]) ? $fieldsData[$curField['fieldID']] : ''); break;
     98                        case PROFILE_FIELD_TYPE_SELECTMULTI:  $p['fieldsData'][$curField['fieldID']] = (isset($_POST['p']['FieldsData'][$curField['fieldID']]) == TRUE && is_array($_POST['p']['FieldsData'][$curField['fieldID']]) == TRUE) ? $_POST['p']['FieldsData'][$curField['fieldID']] : (isset($fieldsData[$curField['fieldID']]) ? explode(',',$fieldsData[$curField['fieldID']]) : array()); break;
     99                    }
     100                }
     101
     102                if(isset($_GET['doit'])) {
     103                    $fieldIsMissing = FALSE;
    106104                    while(list(,$cur_field) = each($profile_fields)) {
    107105                        if($cur_field['field_is_required'] == 1 && ($cur_field['field_type'] != 3 && $p_fields_data[$cur_field['field_id']] === '' || $cur_field['field_type'] == 3 && count($p_fields_data[$cur_field['field_id']]) == 0)) {
    108                             $field_missing = TRUE;
     106                            $fieldIsMissing = TRUE;
    109107                            break;
    110108                        }
     
    126124                        reset($profile_fields);
    127125
    128                         $this->modules['DB']->query("DELETE FROM ".TBLPFX."profile_fields_data WHERE user_id='$uSER_ID' AND field_id IN ('".implode(',',$delete_ids)."')");
     126                        $this->modules['DB']->query("DELETE FROM ".TBLPFX."profile_fields_data WHERE user_id='".USERID."' AND fieldID IN ('".implode(',',$deleteIDs)."')");
    129127                    }
    130128                }
    131129
    132130                $groupsData = array(
    133                     array('GroupName'=>$this->modules['Language']->getString('Required_information'),'GroupType'=>1,'GroupFields'=>array()),
    134                     array('GroupName'=>$this->modules['Language']->getString('Other_information'),'GroupType'=>0,'GroupFields'=>array())
     131                    array('GroupName'=>$this->modules['Language']->getString('Required_information'),'groupType'=>1,'groupFields'=>array()),
     132                    array('GroupName'=>$this->modules['Language']->getString('Other_information'),'groupType'=>0,'groupFields'=>array())
    135133                );
    136134
    137135                foreach($profileFields AS $curField) {
    138                     switch($curField['FieldType']) {
     136                    switch($curField['fieldType']) {
    139137                        case PROFILE_FIELD_TYPE_TEXT:
    140138                        case PROFILE_FIELD_TYPE_TEXTAREA:
    141                             $curField['_FieldValue'] = Functions::HTMLSpecialChars(Functions::StripSlashes($p['FieldsData'][$curField['FieldID']]));
     139                            $curField['_fieldValue'] = Functions::HTMLSpecialChars(Functions::StripSlashes($p['fieldsData'][$curField['fieldID']]));
    142140                            break;
    143141
    144142                        case PROFILE_FIELD_TYPE_SELECTSINGLE:
    145143                        case PROFILE_FIELD_TYPE_SELECTMULTI:
    146                             $curField['_FieldSelectedIDs'] = $p['FieldsData'][$curField['FieldID']];
    147                             $curField['_FieldOptions'] = unserialize($curField['FieldData']);
     144                            $curField['_fieldSelectedIDs'] = $p['fieldsData'][$curField['fieldID']];
     145                            $curField['_fieldOptions'] = unserialize($curField['fieldData']);
    148146                            break;
    149147                    }
    150                     if($curField['FieldIsRequired'] == 0) $groupsData[1]['GroupFields'][] = $curField;
    151                     else $groupsData[0]['GroupFields'][] = $curField;
     148                    if($curField['fieldIsRequired'] == 0) $groupsData[1]['groupFields'][] = $curField;
     149                    else $groupsData[0]['groupFields'][] = $curField;
    152150                }
    153151
    154152                $this->modules['Template']->assign(array(
    155153                    'p'=>$p,
    156                     'GroupsData'=>$groupsData
     154                    'groupsData'=>$groupsData,
     155                    'error'=>$error
    157156                ));
    158157                $this->modules['PageParts']->printPage('EditProfileExtendedProfile.tpl');
     
    161160            case 'ProfileSettings':
    162161                $p = array();
    163                 $p['UserTimeZone'] = isset($_POST['p']['UserTimeZone']) ? $_POST['p']['UserTimeZone'] : $this->modules['Auth']->getValue('UserTimeZone');
    164                 $p['UserHideEmail'] = isset($_POST['p']['UserHideEmail']) ? intval($_POST['p']['UserHideEmail']) : $this->modules['Auth']->getValue('UserHideEmail');
    165                 $p['UserReceiveEmails'] = isset($_POST['p']['UserReceiveEmails']) ? intval($_POST['p']['UserReceiveEmails']) : $this->modules['Auth']->getValue('UserReceiveEmails');
     162                $p['userTimeZone'] = isset($_POST['p']['userTimeZone']) ? $_POST['p']['userTimeZone'] : $this->modules['Auth']->getValue('userTimeZone');
     163                $p['userHideEmail'] = isset($_POST['p']['userHideEmail']) ? intval($_POST['p']['userHideEmail']) : $this->modules['Auth']->getValue('userHideEmail');
     164                $p['userReceiveEmails'] = isset($_POST['p']['userReceiveEmails']) ? intval($_POST['p']['userReceiveEmails']) : $this->modules['Auth']->getValue('userReceiveEmails');
    166165
    167166                $timeZones = Functions::getTimeZones(TRUE);
    168167
    169                 if(in_array($p['UserHideEmail'],array(0,1)) == FALSE) $p['UserHideEmail'] = 0;
    170                 if(in_array($p['UserReceiveEmails'],array(0,1)) == FALSE) $p['UserReceiveEmails'] = 1;
    171                 if(!isset($timeZones[$p['UserTimeZone']])) $p['UserTimeZone'] = 'gmt';
     168                if(in_array($p['userHideEmail'],array(0,1)) == FALSE) $p['userHideEmail'] = 0;
     169                if(in_array($p['userReceiveEmails'],array(0,1)) == FALSE) $p['userReceiveEmails'] = 1;
     170                if(!isset($timeZones[$p['userTimeZone']])) $p['userTimeZone'] = 'gmt';
    172171
    173172                if(isset($_GET['doit'])) {
     
    176175                            ".TBLPFX."users
    177176                        SET
    178                             UserHideEmail='".$p['UserHideEmail']."',
    179                             UserReceiveEmails='".$p['UserReceiveEmails']."',
    180                             UserTimeZone='".$p['UserTimeZone']."'
    181                         WHERE UserID='".USERID."'
     177                            userHideEmail='".$p['userHideEmail']."',
     178                            userReceiveEmails='".$p['userReceiveEmails']."',
     179                            userTimeZone='".$p['userTimeZone']."'
     180                        WHERE userID='".USERID."'
    182181                    ");
    183182
    184                     include_once('pheader.php');
    185                     show_message($this->modules['Language']->getString('Settings_saved'),$this->modules['Language']->getString('message_settings_successfully_saved'));
    186                     include_once('ptail.php'); exit;
     183                    // TODO richtige meldung
     184                    die('geupdatet');
     185                    exit;
     186                    //include_once('pheader.php');
     187                    //show_message($this->modules['Language']->getString('Settings_saved'),$this->modules['Language']->getString('message_settings_successfully_saved'));
     188                    //include_once('ptail.php'); exit;
    187189                }
    188190
    189191                $this->modules['Template']->assign(array(
    190192                    'p'=>$p,
    191                     'TimeZones'=>$timeZones
     193                    'timeZones'=>$timeZones
    192194                ));
    193195                $this->modules['PageParts']->printPage('EditProfileProfileSettings.tpl');
     
    195197
    196198            case 'TopicSubscriptions':
    197                 $topicID = isset($_GET['TopicID']) ? intval($_GET['TopicID']) : 0;
    198                 $topicIDs = (isset($_POST['TopicIDs']) && is_array($_POST['TopicIDs']) == TRUE) ? $_POST['TopicIDs'] : array();
    199 
    200                 if(isset($_GET['Doit'])) {
     199                $topicID = isset($_GET['topicID']) ? intval($_GET['topicID']) : 0;
     200                $topicIDs = (isset($_POST['topicIDs']) && is_array($_POST['topicIDs']) == TRUE) ? $_POST['topicIDs'] : array();
     201
     202                if(isset($_GET['doit'])) {
    201203                    if($topicID != 0)
    202                         $this->modules['DB']->query("DELETE FROM ".TBLPFX."topics_subscriptions WHERE UserID='".USERID."' AND TopicID='$topicID'");
     204                        $this->modules['DB']->query("DELETE FROM ".TBLPFX."topics_subscriptions WHERE userID='".USERID."' AND topicID='$topicID'");
    203205
    204206                    if(count($topicIDs) > 0)
    205                         $this->modules['DB']->query("DELETE FROM ".TBLPFX."topics_subscriptions WHERE UserID='".USERID."' AND TopicID IN('".implode("','",$topicIDs)."')");
    206                 }
    207 
    208                 $this->modules['DB']->query("SELECT t2.TopicTitle,t1.TopicID FROM (".TBLPFX."topics_subscriptions AS t1, ".TBLPFX."topics AS t2) WHERE t1.UserID='".USERID."' AND t2.TopicID=t1.TopicID");
     207                        $this->modules['DB']->query("DELETE FROM ".TBLPFX."topics_subscriptions WHERE userID='".USERID."' AND topicID IN('".implode("','",$topicIDs)."')");
     208                }
     209
     210                $this->modules['DB']->query("SELECT t2.topicTitle,t1.topicID FROM (".TBLPFX."topics_subscriptions AS t1, ".TBLPFX."topics AS t2) WHERE t1.userID='".USERID."' AND t2.topicID=t1.topicID");
    209211                $subscriptionsData = $this->modules['DB']->raw2Array();
    210212
     
    212214
    213215                $this->modules['Template']->assign(array(
    214                     'SubscriptionsData'=>$subscriptionsData
     216                    'subscriptionsData'=>$subscriptionsData
    215217                ));
    216218                $this->modules['PageParts']->printPage('EditProfileTopicSubscriptions.tpl');
     
    218220
    219221            case 'Avatar':
    220                 $p['AvatarAddress'] = isset($_POST['p']['AvatarAddress']) ? $_POST['p']['AvatarAddress'] : addslashes($this->modules['Auth']->getValue('UserAvatarAddress'));
     222                $p['avatarAddress'] = isset($_POST['p']['avatarAddress']) ? $_POST['p']['avatarAddress'] : addslashes($this->modules['Auth']->getValue('userAvatarAddress'));
    221223
    222224                if(isset($_GET['Doit']))
    223                     $this->modules['DB']->query("UPDATE ".TBLPFX."users SET UserAvatarAddress='".$p['AvatarAddress']."' WHERE UserID='".USERID."'");
    224 
    225                 $this->modules['DB']->query("SELECT AvatarAddress FROM ".TBLPFX."avatars");
     225                    $this->modules['DB']->query("UPDATE ".TBLPFX."users SET userAvatarAddress='".$p['avatarAddress']."' WHERE userID='".USERID."'");
     226
     227                $this->modules['DB']->query("SELECT avatarAddress FROM ".TBLPFX."avatars");
    226228                $avatarsData = $this->modules['DB']->raw2Array();
    227229                $avatarsCounter = count($avatarsData);
    228230
    229231                $this->modules['Template']->assign(array(
    230                     'AvatarsData'=>$avatarsData,
    231                     'AvatarsCounter'=>$avatarsCounter,
     232                    'avatarsData'=>$avatarsData,
     233                    'avatarsCounter'=>$avatarsCounter,
    232234                    'p'=>$p
    233235                ));
     
    237239            case 'Memo':
    238240                $p = array();
    239                 $p['UserMemo'] = isset($_POST['p']['UserMemo']) ? $_POST['p']['UserMemo'] : addslashes($this->modules['Auth']->getValue('UserMemo'));
     241                $p['userMemo'] = isset($_POST['p']['userMemo']) ? $_POST['p']['userMemo'] : addslashes($this->modules['Auth']->getValue('userMemo'));
    240242
    241243                $memoWasUpdated = FALSE;
    242244
    243245                if(isset($_GET['doit'])) {
    244                     $this->modules['DB']->query("UPDATE ".TBLPFX."users SET user_memo='$p_user_memo' WHERE user_id='$uSER_ID'");
     246                    $this->modules['DB']->query("UPDATE ".TBLPFX."users SET userMemo='".$p['userMemo']."' WHERE userID='".USERID."'");
    245247                    $memoWasUpdated = TRUE;
    246248                }
     
    250252                $this->modules['Template']->assign(array(
    251253                    'p'=>Functions::HTMLSpecialChars(Functions::stripSlashes($p)),
    252                     'MemoWasUpdated'=>$memoWasUpdated
     254                    'memoWasUpdated'=>$memoWasUpdated
    253255                ));
    254256                $this->modules['PageParts']->printPage('EditProfileMemo.tpl');
  • trunk/modules/MemberList.class.php

    r6 r8  
    55        'Auth',
    66        'Cache',
     7        'Constants',
    78        'DB',
    89        'Language',
     
    1314
    1415    public function executeMe() {
    15         $usersPerPage = isset($_REQUEST['UsersPerPage']) ? intval($_REQUEST['UsersPerPage']) : 20;
    16         $orderBy = isset($_REQUEST['OrderBy']) ? $_REQUEST['OrderBy'] : 'id';
    17         $orderType = isset($_REQUEST['OrderType']) ? $_REQUEST['OrderType'] : 'ASC';
    18         $page = isset($_GET['Page']) ? $_GET['Page'] : '1';
     16        $usersPerPage = isset($_REQUEST['usersPerPage']) ? intval($_REQUEST['usersPerPage']) : 20;
     17        $orderBy = isset($_REQUEST['orderBy']) ? $_REQUEST['orderBy'] : 'id';
     18        $orderType = isset($_REQUEST['orderType']) ? $_REQUEST['orderType'] : 'ASC';
     19        $page = isset($_GET['page']) ? $_GET['page'] : '1';
    1920
    2021
     
    7475        // Die Daten der Profilfelder laden, die in der Mitgliederliste zusaetzlich angezeigt werden sollen
    7576        //
    76         $this->modules['DB']->query("SELECT * FROM ".TBLPFX."profile_fields WHERE FieldShowMemberList='1'");
     77        $this->modules['DB']->query("SELECT * FROM ".TBLPFX."profile_fields WHERE fieldShowMemberList='1'");
    7778        $fieldsData = $this->modules['DB']->raw2Array();
    7879
     
    8384        $fieldIDs = array();
    8485        foreach($fieldsData AS $curField)
    85             $fieldIDs[] = $curField['FieldID'];
     86            $fieldIDs[] = $curField['fieldID'];
    8687
    8788
     
    8990        // Mitgliederdaten laden
    9091        //
    91         $this->modules['DB']->query("SELECT t1.UserID,t1.UserNick,t1.UserEmail,t1.UserPostsCounter,t1.UserIsAdmin,t1.UserIsSupermod,t2.RankName AS UserRankName FROM ".TBLPFX."users AS t1 LEFT JOIN ".TBLPFX."ranks AS t2 ON t1.RankID=t2.RankID ORDER BY $queryOrderBy $orderType LIMIT $start,$usersPerPage");
     92        $this->modules['DB']->query("
     93            SELECT
     94                t1.userID,
     95                t1.userNick,
     96                t1.userEmail,
     97                t1.userPostsCounter,
     98                t1.userIsAdmin,
     99                t1.userIsSupermod,
     100                t2.rankName AS userRankName
     101            FROM
     102                ".TBLPFX."users AS t1
     103            LEFT JOIN ".TBLPFX."ranks AS t2 ON t1.rankID=t2.rankID
     104            ORDER BY $queryOrderBy $orderType
     105            LIMIT $start,$usersPerPage
     106        ");
    92107        $usersData = $this->modules['DB']->raw2Array();
    93108
     
    98113        $userIDs = array();
    99114        foreach($usersData AS $curUser)
    100             $userIDs[] = $curUser['UserID'];
     115            $userIDs[] = $curUser['userID'];
    101116
    102117
     
    104119        // Die Mitgliederdaten der extra-Profilfelder laden
    105120        //
    106         $this->modules['DB']->query("SELECT UserID,FieldID,FieldValue FROM ".TBLPFX."profile_fields_data WHERE UserID IN ('".implode("','",$userIDs)."') AND FieldID IN ('".implode("','",$fieldIDs)."')");
     121        $this->modules['DB']->query("
     122            SELECT
     123                userID,
     124                fieldID,
     125                fieldValue
     126            FROM
     127                ".TBLPFX."profile_fields_data
     128            WHERE
     129                userID IN ('".implode("','",$userIDs)."')
     130                AND fieldID IN ('".implode("','",$fieldIDs)."')
     131        ");
    107132        $fieldsValues = $this->modules['DB']->raw2Array();
    108133
     
    115140
    116141            $curUserRank = '';
    117             if($curUser['UserIsAdmin'] == 1) $curUserRank = $this->modules['Language']->getString('Administrator');
    118             elseif($curUser['UserIsSupermod'] == 1) $curUserRank = $this->modules['Language']->getString('Supermoderator');
    119             elseif(in_array($curUser['UserID'],$modIDs)) $curUserRank = $this->modules['Language']->getString('Moderator');
    120             elseif($curUser['UserRankName'] != '') $curUserRank = $curUser['UserRankName'];
     142            if($curUser['userIsAdmin'] == 1) $curUserRank = $this->modules['Language']->getString('Administrator');
     143            elseif($curUser['userIsSupermod'] == 1) $curUserRank = $this->modules['Language']->getString('Supermoderator');
     144            elseif(in_array($curUser['userID'],$modIDs)) $curUserRank = $this->modules['Language']->getString('Moderator');
     145            elseif($curUser['userRankName'] != '') $curUserRank = $curUser['userRankName'];
    121146            else {
    122147                foreach($ranksData[0] AS $curRank) {
    123                     if($curRank['RankPosts'] > $curUser['UserPostsCounter']) break;
     148                    if($curRank['rankPosts'] > $curUser['userPostsCounter']) break;
    124149
    125                     $curUserRank = $curRank['RankName']; // ...den Namen das Rangs verwenden...
     150                    $curUserRank = $curRank['rankName']; // ...den Namen das Rangs verwenden...
    126151                    //$cur_poster_rank_pic = $cur_rank['rank_gfx']; // ...und das Bild des Rangs verwenden
    127152                }
    128153            }
    129154
    130             $curUser['_UserRankName'] = $curUserRank;
     155            $curUser['_userRankName'] = $curUserRank;
    131156
    132157            // Die extra-Profilefelder
     
    136161
    137162                while(list($curKey,$curValue) = each($fieldsValues)) {
    138                     if($curValue['UserID'] != $curUser['UserID'] || $curValue['FieldID'] != $curField['FieldID']) continue;
    139                     $curFieldValue = $curValue['FieldValue'];
     163                    if($curValue['userID'] != $curUser['userID'] || $curValue['fieldID'] != $curField['fieldID']) continue;
     164                    $curFieldValue = $curValue['fieldValue'];
    140165                    unset($fieldsValues[$curKey]);
    141166                    break;
    142167                }
    143168
    144                 if($curFieldValue != '') $curFieldValue = sprintf($curField['FieldLink'],$curFieldValue);
    145                 $curUserFieldsValues[$curField['FieldID']] = $curFieldValue;
     169                if($curFieldValue != '') $curFieldValue = sprintf($curField['fieldLink'],$curFieldValue);
     170                $curUserFieldsValues[$curField['fieldID']] = $curFieldValue;
    146171            }
    147172
    148             $curUser['_UserFieldsValues'] = $curUserFieldsValues;
     173            $curUser['_userFieldsValues'] = $curUserFieldsValues;
    149174        }
    150175
     
    154179        // Seite ausgeben
    155180        $this->modules['Template']->assign(array(
    156             'FieldsData'=>$fieldsData,
    157             'UsersData'=>$usersData,
    158             'Page'=>$page,
    159             'OrderBy'=>$orderBy,
    160             'OrderType'=>$orderType
     181            'fieldsData'=>$fieldsData,
     182            'usersData'=>$usersData,
     183            'page'=>$page,
     184            'orderBy'=>$orderBy,
     185            'orderType'=>$orderType
    161186        ));
    162187
  • trunk/modules/PageParts.class.php

    r6 r8  
    5353            $this->modules['Template']->display('EditProfileHeader.tpl');
    5454        elseif($this->flags['inPrivateMessages']) {
    55             $this->modules['DB']->query("SELECT FolderName,FolderID FROM ".TBLPFX."pms_folders WHERE UserID='".USERID."' ORDER BY FolderName");
     55            $this->modules['DB']->query("SELECT folderName,folderID FROM ".TBLPFX."pms_folders WHERE userID='".USERID."' ORDER BY folderName");
    5656            $headerFoldersData = $this->modules['DB']->raw2Array();
    5757
    5858            array_unshift($headerFoldersData, // Fuegt an den Anfang die Standardordner hinzu...
    59                 array('FolderID'=>0,'FolderName'=>$this->modules['Language']->getString('Inbox')),
    60                 array('FolderID'=>1,'FolderName'=>$this->modules['Language']->getString('Outbox'))
     59                array('folderID'=>0,'folderName'=>$this->modules['Language']->getString('Inbox')),
     60                array('folderID'=>1,'folderName'=>$this->modules['Language']->getString('Outbox'))
    6161            );
    6262            reset($headerFoldersData);
    6363
    64             $this->modules['Template']->assign('HeaderFoldersData',$headerFoldersData);
     64            $this->modules['Template']->assign('headerFoldersData',$headerFoldersData);
    6565
    6666            $this->modules['Template']->display('PrivateMessagesHeader.tpl');
  • trunk/modules/PrivateMessages.class.php

    r6 r8  
    66        'Cache',
    77        'Config',
     8        'Constants',
    89        'DB',
    910        'Language',
     
    1617        if($this->modules['Auth']->isLoggedIn() != 1) die('Kein Zugriff: Nicht eingeloggt');
    1718        elseif($this->modules['Config']->getValue('enable_pms') != 1) {
    18             add_navbar_items(array($lNG['Function_deactivated'],''));
    19 
    20             include_once('pheader.php');
    21             show_message($lNG['Function_deactivated'],$lNG['message_function_deactivated']);
    22             include_once('ptail.php'); exit;
     19            // TODO: Richtige Meldung
     20            //add_navbar_items(array($this->modules['Language']->getString('Function_deactivated'),''));
     21
     22            //include_once('pheader.php');
     23            //show_message($lNG['Function_deactivated'],$lNG['message_function_deactivated']);
     24            //include_once('ptail.php'); exit;
     25            die('Funktion nicht verfuegbar');
    2326        }
    2427
     
    2730        $this->modules['Navbar']->addElement($this->modules['Language']->getString('Private_messages'),INDEXFILE.'?Action=PrivateMessages&'.MYSID);
    2831
    29         $inboxFolderData = array('FolderID'=>0,'FolderName'=>$this->modules['Language']->getString('Inbox'));
    30         $outboxFolderData = array('FolderID'=>1,'FolderName'=>$this->modules['Language']->getString('Outbox'));
    31 
    32         switch(@$_GET['Mode']) {
     32        $inboxFolderData = array('folderID'=>0,'folderName'=>$this->modules['Language']->getString('Inbox'));
     33        $outboxFolderData = array('folderID'=>1,'folderName'=>$this->modules['Language']->getString('Outbox'));
     34
     35        switch(@$_GET['mode']) {
    3336            default:
    34                 $folderID = isset($_GET['FolderID']) ? intval($_GET['FolderID']) : 0;
    35                 $page = isset($_GET['Page']) ? intval($_GET['Page']) : 1;
     37                $folderID = isset($_GET['folderID']) ? intval($_GET['folderID']) : 0;
     38                $page = isset($_GET['page']) ? intval($_GET['page']) : 1;
    3639
    3740                if($folderID == 0) $folderData = $inboxFolderData;
    3841                elseif($folderID == 1) $folderData = $outboxFolderData;
    3942                else {
    40                     $this->modules['DB']->query("SELECT FolderID, FolderName FROM ".TBLPFX."pms_folders WHERE UserID='".USERID."' AND FolderID='$folderID'");
     43                    $this->modules['DB']->query("SELECT folderID, folderName FROM ".TBLPFX."pms_folders WHERE userID='".USERID."' AND folderID='$folderID'");
    4144                    if($this->modules['DB']->getAffectedRows() == 0) {
    4245                        $folderData = $inboxFolderData;
     
    4750
    4851                $this->modules['DB']->query("SELECT COUNT(*) FROM ".TBLPFX."pms WHERE PMToID='".USERID."' AND FolderID='$folderID'");
    49                 list($pMsCounter) = $this->modules['DB']->fetchArray();
    50 
    51                 $pMsPerPage = 20;
     52                list($pmsCounter) = $this->modules['DB']->fetchArray();
     53
     54                $pmsPerPage = 20;
    5255                //$this->modules['Config']->getValue('pms_per_page') = 10;
    5356
    54                 $pageListing = Functions::createPageListing($pMsCounter,$pMsPerPage,$page,"<a href=\"".INDEXFILE."?Action=PrivateMessages&amp;Mode=ViewFolder&amp;FolderID=$folderID&amp;Page=%1\$s&amp;".MYSID."\">%2\$s</a>");
     57                $pageListing = Functions::createPageListing($pmsCounter,$pmsPerPage,$page,"<a href=\"".INDEXFILE."?action=PrivateMessages&amp;mode=ViewFolder&amp;folderID=$folderID&amp;page=%1\$s&amp;".MYSID."\">%2\$s</a>");
    5558                $start = $page*$this->modules['Config']->getValue('pms_per_page')-$this->modules['Config']->getValue('pms_per_page');
    5659
     
    5962                $this->modules['DB']->query("
    6063                    SELECT
    61                         t1.PMID,
    62                         t1.PMSubject,
    63                         t1.PMSendTimestamp,
    64                         t1.PMFromID,
    65                         t1.PMType,
    66                         t1.PMIsRead,
    67                         t1.PMIsReplied,
    68                         t1.PMGuestNick,
    69                         t2.UserNick AS PMFromNick
     64                        t1.pmID,
     65                        t1.pmSubject,
     66                        t1.pmSendTimestamp,
     67                        t1.pmFromID,
     68                        t1.pmType,
     69                        t1.pmIsRead,
     70                        t1.pmIsReplied,
     71                        t1.pmGuestNick,
     72                        t2.userNick AS pmFromNick
    7073                    FROM
    7174                        ".TBLPFX."pms AS t1
    72                     LEFT JOIN ".TBLPFX."users AS t2 ON t1.PMFromID=t2.UserID
     75                    LEFT JOIN ".TBLPFX."users AS t2 ON t1.pmFromID=t2.userID
    7376                    WHERE
    74                         PMToID='".USERID."'
    75                         AND FolderID='$folderID'
     77                        pmToID='".USERID."'
     78                        AND folderID='$folderID'
    7679                    ORDER BY
    77                         PMSendTimestamp DESC
    78                     LIMIT $start,$pMsPerPage
     80                        pmSendTimestamp DESC
     81                    LIMIT $start,$pmsPerPage
    7982                ");
    8083
    81                 $pMsData = array();
     84                $pmsData = array();
    8285                while($curPM = $this->modules['DB']->fetchArray()) {
    83                     $curSenderNick = ($curPM['PMFromID'] == 0) ? $curPM['PMGuestNick'] : $curPM['PMFromNick'];
    84                     $curPM['_PMSender'] = ($curPM['PMType'] == 0) ? sprintf($this->modules['Language']->getString('from_x'),$curSenderNick) : sprintf($this->modules['Language']->getString('to_x'),$curSenderNick);
    85                     $curPM['_PMSendDateTime'] = Functions::toDateTime($curPM['PMSendTimestamp']);
    86                     $pMsData[] = $curPM;
    87                 }
    88 
    89                 $this->modules['Navbar']->addElement(Functions::HTMLSpecialChars($folderData['FolderName']),INDEXFILE.'?Action=PrivateMessages&amp;FolderID='.$folderID.'&amp;'.MYSID);
    90 
    91                 $this->modules['Template']->assign(array(
    92                     'PageListing'=>$pageListing,
    93                     'PMsData'=>$pMsData
    94                 ));
    95 
    96                 $this->modules['PageParts']->printPage('PrivateMessagesDefault.tpl');
     86                    $curSenderNick = ($curPM['pmFromID'] == 0) ? $curPM['pmGuestNick'] : $curPM['pmFromNick'];
     87                    $curPM['_pmSender'] = ($curPM['pmType'] == 0) ? sprintf($this->modules['Language']->getString('from_x'),$curSenderNick) : sprintf($this->modules['Language']->getString('to_x'),$curSenderNick);
     88                    $curPM['_pmSendDateTime'] = Functions::toDateTime($curPM['pmSendTimestamp']);
     89                    $pmsData[] = $curPM;
     90                }
     91
     92                $this->modules['Navbar']->addElement(Functions::HTMLSpecialChars($folderData['folderName']),INDEXFILE.'?action=PrivateMessages&amp;folderID='.$folderID.'&amp;'.MYSID);
     93
     94                $this->modules['Template']->assign(array(
     95                    'pageListing'=>$pageListing,
     96                    'pmsData'=>$pmsData,
     97                    'folderID'=>$folderID,
     98                    'page'=>$page
     99                ));
     100
     101                $this->modules['PageParts']->printPage('PrivateMessagesViewFolder.tpl');
    97102            break;
    98103
     
    239244
    240245            case 'ViewPM':
    241                 $pMID = isset($_GET['PMID']) ? intval($_GET['PMID']) : 0;
    242                 $returnPage = isset($_GET['ReturnPage']) ? intval($_GET['ReturnPage']) : 1;
     246                $pmID = isset($_GET['pmID']) ? intval($_GET['pmID']) : 0;
     247                $returnPage = isset($_GET['returnPage']) ? intval($_GET['returnPage']) : 1;
    243248
    244249                // PM-Daten laden
    245250                $this->modules['DB']->query("
    246251                    SELECT
    247                         t1.PMSubject,
    248                         t1.PMRequestReadReceipt,
    249                         t1.PMSendTimestamp,
    250                         t1.FolderID,
    251                         t1.PMType,
    252                         t1.PMToID,
    253                         t1.PMFromID,
    254                         t1.PMIsRead,
    255                         t1.PMIsReplied,
    256                         t1.PMMessageText,
    257                         t2.UserNick AS PMFromNick,
    258                         t4.FolderName AS PMFolderName
     252                        t1.pmSubject,
     253                        t1.pmRequestReadReceipt,
     254                        t1.pmSendTimestamp,
     255                        t1.folderID,
     256                        t1.pmType,
     257                        t1.pmToID,
     258                        t1.pmFromID,
     259                        t1.pmIsRead,
     260                        t1.pmIsReplied,
     261                        t1.pmMessageText,
     262                        t2.userNick AS pmFromNick,
     263                        t4.folderName AS pmFolderName
    259264                    FROM ".TBLPFX."pms AS t1
    260265                    LEFT JOIN ".TBLPFX."users AS t2 ON t1.PMFromID=t2.UserID
    261266                    LEFT JOIN ".TBLPFX."pms_folders AS t4 ON (t4.FolderID=t1.FolderID AND t4.UserID='".USERID."')
    262                     WHERE t1.PMID='$pMID'
     267                    WHERE t1.pmID='$pmID'
    263268                ");
    264269                if($this->modules['DB']->getAffectedRows() == 0) die('Kann PM-Daten nicht laden!');
    265                 $pMData = $this->modules['DB']->fetchArray();
     270                $pmData = $this->modules['DB']->fetchArray();
    266271
    267272                // Ueberpruefen ob...
    268                 if($pMData['PMToID'] != USERID) die('Kein Zugriff auf diese Nachricht!'); // ...User Zugriff auf PM hat...
    269                 if($pMData['PMIsRead'] != 1) {  // ...die PM schon gelesen ist...
    270                     $this->modules['DB']->query("UPDATE ".TBLPFX."pms SET PMIsRead='1' WHERE PMID='$pMID'");
    271                     if($pMData['PMRequestReadReceipt'] == 1 && $this->modules['Config']->getValue('allow_pms_rconfirmation') == 1 && $pMData['PMFromID'] != 0) // ...und eine Lesebestaetigung angefordert wurde
     273                if($pmData['pmToID'] != USERID) die('Kein Zugriff auf diese Nachricht!'); // ...User Zugriff auf PM hat...
     274                if($pmData['pmIsRead'] != 1) {  // ...die PM schon gelesen ist...
     275                    $this->modules['DB']->query("UPDATE ".TBLPFX."pms SET pmIsRead='1' WHERE pmID='$pmID'");
     276                    if($pmData['pmRequestReadReceipt'] == 1 && $this->modules['Config']->getValue('allow_pms_rconfirmation') == 1 && $pmData['pmFromID'] != 0) // ...und eine Lesebestaetigung angefordert wurde
     277                        // TODO: MySQL-Abfrage
    272278                        $this->modules['DB']->query("
    273279                            INSERT INTO ".TBLPFX."pms SET
     
    277283
    278284                $p = array();
    279                 $p['PMSubject'] = isset($_POST['p']['PMSubject']) ? $_POST['p']['PMSubject'] : $pMData['PMSubject'];
    280                 $p['PMMessageText'] = isset($_POST['p']['PMMessageText']) ? $_POST['p']['PMMessageText'] : '';
    281 
    282                 if(!isset($_GET['Doit']) && strtolower(substr($p['PMSubject'],0,3)) != 're:') $p['PMSubject'] = 'Re: '.$p['PMSubject']; // Falls noch kein Re: da ist, anfuegen
     285                $p['pmSubject'] = isset($_POST['p']['pmSubject']) ? $_POST['p']['pmSubject'] : $pmData['pmSubject'];
     286                $p['pmMessageText'] = isset($_POST['p']['pmMessageText']) ? $_POST['p']['pmMessageText'] : '';
     287
     288                if(!isset($_GET['doit']) && strtolower(substr($p['pmSubject'],0,3)) != 're:') $p['pmSubject'] = 'Re: '.$p['pmSubject']; // Falls noch kein Re: da ist, anfuegen
    283289
    284290                $c = array();
    285                 $c['EnableSmilies'] = $c['EnableBBCode'] = $c['ShowSignature'] = $c['SaveOutbox'] = 1;
    286                 $c['EnableHtmlCode'] = $c['RequestReadReceipt'] = 0;
     291                $c['enableSmilies'] = $c['enableBBCode'] = $c['showSignature'] = $c['saveOutbox'] = 1;
     292                $c['enableHtmlCode'] = $c['requestReadReceipt'] = 0;
    287293
    288294                $error = '';
    289295
    290                 if(isset($_GET['Doit']) && $pMData['PMType'] == 0 && $pMData['PMFromID'] != 0) {
    291                     $c['EnableSmilies'] = (isset($_POST['c']['EnableSmilies']) && $this->modules['Config']->getValue('allow_pms_smilies') == 1) ? 1 : 0;
     296                if(isset($_GET['doit']) && $pmData['pmType'] == 0 && $pmData['pmFromID'] != 0) {
     297                    /*/$c['EnableSmilies'] = (isset($_POST['c']['EnableSmilies']) && $this->modules['Config']->getValue('allow_pms_smilies') == 1) ? 1 : 0;
    292298                    $c['ShowSignature'] = (isset($_POST['c']['ShowSignature']) && $this->modules['Config']->getValue('enable_sig') == 1) ? 1 : 0;
    293299                    $c['EnableBBCode'] = (isset($_POST['c']['EnableBBCode']) && $this->modules['Config']->getValue('allow_pms_bbcode') == 1) ? 1 : 0;
    294300                    $c['SaveOutbox'] = (isset($_POST['c']['SaveOutbox']) && $this->modules['Config']->getValue('enable_outbox') == 1) ? 1 : 0;
    295301                    $c['RequestReadReceipt'] = (isset($_POST['c']['RequestReadReceipt']) && $this->modules['Config']->getValue('allow_pms_rconfirmation') == 1) ? 1 : 0;
    296 
    297                     /*$recipients = explode(',',$p['Recipients']);
     302                    /**/
     303                    /*/$recipients = explode(',',$p['Recipients']);
    298304                    while(list($curKey) = each($recipients)) {
    299305                        $recipients[$curKey] = trim($recipients[$curKey]);
    300306                        if(!$recipients[$curKey] = Functions::getUserID($recipients[$curKey])) unset($recipients[$curKey]);
    301307                    }
    302                     reset($recipients);*/
     308                    reset($recipients);/**/
    303309
    304310                    //if(count($recipients) == 0) $error = $this->modules['Language']->getString('error_no_recipient');
     
    307313                    else {
    308314                        $this->modules['DB']->query("INSERT INTO ".TBLPFX."pms SET
    309                             FolderID='0',
    310                             PMFromID='".USERID."',
    311                             PMToID='".$pMData['PMFromID']."',
    312                             PMIsRead='0',
    313                             PMType='0',
    314                             PMSubject='".$p['PMSubject']."',
    315                             PMMessageText='".$p['PMMessageText']."',
    316                             PMSendTimestamp='".time()."',
    317                             PMEnableBBCode='".$c['EnableBBCode']."',
    318                             PMEnableSmilies='".$c['EnableSmilies']."',
    319                             PMEnableHtmlCode='".$c['EnableHtmlCode']."',
    320                             PMShowSignature='".$c['ShowSignature']."',
    321                             PMRequestReadReceipt='".$c['RequestReadReceipt']."'
     315                            folderID='0',
     316                            pmFromID='".USERID."',
     317                            pmToID='".$pmData['pmFromID']."',
     318                            pmIsRead='0',
     319                            pmType='0',
     320                            pmSubject='".$p['pmSubject']."',
     321                            pmMessageText='".$p['pmMessageText']."',
     322                            pmSendTimestamp='".time()."',
     323                            pmEnableBBCode='".$c['enableBBCode']."',
     324                            pmEnableSmilies='".$c['enableSmilies']."',
     325                            pmEnableHtmlCode='".$c['enableHtmlCode']."',
     326                            pmShowSignature='".$c['showSignature']."',
     327                            pmRequestReadReceipt='".$c['requestReadReceipt']."'
    322328                        ");
    323329
    324330                        if($c['SaveOutbox'] == 1) {
    325331                            $this->modules['DB']->query("INSERT INTO ".TBLPFX."pms SET
    326                                 FolderID='1',
    327                                 PMFromID='".$pMData['PMFromID']."',
    328                                 PMToID='".USERID."',
    329                                 PMIsRead='1',
    330                                 PMType='1',
    331                                 PMSubject='".$p['PMSubject']."',
    332                                 PMMessageText='".$p['PMMessageText']."',
    333                                 PMSendTimestamp='".time()."',
    334                                 PMEnableBBCode='".$c['EnableBBCode']."',
    335                                 PMEnableSmilies='".$c['EnableSmilies']."',
    336                                 PMEnableHtmlCode='".$c['EnableHtmlCode']."',
    337                                 PMShowSignature='".$c['ShowSignature']."',
    338                                 PMRequestReadReceipt='".$c['RequestReadReceipt']."'
     332                                folderID='1',
     333                                pmFromID='".$pmData['pmFromID']."',
     334                                pmToID='".USERID."',
     335                                pmIsRead='1',
     336                                pmType='1',
     337                                pmSubject='".$p['pmSubject']."',
     338                                pmMessageText='".$p['pmMessageText']."',
     339                                pmSendTimestamp='".time()."',
     340                                pmEnableBBCode='".$c['enableBBCode']."',
     341                                pmEnableSmilies='".$c['enableSmilies']."',
     342                                pmEnableHtmlCode='".$c['enableHtmlCode']."',
     343                                pmShowSignature='".$c['showSignature']."',
     344                                pmRequestReadReceipt='".$c['requestReadReceipt']."'
    339345                            ");
    340346                        }
    341347
    342                         if($pMData['PMIsReplied'] != 1)
    343                             $this->modules['DB']->query("UPDATE ".TBLPFX."pms SET PMIsReplied='1' WHERE PMID='$pMID'");
    344 
    345                         Functions::myHeader(INDEXFILE."?Action=PrivateMessages&".MYSID);
    346                     }
    347                 }
    348 
    349 
    350                 if($pMData['PMType'] == 0) {
     348                        if($pmData['PMIsReplied'] != 1)
     349                            $this->modules['DB']->query("UPDATE ".TBLPFX."pms SET pmIsReplied='1' WHERE pmID='$pmID'");
     350
     351                        Functions::myHeader(INDEXFILE."?action=PrivateMessages&".MYSID);
     352                    }
     353                }
     354
     355
     356                if($pmData['pmType'] == 0) {
    351357                    $show = array();
    352                     $show['EnableSmilies'] = $this->modules['Config']->getValue('allow_pms_smilies') == 1;
    353                     $show['ShowSignature'] = $this->modules['Config']->getValue('enable_sig') == 1 && $this->modules['Config']->getValue('allow_pms_signature') == 1;
    354                     $show['EnableBBCode'] = $this->modules['Config']->getValue('allow_pms_bbcode') == 1;
    355                     $show['EnableHtmlCode'] = $this->modules['Config']->getValue('allow_pms_htmlcode') == 1;
    356                     $show['SaveOutbox'] = $this->modules['Config']->getValue('enable_outbox') == 1;
    357                     $show['RequestReadReceipt'] = $this->modules['Config']->getValue('allow_pms_rconfirmation') == 1;
     358                    $show['enableSmilies'] = $this->modules['Config']->getValue('allow_pms_smilies') == 1;
     359                    $show['showSignature'] = $this->modules['Config']->getValue('enable_sig') == 1 && $this->modules['Config']->getValue('allow_pms_signature') == 1;
     360                    $show['enableBBCode'] = $this->modules['Config']->getValue('allow_pms_bbcode') == 1;
     361                    $show['enableHtmlCode'] = $this->modules['Config']->getValue('allow_pms_htmlcode') == 1;
     362                    $show['saveOutbox'] = $this->modules['Config']->getValue('enable_outbox') == 1;
     363                    $show['requestReadReceipt'] = $this->modules['Config']->getValue('allow_pms_rconfirmation') == 1;
    358364
    359365                    $smilies = array(); $smiliesBox = '';
    360                     if($show['EnableSmilies']) {
     366                    if($show['enableSmilies']) {
    361367                        $smilies = $this->modules['Cache']->getSmiliesData('write');
    362368                        $smiliesBox = Functions::getSmiliesBox();
     
    365371
    366372                    $this->modules['Template']->assign(array(
    367                         'Show'=>$show,
    368                         'Error'=>$error,
    369                         'SmiliesBox'=>$smiliesBox,
     373                        'show'=>$show,
     374                        'error'=>$error,
     375                        'smiliesBox'=>$smiliesBox,
    370376                        'p'=>$p,
    371377                        'c'=>$c
     
    373379                }
    374380
    375                 $pMData['_PMSendDateTime'] = Functions::toDateTime($pMData['PMSendTimestamp']);
    376                 $pMData['_PMSender'] = ($pMData['PMType'] == 0) ? sprintf($this->modules['Language']->getString('from_x'),$pMData['PMFromNick']) : sprintf($this->modules['Language']->getString('to_x'),$pMData['PMFromNick']);
    377 
    378                 if($pMData['FolderID'] == 0) $pMData['PMFolderName'] = $this->modules['Language']->getString('Inbox');
    379                 elseif($pMData['FolderID'] == 1) $pMData['PMFolderName'] = $this->modules['Language']->getString('Outbox');
    380 
    381                 $pMData['_PMSubject'] = Functions::HTMLSpecialChars($pMData['PMSubject']);
    382                 $pMData['_PMMessageText'] = nl2br(Functions::HTMLSpecialChars($pMData['PMMessageText']));
    383 
    384                 $this->modules['Template']->assign(array(
    385                     'PMID'=>$pMID,
    386                     'PMData'=>$pMData
     381                $pmData['_pmSendDateTime'] = Functions::toDateTime($pmData['pmSendTimestamp']);
     382                $pmData['_pmSender'] = ($pmData['pmType'] == 0) ? sprintf($this->modules['Language']->getString('from_x'),$pmData['pmFromNick']) : sprintf($this->modules['Language']->getString('to_x'),$pmData['PMFromNick']);
     383
     384                if($pmData['folderID'] == 0) $pmData['pmFolderName'] = $this->modules['Language']->getString('Inbox');
     385                elseif($pmData['folderID'] == 1) $pmData['pmFolderName'] = $this->modules['Language']->getString('Outbox');
     386
     387                $pmData['_pmSubject'] = Functions::HTMLSpecialChars($pmData['pmSubject']);
     388                $pmData['_pmMessageText'] = nl2br(Functions::HTMLSpecialChars($pmData['pmMessageText']));
     389
     390                $this->modules['Template']->assign(array(
     391                    'pmID'=>$pmID,
     392                    'pmData'=>$pmData
    387393                ));
    388394
    389395                $this->modules['Navbar']->addElements(
    390                     array(Functions::HTMLSpecialChars($pMData['PMFolderName']),INDEXFILE.'?Action=PrivateMessages&amp;FolderID='.$pMData['FolderID'].'&amp;'.MYSID),
    391                     array($this->modules['Language']->getString('View_private_message'),INDEXFILE.'?Action=PrivateMessages&amp;PMID='.$pMID.'&amp;'.MYSID)
     396                    array(Functions::HTMLSpecialChars($pmData['pmFolderName']),INDEXFILE.'?action=PrivateMessages&amp;folderID='.$pmData['folderID'].'&amp;'.MYSID),
     397                    array($this->modules['Language']->getString('View_private_message'),INDEXFILE.'?action=PrivateMessages&amp;pmID='.$pmID.'&amp;'.MYSID)
    392398                );
    393399
     
    396402
    397403            case 'ManageFolders':
    398                 $this->modules['DB']->query("SELECT * FROM ".TBLPFX."pms_folders WHERE UserID='".USERID."' ORDER BY FolderName ASC");
     404                $this->modules['DB']->query("SELECT * FROM ".TBLPFX."pms_folders WHERE userID='".USERID."' ORDER BY folderName ASC");
    399405                $foldersData = $this->modules['DB']->raw2Array();
    400406
    401407                $this->modules['Template']->assign(array(
    402                     'FoldersData'=>$foldersData
     408                    'foldersData'=>$foldersData
    403409                ));
    404410
  • trunk/modules/Template.class.php

    r6 r8  
    4040        $this->smarty->display($value1);
    4141    }
     42
     43    public function fetch($value) {
     44        $this->smarty->fetch($value);
     45    }
    4246}
    4347
  • trunk/modules/ViewTopic.class.php

    r6 r8  
    8282            $modTools[] = "<a href=\"".INDEXFILE."?action=edittopic&amp;mode=delete&amp;topic_id=$topicID&amp;".MYSID."\">".$this->modules['Language']->getString('Delete_topic').'</a>';
    8383
    84             $temp = ($topicData['TopicIsPinned'] == 1) ? $this->modules['Language']->getString('Mark_topic_unimportant') : $this->modules['Language']->getString('Mark_topic_important');
     84            $temp = ($topicData['topicIsPinned'] == 1) ? $this->modules['Language']->getString('Mark_topic_unimportant') : $this->modules['Language']->getString('Mark_topic_important');
    8585            $modTools[] = "<a href=\"".INDEXFILE."?action=edittopic&amp;mode=pinn&amp;topic_id=$topicID&amp;".MYSID."\">".$temp.'</a>';
    8686
    87             $temp = ($topicData['TopicStatus'] == TOPIC_STATUS_CLOSED) ? $this->modules['Language']->getString('Open_topic') : $this->modules['Language']->getString('Close_topic');
     87            $temp = ($topicData['topicStatus'] == TOPIC_STATUS_CLOSED) ? $this->modules['Language']->getString('Open_topic') : $this->modules['Language']->getString('Close_topic');
    8888            $modTools[] = "<a href=\"".INDEXFILE."?action=edittopic&amp;mode=openclose&amp;topic_id=$topicID&amp;".MYSID."\">".$temp.'</a>';
    8989        }
  • trunk/modules/WhoIsOnline.class.php

    r6 r8  
    2727        $this->modules['DB']->query("
    2828            SELECT
    29                 t1.SessionUserID,
    30                 t1.SessionLastLocation,
    31                 t1.SessionIsGhost,
    32                 t2.UserNick AS SessionUserNick
     29                t1.sessionUserID,
     30                t1.sessionLastLocation,
     31                t1.sessionIsGhost,
     32                t2.userNick AS sessionUserNick
    3333            FROM ".TBLPFX."sessions AS t1
    34             LEFT JOIN ".TBLPFX."users AS t2 ON t1.SessionUserID=t2.UserID
     34            LEFT JOIN ".TBLPFX."users AS t2 ON t1.sessionUserID=t2.userID
    3535            WHERE
    36                 t1.SessionIsGhost<>'1'
    37                 AND t1.SessionLastUpdate>'".$this->modules['DB']->fromUnixTimestamp(time()-$this->modules['Config']->getValue('wio_timeout')*60)."'
     36                t1.sessionIsGhost<>'1'
     37                AND t1.sessionLastUpdate>'".$this->modules['DB']->fromUnixTimestamp(time()-$this->modules['Config']->getValue('wio_timeout')*60)."'
    3838        ");
    39         $wIOData = $this->modules['DB']->raw2Array();
    40         $wIODataCounter = count($wIOData);
     39        $wioData = $this->modules['DB']->raw2Array();
     40        $wioDataCounter = count($wioData);
    4141
    42         for($i = 0; $i < $wIODataCounter; $i++) {
    43             $curWIO = &$wIOData[$i];
     42        for($i = 0; $i < $wioDataCounter; $i++) {
     43            $curWIO = &$wioData[$i];
    4444
    45             if($curWIO['SessionUserID'] == 0) $curWIO['SessionUserNick'] = $this->modules['Language']->getString('Guest');
    46             $curWIO['_SessionLastLocationText'] = $this->modules['Language']->getString('wio_'.$curWIO['SessionLastLocation']);
     45            if($curWIO['sessionUserID'] == 0) $curWIO['sessionUserNick'] = $this->modules['Language']->getString('Guest');
     46            $curWIO['_sessionLastLocationText'] = $this->modules['Language']->getString('wio_'.$curWIO['sessionLastLocation']);
    4747        }
    4848
     
    5050
    5151        $this->modules['Template']->assign(array(
    52             'WIOData'=>$wIOData
     52            'wioData'=>$wioData
    5353        ));
    5454        $this->modules['PageParts']->printPage('WhoIsOnline.tpl');
  • trunk/templates/std/templates/EditProfileAvatar.tpl

    r6 r8  
    1 <form method="post" action="{$indexFile}?action=EditProfile&amp;mode=Avatar&amp;Doit=1&amp;{$mySID}" name="myForm">
     1<form method="post" action="{$indexFile}?action=EditProfile&amp;mode=Avatar&amp;doit=1&amp;{$mySID}" name="myForm">
    22<table class="TableStd" border="0" cellpadding="3" cellspacing="0" width="100%">
    33<tr><td class="CellCat"><span class="FontCat">{$modules.Language->getString('Avatar')}</span></td></tr>
     
    77  <table border="0" cellpadding="3" cellspacing="0" width="100%">
    88  <tr>
    9    <td><span class="FontNorm">{$modules.Language->getString('Avatar')}:</span>{if $p.AvatarAddress != ''}<br/><img src="{$p.AvatarAddress}" width="{$modules.Config->getValue('avatar_image_width')}" height="{$modules.Config->getValue('avatar_image_height')}"/>{/if}</td>
    10    <td valign="top"><input class="FormText" type="text" size="60" name="p[AvatarAddress]" value="{$p.AvatarAddress}"/></td>
     9   <td><span class="FontNorm">{$modules.Language->getString('Avatar')}:</span>{if $p.avatarAddress != ''}<br/><img src="{$p.avatarAddress}" width="{$modules.Config->getValue('avatar_image_width')}" height="{$modules.Config->getValue('avatar_image_height')}"/>{/if}</td>
     10   <td valign="top"><input class="FormText" type="text" size="60" name="p[avatarAddress]" value="{$p.avatarAddress}"/></td>
    1111  </tr>
    1212  <tr><td colspan="2"><span class="FontNorm"><a href="javascript:popup('{$indexFile}?action=EditProfile&amp;mode=UploadAvatar&amp;{$mySID}','uploadavatarwindow','width=500,height=250,scrollbars=yes,toolbar=no,status=yes')">{$modules.Language->getString('Upload_avatar')}</a></span></td></tr>
     
    1818   <table border="0" cellpadding="3" cellspacing="0" width="100%">
    1919    <tr>
    20     {foreach from=$avatarsData item=curAvatar name=AvatarsLoop}
    21      <td align="center"><a href="javascript:document.getElementsByName('p[AvatarAddress]')[0].value = encodeURI('{$curAvatar.AvatarAddress}'); document.forms.myForm.submit();"><img src="{$curAvatar.AvatarAddress}" width="{$modules.Config->getValue('avatar_image_width')}" height="{$modules.Config->getValue('avatar_image_height')}" border="0" alt=""/></a></td>
    22      {if $smarty.foreach.AvatarsLoop.iteration % 8 == 0 && $smarty.foreach.AvatarsLoop.iteration != $smarty.foreach.AvatarsLoop.total}</tr><tr>{/if}
     20    {foreach from=$avatarsData item=curAvatar name=avatarsLoop}
     21     <td align="center"><a href="javascript:document.getElementsByName('p[avatarAddress]')[0].value = encodeURI('{$curAvatar.avatarAddress}'); document.forms.myForm.submit();"><img src="{$curAvatar.avatarAddress}" width="{$modules.Config->getValue('avatar_image_width')}" height="{$modules.Config->getValue('avatar_image_height')}" border="0" alt=""/></a></td>
     22     {if $smarty.foreach.avatarsLoop.iteration % 8 == 0 && $smarty.foreach.avatarsLoop.iteration != $smarty.foreach.avatarsLoop.total}</tr><tr>{/if}
    2323    {/foreach}
    2424    </tr>
  • trunk/templates/std/templates/EditProfileExtendedProfile.tpl

    r6 r8  
    1 <form method="post" action="{$indexFile}?action=EditProfile&amp;mode=ExtendedProfile&amp;Doit=1&amp;{$mySID}">
     1<form method="post" action="{$indexFile}?action=EditProfile&amp;mode=ExtendedProfile&amp;doit=1&amp;{$mySID}">
    22<table class="TableStd" border="0" cellpadding="3" cellspacing="0" width="100%">
    33<tr><td class="CellCat"><span class="FontCat">{$modules.Language->getString('Extended_profile')}</span></td></tr>
     
    55<tr><td class="CellStd">
    66{foreach from=$groupsData item=curGroup}
    7  {if count($curGroup.GroupFields) > 0}
     7 {if count($curGroup.groupFields) > 0}
    88 <fieldset>
    99 <legend><span class="FontSmall"><b>{$curGroup.GroupName}</b></span></legend>
    1010 <table border="0" cellpadding="2" cellspacing="0" width="100%">
    11  {foreach from=$curGroup.GroupFields item=curField}
    12   {if $curField.FieldType == $smarty.const.PROFILE_FIELD_TYPE_TEXT}
     11 {foreach from=$curGroup.groupFields item=curField}
     12  {if $curField.fieldType == $smarty.const.PROFILE_FIELD_TYPE_TEXT}
    1313   <tr>
    14     <td width="25%"><span class="FontNorm">{$curField.FieldName}:</span></td>
    15     <td width="75%"><input class="FormText" type="text" size="50" name="p[FieldsData][{$curField.FieldID}]" value="{$curField._FieldValue}"/></td>
     14    <td width="25%"><span class="FontNorm">{$curField.fieldName}:</span></td>
     15    <td width="75%"><input class="FormText" type="text" size="50" name="p[fieldsData][{$curField.fieldID}]" value="{$curField._fieldValue}"/></td>
    1616   </tr>
    17   {elseif $curField.FieldType == $smarty.const.PROFILE_FIELD_TYPE_TEXTAREA}
     17  {elseif $curField.fieldType == $smarty.const.PROFILE_FIELD_TYPE_TEXTAREA}
    1818   <tr>
    19     <td width="25%" valign="top"><span class="FontNorm">{$curField.FieldName}:</span></td>
    20     <td width="75%"><textarea class="formtextarea" name="p[FieldsData][{$curField.FieldID}]" cols="30" rows="4">{$curField._FieldValue}</textarea></td>
     19    <td width="25%" valign="top"><span class="FontNorm">{$curField.fieldName}:</span></td>
     20    <td width="75%"><textarea class="FormTextArea" name="p[FieldsData][{$curField.fieldID}]" cols="30" rows="4">{$curField._fieldValue}</textarea></td>
    2121   </tr>
    22   {elseif $curField.FieldType == $smarty.const.PROFILE_FIELD_TYPE_SELECTSINGLE}
     22  {elseif $curField.fieldType == $smarty.const.PROFILE_FIELD_TYPE_SELECTSINGLE}
    2323   <tr>
    24     <td width="25%"><span class="FontNorm">{$curField.FieldName}:</span></td>
    25     <td width="75%"><select class="FormSelect" name="p[FieldsData][{$curField.FieldID}]">
     24    <td width="25%"><span class="FontNorm">{$curField.fieldName}:</span></td>
     25    <td width="75%"><select class="FormSelect" name="p[FieldsData][{$curField.fieldID}]">
    2626    {foreach from=$curField._FieldOptions item=curOption key=curOptionKey}
    2727     <option value="{$curOptionKey}"{if $curOptionKey == $curField._FieldSelectedIDs} selected="selected"{/if}>{$curOption}</option>
     
    2929    </select></td>
    3030   </tr>
    31   {elseif $curField.FieldType == $smarty.const.PROFILE_FIELD_TYPE_SELECTMULTI}
     31  {elseif $curField.fieldType == $smarty.const.PROFILE_FIELD_TYPE_SELECTMULTI}
    3232   <tr>
    33     <td width="25%" valign="top"><span class="FontNorm">{$curField.FieldName}:</span></td>
    34     <td width="75%"><select class="FormSelect" name="p[FieldsData][{$curField.FieldID}][]" size="5" multiple="multiple">
     33    <td width="25%" valign="top"><span class="FontNorm">{$curField.fieldName}:</span></td>
     34    <td width="75%"><select class="FormSelect" name="p[FieldsData][{$curField.fieldID}][]" size="5" multiple="multiple">
    3535    {foreach from=$curField._FieldOptions item=curOption key=curOptionKey}
    36      <option value="{$curOptionKey}"{if in_array($curOptionKey,$curField._FieldSelectedIDs) == TRUE} selected="selected"{/if}>{$curOption}</option>
     36     <option value="{$curOptionKey}"{if in_array($curOptionKey,$curField._fieldSelectedIDs) == TRUE} selected="selected"{/if}>{$curOption}</option>
    3737    {/foreach}
    3838    </select></td>
  • trunk/templates/std/templates/EditProfileGeneral.tpl

    r6 r8  
    1 <form method="post" action="{$indexFile}?action=EditProfile&amp;mode=GeneralProfile&amp;Doit=1&amp;{$mySID}">
     1<form method="post" action="{$indexFile}?action=EditProfile&amp;mode=GeneralProfile&amp;doit=1&amp;{$mySID}">
    22<table class="TableStd" border="0" cellpadding="3" cellspacing="0" width="100%">
    33<tr><td class="CellCat"><span class="FontCat">{$modules.Language->getString('General_profile')}</span></td></tr>
     
    99 <tr>
    1010  <td width="20%"><span class="FontNorm">{$modules.Language->getString('Email_address')}:</span></td>
    11   <td width="80%"><input class="FormText" type="text" size="40" name="p[UserEmail]" value="{$p.UserEmail}"/></td>
     11  <td width="80%"><input class="FormText" type="text" size="40" name="p[userEmail]" value="{$p.userEmail}"/></td>
    1212 </tr>
    1313 <tr>
    1414  <td width="20%" valign="top"><span class="FontNorm">{$modules.Language->getString('Signature')}:</span></td>
    15   <td width="80%"><textarea class="FormTextArea" cols="60" rows="8" name="p[UserSignature]">{$p.UserSignature}</textarea></td>
     15  <td width="80%"><textarea class="FormTextArea" cols="60" rows="8" name="p[userSignature]">{$p.userSignature}</textarea></td>
    1616 </tr>
    1717 </table>
     
    2424 <tr>
    2525  <td width="20%"><span class="FontNorm">{$modules.Language->getString('Current_password')}:</span></td>
    26   <td width="80%"><input class="FormText" type="password" size="30" name="p[UserOldPassword]"/></td>
     26  <td width="80%"><input class="FormText" type="password" size="30" name="p[userOldPassword]"/></td>
    2727 </tr>
    2828 <tr>
    2929  <td width="20%"><span class="FontNorm">{$modules.Language->getString('New_password')}:</span></td>
    30   <td width="80%"><input class="FormText" type="password" size="30" name="p[UserNewPassword]"/></td>
     30  <td width="80%"><input class="FormText" type="password" size="30" name="p[userNewPassword]"/></td>
    3131 </tr>
    3232 <tr>
    3333  <td width="20%"><span class="FontNorm">{$modules.Language->getString('Confirm_new_password')}:</span></td>
    34   <td width="80%"><input class="FormText" type="password" size="30" name="p[UserNewPasswordConfirmation]"/></td>
     34  <td width="80%"><input class="FormText" type="password" size="30" name="p[userNewPasswordConfirmation]"/></td>
    3535 </tr>
    3636 </table>
  • trunk/templates/std/templates/EditProfileMemo.tpl

    r6 r8  
    1 <form method="post" action="{$indexFile}?action=EditProfile&amp;mode=Memo&amp;Doit=1&amp;{$mySID}">
     1<form method="post" action="{$indexFile}?action=EditProfile&amp;mode=Memo&amp;doit=1&amp;{$mySID}">
    22<table class="TableStd" border="0" cellpadding="3" cellspacing="0" width="100%">
    33<tr><td class="CellCat"><span class="FontCat">{$modules.Language->getString('Memo')}</span></td></tr>
     
    55<tr><td class="CellStd">
    66 <div class="DivInfoBox"><span class="FontInfoBox"><img src="templates/std/templates/images/lightbulb_a.gif" style="vertical-align:middle; padding:5px;"/>{$modules.Language->getString('memo_info')}</span></div>
    7  <textarea class="FormTextArea" cols="150" rows="25" name="p_user_memo" style="width:99%;">{$p_user_memo}</textarea>
     7 <textarea class="FormTextArea" cols="150" rows="25" name="p_user_memo" style="width:99%;">{$p.userMemo}</textarea>
    88</td></tr>
    99<tr><td class="CellButtons" align="center"><input class="FormBButton" type="submit" value="{$modules.Language->getString('Update_memo')}"/>&nbsp;&nbsp;&nbsp;<input class="FormButton" type="reset" value="{$modules.Language->getString('Reset')}"/></td></tr>
  • trunk/templates/std/templates/EditProfileProfileSettings.tpl

    r6 r8  
    88  <tr>
    99   <td width="35%" valign="top"><span class="FontNorm">{$modules.Language->getString('Show_email_address')}:</span><br/><span class="FontSmall">{$modules.Language->getString('show_email_address_info')}</span></td>
    10    <td width="65%" valign="top"><span class="FontNorm"><input class="FormRadio" type="radio" name="p[UserHideEmail]" value="0"{if $p.UserHideEmail == 0} checked="checked"{/if}/>&nbsp;{$modules.Language->getString('Yes')}&nbsp;&nbsp;&nbsp;<input class="FormRadio" type="radio" name="p[UserHideEmail]" value="1"{if $p.UserHideEmail == 1} checked="checked"{/if}/>&nbsp;{$modules.Language->getString('No')}</span></td>
     10   <td width="65%" valign="top"><span class="FontNorm"><input class="FormRadio" type="radio" name="p[userHideEmail]" value="0"{if $p.userHideEmail == 0} checked="checked"{/if}/>&nbsp;{$modules.Language->getString('Yes')}&nbsp;&nbsp;&nbsp;<input class="FormRadio" type="radio" name="p[userHideEmail]" value="1"{if $p.userHideEmail == 1} checked="checked"{/if}/>&nbsp;{$modules.Language->getString('No')}</span></td>
    1111  </tr>
    1212  <tr>
    1313   <td width="35%" valign="top"><span class="FontNorm">{$modules.Language->getString('Receive_board_emails')}:</span><br/><span class="FontSmall">{$modules.Language->getString('receive_board_emails_info')}</span></td>
    14    <td width="65%" valign="top"><span class="FontNorm"><input class="FormRadio" type="radio" name="p[UserReceiveEmails]" value="1"{if $p.UserReceiveEmails == 1} checked="checked"{/if}/>&nbsp;{$modules.Language->getString('Yes')}&nbsp;&nbsp;&nbsp;<input class="FormRadio" type="radio" name="p[UserReceiveEmails]" value="0"{if $p.UserReceiveEmails == 0} checked="checked"{/if}/>&nbsp;{$modules.Language->getString('No')}</span></td>
     14   <td width="65%" valign="top"><span class="FontNorm"><input class="FormRadio" type="radio" name="p[userReceiveEmails]" value="1"{if $p.userReceiveEmails == 1} checked="checked"{/if}/>&nbsp;{$modules.Language->getString('Yes')}&nbsp;&nbsp;&nbsp;<input class="FormRadio" type="radio" name="p[userReceiveEmails]" value="0"{if $p.userReceiveEmails == 0} checked="checked"{/if}/>&nbsp;{$modules.Language->getString('No')}</span></td>
    1515  </tr>
    1616  <tr>
    1717   <td width="35%" valign="top"><span class="FontNorm">{$modules.Language->getString('Timezone')}:</span></td>
    18    <td width="65%" valign="top"><select class="form_select" name="p[UserTimeZone]">
     18   <td width="65%" valign="top"><select class="form_select" name="p[userTimeZone]">
    1919   {foreach from=$timeZones item=curTimeZone key=curTimeZoneKey}
    20     <option value="{$curTimeZoneKey}"{if $curTimeZoneKey == $p.UserTimeZone} selected="selected"{/if}>{$curTimeZone}</option>
     20    <option value="{$curTimeZoneKey}"{if $curTimeZoneKey == $p.userTimeZone} selected="selected"{/if}>{$curTimeZone}</option>
    2121   {/foreach}
    2222   </select></td>
  • trunk/templates/std/templates/EditProfileTopicSubscriptions.tpl

    r6 r8  
    1 <form method="post" action="{$indexFile}?action=EditProfile&amp;mode=TopicSubscriptions&amp;Doit=1&amp;{$mySID}">
     1<form method="post" action="{$indexFile}?action=EditProfile&amp;mode=TopicSubscriptions&amp;doit=1&amp;{$mySID}">
    22<table class="TableStd" border="0" cellpadding="3" cellspacing="0" width="100%">
    33<tr><td class="CellCat" colspan="3"><span class="FontCat">{$modules.Language->getString('Topic_subscriptions')}</span></td></tr>
    44{foreach from=$subscriptionsData item=curSubscription}
    55 <tr>
    6   <td class="CellAlt" align="center" width="50"><input type="checkbox" name="TopicIDs[]" value="{$curSubscription.TopicID}"/></td>
    7   <td class="CellStd"><span class="FontNorm"><a href="{$indexFile}?action=ViewTopic&amp;TopicID={$curSubscription.TopicID}&amp;{$mySID}">{$curSubscription.TopicTitle}</a></span></td>
    8   <td class="CellAlt" align="right"><span class="FontSmall"><a href="{$indexFile}?action=EditProfile&amp;mode=TopicSubscriptions&amp;Doit=1&amp;TopicID={$curSubscription.TopicID}&amp;{$mySID}">{$modules.Language->getString('delete')}</a></span></td>
     6  <td class="CellAlt" align="center" width="50"><input type="checkbox" name="topicIDs[]" value="{$curSubscription.topicID}"/></td>
     7  <td class="CellStd"><span class="FontNorm"><a href="{$indexFile}?action=ViewTopic&amp;TopicID={$curSubscription.topicID}&amp;{$mySID}">{$curSubscription.topicTitle}</a></span></td>
     8  <td class="CellAlt" align="right"><span class="FontSmall"><a href="{$indexFile}?action=EditProfile&amp;mode=TopicSubscriptions&amp;doit=1&amp;topicID={$curSubscription.topicID}&amp;{$mySID}">{$modules.Language->getString('delete')}</a></span></td>
    99 </tr>
    1010{foreachelse}
  • trunk/templates/std/templates/MemberList.tpl

    r6 r8  
    1 <form method="post" action="{$indexFile}?action=MemberList&amp;Page={$page}&amp;{$mySID}">
     1<form method="post" action="{$indexFile}?action=MemberList&amp;page={$page}&amp;{$mySID}">
    22<table class="TableStd" border="0" cellpadding="3" cellspacing="0" width="100%">
    33<tr>
     
    77 <td class="CellTitle" align="center"><span class="FontTitleSmall">{$modules.Language->getString('Posts')}</span></td>
    88 {foreach from=$fieldsData item=curField}
    9   <td class="CellTitle" align="center"><span class="FontTitleSmall">{$curField.FieldName}</span></td>
     9  <td class="CellTitle" align="center"><span class="FontTitleSmall">{$curField.fieldName}</span></td>
    1010 {/foreach}
    1111</tr>
    1212{foreach from=$usersData item=curUser}
    1313 <tr>
    14   <td class="CellStd"><span class="FontNorm">{$curUser.UserID}</span></td>
    15   <td class="CellAlt"><span class="FontNorm">{$curUser.UserNick}</span></td>
    16   <td class="CellStd"><span class="FontNorm">{$curUser._UserRankName}</span></td>
    17   <td class="CellAlt"><span class="FontNorm">{$curUser.UserPostsCounter}</span></td>
    18   {foreach from=$curUser._UserFieldsValues item=curFieldValue}
     14  <td class="CellStd"><span class="FontNorm">{$curUser.userID}</span></td>
     15  <td class="CellAlt"><span class="FontNorm">{$curUser.userNick}</span></td>
     16  <td class="CellStd"><span class="FontNorm">{$curUser._userRankName}</span></td>
     17  <td class="CellAlt"><span class="FontNorm">{$curUser.userPostsCounter}</span></td>
     18  {foreach from=$curUser._userFieldsValues item=curFieldValue}
    1919   <td class="{cycle values="CellStd,CellAlt" reset=true}"><span class="FontNorm">{$curFieldValue}</span></td>
    2020  {/foreach}
     
    2222{/foreach}
    2323<tr><td colspan="100" class="CellButtons"><span class="FontSmall"><b>{$modules.Language->getString('Display_options')}:</b> {$modules.Language->getString('Sort_by')}
    24  <select class="FormSelect" name="OrderBy">
     24 <select class="FormSelect" name="orderBy">
    2525  <option value="id"{if $orderBy == 'id'} selected="selected"{/if}>{$modules.Language->getString('User_id')}</option>
    2626  <option value="nick"{if $orderBy == 'nick'} selected="selected"{/if}>{$modules.Language->getString('User_name')}</option>
     
    2828  <option value="posts"{if $orderBy == 'posts'} selected="selected"{/if}>{$modules.Language->getString('Posts')}</option>
    2929 </select>
    30  <select class="FormSelect" name="OrderType">
     30 <select class="FormSelect" name="orderType">
    3131  <option value="DESC"{if $orderType == 'DESC'} selected="selected"{/if}>{$modules.Language->getString('Descending')}</option>
    32   <option value="ASC"{if $order_type == 'ASC'} selected="selected"{/if}>{$modules.Language->getString('Ascending')}</option>
     32  <option value="ASC"{if $orderType == 'ASC'} selected="selected"{/if}>{$modules.Language->getString('Ascending')}</option>
    3333 </select>; {$modules.Language->getString('Users_per_page')}
    34  <select class="FormSelect" name="UsersPerPage">
     34 <select class="FormSelect" name="usersPerPage">
    3535  <option value="10">10</option>
    3636  <option value="20">20</option>
  • trunk/templates/std/templates/PrivateMessagesHeader.tpl

    r6 r8  
    1010   <tr><td class="CellNavNone" style="padding:0px;"><hr style="width:90%; height:1px;"/></td></tr>
    1111   {foreach from=$headerFoldersData item=curFolder}
    12     <tr><td class="CellNav" onclick="goTo('{$indexFile}?action=PrivateMessages&amp;FolderID={$curFolder.FolderID}&amp;{$mySID}');"><a class="FontNav" href="{$indexFile}?action=PrivateMessages&amp;FolderID={$curFolder.FolderID}&amp;{$mySID}">{$curFolder.FolderName}</a></td></tr>
     12    <tr><td class="CellNav" onclick="goTo('{$indexFile}?action=PrivateMessages&amp;FolderID={$curFolder.folderID}&amp;{$mySID}');"><a class="FontNav" href="{$indexFile}?action=PrivateMessages&amp;folderID={$curFolder.folderID}&amp;{$mySID}">{$curFolder.folderName}</a></td></tr>
    1313   {/foreach}
    1414   <tr><td class="CellNavNone" style="padding:0px;"><hr style="width:90%; height:1px;"/></td></tr>
  • trunk/templates/std/templates/PrivateMessagesManageFolders.tpl

    r6 r8  
    33{foreach from=$foldersData item=curFolder}
    44 <tr>
    5   <td class="CellStd"><span class="FontNorm"><a href="{$indexFile}?action=PrivateMessages&amp;mode=EditFolder&amp;FolderID={$curFolder.FolderID}&amp;{$mySID}">{$curFolder.FolderName}</a></span></td>
    6   <td class="CellAlt" align="right"><span class="FontSmall"><a href="{$indexFile}?action=PrivateMessages&amp;mode=DeleteFolder&amp;FolderID={$curFolder.FolderID}&amp;{$mySID}"><img src="{$modules.Template->getTemplateDir()}/images/icons/FolderDelete.png" class="ImageIcon" alt="{$modules.Language->getString('Delete_folder')}" border="0"/></a><a href="{$indexFile}?action=PrivateMessages&amp;FolderID={$curFolder.FolderID}&amp;{$mySID}"><img src="{$modules.Template->getTemplateDir()}/images/icons/FolderGo.png" class="ImageIcon" alt="" border="0"/></a><a href="{$indexFile}?action=PrivateMessages&amp;mode=EditFolder&amp;FolderID={$curFolder.FolderID}&amp;{$mySID}"><img src="{$modules.Template->getTemplateDir()}/images/icons/FolderEdit.png" class="ImageIcon" alt="{$modules.Language->getString('Edit_folder')}" border="0"/></a></span></td>
     5  <td class="CellStd"><span class="FontNorm"><a href="{$indexFile}?action=PrivateMessages&amp;mode=EditFolder&amp;folderID={$curFolder.folderID}&amp;{$mySID}">{$curFolder.folderName}</a></span></td>
     6  <td class="CellAlt" align="right"><span class="FontSmall"><a href="{$indexFile}?action=PrivateMessages&amp;mode=DeleteFolder&amp;folderID={$curFolder.folderID}&amp;{$mySID}"><img src="{$modules.Template->getTemplateDir()}/images/icons/FolderDelete.png" class="ImageIcon" alt="{$modules.Language->getString('Delete_folder')}" border="0"/></a><a href="{$indexFile}?action=PrivateMessages&amp;folderID={$curFolder.folderID}&amp;{$mySID}"><img src="{$modules.Template->getTemplateDir()}/images/icons/FolderGo.png" class="ImageIcon" alt="" border="0"/></a><a href="{$indexFile}?action=PrivateMessages&amp;mode=EditFolder&amp;folderID={$curFolder.folderID}&amp;{$mySID}"><img src="{$modules.Template->getTemplateDir()}/images/icons/FolderEdit.png" class="ImageIcon" alt="{$modules.Language->getString('Edit_folder')}" border="0"/></a></span></td>
    77 </tr>
    88{foreachelse}
  • trunk/templates/std/templates/PrivateMessagesViewFolder.tpl

    r6 r8  
    1010    function switch_all(status) {
    1111        for(i = 0; i < document.TBBForm.length; i++) {
    12             if(document.TBBForm.elements[i].name == 'PMIDs[]') document.TBBForm.elements[i].checked = status;
     12            if(document.TBBForm.elements[i].name == 'pmIDs[]') document.TBBForm.elements[i].checked = status;
    1313        }
    1414    }
    1515{/literal}
    1616</script>
    17 <form method="post" action="{$indexFile}?action=PrivateMessages&amp;FolderID={$folderID}&amp;z={$z}&amp;{$mySID}" name="TBBForm">
     17<form method="post" action="{$indexFile}?action=PrivateMessages&amp;folderID={$folderID}&amp;page={$page}&amp;{$mySID}" name="TBBForm">
    1818<table class="TableStd" border="0" cellpadding="3" cellspacing="0" width="100%">
    1919<tr>
     
    2525 <td class="CellCat" align="center"><span class="FontTitle">{$modules.Language->getString('Actions')}</span></td>
    2626</tr>
    27 {foreach from=$pMsData item=curPM}
     27{foreach from=$pmsData item=curPM}
    2828 <tr>
    29   <td class="CellAlt" align="center"><input type="checkbox" value="{$curPM.PMID}" name="PMIDs[]" /></td>
    30   <td class="CellAlt" align="center"><img src="{if $curPM.PMIsRead == 1}{if $curPM.PMIsReplied == 1}{$modules.Template->getTemplateDir()}/images/icons/PrivateMessageReadReplied.png{else}{$modules.Template->getTemplateDir()}/images/icons/PrivateMessageRead.png{/if}{else}{$modules.Template->getTemplateDir()}/images/icons/PrivateMessageUnread.png{/if}" alt="" border="0"/></td>
    31   <td class="CellStd"><span class="FontNorm"><a href="{$indexFile}?action=PrivateMessages&amp;mode=ViewPM&amp;PMID={$curPM.PMID}&amp;{$mySID}">{if $curPM.PMIsRead == 1}{$curPM.PMSubject}{else}<b>{$curPM.PMSubject}</b>{/if}</a></span></td>
    32   <td class="CellAlt"><span class="FontSmall">{$curPM._PMSender}</span></td>
    33   <td class="CellStd" align="center"><span class="FontSmall">{$curPM._PMSendDateTime}</span></td>
    34   <td class="CellAlt" align="right"><span class="FontSmall"><a href="{$indexFile}?action=PrivateMessages&amp;mode=deletepms&amp;pm_id={$akt_pm.pm_id}&amp;{$mySID}"><img src="{$modules.Template->getTemplateDir()}/images/icons/PrivateMessageDelete.png" class="ImageIcon" alt="{$modules.Language->getString('delete')}" border="0"/></a>{if $curPM.PMType == 0 && $curPM.PMFromID != 0}<a href="{$indexFile}?action=PrivateMessages&amp;mode=ViewPM&amp;PMID={$curPM.PMID}&amp;{$mySID}#Reply"><img src="{$modules.Template->getTemplateDir()}/images/icons/PrivateMessageReadReplied.png" class="ImageIcon" alt="" border="0"/></a>{/if}</span></td>
     29  <td class="CellAlt" align="center"><input type="checkbox" value="{$curPM.pmID}" name="pmIDs[]" /></td>
     30  <td class="CellAlt" align="center"><img src="{if $curPM.pmIsRead == 1}{if $curPM.pmIsReplied == 1}{$modules.Template->getTemplateDir()}/images/icons/PrivateMessageReadReplied.png{else}{$modules.Template->getTemplateDir()}/images/icons/PrivateMessageRead.png{/if}{else}{$modules.Template->getTemplateDir()}/images/icons/PrivateMessageUnread.png{/if}" alt="" border="0"/></td>
     31  <td class="CellStd"><span class="FontNorm"><a href="{$indexFile}?action=PrivateMessages&amp;mode=ViewPM&amp;pmID={$curPM.pmID}&amp;{$mySID}">{if $curPM.pmIsRead == 1}{$curPM.pmSubject}{else}<b>{$curPM.pmSubject}</b>{/if}</a></span></td>
     32  <td class="CellAlt"><span class="FontSmall">{$curPM._pmSender}</span></td>
     33  <td class="CellStd" align="center"><span class="FontSmall">{$curPM._pmSendDateTime}</span></td>
     34  <td class="CellAlt" align="right"><span class="FontSmall"><a href="{$indexFile}?action=PrivateMessages&amp;mode=DeletePMs&amp;pmID={$curPM.pmID}&amp;{$mySID}"><img src="{$modules.Template->getTemplateDir()}/images/icons/PrivateMessageDelete.png" class="ImageIcon" alt="{$modules.Language->getString('delete')}" border="0"/></a>{if $curPM.pmType == 0 && $curPM.pmFromID != 0}<a href="{$indexFile}?action=PrivateMessages&amp;mode=ViewPM&amp;pmID={$curPM.pmID}&amp;{$mySID}#Reply"><img src="{$modules.Template->getTemplateDir()}/images/icons/PrivateMessageReadReplied.png" class="ImageIcon" alt="" border="0"/></a>{/if}</span></td>
    3535 </tr>
    3636{foreachelse}
    3737 <tr><td class="CellStd" colspan="6" align="center"><span class="FontNorm">-- {$modules.Language->getString('No_messages_in_this_folder')} --</span></td></tr>
    3838{/foreach}
    39 <tr><td class="CellButtons" colspan="6"><select class="FormSelect" name="p_action" onchange="submit_form();"><option value=''>-- {$modules.Language->getString('Select_action')} --</option><option value=''></option><option value="{$indexFile}?action=PrivateMessages&amp;mode=markread&amp;return_f={$folderID}&amp;return_z={$z}&amp;{$mySID}">{$modules.Language->getString('Mark_as_read')}</option><option value="{$indexFile}?action=PrivateMessages&amp;mode=deletepms&amp;return_f={$folderID}&amp;return_z={$z}&amp;{$mySID}">{$modules.Language->getString('delete')}</option></select></td></tr>
     39<tr><td class="CellButtons" colspan="6"><select class="FormSelect" name="p_action" onchange="submit_form();"><option value=''>-- {$modules.Language->getString('Select_action')} --</option><option value=''></option><option value="{$indexFile}?action=PrivateMessages&amp;mode=markread&amp;returnFolderID{$folderID}&amp;returnPage={$page}&amp;{$mySID}">{$modules.Language->getString('Mark_as_read')}</option><option value="{$indexFile}?action=PrivateMessages&amp;mode=deletepms&amp;returnFolderID{$folderID}&amp;returnPage={$page}&amp;{$mySID}">{$modules.Language->getString('delete')}</option></select></td></tr>
    4040</table>
    4141</form>
  • trunk/templates/std/templates/PrivateMessagesViewPM.tpl

    r6 r8  
    77<tr>
    88 <td class="CellAlt"><span class="FontNorm">{$modules.Language->getString('Date')}:</span></td>
    9  <td class="CellAlt"><span class="FontNorm">{$pMData._PMSendDateTime}</span></td>
     9 <td class="CellAlt"><span class="FontNorm">{$pmData._pmSendDateTime}</span></td>
    1010</tr>
    1111<tr>
    1212 <td class="CellAlt"><span class="FontNorm">{$modules.Language->getString('Subject')}:</span></td>
    13  <td class="CellAlt"><span class="FontNorm"><b>{$pMData._PMSubject}</b> {$pMData._PMSender}</span></td>
     13 <td class="CellAlt"><span class="FontNorm"><b>{$pmData._pmSubject}</b> {$pmData._pmSender}</span></td>
    1414</tr>
    15 <tr><td class="CellStd" colspan="2"><span class="FontNorm">{$pMData._PMMessageText}</span></td></tr>
     15<tr><td class="CellStd" colspan="2"><span class="FontNorm">{$pmData._pmMessageText}</span></td></tr>
    1616</table>
    17 {if $pMData.PMType == 0 && $pMData.PMFromID != 0}
     17{if $pmData.pmType == 0 && $pmData.pmFromID != 0}
    1818 <br/>
    19  <form method="post" action="{$indexFile}?action=PrivateMessages&amp;mode=ViewPM&amp;PMID={$pMID}&amp;Doit=1&amp;{$mySID}" name="tbb_form">
     19 <form method="post" action="{$indexFile}?action=PrivateMessages&amp;mode=ViewPM&amp;pmID={$pmID}&amp;doit=1&amp;{$mySID}" name="tbb_form">
    2020 <table class="TableStd" border="0" cellpadding="3" cellspacing="0" width="100%">
    2121 <colgroup>
     
    2727 <tr>
    2828  <td class="CellStd"><span class="FontNorm">{$modules.Language->getString('Recipient')}:</span></td>
    29   <td class="CellAlt"><span class="FontNorm">{$pMData.PMFromNick}</span></td>
     29  <td class="CellAlt"><span class="FontNorm">{$pmData.pmFromNick}</span></td>
    3030 </tr>
    3131 <tr>
    3232  <td class="CellStd"><span class="FontNorm">{$modules.Language->getString('Subject')}:</span></td>
    33   <td class="CellAlt"><input size="60" class="FormText" type="text" name="p[PMSubject]" value="{$p.PMSubject}" maxlength="255"/></td>
     33  <td class="CellAlt"><input size="60" class="FormText" type="text" name="p[pmSubject]" value="{$p.pmSubject}" maxlength="255"/></td>
    3434 </tr>
    3535 <template:bbcoderow>
     
    4141 <tr>
    4242  <td class="CellStd" valign="top"><span class="FontNorm">{$modules.Language->getString('Message')}:</span></td>
    43   <td class="CellAlt"><textarea class="FormTextArea" rows="14" cols="80" name="p[PMMessageText]" onselect="storecaret();" onclick="storecaret();" onkeyup="storecaret();">{$p.PMMessageText}</textarea></td>
     43  <td class="CellAlt"><textarea class="FormTextArea" rows="14" cols="80" name="p[pmMessageText]" onselect="storecaret();" onclick="storecaret();" onkeyup="storecaret();">{$p.pmMessageText}</textarea></td>
    4444 </tr>
    4545 <tr>
    4646  <td class="CellStd" valign="top"><span class="FontNorm">{$modules.Language->getString('Options')}:</span></td>
    4747  <td class="CellAlt"><span class="FontNorm">
    48    {if $show.EnableSmilies}<input type="checkbox" name="c[EnableSmilies]" value="1"{if $c.EnableSmilies == 1} checked="checked"{/if} id="iEnableSmilies"/><label for="iEnableSmilies">&nbsp;{$modules.Language->getString('Enable_smilies')}</label><br/>{/if}
    49    {if $show.ShowSignature}<input type="checkbox" name="c[ShowSignature]" value="1"{if $c.ShowSignature == 1} checked="checked"{/if} id="iShowSignature"/><label for="iShowSignature">&nbsp;{$modules.Language->getString('Show_signature')}</label><br/>{/if}
    50    {if $show.EnableBBCode}<input type="checkbox" name="c[EnableBBCode]" value="1"{if $c.EnableBBCode == 1} checked="checked"{/if} id="iEnableBBCode"/><label for="iEnableBBCode">&nbsp;{$modules.Language->getString('Enable_bbcode')}</label><br/>{/if}
    51    {if $show.EnableHtmlCode}<input type="checkbox" name="c[EnableHtmlCode]" value="1"{if $c.EnableHtmlCode == 1} checked="checked"{/if} id="iEnableHtmlCode"/><label for="iEnableHtmlCode">&nbsp;{$modules.Language->getString('Enable_html_code')}</label><br/>{/if}
    52    {if $show.SaveOutbox}<input type="checkbox" name="c[SaveOutbox]" value="1"{if $c.SaveOutbox == 1} checked="checked"{/if} id="iSaveOutbox"/><label for="iSaveOutbox">&nbsp;{$modules.Language->getString('Save_pm_outbox')}</label><br/>{/if}
    53    {if $show.RequestReadReceipt}<input type="checkbox" name="c[RequestReadReceipt]" value="1"{if $c.RequestReadReceipt == 1} checked="checked"{/if} id="iRequestReadReceipt"/><label for="iRequestReadReceipt">&nbsp;{$modules.Language->getString('Request_read_confirmation')}</label><br/>{/if}
     48   {if $show.enableSmilies}<label><input type="checkbox" name="c[enableSmilies]" value="1"{if $c.enableSmilies == 1} checked="checked"{/if}/>&nbsp;{$modules.Language->getString('Enable_smilies')}</label><br/>{/if}
     49   {if $show.showSignature}<label><input type="checkbox" name="c[showSignature]" value="1"{if $c.showSignature == 1} checked="checked"{/if}/>&nbsp;{$modules.Language->getString('Show_signature')}</label><br/>{/if}
     50   {if $show.enableBBCode}<label><input type="checkbox" name="c[enableBBCode]" value="1"{if $c.enableBBCode == 1} checked="checked"{/if}/>&nbsp;{$modules.Language->getString('Enable_bbcode')}</label><br/>{/if}
     51   {if $show.enableHtmlCode}<label><input type="checkbox" name="c[enableHtmlCode]" value="1"{if $c.enableHtmlCode == 1} checked="checked"{/if}/>&nbsp;{$modules.Language->getString('Enable_html_code')}</label><br/>{/if}
     52   {if $show.saveOutbox}<label><input type="checkbox" name="c[saveOutbox]" value="1"{if $c.saveOutbox == 1} checked="checked"{/if}/>&nbsp;{$modules.Language->getString('Save_pm_outbox')}</label><br/>{/if}
     53   {if $show.requestReadReceipt}<label><input type="checkbox" name="c[requestReadReceipt]" value="1"{if $c.requestReadReceipt == 1} checked="checked"{/if}/>&nbsp;{$modules.Language->getString('Request_read_confirmation')}</label><br/>{/if}
    5454  </span></td>
    5555 </tr>
  • trunk/templates/std/templates/WhoIsOnline.tpl

    r6 r8  
    11<table class="TableStd" width="100%">
    22<tr><td class="CellTitle" colspan="2"><span class="FontTitle">{$modules.Language->getString('Who_is_online')}</span></td></tr>
    3 {foreach from=$wIOData item=curWIO}
     3{foreach from=$wioData item=curWIO}
    44 <tr>
    5   <td class="CellStd"><span class="FontNorm">{$curWIO.SessionUserNick}</span></td>
    6   <td class="CellAlt"><span class="FontNorm">{$curWIO._SessionLastLocationText}</span></td>
     5  <td class="CellStd"><span class="FontNorm">{$curWIO.sessionUserNick}</span></td>
     6  <td class="CellAlt"><span class="FontNorm">{$curWIO._sessionLastLocationText}</span></td>
    77 </tr>
    88{/foreach}
Note: See TracChangeset for help on using the changeset viewer.