diff --git a/web/admin.php b/web/admin.php index 418c6b6a..24d157ea 100644 --- a/web/admin.php +++ b/web/admin.php @@ -41,21 +41,25 @@ define('EASYWIDIR', dirname(__FILE__)); if (is_dir(EASYWIDIR . '/install')) { die('Please remove the "install" folder'); } -include(EASYWIDIR . '/stuff/vorlage.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); -include(EASYWIDIR . '/stuff/functions.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); include(EASYWIDIR . '/stuff/settings.php'); -include(EASYWIDIR . '/stuff/init_admin.php'); -include(EASYWIDIR . '/stuff/adminhome.php'); +include(EASYWIDIR . '/stuff/admin/init_admin.php'); +include(EASYWIDIR . '/stuff/admin/adminhome.php'); -if ($ui->smallletters('w', 255, 'get') and isset($what_to_be_included_array[$ui->smallletters('w', 255, 'get')]) and is_file((EASYWIDIR . '/stuff/' . $what_to_be_included_array[$ui->smallletters('w', 255, 'get')]))) { +if ($ui->smallletters('w', 255, 'get') and isset($what_to_be_included_array[$ui->smallletters('w', 255, 'get')]) and is_file((EASYWIDIR . '/stuff/admin/' . $what_to_be_included_array[$ui->smallletters('w', 255, 'get')]))) { + include(EASYWIDIR . '/stuff/admin/' . $what_to_be_included_array[$ui->smallletters('w', 255, 'get')]); +} else if ($ui->smallletters('w', 255, 'get') and isset($what_to_be_included_array[$ui->smallletters('w', 255, 'get')]) and is_file((EASYWIDIR . '/stuff/' . $what_to_be_included_array[$ui->smallletters('w', 255, 'get')]))) { include(EASYWIDIR . '/stuff/' . $what_to_be_included_array[$ui->smallletters('w', 255, 'get')]); - unset($dbConnect); +} else if ($ui->smallletters('w', 255, 'get') and isset($customFiles[$ui->smallletters('w', 255, 'get')]) and is_file((EASYWIDIR . '/stuff/custom_modules/' . $customFiles[$ui->smallletters('w', 255, 'get')]))) { + include(EASYWIDIR . '/stuff/custom_modules/' . $customFiles[$ui->smallletters('w', 255, 'get')]); } else { - unset($dbConnect); $template_file = 'admin_home.tpl'; } +unset($dbConnect); + if (!isset($template_to_use) or !isset($template_to_use) ) { $template_to_use = 'default'; } diff --git a/web/ajax.php b/web/ajax.php index c75a37c8..aed01df9 100644 --- a/web/ajax.php +++ b/web/ajax.php @@ -40,9 +40,9 @@ define('EASYWIDIR', dirname(__FILE__)); if (is_dir(EASYWIDIR . '/install')) die('Please remove the "install" folder'); -include(EASYWIDIR . '/stuff/functions.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); -include(EASYWIDIR . '/stuff/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); include(EASYWIDIR . '/stuff/config.php'); include(EASYWIDIR . '/stuff/settings.php'); if (isset($admin_id)) { diff --git a/web/api.php b/web/api.php index faf1987c..a292fd94 100644 --- a/web/api.php +++ b/web/api.php @@ -46,9 +46,9 @@ if (is_dir(EASYWIDIR . '/install')) { $logininclude = true; -include(EASYWIDIR . '/stuff/vorlage.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); -include(EASYWIDIR . '/stuff/functions.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); include(EASYWIDIR . '/stuff/settings.php'); if ($ui->ip4('REMOTE_ADDR', 'server') and $ui->names('user', 255, 'post')) { @@ -136,13 +136,13 @@ if (isset($resellerIDs) and count($resellerIDs)==1 and passwordhash($ui->passwor if ($type == 'user') { - include(EASYWIDIR . '/stuff/api_users.php'); + include(EASYWIDIR . '/stuff/api/api_users.php'); } else if ($type == 'voice') { if ($voModule == true) { - include(EASYWIDIR . '/stuff/api_voice.php'); + include(EASYWIDIR . '/stuff/api/api_voice.php'); } else { @@ -153,13 +153,13 @@ if (isset($resellerIDs) and count($resellerIDs)==1 and passwordhash($ui->passwor } else if ($type == 'mysql') { - include(EASYWIDIR . '/stuff/api_mysql.php'); + include(EASYWIDIR . '/stuff/api/api_mysql.php'); } else if ($type == 'gserver') { if ($gsModule == true) { - include(EASYWIDIR . '/stuff/api_gserver.php'); + include(EASYWIDIR . '/stuff/api/api_gserver.php'); } else { diff --git a/web/cloud.php b/web/cloud.php index 102e21a7..03979fb1 100644 --- a/web/cloud.php +++ b/web/cloud.php @@ -64,12 +64,12 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR'] == $ip) { printText('Cloud jobs started'); - include(EASYWIDIR . '/stuff/vorlage.php'); - include(EASYWIDIR . '/stuff/functions.php'); - include(EASYWIDIR . '/stuff/class_validator.php'); - include(EASYWIDIR . '/stuff/class_ts3.php'); + include(EASYWIDIR . '/stuff/methods/vorlage.php'); + include(EASYWIDIR . '/stuff/methods/functions.php'); + include(EASYWIDIR . '/stuff/methods/class_validator.php'); + include(EASYWIDIR . '/stuff/methods/class_ts3.php'); include(EASYWIDIR . '/stuff/settings.php'); - include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); + include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); printText('File include and parameters fetched. Start connecting to external systems.'); diff --git a/web/css/default/social_buttons.css b/web/css/default/social_buttons.css index 75e49cd3..3b938959 100644 --- a/web/css/default/social_buttons.css +++ b/web/css/default/social_buttons.css @@ -8,18 +8,18 @@ .btn-github {color: #ffffff;text-shadow: 0 -1px 0 rgba(0,0,0,0.25);background-color: #78cb54;background-image: -moz-linear-gradient(top,#6cc644,#8bd26b);background-image: -webkit-gradient(linear,0 0,0 100%,from(#6cc644),to(#8bd26b));background-image: -webkit-linear-gradient(top,#6cc644,#8bd26b);background-image: -o-linear-gradient(top,#6cc644,#8bd26b);background-image: linear-gradient(to bottom,#6cc644,#8bd26b);background-repeat: repeat-x;filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff6cc644',endColorstr='#ff8bd26b',GradientType=0);border-color: #8bd26b #8bd26b #60b838;border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color: #8bd26b;filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);} .btn-github:hover,.btn-github:focus,.btn-github:active,.btn-github.active,.btn-github.disabled,.btn-github[disabled] {color: #ffffff;background-color: #8bd26b;*background-color: #7bcc58;} .btn-github:active,.btn-github.active {background-color: #6cc644;} -.btn-google.active {color: rgba(255,255,255,0.75);} -.btn-google {color: #ffffff;text-shadow: 0 -1px 0 rgba(0,0,0,0.25);background-color: #e05b4a;background-image: -moz-linear-gradient(top,#dd4b39,#e47365);background-image: -webkit-gradient(linear,0 0,0 100%,from(#dd4b39),to(#e47365));background-image: -webkit-linear-gradient(top,#dd4b39,#e47365);background-image: -o-linear-gradient(top,#dd4b39,#e47365);background-image: linear-gradient(to bottom,#dd4b39,#e47365);background-repeat: repeat-x;filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdd4b39',endColorstr='#ffe47365',GradientType=0);border-color: #e47365 #e47365 #d73925;border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color: #e47365;filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);} -.btn-google:hover,.btn-google:focus,.btn-google:active,.btn-google.active,.btn-google.disabled,.btn-google[disabled] {color: #ffffff;background-color: #e47365;*background-color: #e15f4f;} -.btn-google:active,.btn-google.active {background-color: #dd4b39;} +.btn-google-plus.active {color: rgba(255,255,255,0.75);} +.btn-google-plus {color: #ffffff;text-shadow: 0 -1px 0 rgba(0,0,0,0.25);background-color: #e05b4a;background-image: -moz-linear-gradient(top,#dd4b39,#e47365);background-image: -webkit-gradient(linear,0 0,0 100%,from(#dd4b39),to(#e47365));background-image: -webkit-linear-gradient(top,#dd4b39,#e47365);background-image: -o-linear-gradient(top,#dd4b39,#e47365);background-image: linear-gradient(to bottom,#dd4b39,#e47365);background-repeat: repeat-x;filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdd4b39',endColorstr='#ffe47365',GradientType=0);border-color: #e47365 #e47365 #d73925;border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color: #e47365;filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);} +.btn-google-plus:hover,.btn-google-plus:focus,.btn-google-plus:active,.btn-google-plus.active,.btn-google-plus.disabled,.btn-google-plus[disabled] {color: #ffffff;background-color: #e47365;*background-color: #e15f4f;} +.btn-google-plus:active,.btn-google-plus.active {background-color: #dd4b39;} .btn-linkedin.active {color: rgba(255,255,255,0.75);} .btn-linkedin {color: #ffffff;text-shadow: 0 -1px 0 rgba(0,0,0,0.25);background-color: #0089ca;background-image: -moz-linear-gradient(top,#007bb6,#009de9);background-image: -webkit-gradient(linear,0 0,0 100%,from(#007bb6),to(#009de9));background-image: -webkit-linear-gradient(top,#007bb6,#009de9);background-image: -o-linear-gradient(top,#007bb6,#009de9);background-image: linear-gradient(to bottom,#007bb6,#009de9);background-repeat: repeat-x;filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff007bb6',endColorstr='#ff009de9',GradientType=0);border-color: #009de9 #009de9 #006a9d;border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color: #009de9;filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);} .btn-linkedin:hover,.btn-linkedin:focus,.btn-linkedin:active,.btn-linkedin.active,.btn-linkedin.disabled,.btn-linkedin[disabled] {color: #ffffff;background-color: #009de9;*background-color: #008cd0;} .btn-linkedin:active,.btn-linkedin.active {background-color: #007bb6;} -.btn-live.active {color: rgba(255,255,255,0.75);} -.btn-live {color: #ffffff;text-shadow: 0 -1px 0 rgba(0,0,0,0.25);background-color: #397eee;background-image: -moz-linear-gradient(top,#2672ec,#5590f0);background-image: -webkit-gradient(linear,0 0,0 100%,from(#2672ec),to(#5590f0));background-image: -webkit-linear-gradient(top,#2672ec,#5590f0);background-image: -o-linear-gradient(top,#2672ec,#5590f0);background-image: linear-gradient(to bottom,#2672ec,#5590f0);background-repeat: repeat-x;filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2672ec',endColorstr='#ff5590f0',GradientType=0);border-color: #5590f0 #5590f0 #1464e4;border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color: #5590f0;filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);} -.btn-live:hover,.btn-live:focus,.btn-live:active,.btn-live.active,.btn-live.disabled,.btn-live[disabled] {color: #ffffff;background-color: #5590f0;*background-color: #3d81ee;} -.btn-live:active,.btn-live.active {background-color: #2672ec;} +.btn-windows.active {color: rgba(255,255,255,0.75);} +.btn-windows {color: #ffffff;text-shadow: 0 -1px 0 rgba(0,0,0,0.25);background-color: #397eee;background-image: -moz-linear-gradient(top,#2672ec,#5590f0);background-image: -webkit-gradient(linear,0 0,0 100%,from(#2672ec),to(#5590f0));background-image: -webkit-linear-gradient(top,#2672ec,#5590f0);background-image: -o-linear-gradient(top,#2672ec,#5590f0);background-image: linear-gradient(to bottom,#2672ec,#5590f0);background-repeat: repeat-x;filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2672ec',endColorstr='#ff5590f0',GradientType=0);border-color: #5590f0 #5590f0 #1464e4;border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color: #5590f0;filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);} +.btn-windows:hover,.btn-windows:focus,.btn-windows:active,.btn-windows.active,.btn-windows.disabled,.btn-windows[disabled] {color: #ffffff;background-color: #5590f0;*background-color: #3d81ee;} +.btn-windows:active,.btn-windows.active {background-color: #2672ec;} .btn-mailru.active {color: rgba(255,255,255,0.75);} .btn-mailru {color: #ffffff;text-shadow: 0 -1px 0 rgba(0,0,0,0.25);background-color: #0961b9;background-image: -moz-linear-gradient(top,#0857a6,#0a70d7);background-image: -webkit-gradient(linear,0 0,0 100%,from(#0857a6),to(#0a70d7));background-image: -webkit-linear-gradient(top,#0857a6,#0a70d7);background-image: -o-linear-gradient(top,#0857a6,#0a70d7);background-image: linear-gradient(to bottom,#0857a6,#0a70d7);background-repeat: repeat-x;filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0857a6',endColorstr='#ff0a70d7',GradientType=0);border-color: #0a70d7 #0a70d7 #074a8e;border-color: rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);*background-color: #0a70d7;filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);} .btn-mailru:hover,.btn-mailru:focus,.btn-mailru:active,.btn-mailru.active,.btn-mailru.disabled,.btn-mailru[disabled] {color: #ffffff;background-color: #0a70d7;*background-color: #0964be;} diff --git a/web/css/sb-admin-v2/sb-admin.css b/web/css/sb-admin-v2/sb-admin.css new file mode 100644 index 00000000..98de3658 --- /dev/null +++ b/web/css/sb-admin-v2/sb-admin.css @@ -0,0 +1,319 @@ +/* Global Styles */ + +/* ------------------------------- */ + + body { + background-color: #f8f8f8; +} + +/* Wrappers */ + +/* ------------------------------- */ + + #wrapper { + width: 100%; +} + +#page-wrapper { + padding: 0 15px; + min-height: 568px; + background-color: #fff; +} + +@media(min-width:768px) { + #page-wrapper { + position: inherit; + margin: 0 0 0 250px; + padding: 0 30px; + min-height: 1300px; + border-left: 1px solid #e7e7e7; + } +} + +.navbar-static-side ul li { + border-bottom: 1px solid #e7e7e7; +} + +/* Navigation */ + +/* ------------------------------- */ + +/* Top Right Navigation Dropdown Styles */ + + .navbar-top-links li { + display: inline-block; +} + +.navbar-top-links li:last-child { + margin-right: 15px; +} + +.navbar-top-links li a { + padding: 15px; + min-height: 50px; +} + +.navbar-top-links .dropdown-menu li { + display: block; +} + +.navbar-top-links .dropdown-menu li:last-child { + margin-right: 0; +} + +.navbar-top-links .dropdown-menu li a { + padding: 3px 20px; + min-height: 0; +} + +.navbar-top-links .dropdown-menu li a div { + white-space: normal; +} + +.navbar-top-links .dropdown-messages, +.navbar-top-links .dropdown-tasks, +.navbar-top-links .dropdown-alerts { + width: 310px; + min-width: 0; +} + +.navbar-top-links .dropdown-messages { + margin-left: 5px; +} + +.navbar-top-links .dropdown-tasks { + margin-left: -59px; +} + +.navbar-top-links .dropdown-alerts { + margin-left: -123px; +} + +.navbar-top-links .dropdown-user { + right: 0; + left: auto; +} + +/* Sidebar Menu Styles */ + + .sidebar-search { + padding: 15px; +} + +.arrow { + float: right; +} + +.fa.arrow:before { + content: "\f104"; +} + +.active > a > .fa.arrow:before { + content: "\f107"; +} + +.arrow-active { + float: right; +} + +.fa.arrow-active:before { + content: "\f107"; +} + +.active > a > .fa.arrow-active:before { + content: "\f104"; +} + +.nav-second-level li, +.nav-third-level li { + border-bottom: none !important; +} + +.nav-second-level li a { + padding-left: 37px; +} + +.nav-third-level li a { + padding-left: 52px; +} + +@media(min-width:768px) { + .navbar-static-side { + z-index: 1; + position: absolute; + width: 250px; + } + + .navbar-top-links .dropdown-messages, + .navbar-top-links .dropdown-tasks, + .navbar-top-links .dropdown-alerts { + margin-left: auto; + } +} + +/* Buttons */ + +/* ------------------------------- */ + + .btn-outline { + color: inherit; + background-color: transparent; + transition: all .5s; +} + +.btn-primary.btn-outline { + color: #428bca; +} + +.btn-success.btn-outline { + color: #5cb85c; +} + +.btn-info.btn-outline { + color: #5bc0de; +} + +.btn-warning.btn-outline { + color: #f0ad4e; +} + +.btn-danger.btn-outline { + color: #d9534f; +} + +.btn-primary.btn-outline:hover, +.btn-success.btn-outline:hover, +.btn-info.btn-outline:hover, +.btn-warning.btn-outline:hover, +.btn-danger.btn-outline:hover { + color: #fff; +} + +/* Pages */ + +/* ------------------------------- */ + +/* Dashboard Chat */ + + .chat { + margin: 0; + padding: 0; + list-style: none; +} + +.chat li { + margin-bottom: 10px; + padding-bottom: 5px; + border-bottom: 1px dotted #B3A9A9; +} + +.chat li.left .chat-body { + margin-left: 60px; +} + +.chat li.right .chat-body { + margin-right: 60px; +} + +.chat li .chat-body p { + margin: 0; + color: #777777; +} + +.panel .slidedown .glyphicon, +.chat .glyphicon { + margin-right: 5px; +} + +.chat-panel .panel-body { + height: 350px; + overflow-y: scroll; +} + +/* Login Page */ + + .login-panel { + margin-top: 25%; +} + +/* Flot Chart Containers */ + + .flot-chart { + display: block; + height: 400px; +} + +.flot-chart-content { + width: 100%; + height: 100%; +} + +/* DataTables Overrides */ + + table.dataTable thead .sorting, +table.dataTable thead .sorting_asc:after, +table.dataTable thead .sorting_desc, +table.dataTable thead .sorting_asc_disabled, +table.dataTable thead .sorting_desc_disabled { + background: transparent; +} + +table.dataTable thead .sorting_asc:after { + content: "\f0de"; + float: right; + font-family: fontawesome; +} + +table.dataTable thead .sorting_desc:after { + content: "\f0dd"; + float: right; + font-family: fontawesome; +} + +table.dataTable thead .sorting:after { + content: "\f0dc"; + float: right; + font-family: fontawesome; + color: rgba(50,50,50,.5); +} + +/* Circle Buttons */ + + .btn-circle { + width: 30px; + height: 30px; + padding: 6px 0; + border-radius: 15px; + text-align: center; + font-size: 12px; + line-height: 1.428571429; +} + +.btn-circle.btn-lg { + width: 50px; + height: 50px; + padding: 10px 16px; + border-radius: 25px; + font-size: 18px; + line-height: 1.33; +} + +.btn-circle.btn-xl { + width: 70px; + height: 70px; + padding: 10px 16px; + border-radius: 35px; + font-size: 24px; + line-height: 1.33; +} + +.show-grid [class^="col-"] { + padding-top: 10px; + padding-bottom: 10px; + border: 1px solid #ddd; + background-color: #eee !important; +} + +.show-grid { + margin: 15px 0; +} \ No newline at end of file diff --git a/web/get_password.php b/web/get_password.php index 9a1fb56d..1d46ee94 100644 --- a/web/get_password.php +++ b/web/get_password.php @@ -41,10 +41,10 @@ define('EASYWIDIR', dirname(__FILE__)); -include(EASYWIDIR . '/stuff/vorlage.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); include(EASYWIDIR . '/stuff/config.php'); -include(EASYWIDIR . '/stuff/functions.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); include(EASYWIDIR . '/stuff/settings.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); diff --git a/web/images.php b/web/images.php index 8949f480..2a184f5e 100644 --- a/web/images.php +++ b/web/images.php @@ -40,9 +40,9 @@ define('EASYWIDIR', dirname(__FILE__)); -include(EASYWIDIR . '/stuff/functions.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); -include(EASYWIDIR . '/stuff/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); include(EASYWIDIR . '/stuff/settings.php'); if (isset($admin_id) and $ui->st('img', 'get')) { diff --git a/web/index.php b/web/index.php index 3ce61bce..57936809 100644 --- a/web/index.php +++ b/web/index.php @@ -43,26 +43,32 @@ define('EASYWIDIR', dirname(__FILE__)); $main = 1; $page_include = 1; -include(EASYWIDIR . '/stuff/vorlage.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); -include(EASYWIDIR . '/stuff/functions.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); include(EASYWIDIR . '/stuff/settings.php'); -include(EASYWIDIR . '/stuff/class_page_settings.php'); -include(EASYWIDIR . '/stuff/init_page.php'); +include(EASYWIDIR . '/stuff/methods/class_page_settings.php'); +include(EASYWIDIR . '/stuff/cms/init_page.php'); if (isset($page_active) and $page_active == 'Y') { + if (isset($throw404)) { $template_file = 'page_404.tpl'; + } else if (isset($what_to_be_included_array[$s]) and is_file(EASYWIDIR . '/stuff/cms/' . $what_to_be_included_array[$s])) { + include(EASYWIDIR . '/stuff/cms/' . $what_to_be_included_array[$s]); } else if (isset($what_to_be_included_array[$s]) and is_file(EASYWIDIR . '/stuff/' . $what_to_be_included_array[$s])) { include(EASYWIDIR . '/stuff/' . $what_to_be_included_array[$s]); } else if (isset($what_to_be_included_array[$s]) and is_file(EASYWIDIR . '/' . $what_to_be_included_array[$s])) { include(EASYWIDIR . '/' . $what_to_be_included_array[$s]); + } else if (isset($customFiles[$s])) { + include(EASYWIDIR . '/stuff/custom_modules/' . $customFiles[$s]); } else if (isset($s) and !isset($what_to_be_included_array[$s])) { $template_file = 'page_404.tpl'; } else { $template_file = 'page_home.tpl'; } + unset($dbConnect); if (!isset($template_to_use) or !isset($template_to_use) ) { @@ -75,9 +81,9 @@ if (isset($page_active) and $page_active == 'Y') { $template_file = (string) $template_file; } - include(IncludeTemplate($template_to_use,'page_header.tpl')); - include(IncludeTemplate($template_to_use,(preg_match('/^(.*)\.tpl$/', $template_file)) ? $template_file : 'page_general.tpl')); - include(IncludeTemplate($template_to_use,'page_footer.tpl')); + include(IncludeTemplate($template_to_use, 'page_header.tpl', 'cms')); + include(IncludeTemplate($template_to_use, (preg_match('/^(.*)\.tpl$/', $template_file)) ? $template_file : 'page_general.tpl', 'cms')); + include(IncludeTemplate($template_to_use, 'page_footer.tpl', 'cms')); } else { redirect($page_data->pageurl . '/login.php'); diff --git a/web/install/install.php b/web/install/install.php index f2cfdc04..05613e66 100644 --- a/web/install/install.php +++ b/web/install/install.php @@ -42,8 +42,8 @@ ini_set('display_errors', 1); error_reporting(E_ALL|E_STRICT); define('EASYWIDIR', dirname(dirname(__FILE__))); -require_once(EASYWIDIR . '/stuff/functions.php'); -require_once(EASYWIDIR . '/stuff/vorlage.php'); +require_once(EASYWIDIR . '/stuff/methods/functions.php'); +require_once(EASYWIDIR . '/stuff/methods/vorlage.php'); $currentStep = (isset($_GET['step']) and $_GET['step'] > 0 and $_GET['step'] < 10) ? (int) $_GET['step'] : 0; $progressPercent = (100 / 9) * $currentStep ; @@ -153,6 +153,13 @@ if ($currentStep == 0) { 'languages/default/dk/', 'languages/default/uk', 'stuff/', + 'stuff/admin/', + 'stuff/api/', + 'stuff/cms/', + 'stuff/custom_modules/', + 'stuff/jobs/', + 'stuff/methods/', + 'stuff/user/', 'template/', 'template/default/', 'third_party/', @@ -360,7 +367,7 @@ if ($currentStep == 4 and count($systemCheckError) == 0) { try { - require_once(EASYWIDIR . '/stuff/tables_add.php'); + require_once(EASYWIDIR . '/stuff/methods/tables_add.php'); $displayToUser .= "
{$languageObject->ok_db_tables_create}
"; $displayToUser .= "
{$languageObject->continue}
"; @@ -391,7 +398,7 @@ if ($currentStep == 5 and count($systemCheckError) == 0) { $response = new UpdateResponse(); - require_once(EASYWIDIR . '/stuff/tables_repair.php'); + require_once(EASYWIDIR . '/stuff/methods/tables_repair.php'); if (strpos($response->response, 'Error: no such table:') !== false) { @@ -811,7 +818,7 @@ if ($currentStep == 8 and count($systemCheckError) == 0) { try { - require_once(EASYWIDIR . '/stuff/gameslist.php'); + include(EASYWIDIR . '/stuff/methods/gameslist.php'); $displayToUser .= "
{$languageObject->continue}
"; $displayToUser .= "
{$languageObject->ok_gameserver_data}
"; diff --git a/web/install/update.php b/web/install/update.php index 9c864d16..9b2be45e 100644 --- a/web/install/update.php +++ b/web/install/update.php @@ -170,7 +170,7 @@ if (versioncheck ($version, '2.10', 'update_209-210.php', $response)) { $version = '2.10'; } -include(EASYWIDIR . '/stuff/tables_add.php'); +include(EASYWIDIR . '/stuff/methods/tables_add.php'); if (versioncheck ($version, '2.11', 'update_210-211.php', $response)) { $version = '2.11'; @@ -241,9 +241,9 @@ if (versioncheck ($version, '4.30', 'update_420-430.php', $response)) { $response->add('Repairing tables if needed.'); -include(EASYWIDIR . '/stuff/tables_repair.php'); +include(EASYWIDIR . '/stuff/methods/tables_repair.php'); -include(EASYWIDIR . '/stuff/tables_entries_repair.php'); +include(EASYWIDIR . '/stuff/methods/tables_entries_repair.php'); # Ende if (!isset($updateinclude) or $updateinclude == false) { diff --git a/web/jobs.php b/web/jobs.php index eab9bd74..c3635c0c 100644 --- a/web/jobs.php +++ b/web/jobs.php @@ -72,16 +72,16 @@ if (isset($argv)) { define('EASYWIDIR', dirname(__FILE__)); -include(EASYWIDIR . '/stuff/vorlage.php'); -include(EASYWIDIR . '/stuff/functions.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); -include(EASYWIDIR . '/stuff/class_rootserver.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/class_rootserver.php'); include(EASYWIDIR . '/stuff/settings.php'); -include(EASYWIDIR . '/stuff/functions_gs.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); -include(EASYWIDIR . '/stuff/class_ts3.php'); -include(EASYWIDIR . '/stuff/functions_ts3.php'); -include(EASYWIDIR . '/stuff/mysql_functions.php'); +include(EASYWIDIR . '/stuff/methods/functions_gs.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/class_ts3.php'); +include(EASYWIDIR . '/stuff/methods/functions_ts3.php'); +include(EASYWIDIR . '/stuff/methods/mysql_functions.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip, ipstoarray($rSA['cronjob_ips']))) { @@ -177,49 +177,49 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip, $theOutput = new runGraph($jobCount,$newLine); # us > vo > gs > my > vs - include(EASYWIDIR . '/stuff/jobs_user.php'); + include(EASYWIDIR . '/stuff/jobs/jobs_user.php'); $counJobs->execute(); $jobCount = $counJobs->rowCount(); $theOutput->updateCount($jobCount); print "\r\n" . 'Total jobs open after user cleanup jobs are done: ' . $jobCount . "\r\n"; print 'Executing voice jobs' . "\r\n"; - include(EASYWIDIR . '/stuff/jobs_voice.php'); + include(EASYWIDIR . '/stuff/jobs/jobs_voice.php'); $counJobs->execute(); $jobCount = $counJobs->rowCount(); $theOutput->updateCount($jobCount); print "\r\n" . 'Total jobs open after voice jobs are done: ' . $jobCount . "\r\n"; print 'Executing TS DNS jobs' . "\r\n"; - include(EASYWIDIR . '/stuff/jobs_tsdns.php'); + include(EASYWIDIR . '/stuff/jobs/jobs_tsdns.php'); $counJobs->execute(); $jobCount = $counJobs->rowCount(); $theOutput->updateCount($jobCount); print "\r\n" . 'Total jobs open after TS DNS jobs are done: ' . $jobCount . "\r\n"; print 'Executing mysql jobs' . "\r\n"; - include(EASYWIDIR . '/stuff/jobs_mysql.php'); + include(EASYWIDIR . '/stuff/jobs/jobs_mysql.php'); $counJobs->execute(); $jobCount = $counJobs->rowCount(); $theOutput->updateCount($jobCount); print "\r\n" . 'Total jobs open after mysql jobs are done: ' . $jobCount . "\r\n"; print 'Executing gameserver jobs' . "\r\n"; - include(EASYWIDIR . '/stuff/jobs_gserver.php'); + include(EASYWIDIR . '/stuff/jobs/jobs_gserver.php'); $counJobs->execute(); $jobCount = $counJobs->rowCount(); $theOutput->updateCount($jobCount); print "\r\n" . 'Total jobs open after gameserver jobs are done: ' . $jobCount . "\r\n"; print 'Executing root server jobs' . "\r\n"; - include(EASYWIDIR . '/stuff/jobs_roots.php'); + include(EASYWIDIR . '/stuff/jobs/jobs_roots.php'); $counJobs->execute(); $jobCount = $counJobs->rowCount(); $theOutput->updateCount($jobCount); print "\r\n" . 'Total jobs open after root server jobs are done: ' . $jobCount . "\r\n"; print 'Executing user remove jobs' . "\r\n"; - include(EASYWIDIR . '/stuff/jobs_user_rm.php'); + include(EASYWIDIR . '/stuff/jobs/jobs_user_rm.php'); print "\n"; if ($deamon == true) { diff --git a/web/js/sb-admin-v2/metisMenu/jquery.metisMenu.js b/web/js/sb-admin-v2/metisMenu/jquery.metisMenu.js new file mode 100644 index 00000000..36a8098d --- /dev/null +++ b/web/js/sb-admin-v2/metisMenu/jquery.metisMenu.js @@ -0,0 +1,45 @@ +;(function ($, window, document, undefined) { + + var pluginName = "metisMenu", + defaults = { + toggle: true + }; + + function Plugin(element, options) { + this.element = element; + this.settings = $.extend({}, defaults, options); + this._defaults = defaults; + this._name = pluginName; + this.init(); + } + + Plugin.prototype = { + init: function () { + + var $this = $(this.element), + $toggle = this.settings.toggle; + + $this.find('li.active').has('ul').children('ul').addClass('collapse in'); + $this.find('li').not('.active').has('ul').children('ul').addClass('collapse'); + + $this.find('li').has('ul').children('a').on('click', function (e) { + e.preventDefault(); + + $(this).parent('li').toggleClass('active').children('ul').collapse('toggle'); + + if ($toggle) { + $(this).parent('li').siblings().removeClass('active').children('ul.in').collapse('hide'); + } + }); + } + }; + + $.fn[ pluginName ] = function (options) { + return this.each(function () { + if (!$.data(this, "plugin_" + pluginName)) { + $.data(this, "plugin_" + pluginName, new Plugin(this, options)); + } + }); + }; + +})(jQuery, window, document); diff --git a/web/js/sb-admin-v2/sb-admin.js b/web/js/sb-admin-v2/sb-admin.js new file mode 100644 index 00000000..81a9d7bf --- /dev/null +++ b/web/js/sb-admin-v2/sb-admin.js @@ -0,0 +1,31 @@ +$(function() { + + $('#side-menu').metisMenu(); + +}); + +//Loads the correct sidebar on window load +$(function() { + + $(window).bind("load", function() { + console.log($(this).width()) + if ($(this).width() < 768) { + $('div.sidebar-collapse').addClass('collapse') + } else { + $('div.sidebar-collapse').removeClass('collapse') + } + }) +}) + +//Collapses the sidebar on window resize +$(function() { + + $(window).bind("resize", function() { + console.log($(this).width()) + if ($(this).width() < 768) { + $('div.sidebar-collapse').addClass('collapse') + } else { + $('div.sidebar-collapse').removeClass('collapse') + } + }) +}) diff --git a/web/lend.php b/web/lend.php index 309ba76e..a1ede426 100644 --- a/web/lend.php +++ b/web/lend.php @@ -50,9 +50,9 @@ if (isset($page_include)) { $logininclude = 1; - include(EASYWIDIR . '/stuff/vorlage.php'); - include(EASYWIDIR . '/stuff/class_validator.php'); - include(EASYWIDIR . '/stuff/functions.php'); + include(EASYWIDIR . '/stuff/methods/vorlage.php'); + include(EASYWIDIR . '/stuff/methods/class_validator.php'); + include(EASYWIDIR . '/stuff/methods/functions.php'); include(EASYWIDIR . '/stuff/settings.php'); $query = $sql->prepare("SELECT `language` FROM `settings` WHERE `resellerid`=0 LIMIT 1"); @@ -65,9 +65,9 @@ if (isset($page_include)) { } include(EASYWIDIR . '/stuff/keyphrasefile.php'); -include(EASYWIDIR . '/stuff/functions_gs.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); -include(EASYWIDIR . '/stuff/class_ts3.php'); +include(EASYWIDIR . '/stuff/methods/functions_gs.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/class_ts3.php'); $validacces = false; @@ -425,7 +425,9 @@ if (isset($servertype)) { $tFile = (isset($lendIPBlock)) ? 'lenddata_ipblock.tpl' : 'lenddata.tpl'; - if (isset($template_to_use) and is_file(EASYWIDIR . '/template/' . $template_to_use . '/' . $tFile)) { + if (isset($template_to_use) and is_file(EASYWIDIR . '/template/' . $template_to_use . '/cms/' . $tFile)) { + include(EASYWIDIR . '/template/' . $template_to_use . '/cms/' . $tFile); + } else if (isset($template_to_use) and is_file(EASYWIDIR . '/template/' . $template_to_use . '/' . $tFile)) { include(EASYWIDIR . '/template/' . $template_to_use . '/' . $tFile); } else if (is_file(EASYWIDIR . '/template/default/' . $tFile)) { include(EASYWIDIR . '/template/default/' . $tFile); @@ -908,7 +910,10 @@ if (!isset($template_file) and ((!isset($servertype) and isset($page_include) an } else { - if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/lenddata.tpl')) { + if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/cms/lenddata.tpl')) { + include(EASYWIDIR . '/template/' . $template_to_use . '/cms/lenddata.tpl'); + + } else if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/lenddata.tpl')) { include(EASYWIDIR . '/template/' . $template_to_use . '/lenddata.tpl'); } else if (is_file(EASYWIDIR . '/template/default/lenddata.tpl')) { @@ -953,7 +958,12 @@ if (!isset($template_file) and ((!isset($servertype) and isset($page_include) an $template_file = 'page_lend.tpl'; } else { - if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/lend.tpl')) { + + if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/cms/lend.tpl')) { + + include(EASYWIDIR . '/template/' . $template_to_use . '/cms/lend.tpl'); + + } else if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/lend.tpl')) { include(EASYWIDIR . '/template/' . $template_to_use . '/lend.tpl'); } else if (is_file(EASYWIDIR . '/template/default/lend.tpl')) { @@ -1302,7 +1312,10 @@ if (!isset($template_file) and ((!isset($servertype) and isset($page_include) an } else { - if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/lenddata.tpl')) { + if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/cms/lenddata.tpl')) { + include(EASYWIDIR . '/template/' . $template_to_use . '/cms/lenddata.tpl'); + + } else if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/lenddata.tpl')) { include(EASYWIDIR . '/template/' . $template_to_use . '/lenddata.tpl'); } else if (is_file(EASYWIDIR . '/template/default/lenddata.tpl')) { @@ -1341,7 +1354,10 @@ if (!isset($template_file) and ((!isset($servertype) and isset($page_include) an } else { - if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/lend.tpl')) { + if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/cms/lend.tpl')) { + include(EASYWIDIR . '/template/' . $template_to_use . '/cms/lend.tpl'); + + } else if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/lend.tpl')) { include(EASYWIDIR . '/template/' . $template_to_use . '/lend.tpl'); } else if (is_file(EASYWIDIR . '/template/default/lend.tpl')) { diff --git a/web/login.php b/web/login.php index 80d43534..cc30b453 100644 --- a/web/login.php +++ b/web/login.php @@ -48,10 +48,10 @@ if (is_dir(EASYWIDIR . '/install')) { die('Please remove the "install" folder'); } -include(EASYWIDIR . '/stuff/vorlage.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); include(EASYWIDIR . '/third_party/password_compat/password.php'); -include(EASYWIDIR . '/stuff/functions.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); include(EASYWIDIR . '/stuff/settings.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); @@ -422,7 +422,17 @@ if ($ui->st('w', 'get') == 'lo') { $query = $sql->prepare("SELECT `filename` FROM `userdata_social_providers` WHERE `resellerID`=0 AND `active`='Y'"); $query->execute(); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - $serviceProviders[$row['filename']] = strtolower($row['filename']); + + $cssIcon = strtolower($row['filename']); + + if ($cssIcon == 'google') { + $cssIcon = 'google-plus'; + } else if ($cssIcon == 'live') { + $cssIcon = 'windows'; + } + + $serviceProviders[$row['filename']] = strtolower($cssIcon); + } if (count($serviceProviders) > 0) { @@ -446,10 +456,21 @@ if ($ui->st('w', 'get') == 'lo') { if (!isset($include) and !isset($passwordCorrect) and !$ui->username('username', 255, 'post') and !$ui->ismail('username', 255, 'post') and !$ui->password('password', 255, 'post') and !isset($_SESSION['sessionid'])) { $serviceProviders = array(); + $query = $sql->prepare("SELECT `filename` FROM `userdata_social_providers` WHERE `resellerID`=0 AND `active`='Y'"); $query->execute(); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - $serviceProviders[$row['filename']] = strtolower($row['filename']); + + $cssIcon = strtolower($row['filename']); + + if ($cssIcon == 'google') { + $cssIcon = 'google-plus'; + } else if ($cssIcon == 'live') { + $cssIcon = 'windows'; + } + + $serviceProviders[$row['filename']] = strtolower($cssIcon); + } if (count($serviceProviders) > 0) { @@ -737,7 +758,9 @@ if ($ui->st('w', 'get') == 'lo') { } if (isset($include) and isset($template_to_use)) { - if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/' . $include)) { + if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/cms/' . $include)) { + include(EASYWIDIR . '/template/' . $template_to_use . '/cms/' . $include); + } else if (is_file(EASYWIDIR . '/template/' . $template_to_use . '/' . $include)) { include(EASYWIDIR . '/template/' . $template_to_use . '/' . $include); } else if (is_file(EASYWIDIR . '/template/default/' . $include)) { include(EASYWIDIR . '/template/default/' . $include); diff --git a/web/protectioncheck.php b/web/protectioncheck.php index 4cd87b29..a26e1daa 100644 --- a/web/protectioncheck.php +++ b/web/protectioncheck.php @@ -53,9 +53,9 @@ if (isset($page_include)) { $logininclude = true; - include(EASYWIDIR . '/stuff/vorlage.php'); - include(EASYWIDIR . '/stuff/class_validator.php'); - include(EASYWIDIR . '/stuff/functions.php'); + include(EASYWIDIR . '/stuff/methods/vorlage.php'); + include(EASYWIDIR . '/stuff/methods/class_validator.php'); + include(EASYWIDIR . '/stuff/methods/functions.php'); include(EASYWIDIR . '/stuff/settings.php'); if (!isset($user_language)) { @@ -147,10 +147,16 @@ if (!isset($protected)) { $imgAlt = 'protected'; } if ($ui->ipport('serveraddress', 'post')) { + if (isset($page_include)) { + $template_file = 'page_protectioncheck.tpl'; + } else { - if (file_exists(EASYWIDIR . '/template/' . $template_to_use . '/protectioncheck.tpl')) { + + if (file_exists(EASYWIDIR . '/template/' . $template_to_use . '/cms/protectioncheck.tpl')) { + include(EASYWIDIR . '/template/' . $template_to_use . '/cms/protectioncheck.tpl'); + } else if (file_exists(EASYWIDIR . '/template/' . $template_to_use . '/protectioncheck.tpl')) { include(EASYWIDIR . '/template/' . $template_to_use . '/protectioncheck.tpl'); } else if (file_exists(EASYWIDIR . '/template/default/protectioncheck.tpl')) { include(EASYWIDIR . '/template/default/protectioncheck.tpl'); @@ -158,7 +164,8 @@ if ($ui->ipport('serveraddress', 'post')) { include(EASYWIDIR . '/template/protectioncheck.tpl'); } } -} else if (!isset($page_include) and $ui->ip('ip', 'get') and $ui->port('po', 'get')) { + + } else if (!isset($page_include) and $ui->ip('ip', 'get') and $ui->port('po', 'get')) { if ($ui->username('gamestring', 50, 'get') == 'xml') { if (!isset($protected)) { echo 'unknown'; @@ -225,8 +232,11 @@ XML; $page_data->langLinks($langLinks); $template_file = 'page_protectioncheck.tpl'; + } else { - if (file_exists(EASYWIDIR . '/template/' . $template_to_use . '/protectioncheck.tpl')) { + if (file_exists(EASYWIDIR . '/template/' . $template_to_use . '/cms/protectioncheck.tpl')) { + include(EASYWIDIR . '/template/' . $template_to_use . '/cms/protectioncheck.tpl'); + } else if (file_exists(EASYWIDIR . '/template/' . $template_to_use . '/protectioncheck.tpl')) { include(EASYWIDIR . '/template/' . $template_to_use . '/protectioncheck.tpl'); } else if (file_exists(EASYWIDIR . '/template/default/protectioncheck.tpl')) { include(EASYWIDIR . '/template/default/protectioncheck.tpl'); diff --git a/web/reboot.php b/web/reboot.php index 6dbf6598..226d0e76 100644 --- a/web/reboot.php +++ b/web/reboot.php @@ -47,15 +47,15 @@ if (isset($_SERVER['REMOTE_ADDR'])) { set_time_limit($timelimit); define('EASYWIDIR', dirname(__FILE__)); -include(EASYWIDIR . '/stuff/vorlage.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); -include(EASYWIDIR . '/stuff/functions.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); include(EASYWIDIR . '/stuff/settings.php'); -include(EASYWIDIR . '/stuff/functions_gs.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); -include(EASYWIDIR . '/stuff/class_masterserver.php'); -include(EASYWIDIR . '/stuff/class_ts3.php'); -include(EASYWIDIR . '/stuff/queries_updates.php'); +include(EASYWIDIR . '/stuff/methods/functions_gs.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/class_masterserver.php'); +include(EASYWIDIR . '/stuff/methods/class_ts3.php'); +include(EASYWIDIR . '/stuff/methods/queries_updates.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip, ipstoarray($rSA['cronjob_ips']))) { @@ -576,7 +576,7 @@ if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip, $newsInclude = true; $printToConsole = true; print "Check for new news feeds\r\n"; - include(EASYWIDIR . '/stuff/feeds_function.php'); + include(EASYWIDIR . '/stuff/methods/feeds_function.php'); if (isset($template_file)) { print $template_file."\r\n"; } diff --git a/web/serverallocation.php b/web/serverallocation.php index 78b060de..f0916048 100644 --- a/web/serverallocation.php +++ b/web/serverallocation.php @@ -37,9 +37,9 @@ */ define('EASYWIDIR', dirname(__FILE__)); -include(EASYWIDIR . '/stuff/functions.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); -include(EASYWIDIR . '/stuff/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); include(EASYWIDIR . '/stuff/config.php'); include(EASYWIDIR . '/stuff/settings.php'); @@ -78,7 +78,7 @@ if ($ui->smallletters('w',5, 'get') == 'check') { foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { if ($row['mapGroup'] != null) { $mapGroup = $row['mapGroup']; - require_once IncludeTemplate($template_to_use,'ajax_userpanel_mapgroup.tpl'); + require_once IncludeTemplate($template_to_use,'ajax_userpanel_mapgroup.tpl', 'ajax'); } } @@ -169,7 +169,7 @@ if ($ui->smallletters('w',5, 'get') == 'check') { $best_hdd[] = $mountpoint; } } - require_once IncludeTemplate($template_to_use,'ajax_admin_vserver_allocation.tpl'); + require_once IncludeTemplate($template_to_use,'ajax_admin_vserver_allocation.tpl', 'ajax'); } else if ($ui->st('d', 'get')=="ui" and $ui->id('id',19, 'get')) { foreach (freeips($ui->id('id',19, 'get')) as $ip) echo $ip."
"; @@ -185,7 +185,7 @@ if ($ui->smallletters('w',5, 'get') == 'check') { $installed = 0; $max_databases = 0; } - require_once IncludeTemplate($template_to_use,'ajax_admin_mysql_server.tpl'); + require_once IncludeTemplate($template_to_use,'ajax_admin_mysql_server.tpl', 'ajax'); } else if ($ui->st('d', 'get')=="tr" and $ui->st('w', 'get')) { if ($ui->st('w', 'get')=="su") { @@ -263,7 +263,7 @@ if ($ui->smallletters('w',5, 'get') == 'check') { natsort($ips); foreach ($ips as $ip) $data[] = ''; } - require_once IncludeTemplate($template_to_use,'ajax_admin_traffic.tpl'); + require_once IncludeTemplate($template_to_use,'ajax_admin_traffic.tpl', 'ajax'); } else if ($ui->st('d', 'get')=="vu" and $ui->st('w', 'get')) { if ($ui->st('w', 'get')=="us") { $query = $sql->prepare("SELECT u.`id`,u.`cname`,u.`vname`,u.`name` FROM `userdata` u INNER JOIN `voice_server` v ON u.`id`=v.`userid` AND v.`active`='Y' WHERE u.`resellerid`=? GROUP BY u.`id`"); @@ -281,7 +281,7 @@ if ($ui->smallletters('w',5, 'get') == 'check') { $query->execute(array($reseller_id)); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) $data[] = ''; } - require_once IncludeTemplate($template_to_use,'ajax_admin_voice_stats.tpl'); + require_once IncludeTemplate($template_to_use,'ajax_admin_voice_stats.tpl', 'ajax'); } else if ($ui->username('distro', 50, 'get') and $ui->id('id',19, 'get') and ($pa['vserversettings'] or $pa['root']) and $reseller_id == 0) { $pselect = $sql->prepare("SELECT `pxeautorun` FROM `resellerimages` WHERE `bitversion`=? AND `distro`=?"); $pselect->execute(array($ui->id('id',19, 'get'), $ui->username('distro', 50, 'get'))); @@ -351,8 +351,8 @@ if ($ui->smallletters('w',5, 'get') == 'check') { } else if ($ui->username('gamestring', 50, 'get') and $ui->id('id',19, 'get') and ($pa['roots'] or $pa['root'])) { - include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); - include(EASYWIDIR . '/stuff/class_masterserver.php'); + include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); + include(EASYWIDIR . '/stuff/methods/class_masterserver.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); $sprache = getlanguagefile('roots', $user_language, $reseller_id); @@ -420,7 +420,7 @@ if ($ui->smallletters('w',5, 'get') == 'check') { } else { $uslots = $row['uslots']; } - require_once IncludeTemplate($template_to_use,'ajax_admin_voiceserver_usage.tpl'); + require_once IncludeTemplate($template_to_use,'ajax_admin_voiceserver_usage.tpl', 'ajax'); } } else if ($pa['gserver'] and $ui->st('d', 'get')!="vs" and $ui->st('d', 'get')!="vo" and ($ui->id('id',19, 'get') or $ui->ip('ip', 'get'))) { $sprache = getlanguagefile('gserver', $user_language, $reseller_id); @@ -446,7 +446,7 @@ if ($ui->smallletters('w',5, 'get') == 'check') { $max+=$row['slots']; $installedserver++; } - require_once IncludeTemplate($template_to_use,'ajax_admin_gserver_usage.tpl'); + require_once IncludeTemplate($template_to_use,'ajax_admin_gserver_usage.tpl', 'ajax'); } else if ($ui->ip('ip', 'get') and $ui->st('d', 'get')!="vs") { $query = $sql->prepare("SELECT `port`,`port2`,`port3`,`port4`,`port5` FROM `gsswitch` WHERE `serverip`=? AND `resellerid`=? ORDER BY `port`"); $query->execute(array($ui->ip('ip', 'get'), $reseller_id)); @@ -481,7 +481,7 @@ if ($ui->smallletters('w',5, 'get') == 'check') { } else { $ports = ''; } - require_once IncludeTemplate($template_to_use,'ajax_admin_gserver_ports.tpl'); + require_once IncludeTemplate($template_to_use,'ajax_admin_gserver_ports.tpl', 'ajax'); } } else if (($pa['usertickets'] or $pa['usertickets']) and $ui->port('po', 'get') and ($ui->st('d', 'get') == 'ut' or $ui->st('d', 'get') == 'rt')) { if ($reseller_id != 0 and $admin_id==$reseller_id and $ui->st('d', 'get') == 'rt') { @@ -511,6 +511,6 @@ if ($ui->smallletters('w',5, 'get') == 'check') { $table[] = array('id' => $row['id'], 'topic' => $topic); } $ticketTemplate=($ui->id('r',1, 'get') != 1) ? 'ajax_userpanel_ticket_category.tpl' : 'ajax_admin_reseller_ticket_category.tpl'; - require_once IncludeTemplate($template_to_use, $ticketTemplate); + require_once IncludeTemplate($template_to_use, $ticketTemplate, 'ajax'); } } \ No newline at end of file diff --git a/web/serverlog.php b/web/serverlog.php index 499bad1b..22b87dd6 100644 --- a/web/serverlog.php +++ b/web/serverlog.php @@ -37,10 +37,10 @@ */ define('EASYWIDIR', dirname(__FILE__)); -include(EASYWIDIR . '/stuff/functions.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); -include(EASYWIDIR . '/stuff/class_ftp.php'); -include(EASYWIDIR . '/stuff/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/class_ftp.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); include(EASYWIDIR . '/stuff/settings.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); diff --git a/web/startupdates.php b/web/startupdates.php index 339bdebd..bd958ad1 100644 --- a/web/startupdates.php +++ b/web/startupdates.php @@ -47,12 +47,12 @@ if (isset($_SERVER['REMOTE_ADDR'])) { set_time_limit($timelimit); define('EASYWIDIR', dirname(__FILE__)); -include(EASYWIDIR . '/stuff/vorlage.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); -include(EASYWIDIR . '/stuff/functions.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); include(EASYWIDIR . '/stuff/settings.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); -include(EASYWIDIR . '/stuff/class_masterserver.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/class_masterserver.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); if (!isset($ip) or $ui->escaped('SERVER_ADDR', 'server') == $ip or in_array($ip, ipstoarray($rSA['cronjob_ips']))) { diff --git a/web/statuscheck.php b/web/statuscheck.php index a50dc313..e92e16f6 100644 --- a/web/statuscheck.php +++ b/web/statuscheck.php @@ -65,13 +65,13 @@ if (isset($argv)) { } define('EASYWIDIR', dirname(__FILE__)); -include(EASYWIDIR . '/stuff/vorlage.php'); -include(EASYWIDIR . '/stuff/functions.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); include(EASYWIDIR . '/stuff/settings.php'); -include(EASYWIDIR . '/stuff/functions_gs.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); -include(EASYWIDIR . '/stuff/class_ts3.php'); +include(EASYWIDIR . '/stuff/methods/functions_gs.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/class_ts3.php'); include(EASYWIDIR . '/third_party/gameq/GameQ.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); diff --git a/web/stuff/addons.php b/web/stuff/admin/addons.php similarity index 100% rename from web/stuff/addons.php rename to web/stuff/admin/addons.php diff --git a/web/stuff/admin_modules.php b/web/stuff/admin/admin_modules.php similarity index 100% rename from web/stuff/admin_modules.php rename to web/stuff/admin/admin_modules.php diff --git a/web/stuff/admin_search.php b/web/stuff/admin/admin_search.php similarity index 100% rename from web/stuff/admin_search.php rename to web/stuff/admin/admin_search.php diff --git a/web/stuff/admin_social_provider.php b/web/stuff/admin/admin_social_provider.php similarity index 100% rename from web/stuff/admin_social_provider.php rename to web/stuff/admin/admin_social_provider.php diff --git a/web/stuff/adminhome.php b/web/stuff/admin/adminhome.php similarity index 95% rename from web/stuff/adminhome.php rename to web/stuff/admin/adminhome.php index 9dafa9d0..dd81c5b7 100644 --- a/web/stuff/adminhome.php +++ b/web/stuff/admin/adminhome.php @@ -167,9 +167,9 @@ if ($ui->smallletters('w',2, 'get') == 'da' or (!$ui->smallletters('w',2, 'get') $query2->execute(array($user_language)); foreach ($query2->fetchAll(PDO::FETCH_ASSOC) as $row2) { if ($row['merge'] == 'N') { - $feedArray[$page_url][] = array('title' => $row2['title'], 'link' => (isset($seo) and $seo== 'Y') ? $page_url. '/' . $user_language . '/' . szrp($gsprache->news) . '/' . szrp($row2['title']) . '/' : $page_url.'/index.php?site=news&id=' . $row2['id'], 'text' => nl2br($row2['text']), 'url' => $page_url); + $feedArray[$page_url][] = array('title' => $row2['title'], 'link' => (isset($seo) and $seo == 'Y') ? $page_url. '/' . $user_language . '/' . szrp($gsprache->news) . '/' . szrp($row2['title']) . '/' : $page_url.'/index.php?site=news&id=' . $row2['id'], 'text' => nl2br($row2['text']), 'url' => $page_url); } else { - $feedArray['News'][] = array('title' => $row2['title'], 'link' => (isset($seo) and $seo== 'Y') ? $page_url. '/' . $user_language . '/' . szrp($gsprache->news) . '/' . szrp($row2['title']) . '/' : $page_url.'/index.php?site=news&id=' . $row2['id'], 'text' => nl2br($row2['text']), 'url' => $page_url); + $feedArray['News'][] = array('title' => $row2['title'], 'link' => (isset($seo) and $seo == 'Y') ? $page_url. '/' . $user_language . '/' . szrp($gsprache->news) . '/' . szrp($row2['title']) . '/' : $page_url.'/index.php?site=news&id=' . $row2['id'], 'text' => nl2br($row2['text']), 'url' => $page_url); } } diff --git a/web/stuff/api_external_auth.php b/web/stuff/admin/api_external_auth.php similarity index 100% rename from web/stuff/api_external_auth.php rename to web/stuff/admin/api_external_auth.php diff --git a/web/stuff/api_import_users.php b/web/stuff/admin/api_import_users.php similarity index 100% rename from web/stuff/api_import_users.php rename to web/stuff/admin/api_import_users.php diff --git a/web/stuff/api_settings.php b/web/stuff/admin/api_settings.php similarity index 100% rename from web/stuff/api_settings.php rename to web/stuff/admin/api_settings.php diff --git a/web/stuff/eac.php b/web/stuff/admin/eac.php similarity index 100% rename from web/stuff/eac.php rename to web/stuff/admin/eac.php diff --git a/web/stuff/feeds.php b/web/stuff/admin/feeds.php similarity index 100% rename from web/stuff/feeds.php rename to web/stuff/admin/feeds.php diff --git a/web/stuff/feeds_entries.php b/web/stuff/admin/feeds_entries.php similarity index 98% rename from web/stuff/feeds_entries.php rename to web/stuff/admin/feeds_entries.php index d33ba3e8..6f22ca57 100644 --- a/web/stuff/feeds_entries.php +++ b/web/stuff/admin/feeds_entries.php @@ -54,7 +54,7 @@ if ($reseller_id == 0) { $lookUpID=($reseller_id != 0 and $admin_id != $reseller_id) ? $admin_id: $reseller_id; if ($ui->st('d', 'get') == 'ud') { $newsInclude = true; - include(EASYWIDIR . '/stuff/feeds_function.php'); + include(EASYWIDIR . '/stuff/methods/feeds_function.php'); } else if ($ui->st('d', 'get') == 'md') { $ids=(array)$ui->active('ids', 'post'); $delete = $sql->prepare("DELETE FROM `feeds_news` WHERE `newsID`=? AND `resellerID`=? LIMIT 1"); diff --git a/web/stuff/gserver.php b/web/stuff/admin/gserver.php similarity index 99% rename from web/stuff/gserver.php rename to web/stuff/admin/gserver.php index 342d00bc..b6efbe41 100644 --- a/web/stuff/gserver.php +++ b/web/stuff/admin/gserver.php @@ -42,7 +42,7 @@ if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['gserver'])) } include(EASYWIDIR . '/stuff/keyphrasefile.php'); -include(EASYWIDIR . '/stuff/functions_gs.php'); +include(EASYWIDIR . '/stuff/methods/functions_gs.php'); $sprache = getlanguagefile('gserver',$user_language,$reseller_id); $loguserid = $admin_id; $logusername = getusername($admin_id); @@ -375,7 +375,7 @@ if ($ui->st('d', 'get') == 'ad' and is_numeric($licenceDetails['lG']) and $licen $query = $sql->prepare("SELECT `id` FROM `gsswitch` WHERE `rootID`=? AND `serverip`=? AND `port`=? AND `userid`!=? AND `resellerid`=? LIMIT 1"); $query->execute(array($serverid,$serverip,$port,$customer,$reseller_id)); if ($query->rowCount() == 0) { - include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); + include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); $gamestring = array(); $template_file = ''; $rdata=serverdata('root',$serverid,$aeskey); @@ -663,7 +663,7 @@ if ($ui->st('d', 'get') == 'ad' and is_numeric($licenceDetails['lG']) and $licen $template_file = $sprache->no_server_left; } if (isset($rootID)) { - include (EASYWIDIR . '/stuff/functions_ssh_exec.php'); + include (EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); ssh2_execute('gs', $rootID, $cmds); } $loguseraction="%del% %gserver% $serverip:$port"; @@ -837,7 +837,7 @@ if ($ui->st('d', 'get') == 'ad' and is_numeric($licenceDetails['lG']) and $licen $pallowed = ($ui->active('pallowed', 'post')) ? $ui->active('pallowed', 'post') : 'N'; $ftppass = $ui->password('password',50, 'post'); $pallowed = $ui->active('pallowed', 'post'); - include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); + include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); $query = $sql->prepare("SELECT `newlayout`,`userid`,AES_DECRYPT(`ftppassword`,?) AS `ftp`,AES_DECRYPT(`ppassword`,?) AS `ppass`,`active`,`rootID`,`serverip`,`port`,`port2`,`port3`,`port4`,`port5`,`userid`,`slots` FROM `gsswitch` WHERE `id`=? AND `resellerid`=? LIMIT 1"); $query->execute(array($aeskey,$aeskey,$server_id,$reseller_id)); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { @@ -1062,7 +1062,7 @@ if ($ui->st('d', 'get') == 'ad' and is_numeric($licenceDetails['lG']) and $licen } } if (count($gamestring)>0 and $ui->active('type', 'post')) { - include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); + include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); $gamestring=count($gamestring) . '_' . implode('_',$gamestring); $rdata=serverdata('root',$serverid,$aeskey); $sship = $rdata['ip']; @@ -1106,7 +1106,7 @@ if ($ui->st('d', 'get') == 'ad' and is_numeric($licenceDetails['lG']) and $licen $rootID = $row['rootID']; } if (isset($gsip) and isset($port)) { - include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); + include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); if ($ui->st('d', 'get') == 'rs') { $template_file = 'Restart done'; $cmds=gsrestart($id,'re',$aeskey,$reseller_id); diff --git a/web/stuff/gserver_file_templates.php b/web/stuff/admin/gserver_file_templates.php similarity index 100% rename from web/stuff/gserver_file_templates.php rename to web/stuff/admin/gserver_file_templates.php diff --git a/web/stuff/images.php b/web/stuff/admin/images.php similarity index 100% rename from web/stuff/images.php rename to web/stuff/admin/images.php diff --git a/web/stuff/init_admin.php b/web/stuff/admin/init_admin.php similarity index 98% rename from web/stuff/init_admin.php rename to web/stuff/admin/init_admin.php index 04d7c42d..fb7552f6 100644 --- a/web/stuff/init_admin.php +++ b/web/stuff/admin/init_admin.php @@ -102,12 +102,13 @@ $what_to_be_included_array = array( $easywiModules = array('gs' => true, 'ip' => true, 'ea' => true, 'my' => true, 'pn' => true, 'ro' => true, 'ti' => true, 'le' => true, 'vo' => true); $customModules = array('gs' => array(), 'mo' => array(), 'my' => array(), 'ro' => array(), 'ti' => array(), 'us' => array(), 'vo' => array(), 'pa' => array()); +$customFiles = array(); $query = $sql->prepare("SELECT * FROM `modules` WHERE `type` IN ('A','C')"); $query2 = $sql->prepare("SELECT `text` FROM `translations` WHERE `type`='mo' AND `transID`=? AND `lang`=? LIMIT 1"); $query->execute(); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - if ($row['active'] == 'Y' and $row['type'] == 'A' and is_file(EASYWIDIR . '/stuff/' . $row['file'])) { + if ($row['active'] == 'Y' and $row['type'] == 'A' and is_file(EASYWIDIR . '/stuff/custom_modules/' . $row['file'])) { $query2->execute(array($row['id'], $user_language)); $name = $query2->fetchColumn(); @@ -120,7 +121,7 @@ foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { } $customModules[$row['sub']][$row['get']] = $name; - $what_to_be_included_array[$row['get']] = $row['file']; + $customFiles[$row['get']] = $row['file']; } else if ($row['type'] == 'C' and $row['active'] == 'N') { $easywiModules[$row['get']] = false; diff --git a/web/stuff/ip_bans.php b/web/stuff/admin/ip_bans.php similarity index 100% rename from web/stuff/ip_bans.php rename to web/stuff/admin/ip_bans.php diff --git a/web/stuff/jobs_list.php b/web/stuff/admin/jobs_list.php similarity index 100% rename from web/stuff/jobs_list.php rename to web/stuff/admin/jobs_list.php diff --git a/web/stuff/lendserver.php b/web/stuff/admin/lendserver.php similarity index 99% rename from web/stuff/lendserver.php rename to web/stuff/admin/lendserver.php index 3974b116..1237555d 100644 --- a/web/stuff/lendserver.php +++ b/web/stuff/admin/lendserver.php @@ -41,9 +41,9 @@ if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and (!isset($pa) or ( die; } include(EASYWIDIR . '/stuff/keyphrasefile.php'); -include(EASYWIDIR . '/stuff/functions_gs.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); -include(EASYWIDIR . '/stuff/class_ts3.php'); +include(EASYWIDIR . '/stuff/methods/functions_gs.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/class_ts3.php'); $sprache = getlanguagefile('lendserver', $user_language, $reseller_id); $gssprache = getlanguagefile('gserver', $user_language, $reseller_id); diff --git a/web/stuff/logdata.php b/web/stuff/admin/logdata.php similarity index 100% rename from web/stuff/logdata.php rename to web/stuff/admin/logdata.php diff --git a/web/stuff/maillog.php b/web/stuff/admin/maillog.php similarity index 100% rename from web/stuff/maillog.php rename to web/stuff/admin/maillog.php diff --git a/web/stuff/masterserver.php b/web/stuff/admin/masterserver.php similarity index 99% rename from web/stuff/masterserver.php rename to web/stuff/admin/masterserver.php index 794a7f51..f3a7f41c 100644 --- a/web/stuff/masterserver.php +++ b/web/stuff/admin/masterserver.php @@ -42,8 +42,8 @@ if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['masterServe } include(EASYWIDIR . '/stuff/keyphrasefile.php'); -include(EASYWIDIR . '/stuff/class_masterserver.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/class_masterserver.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); $sprache = getlanguagefile('roots',$user_language,$reseller_id); $loguserid = $admin_id; diff --git a/web/stuff/mysql_root.php b/web/stuff/admin/mysql_root.php similarity index 96% rename from web/stuff/mysql_root.php rename to web/stuff/admin/mysql_root.php index d356ea11..2b87c375 100644 --- a/web/stuff/mysql_root.php +++ b/web/stuff/admin/mysql_root.php @@ -45,7 +45,7 @@ if (!isset($admin_id) or $main != 1 or !isset($reseller_id) or !$pa['root']) { if ($ui->st('d', 'get') == 'bu' and $ui->st('action', 'post') == 'bu' and $reseller_id == 0) { - include(EASYWIDIR . '/stuff/mysql_backup_class.php'); + include(EASYWIDIR . '/stuff/methods/mysql_backup_class.php'); $createBackup = true; header('Content-type: application/sql; charset=utf-8'); @@ -80,22 +80,22 @@ if ($ui->st('d', 'get') == 'bu' and $ui->st('action', 'post') == 'bu' and $resel if (!isset($alreadyRepaired)) { $response->add('Adding tables if needed.'); - include(EASYWIDIR . '/stuff/tables_add.php'); + include(EASYWIDIR . '/stuff/methods/tables_add.php'); } if (!isset($alreadyRepaired)) { $response->add('Repairing tables if needed.'); - include(EASYWIDIR . '/stuff/tables_repair.php'); + include(EASYWIDIR . '/stuff/methods/tables_repair.php'); } $response->add('Fixing data entries if needed.'); - include(EASYWIDIR . '/stuff/tables_entries_repair.php'); + include(EASYWIDIR . '/stuff/methods/tables_entries_repair.php'); $template_file = $response->response; } else if ($ui->st('d', 'get') == 'rg') { - require_once(EASYWIDIR . '/stuff/gameslist.php'); + include(EASYWIDIR . '/stuff/methods/gameslist.php'); if ($ui->st('action', 'post') == 'rg') { @@ -147,7 +147,7 @@ if ($ui->st('d', 'get') == 'bu' and $ui->st('action', 'post') == 'bu' and $resel } else if ($ui->st('d', 'get') == 'ra') { - require_once(EASYWIDIR . '/stuff/addonslist.php'); + require_once(EASYWIDIR . '/stuff/methods/addonslist.php'); if ($ui->st('action', 'post') == 'ra') { diff --git a/web/stuff/mysql_server.php b/web/stuff/admin/mysql_server.php similarity index 99% rename from web/stuff/mysql_server.php rename to web/stuff/admin/mysql_server.php index 90705027..f7d767e5 100644 --- a/web/stuff/mysql_server.php +++ b/web/stuff/admin/mysql_server.php @@ -40,7 +40,7 @@ if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['mysql_setti die; } -include(EASYWIDIR . '/stuff/mysql_functions.php'); +include(EASYWIDIR . '/stuff/methods/mysql_functions.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); $sprache = getlanguagefile('mysql',$user_language,$reseller_id); diff --git a/web/stuff/page_comments.php b/web/stuff/admin/page_comments.php similarity index 99% rename from web/stuff/page_comments.php rename to web/stuff/admin/page_comments.php index e7516c50..1e048807 100644 --- a/web/stuff/page_comments.php +++ b/web/stuff/admin/page_comments.php @@ -1,4 +1,5 @@ w('action', 4, 'post') and !token(true)) { $pinsert->execute(array(':active' => $active,':esxi' => $esxi,':ip' => $ip,':port' => $port,':aeskey' => $aeskey,':user' => $user,':pass' => $pass,':os' => $os,':description' => $description,':publickey' => $publickey,':keyname' => $keyname, ':cpu' => $cpu, ':cores' => $cores,':mhz' => $mhz,':ram' => $ram,':maxserver' => $maxserver,':thin' => $thin,':thinquota' => $thinquota,':reseller' => $reseller)); $serverid = $sql->lastInsertId(); - include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); + include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); $uidb = ssh2_execute('vh', $serverid, 'cd /vmfs/volumes; S=""; for U in `ls -la | grep "drwxr-xr-t" | awk \'{print $9}\'`; do C=`vmkfstools -Ph $U 2> /dev/null | grep "Capacity" | awk \'{print $2$3}\'`; S="$S$U:$C;"; done; for U in `ls -la | grep "drwxrwxrwx" | awk \'{print $9}\'`; do C=`vmkfstools -Ph $U 2> /dev/null | grep "Capacity" | awk \'{print $2$3}\'`; S="$S$U:$C;"; done; echo $S'); if ($uidb != '' and $uidb !== false) { diff --git a/web/stuff/root_virtual_server.php b/web/stuff/admin/root_virtual_server.php similarity index 100% rename from web/stuff/root_virtual_server.php rename to web/stuff/admin/root_virtual_server.php diff --git a/web/stuff/roots.php b/web/stuff/admin/roots.php similarity index 99% rename from web/stuff/roots.php rename to web/stuff/admin/roots.php index a4f0a04c..d11049be 100644 --- a/web/stuff/roots.php +++ b/web/stuff/admin/roots.php @@ -42,7 +42,7 @@ if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['roots'])) { } include(EASYWIDIR . '/stuff/keyphrasefile.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); $sprache = getlanguagefile('roots', $user_language, $reseller_id); $gsSprache = getlanguagefile('gserver', $user_language, $reseller_id); @@ -373,7 +373,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) { if (count($cmds) > 0) { - include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); + include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); $return = ssh2_execute('gs', $id, $cmds); diff --git a/web/stuff/roots_os_templates.php b/web/stuff/admin/roots_os_templates.php similarity index 100% rename from web/stuff/roots_os_templates.php rename to web/stuff/admin/roots_os_templates.php diff --git a/web/stuff/roots_subnets.php b/web/stuff/admin/roots_subnets.php similarity index 100% rename from web/stuff/roots_subnets.php rename to web/stuff/admin/roots_subnets.php diff --git a/web/stuff/tickets.php b/web/stuff/admin/tickets.php similarity index 100% rename from web/stuff/tickets.php rename to web/stuff/admin/tickets.php diff --git a/web/stuff/tickets_reseller.php b/web/stuff/admin/tickets_reseller.php similarity index 100% rename from web/stuff/tickets_reseller.php rename to web/stuff/admin/tickets_reseller.php diff --git a/web/stuff/traffic.php b/web/stuff/admin/traffic.php similarity index 100% rename from web/stuff/traffic.php rename to web/stuff/admin/traffic.php diff --git a/web/stuff/user.php b/web/stuff/admin/user.php similarity index 100% rename from web/stuff/user.php rename to web/stuff/admin/user.php diff --git a/web/stuff/user_groups.php b/web/stuff/admin/user_groups.php similarity index 100% rename from web/stuff/user_groups.php rename to web/stuff/admin/user_groups.php diff --git a/web/stuff/versioncheck.php b/web/stuff/admin/versioncheck.php similarity index 98% rename from web/stuff/versioncheck.php rename to web/stuff/admin/versioncheck.php index f53ce13c..e542ddf3 100644 --- a/web/stuff/versioncheck.php +++ b/web/stuff/admin/versioncheck.php @@ -200,7 +200,7 @@ if ($ui->st('d', 'get') == 'ud' and $reseller_id == 0 and $pa['updateEW'] and ($ if (!isset($alreadyRepaired)) { $response->add('Adding tables if needed.'); - include(EASYWIDIR . '/stuff/tables_add.php'); + include(EASYWIDIR . '/stuff/methods/tables_add.php'); } if ($ewVersions['cVersion'] < $ewVersions['version'] and is_file(EASYWIDIR . '/install/update.php')) { @@ -211,7 +211,7 @@ if ($ui->st('d', 'get') == 'ud' and $reseller_id == 0 and $pa['updateEW'] and ($ if (!isset($alreadyRepaired)) { $response->add('Repairing tables if needed.'); - include(EASYWIDIR . '/stuff/tables_repair.php'); + include(EASYWIDIR . '/stuff/methods/tables_repair.php'); } } diff --git a/web/stuff/voice.php b/web/stuff/admin/voice.php similarity index 99% rename from web/stuff/voice.php rename to web/stuff/admin/voice.php index 202aa31c..bba3f352 100644 --- a/web/stuff/voice.php +++ b/web/stuff/admin/voice.php @@ -41,8 +41,8 @@ if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['voiceserver } include(EASYWIDIR . '/stuff/keyphrasefile.php'); -include(EASYWIDIR . '/stuff/class_ts3.php'); -include(EASYWIDIR . '/stuff/functions_ts3.php'); +include(EASYWIDIR . '/stuff/methods/class_ts3.php'); +include(EASYWIDIR . '/stuff/methods/functions_ts3.php'); $sprache = getlanguagefile('voice',$user_language,$reseller_id); $loguserid = $admin_id; diff --git a/web/stuff/voice_master.php b/web/stuff/admin/voice_master.php similarity index 99% rename from web/stuff/voice_master.php rename to web/stuff/admin/voice_master.php index a458c06a..3c603d3d 100644 --- a/web/stuff/voice_master.php +++ b/web/stuff/admin/voice_master.php @@ -39,9 +39,9 @@ */ include(EASYWIDIR . '/stuff/keyphrasefile.php'); -include(EASYWIDIR . '/stuff/class_ts3.php'); -include(EASYWIDIR . '/stuff/functions_ts3.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/class_ts3.php'); +include(EASYWIDIR . '/stuff/methods/functions_ts3.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); include(EASYWIDIR . '/third_party/password_compat/password.php'); if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['voicemasterserver'])) { diff --git a/web/stuff/voice_tsdns.php b/web/stuff/admin/voice_tsdns.php similarity index 99% rename from web/stuff/voice_tsdns.php rename to web/stuff/admin/voice_tsdns.php index 0c3143d1..621aee97 100644 --- a/web/stuff/voice_tsdns.php +++ b/web/stuff/admin/voice_tsdns.php @@ -43,8 +43,8 @@ if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['voiceserver die; } include(EASYWIDIR . '/stuff/keyphrasefile.php'); -include(EASYWIDIR . '/stuff/functions_ts3.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/functions_ts3.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); include(EASYWIDIR . '/third_party/password_compat/password.php'); $sprache = getlanguagefile('voice', $user_language, $reseller_id); diff --git a/web/stuff/voice_tsdnsrecords.php b/web/stuff/admin/voice_tsdnsrecords.php similarity index 99% rename from web/stuff/voice_tsdnsrecords.php rename to web/stuff/admin/voice_tsdnsrecords.php index f8afb14b..ff67fb92 100644 --- a/web/stuff/voice_tsdnsrecords.php +++ b/web/stuff/admin/voice_tsdnsrecords.php @@ -42,7 +42,7 @@ if ((!isset($admin_id) or $main != 1) or (isset($admin_id) and !$pa['voiceserver die; } -include(EASYWIDIR . '/stuff/functions_ts3.php'); +include(EASYWIDIR . '/stuff/methods/functions_ts3.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); $sprache = getlanguagefile('voice',$user_language,$reseller_id); diff --git a/web/stuff/voice_usage.php b/web/stuff/admin/voice_usage.php similarity index 100% rename from web/stuff/voice_usage.php rename to web/stuff/admin/voice_usage.php diff --git a/web/stuff/api_gserver.php b/web/stuff/api/api_gserver.php similarity index 100% rename from web/stuff/api_gserver.php rename to web/stuff/api/api_gserver.php diff --git a/web/stuff/api_mysql.php b/web/stuff/api/api_mysql.php similarity index 100% rename from web/stuff/api_mysql.php rename to web/stuff/api/api_mysql.php diff --git a/web/stuff/api_users.php b/web/stuff/api/api_users.php similarity index 100% rename from web/stuff/api_users.php rename to web/stuff/api/api_users.php diff --git a/web/stuff/api_voice.php b/web/stuff/api/api_voice.php similarity index 100% rename from web/stuff/api_voice.php rename to web/stuff/api/api_voice.php diff --git a/web/stuff/init_page.php b/web/stuff/cms/init_page.php similarity index 95% rename from web/stuff/init_page.php rename to web/stuff/cms/init_page.php index 0fefa6dc..6bd6fd91 100644 --- a/web/stuff/init_page.php +++ b/web/stuff/cms/init_page.php @@ -54,6 +54,7 @@ if (isset($page_active) and $page_active == 'Y') { $easywiModules = array('gs' => true, 'ip' => true, 'ea' => true, 'my' => true, 'ro' => true, 'ti' => true, 'le' => true, 'vo' => true); $customModules = array('gs' => array(), 'mo' => array(), 'my' => array(), 'ro' => array(), 'ti' => array(), 'us' => array(), 'vo' => array(), 'pa' => array()); + $customFiles = array(); $what_to_be_included_array = array('news' => 'page_news.php','contact' => 'page_contact.php', 'page' => 'page_page.php','home' => 'page_page.php','about' => 'page_page.php','gallery' => 'page_page.php','sitemap' => 'page_page.php','search' => 'page_page.php', @@ -67,7 +68,7 @@ if (isset($page_active) and $page_active == 'Y') { $query->execute(); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - if ($row['active'] == 'Y' and $row['type'] == 'P' and is_file(EASYWIDIR . '/stuff/' . $row['file'])) { + if ($row['active'] == 'Y' and $row['type'] == 'P' and is_file(EASYWIDIR . '/stuff/custom_modules/' . $row['file'])) { $query2->execute(array($row['id'], $user_language)); $name = $query2->fetchColumn(); @@ -80,7 +81,7 @@ if (isset($page_active) and $page_active == 'Y') { } $customModules[$row['sub']][$row['get']] = $name; - $what_to_be_included_array[$row['get']] = $row['file']; + $customFiles[$row['get']] = $row['file']; } else if ($row['type'] == 'C' and $row['active'] == 'N') { $easywiModules[$row['get']] = false; @@ -205,7 +206,7 @@ if (isset($page_active) and $page_active == 'Y') { $query->execute(array($user_language)); $page_data->SetData('about', $query->fetchColumn()); - $query = $sql->prepare("SELECT p.`id`,p.`subpage`,t.`title`,t.`text` FROM `page_pages` p LEFT JOIN `page_pages_text` t ON p.`id`=t.`pageid` AND t.`language`=? WHERE p.`released`='1' AND p.`type`='news' AND p.`resellerid`=0 ORDER BY `id` DESC LIMIT $maxnews_sidebar"); + $query = $sql->prepare("SELECT p.`id`,p.`subpage`,t.`title`,t.`text` FROM `page_pages` p LEFT JOIN `page_pages_text` t ON p.`id`=t.`pageid` AND t.`language`=? WHERE p.`released`='1' AND p.`type`='news' AND p.`resellerid`=0 ORDER BY `id` DESC LIMIT " . $maxnews_sidebar); $query->execute(array($user_language)); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { $page_data->SetNewsPost($row['id'], $row['title'], $row['text'], $newssidebar_textlength); @@ -250,6 +251,8 @@ if (isset($page_active) and $page_active == 'Y') { $s = 'page'; } else if (isset($what_to_be_included_array[$page_category])) { $s = $page_category; + } else if (isset($customFiles[$page_category])) { + $s = $page_category; } } @@ -257,7 +260,9 @@ if (isset($page_active) and $page_active == 'Y') { $page_lookupid = $admin_id; } else if (isset($user_id)) { + $page_lookupid = $user_id; + } else { $serviceProviders = array(); @@ -265,7 +270,17 @@ if (isset($page_active) and $page_active == 'Y') { $query = $sql->prepare("SELECT `filename` FROM `userdata_social_providers` WHERE `resellerID`=0 AND `active`='Y'"); $query->execute(); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - $serviceProviders[$row['filename']] = strtolower($row['filename']); + + $cssIcon = strtolower($row['filename']); + + if ($cssIcon == 'google') { + $cssIcon = 'google-plus'; + } else if ($cssIcon == 'live') { + $cssIcon = 'windows'; + } + + $serviceProviders[$row['filename']] = strtolower($cssIcon); + } if (count($serviceProviders) > 0) { diff --git a/web/stuff/page_contact.php b/web/stuff/cms/page_contact.php similarity index 100% rename from web/stuff/page_contact.php rename to web/stuff/cms/page_contact.php diff --git a/web/stuff/page_download.php b/web/stuff/cms/page_download.php similarity index 96% rename from web/stuff/page_download.php rename to web/stuff/cms/page_download.php index ee94c0df..bb57d23b 100644 --- a/web/stuff/page_download.php +++ b/web/stuff/cms/page_download.php @@ -123,7 +123,7 @@ if (isset($downloadID)) { $query->execute(array($user_language)); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { if (($row['show'] == 'E' or ($row['show'] == 'A' and isset($admin_id)) or ($row['show'] == 'R' and (isset($user_id) or isset($admin_id)))) and file_exists(EASYWIDIR . "/downloads/${row['fileID']}.${row['fileExtension']}")) { - $table[] = array('id' => $row['fileID'], 'description' => $row['description'], 'link' => (isset($seo) and $seo== 'Y') ? $page_data->pages['downloads']['link'].'get/'.$row['fileID'].'/' : $page_data->pages['downloads']['link'].'&action=get&id='.$row['fileID'], 'text' => $row['text']); + $table[] = array('id' => $row['fileID'], 'description' => $row['description'], 'link' => (isset($seo) and $seo == 'Y') ? $page_data->pages['downloads']['link'].'get/'.$row['fileID'].'/' : $page_data->pages['downloads']['link'].'&action=get&id='.$row['fileID'], 'text' => $row['text']); } } diff --git a/web/stuff/page_news.php b/web/stuff/cms/page_news.php similarity index 98% rename from web/stuff/page_news.php rename to web/stuff/cms/page_news.php index 410b3578..ba35c92a 100644 --- a/web/stuff/page_news.php +++ b/web/stuff/cms/page_news.php @@ -81,11 +81,11 @@ if ((isset($page_name) and $page_name != szrp($page_sprache->older) and isset($p $page_data->AddData('keywords', $row2['name']); - if ($seo== 'Y' and $row2['type'] == 'tag') { + if ($seo == 'Y' and $row2['type'] == 'tag') { $tagLink = $page_url. '/' . $user_language . '/' . szrp($page_sprache->tag) . '/' . szrp($row2['name']) . '/'; } else if ($row2['type'] == 'tag') { $tagLink = $page_url.'/index.php?site=tag&tag='.szrp($row2['name']); - } else if ($seo== 'Y' and $row2['type'] == 'category') { + } else if ($seo == 'Y' and $row2['type'] == 'category') { $categoryLink = $page_url. '/' . $user_language . '/' . szrp($page_sprache->categories) . '/' . szrp($row2['name']) . '/'; } else if ($row2['type'] == 'category') { $categoryLink = $page_url.'/index.php?site=categories&tag='.szrp($row2['name']); @@ -330,7 +330,7 @@ if ((isset($page_name) and $page_name != szrp($page_sprache->older) and isset($p $tagLink = $page_url. '/' . $user_language . '/' . szrp($page_sprache->tag) . '/' . szrp($row2['name']) . '/'; } else if ($row2['type'] == 'tag') { $tagLink = $page_url.'/index.php?site=tag&tag='.szrp($row2['name']); - } else if ($seo== 'Y' and $row2['type'] == 'category') { + } else if ($seo == 'Y' and $row2['type'] == 'category') { $categoryLink = $page_url. '/' . $user_language . '/' . szrp($page_sprache->categories) . '/' . szrp($row2['name']) . '/'; } else if ($row2['type'] == 'category') { $categoryLink = $page_url.'/index.php?site=categories&tag=' . szrp($row2['name']); diff --git a/web/stuff/page_page.php b/web/stuff/cms/page_page.php similarity index 100% rename from web/stuff/page_page.php rename to web/stuff/cms/page_page.php diff --git a/web/stuff/page_register.php b/web/stuff/cms/page_register.php similarity index 100% rename from web/stuff/page_register.php rename to web/stuff/cms/page_register.php diff --git a/web/stuff/page_tag.php b/web/stuff/cms/page_tag.php similarity index 96% rename from web/stuff/page_tag.php rename to web/stuff/cms/page_tag.php index b52846f8..ec07e0c7 100644 --- a/web/stuff/page_tag.php +++ b/web/stuff/cms/page_tag.php @@ -1,4 +1,5 @@ . */ -if ($seo== 'Y') { +if ($seo == 'Y') { $search_tag=strtolower($page_name); if (!isset($page_count)) { $page_count = 1; @@ -74,19 +75,19 @@ if (isset($search_tag) and $search_tag != '' and $search_tag != null) { } else { $limit=($maxnews*$page_count)-$maxnews.','.($maxnews*$page_count); } - if ($max_old>$page_count and $seo== 'Y') { + if ($max_old>$page_count and $seo == 'Y') { $older = $page_url. '/' . $user_language. '/' . $page_sprache->$s. '/' . $search_tag . '/' . ($page_count+1) . '/'; } else if ($max_old>$page_count and $seo== 'N') { $older = $page_url.'/index.php?site='.$s.'&tag='.strtolower(szrp($row2['name'])).'&older='.($page_count+1); } } else if ($page_row_count>$maxnews and !isset($page_count)) { - if ($seo== 'Y') { + if ($seo == 'Y') { $older = $page_url. '/' . $user_language. '/' . $page_sprache->$s. '/' . $search_tag.'/2/'; } else { $older = $page_url.'/index.php?site='.$s.'&tag='.strtolower(szrp($row2['name'])).'&older=2'; } } - if (isset($page_count) and $page_count>1 and $seo== 'Y') { + if (isset($page_count) and $page_count>1 and $seo == 'Y') { $newer = $page_url. '/' . $user_language. '/' . $page_sprache->$s. '/' . $search_tag . '/' . ($page_count-1) . '/'; } else if (isset($page_count) and $page_count>1 and $seo== 'N') { $newer = $page_url.'/index.php?site='.$s.'&tag='.strtolower(szrp($row2['name'])).'&older='.($page_count-1); @@ -94,7 +95,7 @@ if (isset($search_tag) and $search_tag != '' and $search_tag != null) { $query = $sql->prepare("SELECT p.`id`,p.`date`,p.`type`,t.`title`,t.`text` FROM `page_terms_used` u LEFT JOIN `page_pages_text` t ON u.`language_id`=t.`id` AND t.`language`=? LEFT JOIN `page_pages` p ON u.`page_id`=p.`id` AND (p.`type`='page' OR p.`type`='news') WHERE t.`title` IS NOT NULL AND t.`text` IS NOT NULL AND t.`title`!='' AND t.`text`!='' AND u.`term_id`=? AND u.`resellerid`='0' ORDER BY p.`id` DESC LIMIT $limit"); $query->execute(array($user_language, $row['id'])); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - if ($seo== 'Y') { + if ($seo == 'Y') { $type = ''; if ($row['type'] == 'news') $type=szrp($gsprache->news) . '/'; $row_link = $page_url. '/' . $user_language. '/' . $type.szrp($row['title']) . '/'; diff --git a/web/stuff/jobs_gserver.php b/web/stuff/jobs/jobs_gserver.php similarity index 100% rename from web/stuff/jobs_gserver.php rename to web/stuff/jobs/jobs_gserver.php diff --git a/web/stuff/jobs_mysql.php b/web/stuff/jobs/jobs_mysql.php similarity index 100% rename from web/stuff/jobs_mysql.php rename to web/stuff/jobs/jobs_mysql.php diff --git a/web/stuff/jobs_roots.php b/web/stuff/jobs/jobs_roots.php similarity index 100% rename from web/stuff/jobs_roots.php rename to web/stuff/jobs/jobs_roots.php diff --git a/web/stuff/jobs_tsdns.php b/web/stuff/jobs/jobs_tsdns.php similarity index 100% rename from web/stuff/jobs_tsdns.php rename to web/stuff/jobs/jobs_tsdns.php diff --git a/web/stuff/jobs_user.php b/web/stuff/jobs/jobs_user.php similarity index 100% rename from web/stuff/jobs_user.php rename to web/stuff/jobs/jobs_user.php diff --git a/web/stuff/jobs_user_rm.php b/web/stuff/jobs/jobs_user_rm.php similarity index 100% rename from web/stuff/jobs_user_rm.php rename to web/stuff/jobs/jobs_user_rm.php diff --git a/web/stuff/jobs_voice.php b/web/stuff/jobs/jobs_voice.php similarity index 100% rename from web/stuff/jobs_voice.php rename to web/stuff/jobs/jobs_voice.php diff --git a/web/stuff/addonslist.php b/web/stuff/methods/addonslist.php similarity index 100% rename from web/stuff/addonslist.php rename to web/stuff/methods/addonslist.php diff --git a/web/stuff/class_ftp.php b/web/stuff/methods/class_ftp.php similarity index 100% rename from web/stuff/class_ftp.php rename to web/stuff/methods/class_ftp.php diff --git a/web/stuff/class_masterserver.php b/web/stuff/methods/class_masterserver.php similarity index 100% rename from web/stuff/class_masterserver.php rename to web/stuff/methods/class_masterserver.php diff --git a/web/stuff/class_page_settings.php b/web/stuff/methods/class_page_settings.php similarity index 100% rename from web/stuff/class_page_settings.php rename to web/stuff/methods/class_page_settings.php diff --git a/web/stuff/class_rest.php b/web/stuff/methods/class_rest.php similarity index 100% rename from web/stuff/class_rest.php rename to web/stuff/methods/class_rest.php diff --git a/web/stuff/class_rootserver.php b/web/stuff/methods/class_rootserver.php similarity index 100% rename from web/stuff/class_rootserver.php rename to web/stuff/methods/class_rootserver.php diff --git a/web/stuff/class_ts3.php b/web/stuff/methods/class_ts3.php similarity index 100% rename from web/stuff/class_ts3.php rename to web/stuff/methods/class_ts3.php diff --git a/web/stuff/class_validator.php b/web/stuff/methods/class_validator.php similarity index 100% rename from web/stuff/class_validator.php rename to web/stuff/methods/class_validator.php diff --git a/web/stuff/feeds_function.php b/web/stuff/methods/feeds_function.php similarity index 100% rename from web/stuff/feeds_function.php rename to web/stuff/methods/feeds_function.php diff --git a/web/stuff/functions.php b/web/stuff/methods/functions.php similarity index 99% rename from web/stuff/functions.php rename to web/stuff/methods/functions.php index 40c31578..425b5bad 100644 --- a/web/stuff/functions.php +++ b/web/stuff/methods/functions.php @@ -802,9 +802,12 @@ if (!function_exists('passwordgenerate')) { } } - function IncludeTemplate($use, $file) { + function IncludeTemplate($use, $file, $location = 'admin') { - if (is_file(EASYWIDIR . '/template/' . $use. '/' . $file) and preg_match('/^(.*)\.[\w]{1,}$/', $file)) { + if (is_file(EASYWIDIR . '/template/' . $use. '/' . $location. '/' . $file) and preg_match('/^(.*)\.[\w]{1,}$/', $file)) { + return EASYWIDIR . '/template/' . $use. '/' . $location. '/' . $file; + + } else if (is_file(EASYWIDIR . '/template/' . $use. '/' . $file) and preg_match('/^(.*)\.[\w]{1,}$/', $file)) { return EASYWIDIR . '/template/' . $use. '/' . $file; } else if (is_file(EASYWIDIR . '/template/default/'.$file) and preg_match('/^(.*)\.[\w]{1,}$/', $file)) { diff --git a/web/stuff/functions_gs.php b/web/stuff/methods/functions_gs.php similarity index 99% rename from web/stuff/functions_gs.php rename to web/stuff/methods/functions_gs.php index 8988e89e..d4bde399 100644 --- a/web/stuff/functions_gs.php +++ b/web/stuff/methods/functions_gs.php @@ -48,7 +48,7 @@ if (!function_exists('gsrestart')) { if (!class_exists('EasyWiFTP')) { - include(EASYWIDIR . '/stuff/class_ftp.php'); + include(EASYWIDIR . '/stuff/methods/class_ftp.php'); } global $sql; @@ -641,7 +641,7 @@ if (!function_exists('gsrestart')) { if (isset($ssh2cmd) and $active == 'Y') { if (!function_exists('ssh2_execute')) { - include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); + include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); } if (isset($ssh2cmd)) { diff --git a/web/stuff/functions_ssh_exec.php b/web/stuff/methods/functions_ssh_exec.php similarity index 100% rename from web/stuff/functions_ssh_exec.php rename to web/stuff/methods/functions_ssh_exec.php diff --git a/web/stuff/functions_ts3.php b/web/stuff/methods/functions_ts3.php similarity index 100% rename from web/stuff/functions_ts3.php rename to web/stuff/methods/functions_ts3.php diff --git a/web/stuff/gameslist.php b/web/stuff/methods/gameslist.php similarity index 100% rename from web/stuff/gameslist.php rename to web/stuff/methods/gameslist.php diff --git a/web/stuff/mysql_backup_class.php b/web/stuff/methods/mysql_backup_class.php similarity index 100% rename from web/stuff/mysql_backup_class.php rename to web/stuff/methods/mysql_backup_class.php diff --git a/web/stuff/mysql_functions.php b/web/stuff/methods/mysql_functions.php similarity index 100% rename from web/stuff/mysql_functions.php rename to web/stuff/methods/mysql_functions.php diff --git a/web/stuff/queries_updates.php b/web/stuff/methods/queries_updates.php similarity index 100% rename from web/stuff/queries_updates.php rename to web/stuff/methods/queries_updates.php diff --git a/web/stuff/tables_add.php b/web/stuff/methods/tables_add.php similarity index 100% rename from web/stuff/tables_add.php rename to web/stuff/methods/tables_add.php diff --git a/web/stuff/tables_entries_repair.php b/web/stuff/methods/tables_entries_repair.php similarity index 100% rename from web/stuff/tables_entries_repair.php rename to web/stuff/methods/tables_entries_repair.php diff --git a/web/stuff/tables_repair.php b/web/stuff/methods/tables_repair.php similarity index 100% rename from web/stuff/tables_repair.php rename to web/stuff/methods/tables_repair.php diff --git a/web/stuff/vorlage.php b/web/stuff/methods/vorlage.php similarity index 100% rename from web/stuff/vorlage.php rename to web/stuff/methods/vorlage.php diff --git a/web/stuff/settings.php b/web/stuff/settings.php index 0d2d4ebe..93637655 100644 --- a/web/stuff/settings.php +++ b/web/stuff/settings.php @@ -259,7 +259,7 @@ if ($loguserip!='localhost') { $elements = (!empty($ewInstallPath) and strpos($ui->escaped('REQUEST_URI', 'server'), $ewInstallPath) === false) ? preg_split('/\//', $ui->escaped('REQUEST_URI', 'server'), -1, PREG_SPLIT_NO_EMPTY) : preg_split('/\//',substr($ui->escaped('REQUEST_URI', 'server'), strlen($ewInstallPath)), -1, PREG_SPLIT_NO_EMPTY); - if (isset($seo) and $seo== 'Y' and isset($elements[0])) { + if (isset($seo) and $seo == 'Y' and isset($elements[0])) { $page_detect_language = $elements[0]; diff --git a/web/stuff/init_user.php b/web/stuff/user/init_user.php similarity index 99% rename from web/stuff/init_user.php rename to web/stuff/user/init_user.php index af29ac91..e459d62c 100644 --- a/web/stuff/init_user.php +++ b/web/stuff/user/init_user.php @@ -140,6 +140,7 @@ $what_to_be_included_array = array('lo' => 'userpanel_logdata.php', 'ti' => 'use $easywiModules = array('gs' => true, 'ip' => true, 'my' => true, 'ro' => true, 'ti' => true, 'le' => true, 'vo' => true); $customModules = array('gs' => array(), 'mo' => array(), 'my' => array(), 'ro' => array(), 'ti' => array(), 'us' => array(), 'vo' => array()); +$customFiles = array(); $query = $sql->prepare("SELECT * FROM `modules` WHERE `type` IN ('U','C')"); $query2 = $sql->prepare("SELECT `text` FROM `translations` WHERE `type`='mo' AND `transID`=? AND `lang`=? LIMIT 1"); @@ -160,7 +161,7 @@ foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { } $customModules[$row['sub']][$row['get']] = $name; - $what_to_be_included_array[$row['get']] = $row['file']; + $customFiles[$row['get']] = $row['file']; } else if ($row['type'] == 'C' and $row['active'] == 'N') { $easywiModules[$row['get']] = false; diff --git a/web/stuff/userpanel_ao.php b/web/stuff/user/userpanel_ao.php similarity index 99% rename from web/stuff/userpanel_ao.php rename to web/stuff/user/userpanel_ao.php index 9f90b021..806b5d5c 100644 --- a/web/stuff/userpanel_ao.php +++ b/web/stuff/user/userpanel_ao.php @@ -36,7 +36,7 @@ * Programm erhalten haben. Wenn nicht, siehe . */ -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); if ((!isset($user_id) or $main != 1) or (isset($user_id) and !$pa['useraddons'])) { diff --git a/web/stuff/userpanel_backup.php b/web/stuff/user/userpanel_backup.php similarity index 99% rename from web/stuff/userpanel_backup.php rename to web/stuff/user/userpanel_backup.php index 45d62915..edb09d54 100644 --- a/web/stuff/userpanel_backup.php +++ b/web/stuff/user/userpanel_backup.php @@ -37,7 +37,7 @@ */ include(EASYWIDIR . '/stuff/keyphrasefile.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); if ((!isset($user_id) or $main != 1) or (isset($user_id) and !$pa['ftpbackup']) or !$ui->id('id', 10, 'get')) { header('Location: userpanel.php'); diff --git a/web/stuff/userpanel_dedicated.php b/web/stuff/user/userpanel_dedicated.php similarity index 100% rename from web/stuff/userpanel_dedicated.php rename to web/stuff/user/userpanel_dedicated.php diff --git a/web/stuff/userpanel_fdl.php b/web/stuff/user/userpanel_fdl.php similarity index 99% rename from web/stuff/userpanel_fdl.php rename to web/stuff/user/userpanel_fdl.php index 0d44783f..9225e2d7 100644 --- a/web/stuff/userpanel_fdl.php +++ b/web/stuff/user/userpanel_fdl.php @@ -42,7 +42,7 @@ if ((!isset($user_id) or $main != 1) or (isset($user_id) and !$pa['fastdl'])) { } require_once(EASYWIDIR . '/stuff/keyphrasefile.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); $sprache = getlanguagefile('fastdl', $user_language, $reseller_id); $gameSprache = getlanguagefile('gserver', $user_language, $reseller_id); diff --git a/web/stuff/userpanel_gserver.php b/web/stuff/user/userpanel_gserver.php similarity index 98% rename from web/stuff/userpanel_gserver.php rename to web/stuff/user/userpanel_gserver.php index d3b6ef1d..081b79ce 100644 --- a/web/stuff/userpanel_gserver.php +++ b/web/stuff/user/userpanel_gserver.php @@ -40,9 +40,9 @@ if ((!isset($main) or $main != 1) or (!isset($user_id) or (isset($user_id) and ! die('No acces'); } -include(EASYWIDIR . '/stuff/class_ftp.php'); -include(EASYWIDIR . '/stuff/functions_gs.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/class_ftp.php'); +include(EASYWIDIR . '/stuff/methods/functions_gs.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); if (isset($resellerLockupID)) { @@ -489,6 +489,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) { } else { $anticheat = 1; } + if ($row['ftpAccess'] == 'N') { $ftpAccess = 'N'; } @@ -504,43 +505,65 @@ if ($ui->w('action', 4, 'post') and !token(true)) { $updated = false; } - $ftppass = $ui->password('ftppass',100, 'post'); $cmds = array(); + $ftppass = $ui->password('ftppass', 100, 'post'); + if (isset($oldID) and $oldID != $switchID) { - $tmp = gsrestart($id,'so',$aeskey,$reseller_id); + + $tmp = gsrestart($id, 'so', $aeskey, $reseller_id); + if (is_array($tmp)) { foreach($tmp as $t) { $cmds[] = $t; } } + } if ($ftpAccess == 'Y') { + $query = $sql->prepare("UPDATE `gsswitch` SET `serverid`=?,`ftppassword`=AES_ENCRYPT(?,?) WHERE `id`=? AND `resellerid`=? LIMIT 1"); - $query->execute(array($switchID,$ftppass,$aeskey,$id,$reseller_id)); + $query->execute(array($switchID, $ftppass, $aeskey, $id, $reseller_id)); + if (isset($oldID) and $oldID != $switchID or $ftppass != $oldPass) { + if ($oldID != $switchID) { + if (isset($oldProtected) and $oldProtected == 'Y') { + $query = $sql->prepare("UPDATE `gsswitch` SET `protected`='N' WHERE `id`=? AND `resellerid`=? LIMIT 1"); - $query->execute(array($id,$reseller_id)); - $tmp=gsrestart($id,'re',$aeskey,$reseller_id); - if (is_array($tmp)) foreach($tmp as $t) $cmds[] = $t; - } else { - $tmp=gsrestart($id,'re',$aeskey,$reseller_id); - if (is_array($tmp)) foreach($tmp as $t) $cmds[] = $t; + $query->execute(array($id, $reseller_id)); + } + + $tmp = gsrestart($id, 're', $aeskey, $reseller_id); + + if (is_array($tmp)) { + foreach($tmp as $t) { + $cmds[] = $t; + } + } + } + if ($ftppass != $oldPass) { - if ($newlayout == 'Y') $servercname = $servercname . '-' . $id; + + if ($newlayout == 'Y') { + $servercname = $servercname . '-' . $id; + } + $cmds[] = './control.sh mod '.$servercname . ' ' . $ftppass . ' ' . $poldPass; + } + } if ($query->rowCount() > 0) { $updated = true; } + if (isset($rootID) and count($cmds) > 0) { - ssh2_execute('gs',$rootID,$cmds); + ssh2_execute('gs', $rootID, $cmds); } } diff --git a/web/stuff/userpanel_home.php b/web/stuff/user/userpanel_home.php similarity index 100% rename from web/stuff/userpanel_home.php rename to web/stuff/user/userpanel_home.php diff --git a/web/stuff/userpanel_logdata.php b/web/stuff/user/userpanel_logdata.php similarity index 100% rename from web/stuff/userpanel_logdata.php rename to web/stuff/user/userpanel_logdata.php diff --git a/web/stuff/userpanel_migration.php b/web/stuff/user/userpanel_migration.php similarity index 98% rename from web/stuff/userpanel_migration.php rename to web/stuff/user/userpanel_migration.php index 07f41f0b..bcf89ccb 100644 --- a/web/stuff/userpanel_migration.php +++ b/web/stuff/user/userpanel_migration.php @@ -43,8 +43,8 @@ if ((!isset($main) or $main != 1) or (!isset($user_id) or (isset($user_id) and ! } include(EASYWIDIR . '/stuff/keyphrasefile.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); -include(EASYWIDIR . '/stuff/class_ftp.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/class_ftp.php'); $sprache = getlanguagefile('gserver',$user_language,$reseller_id); $loguserid = $user_id; diff --git a/web/stuff/userpanel_mysql.php b/web/stuff/user/userpanel_mysql.php similarity index 99% rename from web/stuff/userpanel_mysql.php rename to web/stuff/user/userpanel_mysql.php index 2ebcc225..4a2ae5b5 100644 --- a/web/stuff/userpanel_mysql.php +++ b/web/stuff/user/userpanel_mysql.php @@ -75,7 +75,7 @@ if ($ui->w('action', 4, 'post') and !token(true)) { $template_file = (isset($dbname)) ? 'userpanel_mysql_db_md.tpl' : 'userpanel_404.tpl'; } else if ($ui->smallletters('action',2, 'post') == 'md'){ if ($ui->password('password',40, 'post')) { - include(EASYWIDIR . '/stuff/mysql_functions.php'); + include(EASYWIDIR . '/stuff/methods/mysql_functions.php'); $password = $ui->password('password',40, 'post'); $ips = $ui->ips('ips', 'post'); $query = $sql->prepare("SELECT e.`dbname`,AES_DECRYPT(e.`password`,?) AS `decryptedpassword`,e.`ips`,e.`max_queries_per_hour`,e.`max_connections_per_hour`,e.`max_updates_per_hour`,e.`max_userconnections_per_hour`,s.`ip`,AES_DECRYPT(s.`password`,?) AS `decryptedpassword2`,s.`port`,s.`user`,u.`cname` FROM `mysql_external_dbs` e LEFT JOIN `mysql_external_servers` s ON e.`sid`=s.`id` LEFT JOIN `userdata` u ON e.`uid`=u.`id` WHERE e.`id`=? AND e.`active`='Y' AND s.`active`='Y' AND e.`uid`=? AND e.`resellerid`=? LIMIT 1"); diff --git a/web/stuff/userpanel_protectionmode.php b/web/stuff/user/userpanel_protectionmode.php similarity index 97% rename from web/stuff/userpanel_protectionmode.php rename to web/stuff/user/userpanel_protectionmode.php index ed6978bb..c9839f3c 100644 --- a/web/stuff/userpanel_protectionmode.php +++ b/web/stuff/user/userpanel_protectionmode.php @@ -40,9 +40,9 @@ if ((!isset($user_id) or $main != 1) or (isset($user_id) and !$pa['restart']) or die; } -include(EASYWIDIR . '/stuff/class_ftp.php'); -include(EASYWIDIR . '/stuff/functions_gs.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/class_ftp.php'); +include(EASYWIDIR . '/stuff/methods/functions_gs.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); $sprache = getlanguagefile('gserver', $user_language, $reseller_id); diff --git a/web/stuff/userpanel_restartcalendar.php b/web/stuff/user/userpanel_restartcalendar.php similarity index 100% rename from web/stuff/userpanel_restartcalendar.php rename to web/stuff/user/userpanel_restartcalendar.php diff --git a/web/stuff/userpanel_substitutes.php b/web/stuff/user/userpanel_substitutes.php similarity index 100% rename from web/stuff/userpanel_substitutes.php rename to web/stuff/user/userpanel_substitutes.php diff --git a/web/stuff/userpanel_substitutes_own.php b/web/stuff/user/userpanel_substitutes_own.php similarity index 100% rename from web/stuff/userpanel_substitutes_own.php rename to web/stuff/user/userpanel_substitutes_own.php diff --git a/web/stuff/userpanel_tickets.php b/web/stuff/user/userpanel_tickets.php similarity index 100% rename from web/stuff/userpanel_tickets.php rename to web/stuff/user/userpanel_tickets.php diff --git a/web/stuff/userpanel_virtual.php b/web/stuff/user/userpanel_virtual.php similarity index 100% rename from web/stuff/userpanel_virtual.php rename to web/stuff/user/userpanel_virtual.php diff --git a/web/stuff/userpanel_voice.php b/web/stuff/user/userpanel_voice.php similarity index 99% rename from web/stuff/userpanel_voice.php rename to web/stuff/user/userpanel_voice.php index a620f33c..5077bc6b 100644 --- a/web/stuff/userpanel_voice.php +++ b/web/stuff/user/userpanel_voice.php @@ -42,9 +42,9 @@ if ((!isset($user_id) or $main != 1) or (isset($user_id) and !$pa['voiceserver'] } include(EASYWIDIR . '/stuff/keyphrasefile.php'); -include(EASYWIDIR . '/stuff/class_ts3.php'); -include(EASYWIDIR . '/stuff/functions_ssh_exec.php'); -include(EASYWIDIR . '/stuff/functions_ts3.php'); +include(EASYWIDIR . '/stuff/methods/class_ts3.php'); +include(EASYWIDIR . '/stuff/methods/functions_ssh_exec.php'); +include(EASYWIDIR . '/stuff/methods/functions_ts3.php'); $sprache = getlanguagefile('voice', $user_language, $reseller_id); $loguserid = $user_id; diff --git a/web/stuff/userpanel_voice_dns.php b/web/stuff/user/userpanel_voice_dns.php similarity index 99% rename from web/stuff/userpanel_voice_dns.php rename to web/stuff/user/userpanel_voice_dns.php index be2c065c..2ca4342a 100644 --- a/web/stuff/userpanel_voice_dns.php +++ b/web/stuff/user/userpanel_voice_dns.php @@ -37,7 +37,7 @@ * Programm erhalten haben. Wenn nicht, siehe . */ -include(EASYWIDIR . '/stuff/functions_ts3.php'); +include(EASYWIDIR . '/stuff/methods/functions_ts3.php'); $sprache = getlanguagefile('voice',$user_language,$reseller_id); $loguserid = $user_id; diff --git a/web/switch.php b/web/switch.php index b4f7692f..4382c1e0 100644 --- a/web/switch.php +++ b/web/switch.php @@ -37,9 +37,9 @@ */ define('EASYWIDIR', dirname(__FILE__)); -include(EASYWIDIR . '/stuff/functions.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); -include(EASYWIDIR . '/stuff/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); include(EASYWIDIR . '/stuff/settings.php'); if (!isset($admin_id) or !isset($reseller_id)) { diff --git a/web/template/default/admin_404.tpl b/web/template/default/admin/admin_404.tpl similarity index 100% rename from web/template/default/admin_404.tpl rename to web/template/default/admin/admin_404.tpl diff --git a/web/template/default/admin_addons_add.tpl b/web/template/default/admin/admin_addons_add.tpl similarity index 100% rename from web/template/default/admin_addons_add.tpl rename to web/template/default/admin/admin_addons_add.tpl diff --git a/web/template/default/admin_addons_dl.tpl b/web/template/default/admin/admin_addons_dl.tpl similarity index 100% rename from web/template/default/admin_addons_dl.tpl rename to web/template/default/admin/admin_addons_dl.tpl diff --git a/web/template/default/admin_addons_list.tpl b/web/template/default/admin/admin_addons_list.tpl similarity index 100% rename from web/template/default/admin_addons_list.tpl rename to web/template/default/admin/admin_addons_list.tpl diff --git a/web/template/default/admin_addons_md.tpl b/web/template/default/admin/admin_addons_md.tpl similarity index 100% rename from web/template/default/admin_addons_md.tpl rename to web/template/default/admin/admin_addons_md.tpl diff --git a/web/template/default/admin_api_external_auth_settings.tpl b/web/template/default/admin/admin_api_external_auth_settings.tpl similarity index 100% rename from web/template/default/admin_api_external_auth_settings.tpl rename to web/template/default/admin/admin_api_external_auth_settings.tpl diff --git a/web/template/default/admin_api_import_users_add.tpl b/web/template/default/admin/admin_api_import_users_add.tpl similarity index 100% rename from web/template/default/admin_api_import_users_add.tpl rename to web/template/default/admin/admin_api_import_users_add.tpl diff --git a/web/template/default/admin_api_import_users_dl.tpl b/web/template/default/admin/admin_api_import_users_dl.tpl similarity index 100% rename from web/template/default/admin_api_import_users_dl.tpl rename to web/template/default/admin/admin_api_import_users_dl.tpl diff --git a/web/template/default/admin_api_import_users_list.tpl b/web/template/default/admin/admin_api_import_users_list.tpl similarity index 100% rename from web/template/default/admin_api_import_users_list.tpl rename to web/template/default/admin/admin_api_import_users_list.tpl diff --git a/web/template/default/admin_api_import_users_md.tpl b/web/template/default/admin/admin_api_import_users_md.tpl similarity index 100% rename from web/template/default/admin_api_import_users_md.tpl rename to web/template/default/admin/admin_api_import_users_md.tpl diff --git a/web/template/default/admin_api_settings.tpl b/web/template/default/admin/admin_api_settings.tpl similarity index 100% rename from web/template/default/admin_api_settings.tpl rename to web/template/default/admin/admin_api_settings.tpl diff --git a/web/template/default/admin_db_operations.tpl b/web/template/default/admin/admin_db_operations.tpl similarity index 100% rename from web/template/default/admin_db_operations.tpl rename to web/template/default/admin/admin_db_operations.tpl diff --git a/web/template/default/admin_db_operations_ao.tpl b/web/template/default/admin/admin_db_operations_ao.tpl similarity index 100% rename from web/template/default/admin_db_operations_ao.tpl rename to web/template/default/admin/admin_db_operations_ao.tpl diff --git a/web/template/default/admin_db_operations_gs.tpl b/web/template/default/admin/admin_db_operations_gs.tpl similarity index 100% rename from web/template/default/admin_db_operations_gs.tpl rename to web/template/default/admin/admin_db_operations_gs.tpl diff --git a/web/template/default/admin_eac.tpl b/web/template/default/admin/admin_eac.tpl similarity index 100% rename from web/template/default/admin_eac.tpl rename to web/template/default/admin/admin_eac.tpl diff --git a/web/template/default/admin_feeds_add.tpl b/web/template/default/admin/admin_feeds_add.tpl similarity index 100% rename from web/template/default/admin_feeds_add.tpl rename to web/template/default/admin/admin_feeds_add.tpl diff --git a/web/template/default/admin_feeds_dl.tpl b/web/template/default/admin/admin_feeds_dl.tpl similarity index 100% rename from web/template/default/admin_feeds_dl.tpl rename to web/template/default/admin/admin_feeds_dl.tpl diff --git a/web/template/default/admin_feeds_entries_list.tpl b/web/template/default/admin/admin_feeds_entries_list.tpl similarity index 100% rename from web/template/default/admin_feeds_entries_list.tpl rename to web/template/default/admin/admin_feeds_entries_list.tpl diff --git a/web/template/default/admin_feeds_list.tpl b/web/template/default/admin/admin_feeds_list.tpl similarity index 100% rename from web/template/default/admin_feeds_list.tpl rename to web/template/default/admin/admin_feeds_list.tpl diff --git a/web/template/default/admin_feeds_md.tpl b/web/template/default/admin/admin_feeds_md.tpl similarity index 100% rename from web/template/default/admin_feeds_md.tpl rename to web/template/default/admin/admin_feeds_md.tpl diff --git a/web/template/default/admin_feeds_settings.tpl b/web/template/default/admin/admin_feeds_settings.tpl similarity index 100% rename from web/template/default/admin_feeds_settings.tpl rename to web/template/default/admin/admin_feeds_settings.tpl diff --git a/web/template/default/admin_footer.tpl b/web/template/default/admin/admin_footer.tpl similarity index 100% rename from web/template/default/admin_footer.tpl rename to web/template/default/admin/admin_footer.tpl diff --git a/web/template/default/admin_gserver_add.tpl b/web/template/default/admin/admin_gserver_add.tpl similarity index 100% rename from web/template/default/admin_gserver_add.tpl rename to web/template/default/admin/admin_gserver_add.tpl diff --git a/web/template/default/admin_gserver_add2.tpl b/web/template/default/admin/admin_gserver_add2.tpl similarity index 100% rename from web/template/default/admin_gserver_add2.tpl rename to web/template/default/admin/admin_gserver_add2.tpl diff --git a/web/template/default/admin_gserver_dl.tpl b/web/template/default/admin/admin_gserver_dl.tpl similarity index 100% rename from web/template/default/admin_gserver_dl.tpl rename to web/template/default/admin/admin_gserver_dl.tpl diff --git a/web/template/default/admin_gserver_list.tpl b/web/template/default/admin/admin_gserver_list.tpl similarity index 100% rename from web/template/default/admin_gserver_list.tpl rename to web/template/default/admin/admin_gserver_list.tpl diff --git a/web/template/default/admin_gserver_md.tpl b/web/template/default/admin/admin_gserver_md.tpl similarity index 100% rename from web/template/default/admin_gserver_md.tpl rename to web/template/default/admin/admin_gserver_md.tpl diff --git a/web/template/default/admin_gserver_ri.tpl b/web/template/default/admin/admin_gserver_ri.tpl similarity index 100% rename from web/template/default/admin_gserver_ri.tpl rename to web/template/default/admin/admin_gserver_ri.tpl diff --git a/web/template/default/admin_header.tpl b/web/template/default/admin/admin_header.tpl similarity index 100% rename from web/template/default/admin_header.tpl rename to web/template/default/admin/admin_header.tpl diff --git a/web/template/default/admin_home.tpl b/web/template/default/admin/admin_home.tpl similarity index 100% rename from web/template/default/admin_home.tpl rename to web/template/default/admin/admin_home.tpl diff --git a/web/template/default/admin_images_add.tpl b/web/template/default/admin/admin_images_add.tpl similarity index 100% rename from web/template/default/admin_images_add.tpl rename to web/template/default/admin/admin_images_add.tpl diff --git a/web/template/default/admin_images_dl.tpl b/web/template/default/admin/admin_images_dl.tpl similarity index 100% rename from web/template/default/admin_images_dl.tpl rename to web/template/default/admin/admin_images_dl.tpl diff --git a/web/template/default/admin_images_list.tpl b/web/template/default/admin/admin_images_list.tpl similarity index 100% rename from web/template/default/admin_images_list.tpl rename to web/template/default/admin/admin_images_list.tpl diff --git a/web/template/default/admin_images_md.tpl b/web/template/default/admin/admin_images_md.tpl similarity index 100% rename from web/template/default/admin_images_md.tpl rename to web/template/default/admin/admin_images_md.tpl diff --git a/web/template/default/admin_ip_bans.tpl b/web/template/default/admin/admin_ip_bans.tpl similarity index 100% rename from web/template/default/admin_ip_bans.tpl rename to web/template/default/admin/admin_ip_bans.tpl diff --git a/web/template/default/admin_jobs_list.tpl b/web/template/default/admin/admin_jobs_list.tpl similarity index 100% rename from web/template/default/admin_jobs_list.tpl rename to web/template/default/admin/admin_jobs_list.tpl diff --git a/web/template/default/admin_lendserver_list.tpl b/web/template/default/admin/admin_lendserver_list.tpl similarity index 100% rename from web/template/default/admin_lendserver_list.tpl rename to web/template/default/admin/admin_lendserver_list.tpl diff --git a/web/template/default/admin_lendserver_settings.tpl b/web/template/default/admin/admin_lendserver_settings.tpl similarity index 100% rename from web/template/default/admin_lendserver_settings.tpl rename to web/template/default/admin/admin_lendserver_settings.tpl diff --git a/web/template/default/admin_logs.tpl b/web/template/default/admin/admin_logs.tpl similarity index 100% rename from web/template/default/admin_logs.tpl rename to web/template/default/admin/admin_logs.tpl diff --git a/web/template/default/admin_logs_mail.tpl b/web/template/default/admin/admin_logs_mail.tpl similarity index 100% rename from web/template/default/admin_logs_mail.tpl rename to web/template/default/admin/admin_logs_mail.tpl diff --git a/web/template/default/admin_master_add.tpl b/web/template/default/admin/admin_master_add.tpl similarity index 100% rename from web/template/default/admin_master_add.tpl rename to web/template/default/admin/admin_master_add.tpl diff --git a/web/template/default/admin_master_dl.tpl b/web/template/default/admin/admin_master_dl.tpl similarity index 100% rename from web/template/default/admin_master_dl.tpl rename to web/template/default/admin/admin_master_dl.tpl diff --git a/web/template/default/admin_master_list.tpl b/web/template/default/admin/admin_master_list.tpl similarity index 100% rename from web/template/default/admin_master_list.tpl rename to web/template/default/admin/admin_master_list.tpl diff --git a/web/template/default/admin_master_ud.tpl b/web/template/default/admin/admin_master_ud.tpl similarity index 100% rename from web/template/default/admin_master_ud.tpl rename to web/template/default/admin/admin_master_ud.tpl diff --git a/web/template/default/admin_master_ud2.tpl b/web/template/default/admin/admin_master_ud2.tpl similarity index 100% rename from web/template/default/admin_master_ud2.tpl rename to web/template/default/admin/admin_master_ud2.tpl diff --git a/web/template/default/admin_modules_ad.tpl b/web/template/default/admin/admin_modules_ad.tpl similarity index 100% rename from web/template/default/admin_modules_ad.tpl rename to web/template/default/admin/admin_modules_ad.tpl diff --git a/web/template/default/admin_modules_dl.tpl b/web/template/default/admin/admin_modules_dl.tpl similarity index 100% rename from web/template/default/admin_modules_dl.tpl rename to web/template/default/admin/admin_modules_dl.tpl diff --git a/web/template/default/admin_modules_list.tpl b/web/template/default/admin/admin_modules_list.tpl similarity index 100% rename from web/template/default/admin_modules_list.tpl rename to web/template/default/admin/admin_modules_list.tpl diff --git a/web/template/default/admin_modules_md.tpl b/web/template/default/admin/admin_modules_md.tpl similarity index 100% rename from web/template/default/admin_modules_md.tpl rename to web/template/default/admin/admin_modules_md.tpl diff --git a/web/template/default/admin_mysql_db_add.tpl b/web/template/default/admin/admin_mysql_db_add.tpl similarity index 100% rename from web/template/default/admin_mysql_db_add.tpl rename to web/template/default/admin/admin_mysql_db_add.tpl diff --git a/web/template/default/admin_mysql_db_dl.tpl b/web/template/default/admin/admin_mysql_db_dl.tpl similarity index 100% rename from web/template/default/admin_mysql_db_dl.tpl rename to web/template/default/admin/admin_mysql_db_dl.tpl diff --git a/web/template/default/admin_mysql_db_list.tpl b/web/template/default/admin/admin_mysql_db_list.tpl similarity index 100% rename from web/template/default/admin_mysql_db_list.tpl rename to web/template/default/admin/admin_mysql_db_list.tpl diff --git a/web/template/default/admin_mysql_db_md.tpl b/web/template/default/admin/admin_mysql_db_md.tpl similarity index 100% rename from web/template/default/admin_mysql_db_md.tpl rename to web/template/default/admin/admin_mysql_db_md.tpl diff --git a/web/template/default/admin_mysql_server_add.tpl b/web/template/default/admin/admin_mysql_server_add.tpl similarity index 100% rename from web/template/default/admin_mysql_server_add.tpl rename to web/template/default/admin/admin_mysql_server_add.tpl diff --git a/web/template/default/admin_mysql_server_dl.tpl b/web/template/default/admin/admin_mysql_server_dl.tpl similarity index 100% rename from web/template/default/admin_mysql_server_dl.tpl rename to web/template/default/admin/admin_mysql_server_dl.tpl diff --git a/web/template/default/admin_mysql_server_list.tpl b/web/template/default/admin/admin_mysql_server_list.tpl similarity index 100% rename from web/template/default/admin_mysql_server_list.tpl rename to web/template/default/admin/admin_mysql_server_list.tpl diff --git a/web/template/default/admin_mysql_server_md.tpl b/web/template/default/admin/admin_mysql_server_md.tpl similarity index 100% rename from web/template/default/admin_mysql_server_md.tpl rename to web/template/default/admin/admin_mysql_server_md.tpl diff --git a/web/template/default/admin_page_comments_list.tpl b/web/template/default/admin/admin_page_comments_list.tpl similarity index 100% rename from web/template/default/admin_page_comments_list.tpl rename to web/template/default/admin/admin_page_comments_list.tpl diff --git a/web/template/default/admin_page_comments_md.tpl b/web/template/default/admin/admin_page_comments_md.tpl similarity index 100% rename from web/template/default/admin_page_comments_md.tpl rename to web/template/default/admin/admin_page_comments_md.tpl diff --git a/web/template/default/admin_page_downloads_add.tpl b/web/template/default/admin/admin_page_downloads_add.tpl similarity index 100% rename from web/template/default/admin_page_downloads_add.tpl rename to web/template/default/admin/admin_page_downloads_add.tpl diff --git a/web/template/default/admin_page_downloads_del.tpl b/web/template/default/admin/admin_page_downloads_del.tpl similarity index 100% rename from web/template/default/admin_page_downloads_del.tpl rename to web/template/default/admin/admin_page_downloads_del.tpl diff --git a/web/template/default/admin_page_downloads_list.tpl b/web/template/default/admin/admin_page_downloads_list.tpl similarity index 100% rename from web/template/default/admin_page_downloads_list.tpl rename to web/template/default/admin/admin_page_downloads_list.tpl diff --git a/web/template/default/admin_page_downloads_mod.tpl b/web/template/default/admin/admin_page_downloads_mod.tpl similarity index 100% rename from web/template/default/admin_page_downloads_mod.tpl rename to web/template/default/admin/admin_page_downloads_mod.tpl diff --git a/web/template/default/admin_page_news_add.tpl b/web/template/default/admin/admin_page_news_add.tpl similarity index 100% rename from web/template/default/admin_page_news_add.tpl rename to web/template/default/admin/admin_page_news_add.tpl diff --git a/web/template/default/admin_page_news_dl.tpl b/web/template/default/admin/admin_page_news_dl.tpl similarity index 100% rename from web/template/default/admin_page_news_dl.tpl rename to web/template/default/admin/admin_page_news_dl.tpl diff --git a/web/template/default/admin_page_news_list.tpl b/web/template/default/admin/admin_page_news_list.tpl similarity index 100% rename from web/template/default/admin_page_news_list.tpl rename to web/template/default/admin/admin_page_news_list.tpl diff --git a/web/template/default/admin_page_news_md.tpl b/web/template/default/admin/admin_page_news_md.tpl similarity index 100% rename from web/template/default/admin_page_news_md.tpl rename to web/template/default/admin/admin_page_news_md.tpl diff --git a/web/template/default/admin_page_pages_add.tpl b/web/template/default/admin/admin_page_pages_add.tpl similarity index 100% rename from web/template/default/admin_page_pages_add.tpl rename to web/template/default/admin/admin_page_pages_add.tpl diff --git a/web/template/default/admin_page_pages_dl.tpl b/web/template/default/admin/admin_page_pages_dl.tpl similarity index 100% rename from web/template/default/admin_page_pages_dl.tpl rename to web/template/default/admin/admin_page_pages_dl.tpl diff --git a/web/template/default/admin_page_pages_list.tpl b/web/template/default/admin/admin_page_pages_list.tpl similarity index 100% rename from web/template/default/admin_page_pages_list.tpl rename to web/template/default/admin/admin_page_pages_list.tpl diff --git a/web/template/default/admin_page_pages_md.tpl b/web/template/default/admin/admin_page_pages_md.tpl similarity index 100% rename from web/template/default/admin_page_pages_md.tpl rename to web/template/default/admin/admin_page_pages_md.tpl diff --git a/web/template/default/admin_page_settings.tpl b/web/template/default/admin/admin_page_settings.tpl similarity index 100% rename from web/template/default/admin_page_settings.tpl rename to web/template/default/admin/admin_page_settings.tpl diff --git a/web/template/default/admin_reseller_tickets_add.tpl b/web/template/default/admin/admin_reseller_tickets_add.tpl similarity index 100% rename from web/template/default/admin_reseller_tickets_add.tpl rename to web/template/default/admin/admin_reseller_tickets_add.tpl diff --git a/web/template/default/admin_reseller_tickets_close.tpl b/web/template/default/admin/admin_reseller_tickets_close.tpl similarity index 100% rename from web/template/default/admin_reseller_tickets_close.tpl rename to web/template/default/admin/admin_reseller_tickets_close.tpl diff --git a/web/template/default/admin_reseller_tickets_list.tpl b/web/template/default/admin/admin_reseller_tickets_list.tpl similarity index 100% rename from web/template/default/admin_reseller_tickets_list.tpl rename to web/template/default/admin/admin_reseller_tickets_list.tpl diff --git a/web/template/default/admin_reseller_tickets_md.tpl b/web/template/default/admin/admin_reseller_tickets_md.tpl similarity index 100% rename from web/template/default/admin_reseller_tickets_md.tpl rename to web/template/default/admin/admin_reseller_tickets_md.tpl diff --git a/web/template/default/admin_reseller_tickets_view.tpl b/web/template/default/admin/admin_reseller_tickets_view.tpl similarity index 100% rename from web/template/default/admin_reseller_tickets_view.tpl rename to web/template/default/admin/admin_reseller_tickets_view.tpl diff --git a/web/template/default/admin_root_dedicated_ad.tpl b/web/template/default/admin/admin_root_dedicated_ad.tpl similarity index 100% rename from web/template/default/admin_root_dedicated_ad.tpl rename to web/template/default/admin/admin_root_dedicated_ad.tpl diff --git a/web/template/default/admin_root_dedicated_dl.tpl b/web/template/default/admin/admin_root_dedicated_dl.tpl similarity index 100% rename from web/template/default/admin_root_dedicated_dl.tpl rename to web/template/default/admin/admin_root_dedicated_dl.tpl diff --git a/web/template/default/admin_root_dedicated_list.tpl b/web/template/default/admin/admin_root_dedicated_list.tpl similarity index 100% rename from web/template/default/admin_root_dedicated_list.tpl rename to web/template/default/admin/admin_root_dedicated_list.tpl diff --git a/web/template/default/admin_root_dedicated_md.tpl b/web/template/default/admin/admin_root_dedicated_md.tpl similarity index 100% rename from web/template/default/admin_root_dedicated_md.tpl rename to web/template/default/admin/admin_root_dedicated_md.tpl diff --git a/web/template/default/admin_root_dedicated_ri.tpl b/web/template/default/admin/admin_root_dedicated_ri.tpl similarity index 100% rename from web/template/default/admin_root_dedicated_ri.tpl rename to web/template/default/admin/admin_root_dedicated_ri.tpl diff --git a/web/template/default/admin_root_dhcp_ad.tpl b/web/template/default/admin/admin_root_dhcp_ad.tpl similarity index 100% rename from web/template/default/admin_root_dhcp_ad.tpl rename to web/template/default/admin/admin_root_dhcp_ad.tpl diff --git a/web/template/default/admin_root_dhcp_dl.tpl b/web/template/default/admin/admin_root_dhcp_dl.tpl similarity index 100% rename from web/template/default/admin_root_dhcp_dl.tpl rename to web/template/default/admin/admin_root_dhcp_dl.tpl diff --git a/web/template/default/admin_root_dhcp_list.tpl b/web/template/default/admin/admin_root_dhcp_list.tpl similarity index 100% rename from web/template/default/admin_root_dhcp_list.tpl rename to web/template/default/admin/admin_root_dhcp_list.tpl diff --git a/web/template/default/admin_root_dhcp_md.tpl b/web/template/default/admin/admin_root_dhcp_md.tpl similarity index 100% rename from web/template/default/admin_root_dhcp_md.tpl rename to web/template/default/admin/admin_root_dhcp_md.tpl diff --git a/web/template/default/admin_root_pxe_ad.tpl b/web/template/default/admin/admin_root_pxe_ad.tpl similarity index 100% rename from web/template/default/admin_root_pxe_ad.tpl rename to web/template/default/admin/admin_root_pxe_ad.tpl diff --git a/web/template/default/admin_root_pxe_dl.tpl b/web/template/default/admin/admin_root_pxe_dl.tpl similarity index 100% rename from web/template/default/admin_root_pxe_dl.tpl rename to web/template/default/admin/admin_root_pxe_dl.tpl diff --git a/web/template/default/admin_root_pxe_list.tpl b/web/template/default/admin/admin_root_pxe_list.tpl similarity index 100% rename from web/template/default/admin_root_pxe_list.tpl rename to web/template/default/admin/admin_root_pxe_list.tpl diff --git a/web/template/default/admin_root_pxe_md.tpl b/web/template/default/admin/admin_root_pxe_md.tpl similarity index 100% rename from web/template/default/admin_root_pxe_md.tpl rename to web/template/default/admin/admin_root_pxe_md.tpl diff --git a/web/template/default/admin_root_subnets_add.tpl b/web/template/default/admin/admin_root_subnets_add.tpl similarity index 100% rename from web/template/default/admin_root_subnets_add.tpl rename to web/template/default/admin/admin_root_subnets_add.tpl diff --git a/web/template/default/admin_root_subnets_dl.tpl b/web/template/default/admin/admin_root_subnets_dl.tpl similarity index 100% rename from web/template/default/admin_root_subnets_dl.tpl rename to web/template/default/admin/admin_root_subnets_dl.tpl diff --git a/web/template/default/admin_root_subnets_list.tpl b/web/template/default/admin/admin_root_subnets_list.tpl similarity index 100% rename from web/template/default/admin_root_subnets_list.tpl rename to web/template/default/admin/admin_root_subnets_list.tpl diff --git a/web/template/default/admin_root_subnets_md.tpl b/web/template/default/admin/admin_root_subnets_md.tpl similarity index 100% rename from web/template/default/admin_root_subnets_md.tpl rename to web/template/default/admin/admin_root_subnets_md.tpl diff --git a/web/template/default/admin_root_templates_add.tpl b/web/template/default/admin/admin_root_templates_add.tpl similarity index 100% rename from web/template/default/admin_root_templates_add.tpl rename to web/template/default/admin/admin_root_templates_add.tpl diff --git a/web/template/default/admin_root_templates_dl.tpl b/web/template/default/admin/admin_root_templates_dl.tpl similarity index 100% rename from web/template/default/admin_root_templates_dl.tpl rename to web/template/default/admin/admin_root_templates_dl.tpl diff --git a/web/template/default/admin_root_templates_list.tpl b/web/template/default/admin/admin_root_templates_list.tpl similarity index 100% rename from web/template/default/admin_root_templates_list.tpl rename to web/template/default/admin/admin_root_templates_list.tpl diff --git a/web/template/default/admin_root_templates_md.tpl b/web/template/default/admin/admin_root_templates_md.tpl similarity index 100% rename from web/template/default/admin_root_templates_md.tpl rename to web/template/default/admin/admin_root_templates_md.tpl diff --git a/web/template/default/admin_root_virtualhosts_add.tpl b/web/template/default/admin/admin_root_virtualhosts_add.tpl similarity index 100% rename from web/template/default/admin_root_virtualhosts_add.tpl rename to web/template/default/admin/admin_root_virtualhosts_add.tpl diff --git a/web/template/default/admin_root_virtualhosts_dl.tpl b/web/template/default/admin/admin_root_virtualhosts_dl.tpl similarity index 100% rename from web/template/default/admin_root_virtualhosts_dl.tpl rename to web/template/default/admin/admin_root_virtualhosts_dl.tpl diff --git a/web/template/default/admin_root_virtualhosts_list.tpl b/web/template/default/admin/admin_root_virtualhosts_list.tpl similarity index 100% rename from web/template/default/admin_root_virtualhosts_list.tpl rename to web/template/default/admin/admin_root_virtualhosts_list.tpl diff --git a/web/template/default/admin_root_virtualhosts_md.tpl b/web/template/default/admin/admin_root_virtualhosts_md.tpl similarity index 100% rename from web/template/default/admin_root_virtualhosts_md.tpl rename to web/template/default/admin/admin_root_virtualhosts_md.tpl diff --git a/web/template/default/admin_root_vserver_add.tpl b/web/template/default/admin/admin_root_vserver_add.tpl similarity index 100% rename from web/template/default/admin_root_vserver_add.tpl rename to web/template/default/admin/admin_root_vserver_add.tpl diff --git a/web/template/default/admin_root_vserver_dl.tpl b/web/template/default/admin/admin_root_vserver_dl.tpl similarity index 100% rename from web/template/default/admin_root_vserver_dl.tpl rename to web/template/default/admin/admin_root_vserver_dl.tpl diff --git a/web/template/default/admin_root_vserver_list.tpl b/web/template/default/admin/admin_root_vserver_list.tpl similarity index 100% rename from web/template/default/admin_root_vserver_list.tpl rename to web/template/default/admin/admin_root_vserver_list.tpl diff --git a/web/template/default/admin_root_vserver_md.tpl b/web/template/default/admin/admin_root_vserver_md.tpl similarity index 100% rename from web/template/default/admin_root_vserver_md.tpl rename to web/template/default/admin/admin_root_vserver_md.tpl diff --git a/web/template/default/admin_root_vserver_re.tpl b/web/template/default/admin/admin_root_vserver_re.tpl similarity index 100% rename from web/template/default/admin_root_vserver_re.tpl rename to web/template/default/admin/admin_root_vserver_re.tpl diff --git a/web/template/default/admin_roots_add.tpl b/web/template/default/admin/admin_roots_add.tpl similarity index 100% rename from web/template/default/admin_roots_add.tpl rename to web/template/default/admin/admin_roots_add.tpl diff --git a/web/template/default/admin_roots_dl.tpl b/web/template/default/admin/admin_roots_dl.tpl similarity index 100% rename from web/template/default/admin_roots_dl.tpl rename to web/template/default/admin/admin_roots_dl.tpl diff --git a/web/template/default/admin_roots_list.tpl b/web/template/default/admin/admin_roots_list.tpl similarity index 100% rename from web/template/default/admin_roots_list.tpl rename to web/template/default/admin/admin_roots_list.tpl diff --git a/web/template/default/admin_roots_md.tpl b/web/template/default/admin/admin_roots_md.tpl similarity index 100% rename from web/template/default/admin_roots_md.tpl rename to web/template/default/admin/admin_roots_md.tpl diff --git a/web/template/default/admin_roots_ri.tpl b/web/template/default/admin/admin_roots_ri.tpl similarity index 100% rename from web/template/default/admin_roots_ri.tpl rename to web/template/default/admin/admin_roots_ri.tpl diff --git a/web/template/default/admin_search.tpl b/web/template/default/admin/admin_search.tpl similarity index 100% rename from web/template/default/admin_search.tpl rename to web/template/default/admin/admin_search.tpl diff --git a/web/template/default/admin_settings.tpl b/web/template/default/admin/admin_settings.tpl similarity index 100% rename from web/template/default/admin_settings.tpl rename to web/template/default/admin/admin_settings.tpl diff --git a/web/template/default/admin_settings_columns_add.tpl b/web/template/default/admin/admin_settings_columns_add.tpl similarity index 100% rename from web/template/default/admin_settings_columns_add.tpl rename to web/template/default/admin/admin_settings_columns_add.tpl diff --git a/web/template/default/admin_settings_columns_dl.tpl b/web/template/default/admin/admin_settings_columns_dl.tpl similarity index 100% rename from web/template/default/admin_settings_columns_dl.tpl rename to web/template/default/admin/admin_settings_columns_dl.tpl diff --git a/web/template/default/admin_settings_columns_list.tpl b/web/template/default/admin/admin_settings_columns_list.tpl similarity index 100% rename from web/template/default/admin_settings_columns_list.tpl rename to web/template/default/admin/admin_settings_columns_list.tpl diff --git a/web/template/default/admin_settings_columns_md.tpl b/web/template/default/admin/admin_settings_columns_md.tpl similarity index 100% rename from web/template/default/admin_settings_columns_md.tpl rename to web/template/default/admin/admin_settings_columns_md.tpl diff --git a/web/template/default/admin_settings_email.tpl b/web/template/default/admin/admin_settings_email.tpl similarity index 100% rename from web/template/default/admin_settings_email.tpl rename to web/template/default/admin/admin_settings_email.tpl diff --git a/web/template/default/admin_settings_imprint.tpl b/web/template/default/admin/admin_settings_imprint.tpl similarity index 100% rename from web/template/default/admin_settings_imprint.tpl rename to web/template/default/admin/admin_settings_imprint.tpl diff --git a/web/template/default/admin_social_provider_add.tpl b/web/template/default/admin/admin_social_provider_add.tpl similarity index 100% rename from web/template/default/admin_social_provider_add.tpl rename to web/template/default/admin/admin_social_provider_add.tpl diff --git a/web/template/default/admin_social_provider_dl.tpl b/web/template/default/admin/admin_social_provider_dl.tpl similarity index 100% rename from web/template/default/admin_social_provider_dl.tpl rename to web/template/default/admin/admin_social_provider_dl.tpl diff --git a/web/template/default/admin_social_provider_list.tpl b/web/template/default/admin/admin_social_provider_list.tpl similarity index 95% rename from web/template/default/admin_social_provider_list.tpl rename to web/template/default/admin/admin_social_provider_list.tpl index a7e65a0e..cc0308e4 100644 --- a/web/template/default/admin_social_provider_list.tpl +++ b/web/template/default/admin/admin_social_provider_list.tpl @@ -18,7 +18,7 @@ Service Provider - status;?> + status;?> del;?> mod;?> diff --git a/web/template/default/admin_social_provider_md.tpl b/web/template/default/admin/admin_social_provider_md.tpl similarity index 100% rename from web/template/default/admin_social_provider_md.tpl rename to web/template/default/admin/admin_social_provider_md.tpl diff --git a/web/template/default/admin_ticket_topic_add.tpl b/web/template/default/admin/admin_ticket_topic_add.tpl similarity index 100% rename from web/template/default/admin_ticket_topic_add.tpl rename to web/template/default/admin/admin_ticket_topic_add.tpl diff --git a/web/template/default/admin_ticket_topic_dl.tpl b/web/template/default/admin/admin_ticket_topic_dl.tpl similarity index 100% rename from web/template/default/admin_ticket_topic_dl.tpl rename to web/template/default/admin/admin_ticket_topic_dl.tpl diff --git a/web/template/default/admin_ticket_topic_list.tpl b/web/template/default/admin/admin_ticket_topic_list.tpl similarity index 100% rename from web/template/default/admin_ticket_topic_list.tpl rename to web/template/default/admin/admin_ticket_topic_list.tpl diff --git a/web/template/default/admin_ticket_topic_md.tpl b/web/template/default/admin/admin_ticket_topic_md.tpl similarity index 100% rename from web/template/default/admin_ticket_topic_md.tpl rename to web/template/default/admin/admin_ticket_topic_md.tpl diff --git a/web/template/default/admin_tickets_list.tpl b/web/template/default/admin/admin_tickets_list.tpl similarity index 100% rename from web/template/default/admin_tickets_list.tpl rename to web/template/default/admin/admin_tickets_list.tpl diff --git a/web/template/default/admin_tickets_md.tpl b/web/template/default/admin/admin_tickets_md.tpl similarity index 100% rename from web/template/default/admin_tickets_md.tpl rename to web/template/default/admin/admin_tickets_md.tpl diff --git a/web/template/default/admin_tickets_view.tpl b/web/template/default/admin/admin_tickets_view.tpl similarity index 100% rename from web/template/default/admin_tickets_view.tpl rename to web/template/default/admin/admin_tickets_view.tpl diff --git a/web/template/default/admin_traffic.tpl b/web/template/default/admin/admin_traffic.tpl similarity index 100% rename from web/template/default/admin_traffic.tpl rename to web/template/default/admin/admin_traffic.tpl diff --git a/web/template/default/admin_traffic_settings.tpl b/web/template/default/admin/admin_traffic_settings.tpl similarity index 100% rename from web/template/default/admin_traffic_settings.tpl rename to web/template/default/admin/admin_traffic_settings.tpl diff --git a/web/template/default/admin_user_add.tpl b/web/template/default/admin/admin_user_add.tpl similarity index 100% rename from web/template/default/admin_user_add.tpl rename to web/template/default/admin/admin_user_add.tpl diff --git a/web/template/default/admin_user_dl.tpl b/web/template/default/admin/admin_user_dl.tpl similarity index 100% rename from web/template/default/admin_user_dl.tpl rename to web/template/default/admin/admin_user_dl.tpl diff --git a/web/template/default/admin_user_groups_add.tpl b/web/template/default/admin/admin_user_groups_add.tpl similarity index 100% rename from web/template/default/admin_user_groups_add.tpl rename to web/template/default/admin/admin_user_groups_add.tpl diff --git a/web/template/default/admin_user_groups_dl.tpl b/web/template/default/admin/admin_user_groups_dl.tpl similarity index 100% rename from web/template/default/admin_user_groups_dl.tpl rename to web/template/default/admin/admin_user_groups_dl.tpl diff --git a/web/template/default/admin_user_groups_list.tpl b/web/template/default/admin/admin_user_groups_list.tpl similarity index 100% rename from web/template/default/admin_user_groups_list.tpl rename to web/template/default/admin/admin_user_groups_list.tpl diff --git a/web/template/default/admin_user_groups_md.tpl b/web/template/default/admin/admin_user_groups_md.tpl similarity index 100% rename from web/template/default/admin_user_groups_md.tpl rename to web/template/default/admin/admin_user_groups_md.tpl diff --git a/web/template/default/admin_user_list.tpl b/web/template/default/admin/admin_user_list.tpl similarity index 100% rename from web/template/default/admin_user_list.tpl rename to web/template/default/admin/admin_user_list.tpl diff --git a/web/template/default/admin_user_md.tpl b/web/template/default/admin/admin_user_md.tpl similarity index 100% rename from web/template/default/admin_user_md.tpl rename to web/template/default/admin/admin_user_md.tpl diff --git a/web/template/default/admin_user_own_md.tpl b/web/template/default/admin/admin_user_own_md.tpl similarity index 100% rename from web/template/default/admin_user_own_md.tpl rename to web/template/default/admin/admin_user_own_md.tpl diff --git a/web/template/default/admin_user_own_pass.tpl b/web/template/default/admin/admin_user_own_pass.tpl similarity index 100% rename from web/template/default/admin_user_own_pass.tpl rename to web/template/default/admin/admin_user_own_pass.tpl diff --git a/web/template/default/admin_user_pass.tpl b/web/template/default/admin/admin_user_pass.tpl similarity index 100% rename from web/template/default/admin_user_pass.tpl rename to web/template/default/admin/admin_user_pass.tpl diff --git a/web/template/default/admin_versioncheck.tpl b/web/template/default/admin/admin_versioncheck.tpl similarity index 100% rename from web/template/default/admin_versioncheck.tpl rename to web/template/default/admin/admin_versioncheck.tpl diff --git a/web/template/default/admin_versioncheck_ud.tpl b/web/template/default/admin/admin_versioncheck_ud.tpl similarity index 100% rename from web/template/default/admin_versioncheck_ud.tpl rename to web/template/default/admin/admin_versioncheck_ud.tpl diff --git a/web/template/default/admin_voice_dns_add.tpl b/web/template/default/admin/admin_voice_dns_add.tpl similarity index 100% rename from web/template/default/admin_voice_dns_add.tpl rename to web/template/default/admin/admin_voice_dns_add.tpl diff --git a/web/template/default/admin_voice_dns_add2.tpl b/web/template/default/admin/admin_voice_dns_add2.tpl similarity index 100% rename from web/template/default/admin_voice_dns_add2.tpl rename to web/template/default/admin/admin_voice_dns_add2.tpl diff --git a/web/template/default/admin_voice_dns_dl.tpl b/web/template/default/admin/admin_voice_dns_dl.tpl similarity index 100% rename from web/template/default/admin_voice_dns_dl.tpl rename to web/template/default/admin/admin_voice_dns_dl.tpl diff --git a/web/template/default/admin_voice_dns_list.tpl b/web/template/default/admin/admin_voice_dns_list.tpl similarity index 100% rename from web/template/default/admin_voice_dns_list.tpl rename to web/template/default/admin/admin_voice_dns_list.tpl diff --git a/web/template/default/admin_voice_dns_md.tpl b/web/template/default/admin/admin_voice_dns_md.tpl similarity index 100% rename from web/template/default/admin_voice_dns_md.tpl rename to web/template/default/admin/admin_voice_dns_md.tpl diff --git a/web/template/default/admin_voice_stats.tpl b/web/template/default/admin/admin_voice_stats.tpl similarity index 100% rename from web/template/default/admin_voice_stats.tpl rename to web/template/default/admin/admin_voice_stats.tpl diff --git a/web/template/default/admin_voice_stats_settings.tpl b/web/template/default/admin/admin_voice_stats_settings.tpl similarity index 100% rename from web/template/default/admin_voice_stats_settings.tpl rename to web/template/default/admin/admin_voice_stats_settings.tpl diff --git a/web/template/default/admin_voice_tsdns_add.tpl b/web/template/default/admin/admin_voice_tsdns_add.tpl similarity index 100% rename from web/template/default/admin_voice_tsdns_add.tpl rename to web/template/default/admin/admin_voice_tsdns_add.tpl diff --git a/web/template/default/admin_voice_tsdns_dl.tpl b/web/template/default/admin/admin_voice_tsdns_dl.tpl similarity index 100% rename from web/template/default/admin_voice_tsdns_dl.tpl rename to web/template/default/admin/admin_voice_tsdns_dl.tpl diff --git a/web/template/default/admin_voice_tsdns_import.tpl b/web/template/default/admin/admin_voice_tsdns_import.tpl similarity index 100% rename from web/template/default/admin_voice_tsdns_import.tpl rename to web/template/default/admin/admin_voice_tsdns_import.tpl diff --git a/web/template/default/admin_voice_tsdns_list.tpl b/web/template/default/admin/admin_voice_tsdns_list.tpl similarity index 100% rename from web/template/default/admin_voice_tsdns_list.tpl rename to web/template/default/admin/admin_voice_tsdns_list.tpl diff --git a/web/template/default/admin_voice_tsdns_md.tpl b/web/template/default/admin/admin_voice_tsdns_md.tpl similarity index 100% rename from web/template/default/admin_voice_tsdns_md.tpl rename to web/template/default/admin/admin_voice_tsdns_md.tpl diff --git a/web/template/default/admin_voicemasterserver_add.tpl b/web/template/default/admin/admin_voicemasterserver_add.tpl similarity index 100% rename from web/template/default/admin_voicemasterserver_add.tpl rename to web/template/default/admin/admin_voicemasterserver_add.tpl diff --git a/web/template/default/admin_voicemasterserver_add2.tpl b/web/template/default/admin/admin_voicemasterserver_add2.tpl similarity index 100% rename from web/template/default/admin_voicemasterserver_add2.tpl rename to web/template/default/admin/admin_voicemasterserver_add2.tpl diff --git a/web/template/default/admin_voicemasterserver_dl.tpl b/web/template/default/admin/admin_voicemasterserver_dl.tpl similarity index 100% rename from web/template/default/admin_voicemasterserver_dl.tpl rename to web/template/default/admin/admin_voicemasterserver_dl.tpl diff --git a/web/template/default/admin_voicemasterserver_list.tpl b/web/template/default/admin/admin_voicemasterserver_list.tpl similarity index 100% rename from web/template/default/admin_voicemasterserver_list.tpl rename to web/template/default/admin/admin_voicemasterserver_list.tpl diff --git a/web/template/default/admin_voicemasterserver_md.tpl b/web/template/default/admin/admin_voicemasterserver_md.tpl similarity index 100% rename from web/template/default/admin_voicemasterserver_md.tpl rename to web/template/default/admin/admin_voicemasterserver_md.tpl diff --git a/web/template/default/admin_voiceserver_add.tpl b/web/template/default/admin/admin_voiceserver_add.tpl similarity index 100% rename from web/template/default/admin_voiceserver_add.tpl rename to web/template/default/admin/admin_voiceserver_add.tpl diff --git a/web/template/default/admin_voiceserver_add2.tpl b/web/template/default/admin/admin_voiceserver_add2.tpl similarity index 100% rename from web/template/default/admin_voiceserver_add2.tpl rename to web/template/default/admin/admin_voiceserver_add2.tpl diff --git a/web/template/default/admin_voiceserver_dl.tpl b/web/template/default/admin/admin_voiceserver_dl.tpl similarity index 100% rename from web/template/default/admin_voiceserver_dl.tpl rename to web/template/default/admin/admin_voiceserver_dl.tpl diff --git a/web/template/default/admin_voiceserver_list.tpl b/web/template/default/admin/admin_voiceserver_list.tpl similarity index 100% rename from web/template/default/admin_voiceserver_list.tpl rename to web/template/default/admin/admin_voiceserver_list.tpl diff --git a/web/template/default/admin_voiceserver_md.tpl b/web/template/default/admin/admin_voiceserver_md.tpl similarity index 100% rename from web/template/default/admin_voiceserver_md.tpl rename to web/template/default/admin/admin_voiceserver_md.tpl diff --git a/web/template/default/ajax_admin_gserver_ports.tpl b/web/template/default/ajax/ajax_admin_gserver_ports.tpl similarity index 100% rename from web/template/default/ajax_admin_gserver_ports.tpl rename to web/template/default/ajax/ajax_admin_gserver_ports.tpl diff --git a/web/template/default/ajax_admin_gserver_usage.tpl b/web/template/default/ajax/ajax_admin_gserver_usage.tpl similarity index 100% rename from web/template/default/ajax_admin_gserver_usage.tpl rename to web/template/default/ajax/ajax_admin_gserver_usage.tpl diff --git a/web/template/default/ajax_admin_mysql_server.tpl b/web/template/default/ajax/ajax_admin_mysql_server.tpl similarity index 100% rename from web/template/default/ajax_admin_mysql_server.tpl rename to web/template/default/ajax/ajax_admin_mysql_server.tpl diff --git a/web/template/default/ajax_admin_traffic.tpl b/web/template/default/ajax/ajax_admin_traffic.tpl similarity index 100% rename from web/template/default/ajax_admin_traffic.tpl rename to web/template/default/ajax/ajax_admin_traffic.tpl diff --git a/web/template/default/ajax_admin_voice_stats.tpl b/web/template/default/ajax/ajax_admin_voice_stats.tpl similarity index 100% rename from web/template/default/ajax_admin_voice_stats.tpl rename to web/template/default/ajax/ajax_admin_voice_stats.tpl diff --git a/web/template/default/ajax_admin_voiceserver_usage.tpl b/web/template/default/ajax/ajax_admin_voiceserver_usage.tpl similarity index 100% rename from web/template/default/ajax_admin_voiceserver_usage.tpl rename to web/template/default/ajax/ajax_admin_voiceserver_usage.tpl diff --git a/web/template/default/ajax_admin_vserver_allocation.tpl b/web/template/default/ajax/ajax_admin_vserver_allocation.tpl similarity index 100% rename from web/template/default/ajax_admin_vserver_allocation.tpl rename to web/template/default/ajax/ajax_admin_vserver_allocation.tpl diff --git a/web/template/default/ajax_userpanel_mapgroup.tpl b/web/template/default/ajax/ajax_userpanel_mapgroup.tpl similarity index 100% rename from web/template/default/ajax_userpanel_mapgroup.tpl rename to web/template/default/ajax/ajax_userpanel_mapgroup.tpl diff --git a/web/template/default/ajax_userpanel_ticket_category.tpl b/web/template/default/ajax/ajax_userpanel_ticket_category.tpl similarity index 100% rename from web/template/default/ajax_userpanel_ticket_category.tpl rename to web/template/default/ajax/ajax_userpanel_ticket_category.tpl diff --git a/web/template/default/contact.tpl b/web/template/default/cms/contact.tpl similarity index 100% rename from web/template/default/contact.tpl rename to web/template/default/cms/contact.tpl diff --git a/web/template/default/lend.tpl b/web/template/default/cms/lend.tpl similarity index 100% rename from web/template/default/lend.tpl rename to web/template/default/cms/lend.tpl diff --git a/web/template/default/lenddata.tpl b/web/template/default/cms/lenddata.tpl similarity index 100% rename from web/template/default/lenddata.tpl rename to web/template/default/cms/lenddata.tpl diff --git a/web/template/default/lenddata_ipblock.tpl b/web/template/default/cms/lenddata_ipblock.tpl similarity index 100% rename from web/template/default/lenddata_ipblock.tpl rename to web/template/default/cms/lenddata_ipblock.tpl diff --git a/web/template/default/login.tpl b/web/template/default/cms/login.tpl similarity index 100% rename from web/template/default/login.tpl rename to web/template/default/cms/login.tpl diff --git a/web/template/default/login_mutiple.tpl b/web/template/default/cms/login_mutiple.tpl similarity index 100% rename from web/template/default/login_mutiple.tpl rename to web/template/default/cms/login_mutiple.tpl diff --git a/web/template/default/page_404.tpl b/web/template/default/cms/page_404.tpl similarity index 100% rename from web/template/default/page_404.tpl rename to web/template/default/cms/page_404.tpl diff --git a/web/template/default/page_downloads_list.tpl b/web/template/default/cms/page_downloads_list.tpl similarity index 100% rename from web/template/default/page_downloads_list.tpl rename to web/template/default/cms/page_downloads_list.tpl diff --git a/web/template/default/page_footer.tpl b/web/template/default/cms/page_footer.tpl similarity index 100% rename from web/template/default/page_footer.tpl rename to web/template/default/cms/page_footer.tpl diff --git a/web/template/default/page_gallery.tpl b/web/template/default/cms/page_gallery.tpl similarity index 100% rename from web/template/default/page_gallery.tpl rename to web/template/default/cms/page_gallery.tpl diff --git a/web/template/default/page_general.tpl b/web/template/default/cms/page_general.tpl similarity index 100% rename from web/template/default/page_general.tpl rename to web/template/default/cms/page_general.tpl diff --git a/web/template/default/page_header.tpl b/web/template/default/cms/page_header.tpl similarity index 100% rename from web/template/default/page_header.tpl rename to web/template/default/cms/page_header.tpl diff --git a/web/template/default/page_home.tpl b/web/template/default/cms/page_home.tpl similarity index 100% rename from web/template/default/page_home.tpl rename to web/template/default/cms/page_home.tpl diff --git a/web/template/default/page_lend.tpl b/web/template/default/cms/page_lend.tpl similarity index 100% rename from web/template/default/page_lend.tpl rename to web/template/default/cms/page_lend.tpl diff --git a/web/template/default/page_lend_list.tpl b/web/template/default/cms/page_lend_list.tpl similarity index 100% rename from web/template/default/page_lend_list.tpl rename to web/template/default/cms/page_lend_list.tpl diff --git a/web/template/default/page_lenddata.tpl b/web/template/default/cms/page_lenddata.tpl similarity index 100% rename from web/template/default/page_lenddata.tpl rename to web/template/default/cms/page_lenddata.tpl diff --git a/web/template/default/page_lenddata_ipblock.tpl b/web/template/default/cms/page_lenddata_ipblock.tpl similarity index 100% rename from web/template/default/page_lenddata_ipblock.tpl rename to web/template/default/cms/page_lenddata_ipblock.tpl diff --git a/web/template/default/page_news.tpl b/web/template/default/cms/page_news.tpl similarity index 100% rename from web/template/default/page_news.tpl rename to web/template/default/cms/page_news.tpl diff --git a/web/template/default/page_news_single.tpl b/web/template/default/cms/page_news_single.tpl similarity index 100% rename from web/template/default/page_news_single.tpl rename to web/template/default/cms/page_news_single.tpl diff --git a/web/template/default/page_page.tpl b/web/template/default/cms/page_page.tpl similarity index 100% rename from web/template/default/page_page.tpl rename to web/template/default/cms/page_page.tpl diff --git a/web/template/default/page_protectioncheck.tpl b/web/template/default/cms/page_protectioncheck.tpl similarity index 100% rename from web/template/default/page_protectioncheck.tpl rename to web/template/default/cms/page_protectioncheck.tpl diff --git a/web/template/default/page_register.tpl b/web/template/default/cms/page_register.tpl similarity index 100% rename from web/template/default/page_register.tpl rename to web/template/default/cms/page_register.tpl diff --git a/web/template/default/page_search.tpl b/web/template/default/cms/page_search.tpl similarity index 100% rename from web/template/default/page_search.tpl rename to web/template/default/cms/page_search.tpl diff --git a/web/template/default/page_sitemap.tpl b/web/template/default/cms/page_sitemap.tpl similarity index 100% rename from web/template/default/page_sitemap.tpl rename to web/template/default/cms/page_sitemap.tpl diff --git a/web/template/default/page_tag.tpl b/web/template/default/cms/page_tag.tpl similarity index 100% rename from web/template/default/page_tag.tpl rename to web/template/default/cms/page_tag.tpl diff --git a/web/template/default/passwordrecovery.tpl b/web/template/default/cms/passwordrecovery.tpl similarity index 100% rename from web/template/default/passwordrecovery.tpl rename to web/template/default/cms/passwordrecovery.tpl diff --git a/web/template/default/passwordrecovery_vo.tpl b/web/template/default/cms/passwordrecovery_vo.tpl similarity index 100% rename from web/template/default/passwordrecovery_vo.tpl rename to web/template/default/cms/passwordrecovery_vo.tpl diff --git a/web/template/default/protectioncheck.tpl b/web/template/default/cms/protectioncheck.tpl similarity index 100% rename from web/template/default/protectioncheck.tpl rename to web/template/default/cms/protectioncheck.tpl diff --git a/web/template/default/userpanel_404.tpl b/web/template/default/user/userpanel_404.tpl similarity index 100% rename from web/template/default/userpanel_404.tpl rename to web/template/default/user/userpanel_404.tpl diff --git a/web/template/default/userpanel_footer.tpl b/web/template/default/user/userpanel_footer.tpl similarity index 100% rename from web/template/default/userpanel_footer.tpl rename to web/template/default/user/userpanel_footer.tpl diff --git a/web/template/default/userpanel_gserver_addon.tpl b/web/template/default/user/userpanel_gserver_addon.tpl similarity index 100% rename from web/template/default/userpanel_gserver_addon.tpl rename to web/template/default/user/userpanel_gserver_addon.tpl diff --git a/web/template/default/userpanel_gserver_backup_md.tpl b/web/template/default/user/userpanel_gserver_backup_md.tpl similarity index 100% rename from web/template/default/userpanel_gserver_backup_md.tpl rename to web/template/default/user/userpanel_gserver_backup_md.tpl diff --git a/web/template/default/userpanel_gserver_backup_rb.tpl b/web/template/default/user/userpanel_gserver_backup_rb.tpl similarity index 100% rename from web/template/default/userpanel_gserver_backup_rb.tpl rename to web/template/default/user/userpanel_gserver_backup_rb.tpl diff --git a/web/template/default/userpanel_gserver_calendar_list.tpl b/web/template/default/user/userpanel_gserver_calendar_list.tpl similarity index 100% rename from web/template/default/userpanel_gserver_calendar_list.tpl rename to web/template/default/user/userpanel_gserver_calendar_list.tpl diff --git a/web/template/default/userpanel_gserver_calendar_md.tpl b/web/template/default/user/userpanel_gserver_calendar_md.tpl similarity index 100% rename from web/template/default/userpanel_gserver_calendar_md.tpl rename to web/template/default/user/userpanel_gserver_calendar_md.tpl diff --git a/web/template/default/userpanel_gserver_config_edit.tpl b/web/template/default/user/userpanel_gserver_config_edit.tpl similarity index 100% rename from web/template/default/userpanel_gserver_config_edit.tpl rename to web/template/default/user/userpanel_gserver_config_edit.tpl diff --git a/web/template/default/userpanel_gserver_config_edit_easy.tpl b/web/template/default/user/userpanel_gserver_config_edit_easy.tpl similarity index 100% rename from web/template/default/userpanel_gserver_config_edit_easy.tpl rename to web/template/default/user/userpanel_gserver_config_edit_easy.tpl diff --git a/web/template/default/userpanel_gserver_config_edit_full.tpl b/web/template/default/user/userpanel_gserver_config_edit_full.tpl similarity index 100% rename from web/template/default/userpanel_gserver_config_edit_full.tpl rename to web/template/default/user/userpanel_gserver_config_edit_full.tpl diff --git a/web/template/default/userpanel_gserver_fdl_es.tpl b/web/template/default/user/userpanel_gserver_fdl_es.tpl similarity index 100% rename from web/template/default/userpanel_gserver_fdl_es.tpl rename to web/template/default/user/userpanel_gserver_fdl_es.tpl diff --git a/web/template/default/userpanel_gserver_fdl_eu.tpl b/web/template/default/user/userpanel_gserver_fdl_eu.tpl similarity index 100% rename from web/template/default/userpanel_gserver_fdl_eu.tpl rename to web/template/default/user/userpanel_gserver_fdl_eu.tpl diff --git a/web/template/default/userpanel_gserver_fdl_list.tpl b/web/template/default/user/userpanel_gserver_fdl_list.tpl similarity index 100% rename from web/template/default/userpanel_gserver_fdl_list.tpl rename to web/template/default/user/userpanel_gserver_fdl_list.tpl diff --git a/web/template/default/userpanel_gserver_list.tpl b/web/template/default/user/userpanel_gserver_list.tpl similarity index 100% rename from web/template/default/userpanel_gserver_list.tpl rename to web/template/default/user/userpanel_gserver_list.tpl diff --git a/web/template/default/userpanel_gserver_md.tpl b/web/template/default/user/userpanel_gserver_md.tpl similarity index 100% rename from web/template/default/userpanel_gserver_md.tpl rename to web/template/default/user/userpanel_gserver_md.tpl diff --git a/web/template/default/userpanel_gserver_migration.tpl b/web/template/default/user/userpanel_gserver_migration.tpl similarity index 100% rename from web/template/default/userpanel_gserver_migration.tpl rename to web/template/default/user/userpanel_gserver_migration.tpl diff --git a/web/template/default/userpanel_gserver_monstaftp.tpl b/web/template/default/user/userpanel_gserver_monstaftp.tpl similarity index 100% rename from web/template/default/userpanel_gserver_monstaftp.tpl rename to web/template/default/user/userpanel_gserver_monstaftp.tpl diff --git a/web/template/default/userpanel_gserver_reinstall.tpl b/web/template/default/user/userpanel_gserver_reinstall.tpl similarity index 100% rename from web/template/default/userpanel_gserver_reinstall.tpl rename to web/template/default/user/userpanel_gserver_reinstall.tpl diff --git a/web/template/default/userpanel_header.tpl b/web/template/default/user/userpanel_header.tpl similarity index 100% rename from web/template/default/userpanel_header.tpl rename to web/template/default/user/userpanel_header.tpl diff --git a/web/template/default/userpanel_home.tpl b/web/template/default/user/userpanel_home.tpl similarity index 100% rename from web/template/default/userpanel_home.tpl rename to web/template/default/user/userpanel_home.tpl diff --git a/web/template/default/userpanel_logs.tpl b/web/template/default/user/userpanel_logs.tpl similarity index 100% rename from web/template/default/userpanel_logs.tpl rename to web/template/default/user/userpanel_logs.tpl diff --git a/web/template/default/userpanel_mysql_db_list.tpl b/web/template/default/user/userpanel_mysql_db_list.tpl similarity index 100% rename from web/template/default/userpanel_mysql_db_list.tpl rename to web/template/default/user/userpanel_mysql_db_list.tpl diff --git a/web/template/default/userpanel_mysql_db_md.tpl b/web/template/default/user/userpanel_mysql_db_md.tpl similarity index 100% rename from web/template/default/userpanel_mysql_db_md.tpl rename to web/template/default/user/userpanel_mysql_db_md.tpl diff --git a/web/template/default/userpanel_pass.tpl b/web/template/default/user/userpanel_pass.tpl similarity index 100% rename from web/template/default/userpanel_pass.tpl rename to web/template/default/user/userpanel_pass.tpl diff --git a/web/template/default/userpanel_root_dedicated_list.tpl b/web/template/default/user/userpanel_root_dedicated_list.tpl similarity index 100% rename from web/template/default/userpanel_root_dedicated_list.tpl rename to web/template/default/user/userpanel_root_dedicated_list.tpl diff --git a/web/template/default/userpanel_root_dedicated_ri.tpl b/web/template/default/user/userpanel_root_dedicated_ri.tpl similarity index 100% rename from web/template/default/userpanel_root_dedicated_ri.tpl rename to web/template/default/user/userpanel_root_dedicated_ri.tpl diff --git a/web/template/default/userpanel_root_virtual_list.tpl b/web/template/default/user/userpanel_root_virtual_list.tpl similarity index 100% rename from web/template/default/userpanel_root_virtual_list.tpl rename to web/template/default/user/userpanel_root_virtual_list.tpl diff --git a/web/template/default/userpanel_root_virtual_ri.tpl b/web/template/default/user/userpanel_root_virtual_ri.tpl similarity index 100% rename from web/template/default/userpanel_root_virtual_ri.tpl rename to web/template/default/user/userpanel_root_virtual_ri.tpl diff --git a/web/template/default/userpanel_substitutes_add.tpl b/web/template/default/user/userpanel_substitutes_add.tpl similarity index 100% rename from web/template/default/userpanel_substitutes_add.tpl rename to web/template/default/user/userpanel_substitutes_add.tpl diff --git a/web/template/default/userpanel_substitutes_del.tpl b/web/template/default/user/userpanel_substitutes_del.tpl similarity index 100% rename from web/template/default/userpanel_substitutes_del.tpl rename to web/template/default/user/userpanel_substitutes_del.tpl diff --git a/web/template/default/userpanel_substitutes_list.tpl b/web/template/default/user/userpanel_substitutes_list.tpl similarity index 100% rename from web/template/default/userpanel_substitutes_list.tpl rename to web/template/default/user/userpanel_substitutes_list.tpl diff --git a/web/template/default/userpanel_substitutes_mod.tpl b/web/template/default/user/userpanel_substitutes_mod.tpl similarity index 100% rename from web/template/default/userpanel_substitutes_mod.tpl rename to web/template/default/user/userpanel_substitutes_mod.tpl diff --git a/web/template/default/userpanel_tickets_add.tpl b/web/template/default/user/userpanel_tickets_add.tpl similarity index 100% rename from web/template/default/userpanel_tickets_add.tpl rename to web/template/default/user/userpanel_tickets_add.tpl diff --git a/web/template/default/userpanel_tickets_close.tpl b/web/template/default/user/userpanel_tickets_close.tpl similarity index 100% rename from web/template/default/userpanel_tickets_close.tpl rename to web/template/default/user/userpanel_tickets_close.tpl diff --git a/web/template/default/userpanel_tickets_list.tpl b/web/template/default/user/userpanel_tickets_list.tpl similarity index 100% rename from web/template/default/userpanel_tickets_list.tpl rename to web/template/default/user/userpanel_tickets_list.tpl diff --git a/web/template/default/userpanel_tickets_md.tpl b/web/template/default/user/userpanel_tickets_md.tpl similarity index 100% rename from web/template/default/userpanel_tickets_md.tpl rename to web/template/default/user/userpanel_tickets_md.tpl diff --git a/web/template/default/userpanel_tickets_view.tpl b/web/template/default/user/userpanel_tickets_view.tpl similarity index 100% rename from web/template/default/userpanel_tickets_view.tpl rename to web/template/default/user/userpanel_tickets_view.tpl diff --git a/web/template/default/userpanel_user_md.tpl b/web/template/default/user/userpanel_user_md.tpl similarity index 100% rename from web/template/default/userpanel_user_md.tpl rename to web/template/default/user/userpanel_user_md.tpl diff --git a/web/template/default/userpanel_user_substitute_md.tpl b/web/template/default/user/userpanel_user_substitute_md.tpl similarity index 100% rename from web/template/default/userpanel_user_substitute_md.tpl rename to web/template/default/user/userpanel_user_substitute_md.tpl diff --git a/web/template/default/userpanel_voiceserver_backup_list.tpl b/web/template/default/user/userpanel_voiceserver_backup_list.tpl similarity index 100% rename from web/template/default/userpanel_voiceserver_backup_list.tpl rename to web/template/default/user/userpanel_voiceserver_backup_list.tpl diff --git a/web/template/default/userpanel_voiceserver_backup_new.tpl b/web/template/default/user/userpanel_voiceserver_backup_new.tpl similarity index 100% rename from web/template/default/userpanel_voiceserver_backup_new.tpl rename to web/template/default/user/userpanel_voiceserver_backup_new.tpl diff --git a/web/template/default/userpanel_voiceserver_ban_ad.tpl b/web/template/default/user/userpanel_voiceserver_ban_ad.tpl similarity index 100% rename from web/template/default/userpanel_voiceserver_ban_ad.tpl rename to web/template/default/user/userpanel_voiceserver_ban_ad.tpl diff --git a/web/template/default/userpanel_voiceserver_ban_list.tpl b/web/template/default/user/userpanel_voiceserver_ban_list.tpl similarity index 100% rename from web/template/default/userpanel_voiceserver_ban_list.tpl rename to web/template/default/user/userpanel_voiceserver_ban_list.tpl diff --git a/web/template/default/userpanel_voiceserver_dns_list.tpl b/web/template/default/user/userpanel_voiceserver_dns_list.tpl similarity index 100% rename from web/template/default/userpanel_voiceserver_dns_list.tpl rename to web/template/default/user/userpanel_voiceserver_dns_list.tpl diff --git a/web/template/default/userpanel_voiceserver_dns_md.tpl b/web/template/default/user/userpanel_voiceserver_dns_md.tpl similarity index 100% rename from web/template/default/userpanel_voiceserver_dns_md.tpl rename to web/template/default/user/userpanel_voiceserver_dns_md.tpl diff --git a/web/template/default/userpanel_voiceserver_key_add.tpl b/web/template/default/user/userpanel_voiceserver_key_add.tpl similarity index 100% rename from web/template/default/userpanel_voiceserver_key_add.tpl rename to web/template/default/user/userpanel_voiceserver_key_add.tpl diff --git a/web/template/default/userpanel_voiceserver_key_list.tpl b/web/template/default/user/userpanel_voiceserver_key_list.tpl similarity index 100% rename from web/template/default/userpanel_voiceserver_key_list.tpl rename to web/template/default/user/userpanel_voiceserver_key_list.tpl diff --git a/web/template/default/userpanel_voiceserver_list.tpl b/web/template/default/user/userpanel_voiceserver_list.tpl similarity index 100% rename from web/template/default/userpanel_voiceserver_list.tpl rename to web/template/default/user/userpanel_voiceserver_list.tpl diff --git a/web/template/default/userpanel_voiceserver_md.tpl b/web/template/default/user/userpanel_voiceserver_md.tpl similarity index 100% rename from web/template/default/userpanel_voiceserver_md.tpl rename to web/template/default/user/userpanel_voiceserver_md.tpl diff --git a/web/trafficdata.php b/web/trafficdata.php index dfd62380..a2c52583 100644 --- a/web/trafficdata.php +++ b/web/trafficdata.php @@ -53,9 +53,9 @@ if (isset($_SERVER['REMOTE_ADDR'])) { } define('EASYWIDIR', dirname(__FILE__)); -include(EASYWIDIR . '/stuff/vorlage.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); -include(EASYWIDIR . '/stuff/functions.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); include(EASYWIDIR . '/stuff/settings.php'); include(EASYWIDIR . '/stuff/keyphrasefile.php'); diff --git a/web/userpanel.php b/web/userpanel.php index dc10b12c..7ea7df23 100644 --- a/web/userpanel.php +++ b/web/userpanel.php @@ -43,21 +43,25 @@ if (is_dir(EASYWIDIR . '/install')) { die('Please remove the "install" folder'); } -include(EASYWIDIR . '/stuff/functions.php'); -include(EASYWIDIR . '/stuff/class_validator.php'); -include(EASYWIDIR . '/stuff/vorlage.php'); +include(EASYWIDIR . '/stuff/methods/functions.php'); +include(EASYWIDIR . '/stuff/methods/class_validator.php'); +include(EASYWIDIR . '/stuff/methods/vorlage.php'); include(EASYWIDIR . '/stuff/settings.php'); -include(EASYWIDIR . '/stuff/init_user.php'); -include(EASYWIDIR . '/stuff/userpanel_home.php'); +include(EASYWIDIR . '/stuff/user/init_user.php'); +include(EASYWIDIR . '/stuff/user/userpanel_home.php'); -if (isset($what_to_be_included_array[$w])) { - include(EASYWIDIR . '/stuff/' . $what_to_be_included_array[$w]); - unset($dbConnect); +if ($ui->smallletters('w', 255, 'get') and isset($what_to_be_included_array[$ui->smallletters('w', 255, 'get')]) and is_file(EASYWIDIR . '/stuff/user/' . $what_to_be_included_array[$ui->smallletters('w', 255, 'get')])) { + include(EASYWIDIR . '/stuff/user/' . $what_to_be_included_array[$ui->smallletters('w', 255, 'get')]); +} else if ($ui->smallletters('w', 255, 'get') and isset($what_to_be_included_array[$ui->smallletters('w', 255, 'get')]) and is_file(EASYWIDIR . '/stuff/' . $what_to_be_included_array[$ui->smallletters('w', 255, 'get')])) { + include(EASYWIDIR . '/stuff/' . $what_to_be_included_array[$ui->smallletters('w', 255, 'get')]); +} else if ($ui->smallletters('w', 255, 'get') and isset($customFiles[$ui->smallletters('w', 255, 'get')]) and is_file((EASYWIDIR . '/stuff/custom_modules/' . $customFiles[$ui->smallletters('w', 255, 'get')]))) { + include(EASYWIDIR . '/stuff/custom_modules/' . $customFiles[$ui->smallletters('w', 255, 'get')]); } else { - unset($dbConnect); $template_file = 'userpanel_home.tpl'; } +unset($dbConnect); + if (!isset($template_to_use) or !isset($template_to_use) ) { $template_to_use = 'default'; } @@ -68,8 +72,8 @@ if (!isset($template_file) or is_array($template_file)) { $template_file = (string) $template_file; } -include(IncludeTemplate($template_to_use, 'userpanel_header.tpl')); -include(IncludeTemplate($template_to_use, (preg_match('/^(.*)\.tpl$/', $template_file)) ? $template_file : 'general.tpl')); -include(IncludeTemplate($template_to_use, 'userpanel_footer.tpl')); +include(IncludeTemplate($template_to_use, 'userpanel_header.tpl', 'user')); +include(IncludeTemplate($template_to_use, (preg_match('/^(.*)\.tpl$/', $template_file)) ? $template_file : 'general.tpl', 'user')); +include(IncludeTemplate($template_to_use, 'userpanel_footer.tpl', 'user')); $sql = null; \ No newline at end of file