- | lang['Compress_file']; ?>: |
+ lang['Compress_file']; ?>: |
lang['NONE']; ?>acl_get('a_restore'))
{
- trigger_error($user->lang['No_admin']);
+ trigger_error($user->lang['NO_ADMIN']);
}
if (isset($_POST['restorestart']))
{
- //
// Handle the file upload ....
// If no file was uploaded report an error...
- //
if (!empty($_POST['local']))
{
$file_tmpname = './../' . str_replace('\\\\', '/', $_POST['local']);
@@ -310,7 +299,7 @@ switch($mode)
}
else
{
- $filename = (!empty($HTTP_POST_FILES['backup_file']['name'])) ? $HTTP_POST_FILES['backup_file']['name'] : '';
+ $filename = (!empty($_POST['backup_file']['name'])) ? $HTTP_POST_FILES['backup_file']['name'] : '';
$file_tmpname = ($HTTP_POST_FILES['backup_file']['tmp_name'] != 'none') ? $HTTP_POST_FILES['backup_file']['tmp_name'] : '';
}
@@ -999,123 +988,6 @@ function output_table_content($content)
echo $content ."\n";
return;
}
-
-
-//
-// Zip creation class from phpMyAdmin 2.3.0 (c) Tobias Ratschiller, Olivier Müller, Loïc Chapeaux, Marc Delisle
-// http://www.phpmyadmin.net/
-//
-// Based on work by Eric Mueller and Denis125
-// Official ZIP file format: http://www.pkware.com/appnote.txt
-//
-class zipfile
-{
- var $datasec = array();
- var $ctrl_dir = array();
- var $eof_ctrl_dir = "\x50\x4b\x05\x06\x00\x00\x00\x00";
- var $old_offset = 0;
-
- function unix_to_dos_time($unixtime = 0)
- {
- $timearray = ($unixtime == 0) ? getdate() : getdate($unixtime);
-
- if ($timearray['year'] < 1980)
- {
- $timearray['year'] = 1980;
- $timearray['mon'] = 1;
- $timearray['mday'] = 1;
- $timearray['hours'] = 0;
- $timearray['minutes'] = 0;
- $timearray['seconds'] = 0;
- }
-
- return (($timearray['year'] - 1980) << 25) | ($timearray['mon'] << 21) | ($timearray['mday'] << 16) |
- ($timearray['hours'] << 11) | ($timearray['minutes'] << 5) | ($timearray['seconds'] >> 1);
- }
-
- function add_file($data, $name, $time = 0)
- {
- $name = str_replace('\\', '/', $name);
-
- $dtime = dechex($this->unix_to_dos_time($time));
- $hexdtime = '\x' . $dtime[6] . $dtime[7]
- . '\x' . $dtime[4] . $dtime[5]
- . '\x' . $dtime[2] . $dtime[3]
- . '\x' . $dtime[0] . $dtime[1];
- eval('$hexdtime = "' . $hexdtime . '";');
-
- $fr = "\x50\x4b\x03\x04";
- $fr .= "\x14\x00"; // ver needed to extract
- $fr .= "\x00\x00"; // gen purpose bit flag
- $fr .= "\x08\x00"; // compression method
- $fr .= $hexdtime; // last mod time and date
-
- $unc_len = strlen($data);
- $crc = crc32($data);
- $zdata = gzcompress($data);
- $zdata = substr(substr($zdata, 0, strlen($zdata) - 4), 2); // fix crc bug
- $c_len = strlen($zdata);
- $fr .= pack('V', $crc); // crc32
- $fr .= pack('V', $c_len); // compressed filesize
- $fr .= pack('V', $unc_len); // uncompressed filesize
- $fr .= pack('v', strlen($name)); // length of filename
- $fr .= pack('v', 0); // extra field length
- $fr .= $name;
-
- // "file data" segment
- $fr .= $zdata;
-
- // "data descriptor" segment (optional but necessary if archive is not
- // served as file)
- $fr .= pack('V', $crc); // crc32
- $fr .= pack('V', $c_len); // compressed filesize
- $fr .= pack('V', $unc_len); // uncompressed filesize
-
- // add this entry to array
- $this -> datasec[] = $fr;
- $new_offset = strlen(implode('', $this->datasec));
-
- // now add to central directory record
- $cdrec = "\x50\x4b\x01\x02";
- $cdrec .= "\x00\x00"; // version made by
- $cdrec .= "\x14\x00"; // version needed to extract
- $cdrec .= "\x00\x00"; // gen purpose bit flag
- $cdrec .= "\x08\x00"; // compression method
- $cdrec .= $hexdtime; // last mod time & date
- $cdrec .= pack('V', $crc); // crc32
- $cdrec .= pack('V', $c_len); // compressed filesize
- $cdrec .= pack('V', $unc_len); // uncompressed filesize
- $cdrec .= pack('v', strlen($name)); // length of filename
- $cdrec .= pack('v', 0); // extra field length
- $cdrec .= pack('v', 0); // file comment length
- $cdrec .= pack('v', 0); // disk number start
- $cdrec .= pack('v', 0); // internal file attributes
- $cdrec .= pack('V', 32); // external file attributes - 'archive' bit set
-
- $cdrec .= pack('V', $this -> old_offset); // relative offset of local header
- $this -> old_offset = $new_offset;
-
- $cdrec .= $name;
-
- // optional extra field, file comment goes here
- // save to central directory
- $this -> ctrl_dir[] = $cdrec;
- }
-
- function file()
- {
- $data = implode('', $this -> datasec);
- $ctrldir = implode('', $this -> ctrl_dir);
-
- return $data . $ctrldir . $this -> eof_ctrl_dir .
- pack('v', sizeof($this -> ctrl_dir)) . // total # of entries "on this disk"
- pack('v', sizeof($this -> ctrl_dir)) . // total # of entries overall
- pack('V', strlen($ctrldir)) . // size of central dir
- pack('V', strlen($data)) . // offset to start of central dir
- "\x00\x00"; // .zip file comment length
- }
-}
-
//
// End Functions
// -----------------------------------------------
diff --git a/phpBB/adm/admin_groups.php b/phpBB/adm/admin_groups.php
index bd65107656..11b1e9455f 100644
--- a/phpBB/adm/admin_groups.php
+++ b/phpBB/adm/admin_groups.php
@@ -60,7 +60,6 @@ else
$action = (isset($_REQUEST['action'])) ? htmlspecialchars($_REQUEST['action']) : '';
}
-
// Grab basic data for group, if group_id is set and exists
if ($group_id)
{
@@ -85,24 +84,6 @@ switch ($mode)
// Which page?
switch ($action)
{
- case 'delete':
- if (!$group_id)
- {
- trigger_error($user->lang['NO_GROUP']);
- }
-
-
- break;
-
- case 'deleteusers':
- if (!$group_id)
- {
- trigger_error($user->lang['NO_GROUP']);
- }
-
-
- break;
-
case 'approve':
if (!$group_id)
{
@@ -122,6 +103,45 @@ switch ($mode)
set_default_group($group_id, $mark_ary, false, $group_name, $group_colour, $group_rank, false, false);
trigger_error($user->lang['GROUP_DEFS_UPDATED']);
break;
+
+ case 'delete':
+ case 'deleteusers':
+ case 'demote':
+ if (!$group_id)
+ {
+ trigger_error($user->lang['NO_GROUP']);
+ }
+
+ if ($error = remove_from_group($action, $group_id, $mark_ary, false, $group_name))
+ {
+ trigger_error($user->lang[$error]);
+ }
+
+ $message = ($action == 'demote') ? 'GROUP_MODS_DEMOTED' : (($action == 'deleteusers') ? 'GROUP_USERS_REMOVE' : 'GROUP_DELETED');
+ trigger_error($user->lang[$message]);
+ break;
+
+ case 'addleaders':
+ case 'addusers':
+ if (!$group_id)
+ {
+ trigger_error($user->lang['NO_GROUP']);
+ }
+
+ if (!$name_ary)
+ {
+ trigger_error($user->lang['NO_USERS']);
+ }
+
+ // Add user/s to group
+ if ($error = add_to_group($action, $group_id, false, $name_ary, $group_colour, $group_rank, $group_avatar, $group_avatar_type))
+ {
+ trigger_error($user->lang[$error]);
+ }
+
+ $message = ($action == 'addleaders') ? 'GROUP_MODS_ADDED' : 'GROUP_USERS_ADDED';
+ trigger_error($user->lang[$message]);
+ break;
case 'edit':
case 'add':
@@ -259,6 +279,9 @@ function swatch()
| |
@@ -270,30 +293,6 @@ function swatch()
break;
-
- case 'addleaders':
- case 'addusers':
- if (!$group_id)
- {
- trigger_error($user->lang['NO_GROUP']);
- }
-
- if (!$name_ary)
- {
- trigger_error($user->lang['NO_USERS']);
- }
-
- // Add user/s to group
- if ($error = add_to_group($action, $group_id, false, $name_ary, $group_colour, $group_rank, $group_avatar, $group_avatar_type))
- {
- trigger_error($user->lang[$error]);
- }
-
- $message = ($action == 'addleaders') ? 'GROUP_MODS_ADDED' : 'GROUP_USERS_ADDED';
- trigger_error($user->lang[$message]);
- break;
-
-
// Show list of leaders, existing and pending members
case 'list':
if (!$group_id)
@@ -410,7 +409,7 @@ function swatch()
?>