diff --git a/upload/configs/main.php b/upload/configs/main.php index 5678f4c..35e2b1d 100644 --- a/upload/configs/main.php +++ b/upload/configs/main.php @@ -22,5 +22,6 @@ 'kc_private' => 'nBJjeiTqRAuXZlqwklPHSgtlCj', 'skin_path' => 'uploads/skins/', 'cloak_path' => 'uploads/cloaks/', + 'hd_cloaks' => true, ); ?> \ No newline at end of file diff --git a/upload/engine/cloak.class.php b/upload/engine/cloak.class.php index 102ebe3..c02e8a4 100644 --- a/upload/engine/cloak.class.php +++ b/upload/engine/cloak.class.php @@ -3,15 +3,16 @@ if(!defined("MCR")){ exit("Hacking Attempt!"); } class cloak{ - private $mp = 22; + private $mp = 16; - private $core, $lng, $db, $user; + private $core, $lng, $db, $user, $cfg; public function __construct($core, $obj){ - $this->core = $core; - $this->user = $core->user; - $this->db = $core->db; - $this->lng = $core->lng; + $this->core = $core; + $this->user = $core->user; + $this->db = $core->db; + $this->lng = $core->lng; + $this->cfg = $core->cfg; if(!is_writable(MCR_CLOAK_PATH)){ $this->core->notify($this->lng['e_msg'], $this->lng['cloak_e_folder_perm'], 2, '?mode=profile'); } @@ -80,61 +81,81 @@ */ public function create_preview($path, $size=224){ //header('Content-Type: image/png'); - $size_x = 32; $image = @imagecreatefrompng($path); if(!$image){ return false; } - if(file_exists(MCR_SKIN_PATH.'interface/'.$this->user->skin.'.png')){ - $skin_path_int = MCR_SKIN_PATH.'interface/'.$this->user->skin.'.png'; + if(file_exists(MCR_SKIN_PATH.$this->user->skin.'.png')){ $skin_path = MCR_SKIN_PATH.$this->user->skin.'.png'; }else{ - $skin_path_int = MCR_SKIN_PATH.'interface/default.png'; $skin_path = MCR_SKIN_PATH.'default.png'; } - $skin_string = file_get_contents($skin_path_int); - - $skin = imagecreatefromstring($skin_string); + $skin = @imagecreatefrompng($skin_path); $skin_size = @getimagesize($skin_path); + $cloak_size = @getimagesize($path); $multiple = $skin_size[0] / 64; - - $mp_x_h = ($this->mp > $multiple) ? ($size_x * $this->mp) / 2 : ($size_x * $multiple) / 2; - $mp_result = ($this->mp > $multiple) ? $this->mp : $multiple; + $size_x = 32; + $preview = imagecreatetruecolor($size_x * $multiple, 32 * $multiple); + $mp_x_h = imagesx($preview) / 2; - $preview = imagecreatetruecolor($size_x * $mp_result, 32 * $mp_result); $transparent = imagecolorallocatealpha($preview, 255, 255, 255, 127); imagefill($preview, 0, 0, $transparent); + imagecopy($preview, $skin, 4 * $multiple, 0 * $multiple, 8 * $multiple, 8 * $multiple, 8 * $multiple, 8 * $multiple); + imagecopy($preview, $skin, 0 * $multiple, 8 * $multiple, 44 * $multiple, 20 * $multiple, 4 * $multiple, 12 * $multiple); + $this->core->imageflip($preview, $skin, 12 * $multiple, 8 * $multiple, 44 * $multiple, 20 * $multiple, 4 * $multiple, 12 * $multiple); + imagecopy($preview, $skin, 4 * $multiple, 8 * $multiple, 20 * $multiple, 20 * $multiple, 8 * $multiple, 12 * $multiple); + imagecopy($preview, $skin, 4 * $multiple, 20 * $multiple, 4 * $multiple, 20 * $multiple, 4 * $multiple, 12 * $multiple); + $this->core->imageflip($preview, $skin, 8 * $multiple, 20 * $multiple, 4 * $multiple, 20 * $multiple, 4 * $multiple, 12 * $multiple); + imagecopy($preview, $skin, 4 * $multiple, 0 * $multiple, 40 * $multiple, 8 * $multiple, 8 * $multiple, 8 * $multiple); + + imagecopy($preview, $skin, $mp_x_h + 4 * $multiple, 8 * $multiple, 32 * $multiple, 20 * $multiple, 8 * $multiple, 12 * $multiple); + imagecopy($preview, $skin, $mp_x_h + 4 * $multiple, 0 * $multiple, 24 * $multiple, 8 * $multiple, 8 * $multiple, 8 * $multiple); + $this->core->imageflip($preview, $skin, $mp_x_h + 0 * $multiple, 8 * $multiple, 52 * $multiple, 20 * $multiple, 4 * $multiple, 12 * $multiple); + imagecopy($preview, $skin, $mp_x_h + 12 * $multiple, 8 * $multiple, 52 * $multiple, 20 * $multiple, 4 * $multiple, 12 * $multiple); + $this->core->imageflip($preview, $skin, $mp_x_h + 4 * $multiple, 20 * $multiple, 12 * $multiple, 20 * $multiple, 4 * $multiple, 12 * $multiple); + imagecopy($preview, $skin, $mp_x_h + 8 * $multiple, 20 * $multiple, 12 * $multiple, 20 * $multiple, 4 * $multiple, 12 * $multiple); + imagecopy($preview, $skin, $mp_x_h + 4 * $multiple, 0 * $multiple, 56 * $multiple, 8 * $multiple, 8 * $multiple, 8 * $multiple); + + $multiple_c = $cloak_size[0] / 64; + + $mp_x_h = ($multiple_c > $multiple) ? ($size_x * $multiple_c) / 2 : ($size_x * $multiple) / 2; + $mp_result = ($multiple_c > $multiple) ? $multiple_c : $multiple; + + $preview_cloak = imagecreatetruecolor($size_x * $mp_result, 32 * $mp_result); + $transparent = imagecolorallocatealpha($preview_cloak, 255, 255, 255, 127); + imagefill($preview_cloak, 0, 0, $transparent); + imagecopyresized( - $preview, // result image + $preview_cloak, // result image $image, // source image round(3 * $mp_result), // start x point of result round(8 * $mp_result), // start y point of result - round(12 * $multiple), // start x point of source img - round(1 * $multiple), // start y point of source img + round(12 * $multiple_c), // start x point of source img + round(1 * $multiple_c), // start y point of source img round(10 * $mp_result), // result <- width -> round(16 * $mp_result), // result /|\ height \|/ - round(10 * $multiple), // width of cloak img (from start x \ y) - round(16 * $multiple) // height of cloak img (from start x \ y) + round(10 * $multiple_c), // width of cloak img (from start x \ y) + round(16 * $multiple_c) // height of cloak img (from start x \ y) ); - imagecopyresized($preview, $skin, 0, 0, 0, 0, imagesx($preview), imagesy($preview), imagesx($skin), imagesy($skin)); + imagecopyresized($preview_cloak, $preview, 0, 0, 0, 0, imagesx($preview_cloak), imagesy($preview_cloak), imagesx($preview), imagesy($preview)); imagecopyresized( - $preview, + $preview_cloak, $image, $mp_x_h + 3 * $mp_result, round(8 * $mp_result), - round(1 * $multiple), - round(1 * $multiple), + round(1 * $multiple_c), + round(1 * $multiple_c), round(10 * $mp_result), round(16 * $mp_result), - round(10 * $multiple), - round(16 * $multiple) + round(10 * $multiple_c), + round(16 * $multiple_c) ); $fullsize = imagecreatetruecolor($size, $size); @@ -143,9 +164,10 @@ $transparent = imagecolorallocatealpha($fullsize, 255, 255, 255, 127); imagefill($fullsize, 0, 0, $transparent); - imagecopyresized($fullsize, $preview, 0, 0, 0, 0, imagesx($fullsize), imagesy($fullsize), imagesx($preview), imagesy($preview)); + imagecopyresized($fullsize, $preview_cloak, 0, 0, 0, 0, imagesx($fullsize), imagesy($fullsize), imagesx($preview_cloak), imagesy($preview_cloak)); imagedestroy($preview); + imagedestroy($preview_cloak); imagedestroy($image); imagedestroy($skin); @@ -159,7 +181,7 @@ * - Проверяет права на максимальный размер изображения */ public function is_cloak_valid($size){ - $formats = $this->core->get_array_formats(); + $formats = $this->core->get_array_formats($this->cfg->main['hd_cloaks']); $max_ratio = $this->user->permissions->sys_max_ratio; @@ -168,22 +190,15 @@ $width = $formats[$max_ratio]["cloak_w"]; $height = $formats[$max_ratio]["cloak_h"]; - /* - if($this->is_skin){ - if($size[0]!=22 || $size[1]!=17){ return false; } - }else{ - $skin_size = @getimagesize(MCR_UPL_PATH.'skins/'.$this->user->login.'.png'); - $key = $this->core->find_in_formats($skin_size[0], $skin_size[1]); - if(!$key){ return false; } - if($formats[$key]["cloak_w"]!==$width || $formats[$key]["cloak_h"]!==$height){ return false; } - } - */ - if($size[0]>$width || $size[1]>$height){ return false; } - if($width<22 || $height<17){ return false; } - - if(round($size[0]/$size[1], 2) != 1.29){ return false; } + if(!$this->cfg->main['hd_cloaks']){ + if($width<22 || $height<17){ return false; } + if(round($size[0]/$size[1], 2) != 1.29){ return false; } + }else{ + if($width<64 || $height<32){ return false; } + if(round($size[0]/$size[1], 2) != 2){ return false; } + } return true; } diff --git a/upload/engine/core.class.php b/upload/engine/core.class.php index 6e98988..166954e 100644 --- a/upload/engine/core.class.php +++ b/upload/engine/core.class.php @@ -678,13 +678,13 @@ * @param formats (array) * */ - public function get_array_formats(){ + public function get_array_formats($hd=false){ $w = 64; $h = 32; - $c_w = 22; - $c_h = 17; + $c_w = ($hd) ? 64 : 22; + $c_h = ($hd) ? 32 : 17; $i = 1; diff --git a/upload/engine/menu.class.php b/upload/engine/menu.class.php index a7b8ea4..f8949ce 100644 --- a/upload/engine/menu.class.php +++ b/upload/engine/menu.class.php @@ -25,7 +25,7 @@ $active = ($this->is_active($url, $ar['sons'])) ? 'active' : ''; $data = array( - "TITLE" => $this->db->HSC($ar['title']), + "TITLE" => $ar['title'], "URL" => $this->db->HSC($url), "TARGET" => $this->db->HSC($ar['target']), "ACTIVE" => $active, @@ -80,7 +80,7 @@ $active = ($this->is_active($url, $ar['sons'])) ? 'active' : ''; $data = array( - "TITLE" => $this->db->HSC($ar['title']), + "TITLE" => $ar['title'], "URL" => $this->db->HSC($url), "TARGET" => $this->db->HSC($ar['target']), "ACTIVE" => $active, @@ -135,8 +135,6 @@ $array = array(); - ob_start(); - while($ar = $this->db->fetch_assoc($query)){ if(!$this->core->is_access($ar['permissions'])){ continue; } @@ -151,11 +149,7 @@ ); } - $tree = $this->generate_menu($array); - - echo $tree; - - return ob_get_clean(); + return $this->generate_menu($array); } public function _list(){ diff --git a/upload/engine/skin.class.php b/upload/engine/skin.class.php index c20b721..b0b9147 100644 --- a/upload/engine/skin.class.php +++ b/upload/engine/skin.class.php @@ -50,7 +50,7 @@ if(!$this->is_skin_valid($get_size)){ $this->core->notify($this->lng['e_msg'], $this->lng['skin_e_format'], 2, '?mode=profile'); } - $multiple = $get_size[0] / $this->mp; + $multiple = $width / $this->mp; // Create and save head of skin + $new_head = $this->create_head($tmp, $multiple); @@ -68,7 +68,6 @@ imagepng($new_preview, MCR_SKIN_PATH.'interface/'.$this->user->login.'.png'); // Create and save preview of skin - - // Save new skin + if(!file_exists(MCR_SKIN_PATH.$this->user->login.'.png')){ if(!copy($tmp, MCR_SKIN_PATH.$this->user->login.'.png')){ $this->core->notify("", $this->lng['skin_e_save'], 2, '?mode=profile'); } } @@ -91,7 +90,7 @@ return $new; } - public function create_preview($path, $multiple, $size=224){ + public function create_preview($path, $multiple=1, $size=224){ $image = @imagecreatefrompng($path); diff --git a/upload/install/tables.sql b/upload/install/tables.sql index 4dbcb59..6b7b3f9 100644 --- a/upload/install/tables.sql +++ b/upload/install/tables.sql @@ -57,7 +57,7 @@ #line CREATE TABLE IF NOT EXISTS `mcr_menu` ( `id` int(10) NOT NULL AUTO_INCREMENT, - `title` varchar(32) NOT NULL DEFAULT '', + `title` text NOT NULL, `parent` int(10) NOT NULL DEFAULT '1', `url` varchar(255) NOT NULL DEFAULT '', `target` varchar(10) CHARACTER SET latin1 NOT NULL DEFAULT '_self', diff --git a/upload/modules/admin/blocks.class.php b/upload/modules/admin/blocks.class.php index 1526721..fbb96c2 100644 --- a/upload/modules/admin/blocks.class.php +++ b/upload/modules/admin/blocks.class.php @@ -21,8 +21,7 @@ $this->core->bc = $this->core->gen_bc($bc); - $this->core->header .= ''; - $this->core->header .= ''; + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/blocks/header.html"); } private function block_array(){ diff --git a/upload/modules/admin/comments.class.php b/upload/modules/admin/comments.class.php index 0e1e739..a657bc6 100644 --- a/upload/modules/admin/comments.class.php +++ b/upload/modules/admin/comments.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/comments/header.html"); } private function comment_array(){ diff --git a/upload/modules/admin/groups.class.php b/upload/modules/admin/groups.class.php index 7fc5841..86ca4a2 100644 --- a/upload/modules/admin/groups.class.php +++ b/upload/modules/admin/groups.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/groups/header.html"); } private function group_array(){ diff --git a/upload/modules/admin/info.class.php b/upload/modules/admin/info.class.php index 6b2e771..814b16b 100644 --- a/upload/modules/admin/info.class.php +++ b/upload/modules/admin/info.class.php @@ -20,13 +20,12 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/info/header.html"); } private function main(){ - $this->core->header .= ''; - $this->core->header .= ''; - return $this->core->sp(MCR_THEME_MOD."admin/info/main.html"); } @@ -102,8 +101,6 @@ } private function extensions(){ - $this->core->header .= ''; - $this->core->header .= ''; return $this->core->sp(MCR_THEME_MOD."admin/info/extensions.html"); } diff --git a/upload/modules/admin/logs.class.php b/upload/modules/admin/logs.class.php index 1e1d494..7872fec 100644 --- a/upload/modules/admin/logs.class.php +++ b/upload/modules/admin/logs.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/logs/header.html"); } private function logs_array(){ diff --git a/upload/modules/admin/menu.class.php b/upload/modules/admin/menu.class.php index 75af907..33994fa 100644 --- a/upload/modules/admin/menu.class.php +++ b/upload/modules/admin/menu.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/menu/header.html"); } private function menu_array(){ diff --git a/upload/modules/admin/menu_adm.class.php b/upload/modules/admin/menu_adm.class.php index 5d0abe3..170f3c1 100644 --- a/upload/modules/admin/menu_adm.class.php +++ b/upload/modules/admin/menu_adm.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/menu_adm/header.html"); } private function menu_array(){ diff --git a/upload/modules/admin/menu_groups.class.php b/upload/modules/admin/menu_groups.class.php index d68fe0a..f560342 100644 --- a/upload/modules/admin/menu_groups.class.php +++ b/upload/modules/admin/menu_groups.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/menu_groups/header.html"); } private function group_array(){ diff --git a/upload/modules/admin/menu_icons.class.php b/upload/modules/admin/menu_icons.class.php index 4f82e1e..5cfe601 100644 --- a/upload/modules/admin/menu_icons.class.php +++ b/upload/modules/admin/menu_icons.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/menu_icons/header.html"); } private function icon_array(){ diff --git a/upload/modules/admin/modules.class.php b/upload/modules/admin/modules.class.php index 95dfe02..11ad999 100644 --- a/upload/modules/admin/modules.class.php +++ b/upload/modules/admin/modules.class.php @@ -20,9 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); - - $this->core->header .= ''; - $this->core->header .= ''; + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/modules/header.html"); } private function module_array(){ diff --git a/upload/modules/admin/monitoring.class.php b/upload/modules/admin/monitoring.class.php index 6de5610..247244e 100644 --- a/upload/modules/admin/monitoring.class.php +++ b/upload/modules/admin/monitoring.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/monitoring/header.html"); } private function monitor_array(){ diff --git a/upload/modules/admin/news.class.php b/upload/modules/admin/news.class.php index ffc6cec..b11fb3f 100644 --- a/upload/modules/admin/news.class.php +++ b/upload/modules/admin/news.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/news/header.html"); } private function news_array(){ diff --git a/upload/modules/admin/news_cats.class.php b/upload/modules/admin/news_cats.class.php index aae3a59..df8d9f6 100644 --- a/upload/modules/admin/news_cats.class.php +++ b/upload/modules/admin/news_cats.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/news_cats/header.html"); } private function cats_array(){ diff --git a/upload/modules/admin/news_views.class.php b/upload/modules/admin/news_views.class.php index 338f287..2c9c4a1 100644 --- a/upload/modules/admin/news_views.class.php +++ b/upload/modules/admin/news_views.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/news_views/header.html"); } private function views_array(){ diff --git a/upload/modules/admin/news_votes.class.php b/upload/modules/admin/news_votes.class.php index a610b9a..faf8cbc 100644 --- a/upload/modules/admin/news_votes.class.php +++ b/upload/modules/admin/news_votes.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/news_votes/header.html"); } private function votes_array(){ diff --git a/upload/modules/admin/panel_menu.class.php b/upload/modules/admin/panel_menu.class.php index 3f3d901..1a0ead5 100644 --- a/upload/modules/admin/panel_menu.class.php +++ b/upload/modules/admin/panel_menu.class.php @@ -17,6 +17,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/panel_menu/header.html"); } private function get_items_array(){ diff --git a/upload/modules/admin/permissions.class.php b/upload/modules/admin/permissions.class.php index 77f96af..454ff97 100644 --- a/upload/modules/admin/permissions.class.php +++ b/upload/modules/admin/permissions.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/permissions/header.html"); } private function permissions_array(){ diff --git a/upload/modules/admin/settings.class.php b/upload/modules/admin/settings.class.php index ecaf501..aa1e056 100644 --- a/upload/modules/admin/settings.class.php +++ b/upload/modules/admin/settings.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/settings/header.html"); } private function themes($select=''){ @@ -310,8 +312,6 @@ private function functions(){ - $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/settings/header.html"); - $cfg = $this->cfg->func; if($_SERVER['REQUEST_METHOD']=='POST'){ diff --git a/upload/modules/admin/statics.class.php b/upload/modules/admin/statics.class.php index 41cc70b..37295a6 100644 --- a/upload/modules/admin/statics.class.php +++ b/upload/modules/admin/statics.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/statics/header.html"); } private function static_array(){ diff --git a/upload/modules/admin/users.class.php b/upload/modules/admin/users.class.php index 2679f59..774dc52 100644 --- a/upload/modules/admin/users.class.php +++ b/upload/modules/admin/users.class.php @@ -20,6 +20,8 @@ ); $this->core->bc = $this->core->gen_bc($bc); + + $this->core->header .= $this->core->sp(MCR_THEME_MOD."admin/users/header.html"); } private function user_array(){ diff --git a/upload/modules/profile.php b/upload/modules/profile.php index 716018a..3acd336 100644 --- a/upload/modules/profile.php +++ b/upload/modules/profile.php @@ -22,9 +22,17 @@ private function delete_skin(){ if(!$this->user->is_skin){ $this->core->notify("", $this->lng['skin_not_set'], 1, '?mode=profile'); } + if(file_exists(MCR_SKIN_PATH.$this->user->skin.'.png')){ unlink(MCR_SKIN_PATH.$this->user->skin.'.png'); + } + + if(file_exists(MCR_SKIN_PATH.'interface/'.$this->user->skin.'.png')){ unlink(MCR_SKIN_PATH.'interface/'.$this->user->skin.'.png'); + } + + if(file_exists(MCR_SKIN_PATH.'interface/'.$this->user->skin.'_mini.png')){ unlink(MCR_SKIN_PATH.'interface/'.$this->user->skin.'_mini.png'); + } if($this->user->is_cloak){ $cloak = array( @@ -54,7 +62,9 @@ if(!$this->user->is_cloak){ $this->core->notify("", $this->lng['cloak_not_set'], 1, '?mode=profile'); } - unlink(MCR_CLOAK_PATH.$this->user->login.'.png'); + if(file_exists(MCR_CLOAK_PATH.$this->user->login.'.png')){ + unlink(MCR_CLOAK_PATH.$this->user->login.'.png'); + } if(!$this->user->is_skin){ unlink(MCR_SKIN_PATH.'interface/'.$this->user->login.'.png'); @@ -92,7 +102,7 @@ if($this->user->is_cloak){ $cloak = array( "tmp_name" => MCR_CLOAK_PATH.$this->user->login.'.png', - "size" => filesize(MCR_CLOAK_PATH.$this->user->login.'.png'), + "size" => (!file_exists(MCR_CLOAK_PATH.$this->user->login.'.png')) ? 0 : filesize(MCR_CLOAK_PATH.$this->user->login.'.png'), "error" => 0, "name" => $this->user->login.'.png' ); diff --git a/upload/system.php b/upload/system.php index a199b92..a118d2e 100644 --- a/upload/system.php +++ b/upload/system.php @@ -8,7 +8,7 @@ // System constants define('PROGNAME', 'WebMCR Reloaded'. MCR); -define('VERSION', 'WebMCR Beta 1.3.7'); +define('VERSION', 'WebMCR Beta 1.3.8'); define('FEEDBACK', ''.PROGNAME.' © 2013-'.date("Y").' Qexy'); define('MCR_ROOT', dirname(__FILE__).'/'); define('MCR_MODE_PATH', MCR_ROOT.'modules/'); diff --git a/upload/themes/default/blocks/banner/main.html b/upload/themes/default/blocks/banner/main.html index 4871ed5..0c2b7d8 100644 --- a/upload/themes/default/blocks/banner/main.html +++ b/upload/themes/default/blocks/banner/main.html @@ -4,8 +4,8 @@
-
-
+
+
\ No newline at end of file diff --git a/upload/themes/default/css/global.css b/upload/themes/default/css/global.css index 0192cec..4b38a3d 100644 --- a/upload/themes/default/css/global.css +++ b/upload/themes/default/css/global.css @@ -696,18 +696,6 @@ } } -.admin-menu-groups .navbar { margin-bottom: 10px; } -.spl-body { display: block; margin-bottom: 10px; } -.spl-body.closed { display: none; } - -.admin-menu-groups .navbar .spl-btn:before, -.admin-menu-groups .navbar .spl-btn.closed:before { content: ""; display: inline-block; width: 12px; height: 8px; background: url("../img/spl-arrows.png") no-repeat; vertical-align: middle; margin-right: 5px; } -.admin-menu-groups .navbar .spl-btn.closed:before { background-position: 0px -8px; } -.admin-menu-groups ul li { text-align: center; display: inline-block; width: 100px; word-wrap: break-word; vertical-align: top; margin-bottom: 5px; } -.admin-menu-groups ul li a { text-decoration: none; } -.admin-menu-groups ul li .i-icon { display: block; width: 64px; height: 64px; margin: auto; opacity: 0.8; } -.admin-menu-groups ul li .i-icon:hover { opacity: 1; } - .form-block.actions{ padding: 10px; height: 30px; @@ -767,23 +755,6 @@ } -.adm-info-modules .thumbnails > .span4 { - margin-left: 5px; - margin-right: 5px; -} - -.adm-info-modules .thumbnails .read-more { - margin-bottom: 5px; -} - -.adm-info-modules .thumbnails .thumbnail > img { - max-height: 130px; -} - -.adm-info-modules .thumbnails .title { - margin: 8px 0px; -} - .qxbb-code { display: block; line-height: 24px; diff --git a/upload/themes/default/css/modules/admin/global.css b/upload/themes/default/css/modules/admin/global.css index 2127ab2..4324c45 100644 --- a/upload/themes/default/css/modules/admin/global.css +++ b/upload/themes/default/css/modules/admin/global.css @@ -13,4 +13,33 @@ .sort-trigger[data-order="desc"]:after { background-position: -288px -120px; +} + +.spl-body { display: block; margin-bottom: 10px; } +.spl-body.closed { display: none; } + +.admin-menu-groups .navbar { margin-bottom: 10px; } +.admin-menu-groups .navbar .spl-btn:before, +.admin-menu-groups .navbar .spl-btn.closed:before { content: ""; display: inline-block; width: 12px; height: 8px; background: url("../img/spl-arrows.png") no-repeat; vertical-align: middle; margin-right: 5px; } +.admin-menu-groups .navbar .spl-btn.closed:before { background-position: 0px -8px; } +.admin-menu-groups ul li { text-align: center; display: inline-block; width: 100px; word-wrap: break-word; vertical-align: top; margin-bottom: 5px; } +.admin-menu-groups ul li a { text-decoration: none; } +.admin-menu-groups ul li .i-icon { display: block; width: 64px; height: 64px; margin: auto; opacity: 0.8; } +.admin-menu-groups ul li .i-icon:hover { opacity: 1; } + +.adm-info-modules .thumbnails > .span4 { + margin-left: 5px; + margin-right: 5px; +} + +.adm-info-modules .thumbnails .read-more { + margin-bottom: 5px; +} + +.adm-info-modules .thumbnails .thumbnail > img { + max-height: 130px; +} + +.adm-info-modules .thumbnails .title { + margin: 8px 0px; } \ No newline at end of file diff --git a/upload/themes/default/js/blocks/online/main.js b/upload/themes/default/js/blocks/online/main.js index 668738e..eea54c3 100644 --- a/upload/themes/default/js/blocks/online/main.js +++ b/upload/themes/default/js/blocks/online/main.js @@ -15,7 +15,7 @@ contentType: false, processData: false, data: formdata, - timeout: 5000, + timeout: 2000, error: function(data){ mcr.logger(data); mcr.notify(lng.error, 'error'); diff --git a/upload/themes/default/modules/admin/blocks/header.html b/upload/themes/default/modules/admin/blocks/header.html new file mode 100644 index 0000000..d43d8b6 --- /dev/null +++ b/upload/themes/default/modules/admin/blocks/header.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/upload/themes/default/modules/admin/comments/header.html b/upload/themes/default/modules/admin/comments/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/comments/header.html diff --git a/upload/themes/default/modules/admin/groups/header.html b/upload/themes/default/modules/admin/groups/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/groups/header.html diff --git a/upload/themes/default/modules/admin/info/header.html b/upload/themes/default/modules/admin/info/header.html new file mode 100644 index 0000000..557c68d --- /dev/null +++ b/upload/themes/default/modules/admin/info/header.html @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/upload/themes/default/modules/admin/logs/header.html b/upload/themes/default/modules/admin/logs/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/logs/header.html diff --git a/upload/themes/default/modules/admin/menu/header.html b/upload/themes/default/modules/admin/menu/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/menu/header.html diff --git a/upload/themes/default/modules/admin/menu_adm/header.html b/upload/themes/default/modules/admin/menu_adm/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/menu_adm/header.html diff --git a/upload/themes/default/modules/admin/menu_groups/header.html b/upload/themes/default/modules/admin/menu_groups/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/menu_groups/header.html diff --git a/upload/themes/default/modules/admin/menu_icons/header.html b/upload/themes/default/modules/admin/menu_icons/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/menu_icons/header.html diff --git a/upload/themes/default/modules/admin/modules/header.html b/upload/themes/default/modules/admin/modules/header.html new file mode 100644 index 0000000..21e2dee --- /dev/null +++ b/upload/themes/default/modules/admin/modules/header.html @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/upload/themes/default/modules/admin/monitoring/header.html b/upload/themes/default/modules/admin/monitoring/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/monitoring/header.html diff --git a/upload/themes/default/modules/admin/news/header.html b/upload/themes/default/modules/admin/news/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/news/header.html diff --git a/upload/themes/default/modules/admin/news_cats/header.html b/upload/themes/default/modules/admin/news_cats/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/news_cats/header.html diff --git a/upload/themes/default/modules/admin/news_views/header.html b/upload/themes/default/modules/admin/news_views/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/news_views/header.html diff --git a/upload/themes/default/modules/admin/news_votes/header.html b/upload/themes/default/modules/admin/news_votes/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/news_votes/header.html diff --git a/upload/themes/default/modules/admin/panel_menu/header.html b/upload/themes/default/modules/admin/panel_menu/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/panel_menu/header.html diff --git a/upload/themes/default/modules/admin/permissions/header.html b/upload/themes/default/modules/admin/permissions/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/permissions/header.html diff --git a/upload/themes/default/modules/admin/statics/header.html b/upload/themes/default/modules/admin/statics/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/statics/header.html diff --git a/upload/themes/default/modules/admin/users/header.html b/upload/themes/default/modules/admin/users/header.html new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/upload/themes/default/modules/admin/users/header.html