Changeset 324 for admin

Timestamp:

12/07/10 22:45:36 (1 year ago)

Author:

Nafania

Message:

Много мелких изменений. Если используется xbtt, то надо обязательно скачать новую версию на форуме.
Добавлен файл cron.php - если есть возможность, то пускайте cron таски через него. Особенно если используете массовую рассылку почты.

Files:

• admin/admin_categories.php (modified) (2 diffs)
• admin/admin_mass_email.php (modified) (6 diffs)
• admin/admin_users.php (modified) (5 diffs)
• admin/admin_voting.php (modified) (5 diffs)
• admin/pagestart.php (modified) (2 diffs)

admin/admin_categories.php

@@ -97 +97 @@
-                $template_file = file_get_contents($root_path . 'templates/upload_templates/' . $cat_id . '.html');
-
-                //preg_match_all('/<tr(.*?)>(.*?)<\/tr>/si', $template_file, $tr_content);
-                preg_match_all('/<!-- IF(.*?)>(.*?)<!-- ENDIF -->/si', $template_file, $tr_content);
-
@@ -462 +461 @@
-
-                                if ( !isset($_POST['move_torrents']) ) {
-
+, info_hash
-                                        $result = $db->sql_query($sql);
-                                        $ids = array();
-                                        while ( $row = $db->sql_fetchrow($result) ) {
-
+$row['info_hash']
-                                        }
-                                        deletetorrent($ids);

admin/admin_mass_email.php

@@ -44 +44 @@
-@set_time_limit(0);
-@ignore_user_abort(true);
+@ini_set('memory_limit', -1);
-
-$message = '';
@@ -74 +75 @@
-        $group_id = ( isset($_POST[POST_GROUPS_URL]) ? intval($_POST[POST_GROUPS_URL]) : 0 );
-
-, u.name FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug WHERE ug.group_id = $group_id AND u.uid = ug.user_id" : "SELECT email, name
+ FROM " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug WHERE ug.group_id = $group_id AND u.uid = ug.user_id" : "SELECT email
-        $result = $db->sql_query($sql);
-
@@ -82 +83 @@
-
-                // Send with BCC, no more than 50 recipients for one mail (to not exceed the limit)
-
+1
-                $email_list = array();
-
@@ -98 +99 @@
-
-                        $email_list[$j][$i]['email']    = $row['email'];
-                        $email_list[$j][$i]['name']             = $row['name'];
-                        $i++;
-                }
@@ -112 +112 @@
-                for ($i = 0, $size = sizeof($email_list); $i < $size; $i++)
-                {
+                        $send_to = false;
-                        for ($j = 0, $list_size = sizeof($email_list[$i]); $j < $list_size; $j++)
-                        {
-                                $email_row = $email_list[$i][$j];
-
-
+
+
+
+
+
+
+
-                        }
-
+
+
+
-                        $messenger->template('admin_send_email');
-
-                        /*$messenger->headers('X-AntiAbuse: Board servername - ' . $config['server_name']);
-                        $messenger->headers('X-AntiAbuse: User_id - ' . $userdata['uid']);
-                        $messenger->headers('X-AntiAbuse: Username - ' . $userdata['name']);
-                        $messenger->headers('X-AntiAbuse: User IP - ' . $user_ip);*/
-
-                        $messenger->subject($subject);
-                        $messenger->set_mail_priority($priority);
@@ -133 +136 @@
-                                'MESSAGE' => $message
-                        ));
-
-
-
-
-
+
+
+
-
-                }
-                unset($email_list);
-
-                $messenger->save_queue();

admin/admin_users.php

@@ -116 +116 @@
-                                'year' => 0,
-                                'month' => 0,
-
+
+
-                        );
-
@@ -265 +266 @@
-                                $updateset[] = 'uploaded = uploaded + ' . $add_upload * 1024 * 1024 * 1024;
-                                $modcomment[] = sprintf($lang['modcomment_add_upload_text'], 't' . time(), $add_upload, $userdata['name'], $add_upload_reason );
+                        }
+
+                        if ( $bonus ) {
+                                $updateset[] = 'total_seed_time = total_seed_time + ' . ( ( 3600 * $bonus ) / $config['my_bonus_points'] );
+                                $modcomment[] = sprintf($lang['modcomment_add_bonus_text'], 't' . time(), $bonus, $userdata['name']);
-                        }
-
@@ -420 +426 @@
-                        $user_status = $this_userdata['enabled'];
-                        $invites = intval($this_userdata['invites']);
+                        $bonus = number_format( $config['my_bonus_points'] * ( $this_userdata['total_seed_time'] / 3600 ), 2 );
-
-
@@ -426 +433 @@
-                        $s_hidden_fields .= '<input type="hidden" name="add_upload_reason" value="" />';
-                        //$s_hidden_fields .= '<input type="hidden" name="signature" value="' . str_replace("\"", "&quot;", $signature) . '" />';
-
-
+
+
+
-
-                        $cats = $cache->obtain_cats();
@@ -563 +571 @@
-
-                                'S_HIDDEN_FIELDS' => $s_hidden_fields,
-
-
+
+
+
+
-
-                        $template->display('body');

admin/admin_voting.php

@@ -37 +37 @@
-include($root_path . 'languages/lang_' . $config['default_lang'] . '/lang_admin_voting.' . $phpEx);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-if ( $mode == 'delete' ) {
-        $vote_id = ( isset($_GET['vote_id']) ? intval($_GET['vote_id']) : 0 );
@@ -81 +65 @@
-                trigger_error('Invalid poll id');
-        }
+}
+
+if ( $mode == 'show_poll_results' ) {
+        $poll_id = request_var('poll_id', 0);
+
+        // Assign Username array
+        $sql = "SELECT DISTINCT u.uid, u.name AS username, u.class, u.warneduntil, u.enabled, u.donor, u.parked, vote_id, vote_user_id, vote_cast
+                        FROM " . USERS_TABLE . " AS u , " . VOTE_USERS_TABLE . " AS vv
+                        WHERE u.uid = vv.vote_user_id AND vote_id = " . $poll_id;
+        $result = $db->sql_query($sql);
+        while ( $row = $db->sql_fetchrow($result) ) {
+                $voter_arr[$row['vote_cast']][] = parse_username($row);
+        }
+
+        // Assign poll options array
+        $sql = "SELECT vote_option_id, vote_option_text, vote_result FROM ". VOTE_RESULTS_TABLE . " WHERE vote_id = " . $poll_id;
+        $result = $db->sql_query($sql);
+
+        while ( $row = $db->sql_fetchrow($result) ) {
+                $option_arr[$row['vote_option_id']] = $row;
+        }
+
+        $result_ary = array();
+
+        foreach( $option_arr AS $vote_option_id => $elem ) {
+                $option_text = $elem["vote_option_text"];
+                $option_result = $elem["vote_result"];
+                $user = ( isset($voter_arr[$vote_option_id]) ? $voter_arr[$vote_option_id] : array() );
+                $user = implode(', ', $user);
+                //$user = substr($user, "0", strrpos($user, ", "));
+
+                $result_ary[$option_text][] = array('result' => $option_result, 'users' => $user);
+        }
+        gc(json_encode(array('results' => $result_ary)));
-}
-
@@ -354 +372 @@
-        ));
-
-        // Assign Username array
-        $sql = "SELECT DISTINCT u.uid, u.name AS username, u.class, u.warneduntil, u.enabled, u.donor, u.parked
-                FROM " . USERS_TABLE . " AS u , " . VOTE_USERS_TABLE . " AS vv
-                WHERE u.uid = vv.vote_user_id";
-
-        $result = $db->sql_query($sql);
-
-        while ( $row = $db->sql_fetchrow($result) )
-        {
-                $user_arr[$row['uid']] = get_user_class_color($row['class'], $row['username']) . get_user_icons($row);
-        }
-
-        // Assign poll options array
-        $sql = "SELECT *
-                FROM ". VOTE_RESULTS_TABLE .
-                " ORDER BY vote_id";
-
-        $result = $db->sql_query($sql);
-
-        while ( $row = $db->sql_fetchrow($result) )
-        {
-                $vote_id = $row['vote_id'];
-                $vote_option_id = $row['vote_option_id'];
-                $vote_option_text = $row['vote_option_text'];
-                $vote_result = $row['vote_result'];
-                $option_arr[$vote_id][$vote_option_id]["text"] = $vote_option_text;
-                $option_arr[$vote_id][$vote_option_id]["result"] = $vote_result;
-        }
-
-        // Assign individual vote results
-        $sql = "SELECT vote_id, vote_user_id, vote_cast
-                FROM ". VOTE_USERS_TABLE .
-                " ORDER BY vote_id";
-
-        $result = $db->sql_query($sql);
-
-        while ( $row = $db->sql_fetchrow($result) )
-        {
-                $vote_id = $row['vote_id'];
-                $vote_user_id = $row['vote_user_id'];
-                $vote_cast = $row['vote_cast'];
-                $voter_arr[$vote_id][$vote_user_id] = $vote_cast;
-        }
-
-
-        $sql ="SELECT *
@@ -459 +433 @@
-                );
-
-                if ( isset($voter_arr[$vote_id]) && sizeof($voter_arr[$vote_id]) )
-                {
-                        foreach($option_arr[$vote_id] as $vote_option_id => $elem)
-                        {
-                                $option_text = $elem["text"];
-                                $option_result = $elem["result"];
-                                $user = ( isset($user_option_arr[$vote_option_id]) ? $user_option_arr[$vote_option_id] : 0 );
-                                $user = substr($user, "0", strrpos($user, ", "));
-
-                                $template->assign_block_vars("viewresult.votes.detail", array(
-                                        'OPTION' => censor_text($option_text),
-                                        'RESULT' => $option_result,
-                                        'USER' => $user )
-                                );
-                        }
-                }
-
-                $i++;
-
-        }
-
@@ -491 +446 @@
-        {
-                $total_polls = $total['total'];
-
+$admin_path . 
-        }
-

admin/pagestart.php

@@ -36 +36 @@
-$userdata = session_pagestart($user_ip);
-init_userprefs($userdata);
-
+
+
-
-$current_page = extract_current_page();
@@ -55 +56 @@
-}
-
-isset($no_page_header)
+$no_page_header
-{
-        // Not including the pageheader can be neccesarry if META tags are