diff --git a/customer_autoresponder.php b/customer_autoresponder.php index b1006b35..1b3bee3f 100644 --- a/customer_autoresponder.php +++ b/customer_autoresponder.php @@ -53,40 +53,73 @@ if ($action == 'add') { ) { standard_error('missingfields'); } - + // Does account exist? - $result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1"); - if ($db->num_rows($result) == 0) { + $stmt = Database::prepare("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` + WHERE `customerid` = :customerid + AND `email` = :account + LIMIT 0,1" + ); + Database::pexecute($stmt, array("account" => $account, "customerid" => $userinfo['customerid'])); + if (Database::num_rows() == 0) { standard_error('accountnotexisting'); } // Does autoresponder exist? - $result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1"); - if ($db->num_rows($result) == 1) { + $stmt = Database::prepare("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` + WHERE `customerid` = :customerid + AND `email` = :account + LIMIT 0,1" + ); + Database::pexecute($stmt, array("account" => $account, "customerid" => $userinfo['customerid'])); + if (Database::num_rows() == 1) { standard_error('autoresponderalreadyexists'); } - - $db->query("INSERT INTO `" . TABLE_MAIL_AUTORESPONDER . "` - SET `email` = '" . $db->escape($account) . "', - `message` = '" . $db->escape($message) . "', - `enabled` = '" . (int)$_POST['active'] . "', - `date_from` = '" . (int)$ts_from . "', - `date_until` = '" . (int)$ts_until . "', - `subject` = '" . $db->escape($subject) . "', - `customerid` = '" . $db->escape((int)$userinfo['customerid']) . "' - "); - $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_autoresponder_used` = `email_autoresponder_used` + 1 WHERE `customerid` = '" . $db->escape((int)$userinfo['customerid']). "'"); + + // Create autoresponder + $stmt = Database::prepare("INSERT INTO `" . TABLE_MAIL_AUTORESPONDER . "` + SET `email` = :account, + `message` = :message, + `enabled` = :enabled, + `date_from` = :date_from, + `date_until` = :date_until, + `subject` = :subject, + `customerid` = :customerid" + ); + $params = array( + "account" => $account, + "message" => $message, + "enabled" => $_POST['active'], + "date_from" => $ts_from, + "date_until" => $ts_until, + "subject" => $subject, + "customerid" => $userinfo['customerid'] + ); + Database::pexecute($stmt, $params); + + // Update email_autoresponder_used count + $stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` + SET `email_autoresponder_used` = `email_autoresponder_used` + 1 + WHERE `customerid` = :customerid" + ); + Database::pexecute($stmt, array("customerid" => $userinfo['customerid'])); redirectTo($filename, Array('s' => $s)); } // Get accounts - $result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` NOT IN (SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "`) ORDER BY email ASC"); - if ($db->num_rows($result) == 0) { + $params = array("customerid" => $userinfo['customerid']); + $acc_stmt = Database::prepare("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` + WHERE `customerid` = :customerid + AND `email` NOT IN (SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "`) + ORDER BY email ASC" + ); + Database::pexecute($acc_stmt, $params); + if (Database::num_rows() == 0) { standard_error('noemailaccount'); } $accounts = ''; - while ($row = $db->fetch_array($result)) { + while ($row = $acc_stmt->fetch(PDO::FETCH_ASSOC)) { $accounts .= ''; } @@ -137,41 +170,64 @@ if ($action == 'add') { } // Does account exist? - $result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1"); - if ($db->num_rows($result) == 0) - { + $stmt = Database::prepare("SELECT `email` FROM `" . TABLE_MAIL_USERS . "` + WHERE `customerid` = :customerid + AND `email` = :account + LIMIT 0,1" + ); + Database::pexecute($stmt, array("account" => $account, "customerid" => $userinfo['customerid'])); + if (Database::num_rows() == 0) { standard_error('accountnotexisting'); } // Does autoresponder exist? - $result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1"); - if ($db->num_rows($result) == 0) { + $stmt = Database::prepare("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` + WHERE `customerid` = :customerid + AND `email` = :account + LIMIT 0,1" + ); + Database::pexecute($stmt, array("account" => $account, "customerid" => $userinfo['customerid'])); + if (Database::num_rows() == 0) { standard_error('invalidautoresponder'); } - $ResponderActive = (isset($_POST['active']) && $_POST['active'] == '1') ? 1 : 0; - - $db->query("UPDATE `" . TABLE_MAIL_AUTORESPONDER . "` - SET `message` = '" . $db->escape($message) . "', - `enabled` = '" . (int)$ResponderActive . "', - `date_from` = '" . (int)$ts_from . "', - `date_until` = '" . (int)$ts_until . "', - `subject` = '" . $db->escape($subject) . "' - WHERE `email` = '" . $db->escape($account) . "' - AND `customerid` = '" . $db->escape((int)$userinfo['customerid']) . "' - "); + // Update autoresponder + $stmt = Database::prepare("UPDATE `" . TABLE_MAIL_AUTORESPONDER . "` + SET `message` = :message, + `enabled` = :enabled, + `date_from` = :date_from, + `date_until` = :date_until, + `subject` = :subject + WHERE `email` = :account + AND `customerid` = :customerid" + ); + $params = array( + "account" => $account, + "message" => $message, + "enabled" => $_POST['active'], + "date_from" => $ts_from, + "date_until" => $ts_until, + "subject" => $subject, + "customerid" => $userinfo['customerid'] + ); + Database::pexecute($stmt, $params); redirectTo($filename, Array('s' => $s)); } $email = trim(htmlspecialchars($_GET['email'])); // Get account data - $result = $db->query("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($email) . "' LIMIT 0,1"); - if ($db->num_rows($result) == 0) { + $acc_stmt = Database::prepare("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "` + WHERE `customerid` = :customerid + AND `email` = :account + LIMIT 0,1" + ); + Database::pexecute($acc_stmt, array("account" => $email, "customerid" => $userinfo['customerid'])); + if (Database::num_rows() == 0) { standard_error('invalidautoresponder'); } - $row = $db->fetch_array($result); + $row = $acc_stmt->fetch(PDO::FETCH_ASSOC); $subject = htmlspecialchars($row['subject']); $message = htmlspecialchars($row['message']); @@ -207,22 +263,33 @@ if ($action == 'add') { eval("echo \"" . getTemplate('autoresponder/autoresponder_edit') . "\";"); } elseif ($action == 'delete') { // Delete autoresponder - if (isset($_POST['send']) - && $_POST['send'] == 'send' - ) { + if (isset($_POST['send']) && $_POST['send'] == 'send') { $account = trim($_POST['account']); // Does autoresponder exist? - $result = $db->query("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' AND `email` = '" . $db->escape($account) . "' LIMIT 0,1"); - if ($db->num_rows($result) == 0) { + $stmt = Database::prepare("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "` + WHERE `customerid` = :customerid + AND `email` = :account + LIMIT 0,1" + ); + Database::pexecute($stmt, array("account" => $account, "customerid" => $userinfo['customerid'])); + if (Database::num_rows() == 0) { standard_error('invalidautoresponder'); } - - $db->query("DELETE FROM `" . TABLE_MAIL_AUTORESPONDER . "` - WHERE `email` = '" . $db->escape($account) . "' - AND `customerid` = '" . $db->escape((int)$userinfo['customerid']) . "' - "); - $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `email_autoresponder_used` = `email_autoresponder_used` - 1 WHERE `customerid` = '" . $db->escape((int)$userinfo['customerid']). "'"); + + // Delete autoresponder + $stmt = Database::prepare("DELETE FROM `" . TABLE_MAIL_AUTORESPONDER . "` + WHERE `email` = :account + AND `customerid` = :customerid" + ); + Database::pexecute($stmt, array("account" => $account, "customerid" => $userinfo['customerid'])); + + // Update email_autoresponder_used count + $stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` + SET `email_autoresponder_used` = `email_autoresponder_used` - 1 + WHERE `customerid` = :customerid" + ); + Database::pexecute($stmt, array("customerid" => $userinfo['customerid'])); redirectTo($filename, Array('s' => $s)); } @@ -232,9 +299,13 @@ if ($action == 'add') { // List existing autoresponders $autoresponder = ''; $count = 0; - $result = $db->query("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = '" . (int)$userinfo['customerid'] . "' ORDER BY email ASC"); + $stmt = Database::prepare("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "` + WHERE `customerid` = :customerid + ORDER BY email ASC" + ); + Database::pexecute($stmt, array("customerid" => $userinfo['customerid'])); - while ($row = $db->fetch_array($result)) { + while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) { if ($row['date_from'] == -1 && $row['date_until'] == -1) { $activated_date = $lng['panel']['not_activated']; } elseif($row['date_from'] == -1 && $row['date_until'] != -1) { diff --git a/customer_domains.php b/customer_domains.php index 6c9b7fc8..7bee8e3d 100644 --- a/customer_domains.php +++ b/customer_domains.php @@ -25,31 +25,31 @@ define('AREA', 'customer'); require ("./lib/init.php"); -if(isset($_POST['id'])) -{ +if(isset($_POST['id'])) { $id = intval($_POST['id']); -} -elseif(isset($_GET['id'])) -{ +} elseif(isset($_GET['id'])) { $id = intval($_GET['id']); } -if($page == 'overview') -{ +if($page == 'overview') { $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_domains"); eval("echo \"" . getTemplate("domains/domains") . "\";"); -} -elseif($page == 'domains') -{ - if($action == '') - { +} elseif($page == 'domains') { + if($action == '') { $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_domains::domains"); $fields = array( 'd.domain' => $lng['domains']['domainname'] ); $paging = new paging($userinfo, $db, TABLE_PANEL_DOMAINS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']); - $result = $db->query("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`caneditdomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `ad`.`id` AS `aliasdomainid`, `ad`.`domain` AS `aliasdomain`, `da`.`id` AS `domainaliasid`, `da`.`domain` AS `domainalias` FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `ad` ON `d`.`aliasdomain`=`ad`.`id` LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `da` ON `da`.`aliasdomain`=`d`.`id` WHERE `d`.`customerid`='" . (int)$userinfo['customerid'] . "' AND `d`.`email_only`='0' AND `d`.`id` <> " . (int)$userinfo['standardsubdomain'] . " " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()); - $paging->setEntries($db->num_rows($result)); + $domains_stmt = Database::prepare("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`caneditdomain`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `ad`.`id` AS `aliasdomainid`, `ad`.`domain` AS `aliasdomain`, `da`.`id` AS `domainaliasid`, `da`.`domain` AS `domainalias` FROM `" . TABLE_PANEL_DOMAINS . "` `d` + LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `ad` ON `d`.`aliasdomain`=`ad`.`id` + LEFT JOIN `" . TABLE_PANEL_DOMAINS . "` `da` ON `da`.`aliasdomain`=`d`.`id` + WHERE `d`.`customerid`= :customerid' + AND `d`.`email_only`='0' + AND `d`.`id` <> :standardsubdomain " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit() + ); + Database::pexecute($domains_stmt, array("customerid" => $userinfo['customerid'], "standardsubdomain" => $userinfo['standardsubdomain'])); + $paging->setEntries(Database::num_rows()); $sortcode = $paging->getHtmlSortCode($lng); $arrowcode = $paging->getHtmlArrowCode($filename . '?page=' . $page . '&s=' . $s); $searchcode = $paging->getHtmlSearchCode($lng); @@ -59,15 +59,12 @@ elseif($page == 'domains') $domains_count = 0; $domain_array = array(); - while($row = $db->fetch_array($result)) - { + while($row = $domains_stmt->fetch(PDO::FETCH_ASSOC)) { $row['domain'] = $idna_convert->decode($row['domain']); $row['aliasdomain'] = $idna_convert->decode($row['aliasdomain']); $row['domainalias'] = $idna_convert->decode($row['domainalias']); - if($row['parentdomainid'] == '0' - && $row['caneditdomain'] == '1') - { + if($row['parentdomainid'] == '0' && $row['caneditdomain'] == '1') { $parentdomains_count++; } @@ -76,21 +73,19 @@ elseif($page == 'domains') */ // nothing (ssl_global) $row['domain_hascert'] = 0; - $ssl_result = $db->query_first("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` WHERE `domainid`='".(int)$row['id']."';"); - if (is_array($ssl_result) - && isset($ssl_result['ssl_cert_file']) - && $ssl_result['ssl_cert_file'] != '' - ) { + $ssl_stmt = Database::prepare("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` WHERE `domainid` = :domainid"); + Database::pexecute($ssl_stmt, array("domainid" => $row['id'])); + $ssl_result = $ssl_stmt->fetch(PDO::FETCH_ASSOC); + if (is_array($ssl_result) && isset($ssl_result['ssl_cert_file']) && $ssl_result['ssl_cert_file'] != '') { // own certificate (ssl_customer_green) $row['domain_hascert'] = 1; } else { // check if it's parent has one set (shared) if ($row['parentdomainid'] != 0) { - $ssl_result = $db->query_first("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` WHERE `domainid`='".(int)$row['parentdomainid']."';"); - if (is_array($ssl_result) - && isset($ssl_result['ssl_cert_file']) - && $ssl_result['ssl_cert_file'] != '' - ) { + $ssl_stmt = Database::prepare("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` WHERE `domainid` = :domainid"); + Database::pexecute($ssl_stmt, array("domainid" => $row['parentdomainid'])); + $ssl_result = $ssl_stmt->fetch(PDO::FETCH_ASSOC); + if (is_array($ssl_result) && isset($ssl_result['ssl_cert_file']) && $ssl_result['ssl_cert_file'] != '') { // parent has a certificate (ssl_shared) $row['domain_hascert'] = 2; } @@ -103,42 +98,30 @@ elseif($page == 'domains') ksort($domain_array); $domain_id_array = array(); - foreach($domain_array as $sortkey => $row) - { + foreach($domain_array as $sortkey => $row) { $domain_id_array[$row['id']] = $sortkey; } $domain_sort_array = array(); - foreach($domain_array as $sortkey => $row) - { - if($row['parentdomainid'] == 0) - { + foreach($domain_array as $sortkey => $row) { + if($row['parentdomainid'] == 0) { $domain_sort_array[$sortkey][$sortkey] = $row; - } - else - { + } else { $domain_sort_array[$domain_id_array[$row['parentdomainid']]][$sortkey] = $row; } } $domain_array = array(); - if($paging->sortfield == 'd.domain' - && $paging->sortorder == 'asc') - { + if($paging->sortfield == 'd.domain' && $paging->sortorder == 'asc') { ksort($domain_sort_array); - } - elseif($paging->sortfield == 'd.domain' - && $paging->sortorder == 'desc') - { + } elseif($paging->sortfield == 'd.domain' && $paging->sortorder == 'desc') { krsort($domain_sort_array); } $i = 0; - foreach($domain_sort_array as $sortkey => $domain_array) - { - if($paging->checkDisplay($i)) - { + foreach($domain_sort_array as $sortkey => $domain_array) { + if($paging->checkDisplay($i)) { $row = htmlentities_array($domain_array[$sortkey]); if($settings['system']['awstats_enabled'] == '1') { $statsapp = 'awstats'; @@ -147,30 +130,20 @@ elseif($page == 'domains') } eval("\$domains.=\"" . getTemplate("domains/domains_delimiter") . "\";"); - if($paging->sortfield == 'd.domain' - && $paging->sortorder == 'asc') - { + if($paging->sortfield == 'd.domain' && $paging->sortorder == 'asc') { ksort($domain_array); - } - elseif($paging->sortfield == 'd.domain' - && $paging->sortorder == 'desc') - { + } elseif($paging->sortfield == 'd.domain' && $paging->sortorder == 'desc') { krsort($domain_array); } - foreach($domain_array as $row) - { - if(strpos($row['documentroot'], $userinfo['documentroot']) === 0) - { + foreach($domain_array as $row) { + if(strpos($row['documentroot'], $userinfo['documentroot']) === 0) { $row['documentroot'] = makeCorrectDir(substr($row['documentroot'], strlen($userinfo['documentroot']))); } // get ssl-ips if activated $show_ssledit = false; - if ($settings['system']['use_ssl'] == '1' - && domainHasSslIpPort($row['id']) - && $row['caneditdomain'] == '1' - ) { + if ($settings['system']['use_ssl'] == '1' && domainHasSslIpPort($row['id']) && $row['caneditdomain'] == '1') { $show_ssledit = true; } $row = htmlentities_array($row); @@ -182,26 +155,29 @@ elseif($page == 'domains') } eval("echo \"" . getTemplate("domains/domainlist") . "\";"); - } - elseif($action == 'delete' - && $id != 0) - { - $result = $db->query_first("SELECT `id`, `customerid`, `domain`, `documentroot`, `isemaildomain`, `parentdomainid` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'"); - $alias_check = $db->query_first('SELECT COUNT(`id`) AS `count` FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `aliasdomain`=\'' . (int)$id . '\''); - - if(isset($result['parentdomainid']) - && $result['parentdomainid'] != '0' - && $alias_check['count'] == 0) - { - if(isset($_POST['send']) - && $_POST['send'] == 'send') - { - if($result['isemaildomain'] == '1') - { - $emails = $db->query_first('SELECT COUNT(`id`) AS `count` FROM `' . TABLE_MAIL_VIRTUAL . '` WHERE `customerid`=\'' . (int)$userinfo['customerid'] . '\' AND `domainid`=\'' . (int)$id . '\''); - - if($emails['count'] != '0') - { + } elseif($action == 'delete' && $id != 0) { + $stmt = Database::prepare("SELECT `id`, `customerid`, `domain`, `documentroot`, `isemaildomain`, `parentdomainid` FROM `" . TABLE_PANEL_DOMAINS . "` + WHERE `customerid` = :customerid + AND `id` = :id" + ); + Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id)); + $result = $stmt->fetch(PDO::FETCH_ASSOC); + + $alias_stmt = Database::prepare("SELECT COUNT(`id`) AS `count` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `aliasdomain` = :aliasdomain"); + Database::pexecute($alias_stmt, array("aliasdomain" => $id)); + $alias_check = $alias_stmt->fetch(PDO::FETCH_ASSOC); + + if(isset($result['parentdomainid']) && $result['parentdomainid'] != '0' && $alias_check['count'] == 0) { + if(isset($_POST['send']) && $_POST['send'] == 'send') { + if($result['isemaildomain'] == '1') { + $emails_stmt = Database::prepare("SELECT COUNT(`id`) AS `count` FROM `" . TABLE_MAIL_VIRTUAL . "` + WHERE `customerid` = :customerid + AND `domainid` = :domainid" + ); + Database::pexecute($emails_stmt, array("customerid" => $userinfo['customerid'], "domainid" => $id)); + $emails = $emails_stmt->fetch(PDO::FETCH_ASSOC); + + if($emails['count'] != '0') { standard_error('domains_cantdeletedomainwithemail'); } } @@ -209,175 +185,194 @@ elseif($page == 'domains') /* * check for APS packages used with this domain, #110 */ - if(domainHasApsInstances($id)) - { + if(domainHasApsInstances($id)) { standard_error('domains_cantdeletedomainwithapsinstances'); } $log->logAction(USR_ACTION, LOG_INFO, "deleted subdomain '" . $idna_convert->decode($result['domain']) . "'"); - $result = $db->query("DELETE FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'"); - $result = $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `subdomains_used`=`subdomains_used`-1 WHERE `customerid`='" . (int)$userinfo['customerid'] . "'"); + $stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_DOMAINS . "` WHERE + `customerid` = :customerid + AND `id` = :id" + ); + Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id)); + + $stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` + SET `subdomains_used` = `subdomains_used` - 1 + WHERE `customerid` = :customerid" + ); + Database::pexecute($stmt, array("customerid" => $userinfo['customerid'])); + inserttask('1'); // Using nameserver, insert a task which rebuilds the server config inserttask('4'); redirectTo($filename, Array('page' => $page, 's' => $s)); - } - else - { + } else { ask_yesno('domains_reallydelete', $filename, array('id' => $id, 'page' => $page, 'action' => $action), $idna_convert->decode($result['domain'])); } - } - else - { + } else { standard_error('domains_cantdeletemaindomain'); } - } - elseif($action == 'add') - { - if($userinfo['subdomains_used'] < $userinfo['subdomains'] - || $userinfo['subdomains'] == '-1') - { - if(isset($_POST['send']) - && $_POST['send'] == 'send') - { + } elseif($action == 'add') { + if($userinfo['subdomains_used'] < $userinfo['subdomains'] || $userinfo['subdomains'] == '-1') { + if(isset($_POST['send']) && $_POST['send'] == 'send') { $subdomain = $idna_convert->encode(preg_replace(Array('/\:(\d)+$/', '/^https?\:\/\//'), '', validate($_POST['subdomain'], 'subdomain', '', 'subdomainiswrong'))); $domain = $idna_convert->encode($_POST['domain']); - $domain_check = $db->query_first("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `domain`='" . $db->escape($domain) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "' AND `parentdomainid`='0' AND `email_only`='0' AND `caneditdomain`='1' "); - $completedomain = $subdomain . '.' . $domain; - $completedomain_check = $db->query_first("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `domain`='" . $db->escape($completedomain) . "' AND `customerid`='" . (int)$userinfo['customerid'] . "' AND `email_only`='0' AND `caneditdomain` = '1'"); - $aliasdomain = intval($_POST['alias']); - $aliasdomain_check = array( - 'id' => 0 + $domain_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` + WHERE `domain` = :domain + AND `customerid` = :customerid + AND `parentdomainid` = '0' + AND `email_only` = '0' + AND `caneditdomain` = '1'" ); + Database::pexecute($domain_stmt, array("domain" => $domain, "customerid" => $userinfo['customerid'])); + $domain_check = $domain_stmt->fetch(PDO::FETCH_ASSOC); + + $completedomain = $subdomain . '.' . $domain; + $completedomain_stmt = Database::prepare("SELECT * FROM `" . TABLE_PANEL_DOMAINS . "` + WHERE `domain` = :domain + AND `customerid` = :customerid + AND `email_only` = '0' + AND `caneditdomain` = '1'" + ); + Database::pexecute($completedomain_stmt, array("domain" => $completedomain, "customerid" => $userinfo['customerid'])); + $completedomain_check = $completedomain_stmt->fetch(PDO::FETCH_ASSOC); + + $aliasdomain = intval($_POST['alias']); + $aliasdomain_check = array('id' => 0); $_doredirect = false; - if($aliasdomain != 0) - { + if($aliasdomain != 0) { // also check ip/port combination to be the same, #176 - $aliasdomain_check = $db->query_first("SELECT `d`.`id` FROM `" . TABLE_PANEL_DOMAINS . "` `d` , `" . TABLE_PANEL_CUSTOMERS . "` `c` , `".TABLE_DOMAINTOIP."` `dip` WHERE `d`.`aliasdomain` IS NULL AND `d`.`id` = '".(int)$aliasdomain."' AND `c`.`standardsubdomain` <> `d`.`id` AND `d`.`customerid` = '" . (int)$userinfo['customerid'] . "' AND `c`.`customerid` = `d`.`customerid` AND `d`.`id` = `dip`.`id_domain` AND `dip`.`id_ipandports` IN (SELECT `id_ipandports` FROM `".TABLE_DOMAINTOIP."` WHERE `id_domain` = '".(int)$aliasdomain."') GROUP BY `d`.`domain` ORDER BY `d`.`domain` ASC;"); + $aliasdomain_stmt = Database::prepare("SELECT `d`.`id` FROM `" . TABLE_PANEL_DOMAINS . "` `d` , `" . TABLE_PANEL_CUSTOMERS . "` `c` , `".TABLE_DOMAINTOIP."` `dip` + WHERE `d`.`aliasdomain` IS NULL + AND `d`.`id` = :id + AND `c`.`standardsubdomain` <> `d`.`id` + AND `d`.`customerid` = :customerid + AND `c`.`customerid` = `d`.`customerid` + AND `d`.`id` = `dip`.`id_domain` + AND `dip`.`id_ipandports` + IN (SELECT `id_ipandports` FROM `".TABLE_DOMAINTOIP."` + WHERE `id_domain` = :id ) + GROUP BY `d`.`domain + ORDER BY `d`.`domain` ASC;" + ); + Database::pexecute($aliasdomain_stmt, array("id" => $aliasdomain, "customerid" => $userinfo['customerid'])); + $aliasdomain_check = $aliasdomain_stmt->fetch(PDO::FETCH_ASSOC); } - if(isset($_POST['url']) - && $_POST['url'] != '' - && validateUrl($idna_convert->encode($_POST['url']))) - { + if(isset($_POST['url']) && $_POST['url'] != '' && validateUrl($idna_convert->encode($_POST['url']))) { $path = $_POST['url']; $_doredirect = true; - } - else - { + } else { $path = validate($_POST['path'], 'path'); } - if(!preg_match('/^https?\:\/\//', $path) - || !validateUrl($idna_convert->encode($path))) - { + if(!preg_match('/^https?\:\/\//', $path) || !validateUrl($idna_convert->encode($path))) { // If path is empty or '/' and 'Use domain name as default value for DocumentRoot path' is enabled in settings, // set default path to subdomain or domain name - if((($path == '') || ($path == '/')) - && $settings['system']['documentroot_use_default_value'] == 1) - { + if((($path == '') || ($path == '/')) && $settings['system']['documentroot_use_default_value'] == 1) { $path = makeCorrectDir($userinfo['documentroot'] . '/' . $completedomain); - } - else - { + } else { $path = makeCorrectDir($userinfo['documentroot'] . '/' . $path); } - if (strstr($path, ":") !== FALSE) - { + if (strstr($path, ":") !== FALSE) { standard_error('pathmaynotcontaincolon'); } - } - else - { + } else { $_doredirect = true; } - if(isset($_POST['openbasedir_path']) - && $_POST['openbasedir_path'] == '1') - { + if(isset($_POST['openbasedir_path']) && $_POST['openbasedir_path'] == '1') { $openbasedir_path = '1'; - } - else - { + } else { $openbasedir_path = '0'; } - if(isset($_POST['ssl_redirect']) - && $_POST['ssl_redirect'] == '1') - { + if(isset($_POST['ssl_redirect']) && $_POST['ssl_redirect'] == '1') { $ssl_redirect = '1'; - } - else - { + } else { $ssl_redirect = '0'; } - if($path == '') - { + if($path == '') { standard_error('patherror'); - } - elseif($subdomain == '') - { + } elseif($subdomain == '') { standard_error(array('stringisempty', 'domainname')); - } - elseif($subdomain == 'www' && $domain_check['wwwserveralias'] == '1') - { + } elseif($subdomain == 'www' && $domain_check['wwwserveralias'] == '1') { standard_error('wwwnotallowed'); - } - elseif($domain == '') - { + } elseif($domain == '') { standard_error('domaincantbeempty'); - } - elseif(strtolower($completedomain_check['domain']) == strtolower($completedomain)) - { + } elseif(strtolower($completedomain_check['domain']) == strtolower($completedomain)) { standard_error('domainexistalready', $completedomain); - } - elseif(strtolower($domain_check['domain']) != strtolower($domain)) - { + } elseif(strtolower($domain_check['domain']) != strtolower($domain)) { standard_error('maindomainnonexist', $domain); - } - elseif($aliasdomain_check['id'] != $aliasdomain) - { + } elseif($aliasdomain_check['id'] != $aliasdomain) { standard_error('domainisaliasorothercustomer'); - } - else - { + } else { // get the phpsettingid from parentdomain, #107 - $phpsid_result = $db->query_first("SELECT `phpsettingid` FROM `".TABLE_PANEL_DOMAINS."` WHERE `id` = '".(int)$domain_check['id']."'"); - if(!isset($phpsid_result['phpsettingid']) - || (int)$phpsid_result['phpsettingid'] <= 0 - ) { + $phpsid_stmt = Database::prepare("SELECT `phpsettingid` FROM `".TABLE_PANEL_DOMAINS."` + WHERE `id` = :id" + ); + Database::pexecute($phpsid_stmt, array("id" => $domain_check['id'])); + $phpsid_result = $phpsid_stmt->fetch(PDO::FETCH_ASSOC); + + if(!isset($phpsid_result['phpsettingid']) || (int)$phpsid_result['phpsettingid'] <= 0) { // assign default config $phpsid_result['phpsettingid'] = 1; } - $result = $db->query("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` SET - `customerid` = '" . (int)$userinfo['customerid'] . "', - `domain` = '" . $db->escape($completedomain) . "', - `documentroot` = '" . $db->escape($path) . "', - `aliasdomain` = ".(($aliasdomain != 0) ? "'" . $db->escape($aliasdomain) . "'" : "NULL") .", - `parentdomainid` = '" . (int)$domain_check['id'] . "', - `isemaildomain` = '" . ($domain_check['subcanemaildomain'] == '3' ? '1' : '0') . "', - `openbasedir` = '" . $db->escape($domain_check['openbasedir']) . "', - `openbasedir_path` = '" . $db->escape($openbasedir_path) . "', - `speciallogfile` = '" . $db->escape($domain_check['speciallogfile']) . "', - `specialsettings` = '" . $db->escape($domain_check['specialsettings']) . "', - `ssl_redirect` = '" . $ssl_redirect . "', - `phpsettingid` = '" . $phpsid_result['phpsettingid'] . "'"); + $stmt = Database::prepare("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` SET + `customerid` = :customerid, + `domain` = :domain, + `documentroot` = :documentroot, + `aliasdomain` = :aliasdomain, + `parentdomainid` = :parentdomainid, + `isemaildomain` = :isemaildomain, + `openbasedir` = :openbasedir, + `openbasedir_path` = :openbasedir_path, + `speciallogfile` = :speciallogfile, + `specialsettings` = :specialsettings, + `ssl_redirect` = :ssl_redirect, + `phpsettingid` = :phpsettingid" + ); + $params = array( + "customerid" => $userinfo['customerid'], + "domain" => $completedomain, + "documentroot" => $path, + "aliasdomain" => $aliasdomain != 0 ? $aliasdomain : "NULL", + "parentdomainid" => $domain_check['id'], + "isemaildomain" => $domain_check['subcanemaildomain'] == '3' ? '1' : '0', + "openbasedir" => $domain_check['openbasedir'], + "openbasedir_path" => $openbasedir_path, + "speciallogfile" => $domain_check['speciallogfile'], + "specialsettings" => $domain_check['specialsettings'], + "ssl_redirect" => $ssl_redirect, + "phpsettingid" => $phpsid_result['phpsettingid'] + ); + Database::pexecute($stmt, $params); - $result = $db->query("INSERT INTO `".TABLE_DOMAINTOIP."` (`id_domain`, `id_ipandports`) SELECT LAST_INSERT_ID(), `id_ipandports` FROM `".TABLE_DOMAINTOIP."` WHERE `id_domain` = '" . (int)$domain_check['id'] . "';"); - - if($_doredirect) - { - $did = $db->insert_id(); + if($_doredirect) { + $did = Database::lastInsertId(); $redirect = isset($_POST['redirectcode']) ? (int)$_POST['redirectcode'] : $settings['customredirect']['default']; addRedirectToDomain($did, $redirect); } + + $stmt = Database::prepare("INSERT INTO `".TABLE_DOMAINTOIP."` + (`id_domain`, `id_ipandports`) + SELECT LAST_INSERT_ID(), `id_ipandports` + FROM `".TABLE_DOMAINTOIP."` + WHERE `id_domain` = :id_domain" + ); + Database::pexecute($stmt, array("id_domain" => $domain_check['id'])); - $result = $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `subdomains_used`=`subdomains_used`+1 WHERE `customerid`='" . (int)$userinfo['customerid'] . "'"); + $stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` + SET `subdomains_used` = `subdomains_used` + 1 + WHERE `customerid` = :customerid" + ); + Database::pexecute($stmt, array("customerid" => $userinfo['customerid'])); + $log->logAction(USR_ACTION, LOG_INFO, "added subdomain '" . $completedomain . "'"); inserttask('1'); @@ -386,38 +381,49 @@ elseif($page == 'domains') redirectTo($filename, Array('page' => $page, 's' => $s)); } - } - else - { - $result = $db->query("SELECT `id`, `domain`, `documentroot`, `ssl_redirect`,`isemaildomain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `parentdomainid`='0' AND `email_only`='0' AND `caneditdomain`='1' ORDER BY `domain` ASC"); + } else { + $stmt = Database::prepare("SELECT `id`, `domain`, `documentroot`, `ssl_redirect`,`isemaildomain` FROM `" . TABLE_PANEL_DOMAINS . "` + WHERE `customerid` = :customerid + AND `parentdomainid` = '0' + AND `email_only` = '0' + AND `caneditdomain` = '1' + ORDER BY `domain` ASC" + ); + Database::pexecute($stmt, array("customerid" => $userinfo['customerid'])); $domains = ''; - while($row = $db->fetch_array($result)) - { - $domains.= makeoption($idna_convert->decode($row['domain']), $row['domain']); + while($row = $stmt->fetch(PDO::FETCH_ASSOC)) { + $domains .= makeoption($idna_convert->decode($row['domain']), $row['domain']); } $aliasdomains = makeoption($lng['domains']['noaliasdomain'], 0, NULL, true); - $result_domains = $db->query("SELECT `d`.`id`, `d`.`domain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_CUSTOMERS . "` `c` WHERE `d`.`aliasdomain` IS NULL AND `d`.`id` <> `c`.`standardsubdomain` AND `d`.`customerid`=`c`.`customerid` AND `d`.`email_only`='0' AND `d`.`customerid`=" . (int)$userinfo['customerid'] . " ORDER BY `d`.`domain` ASC"); + $domains_stmt = Database::prepare("SELECT `d`.`id`, `d`.`domain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_CUSTOMERS . "` `c` + WHERE `d`.`aliasdomain` IS NULL + AND `d`.`id` <> `c`.`standardsubdomain` + AND `d`.`customerid`=`c`.`customerid` + AND `d`.`email_only`='0' + AND `d`.`customerid`= :customerid + ORDER BY `d`.`domain` ASC" + ); + Database::pexecute($domains_stmt, array("customerid" => $userinfo['customerid'])); - while($row_domain = $db->fetch_array($result_domains)) - { - $aliasdomains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['id']); + while($row_domain = $domains_stmt->fetch(PDO::FETCH_ASSOC)) { + $aliasdomains .= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['id']); } $redirectcode = ''; - if($settings['customredirect']['enabled'] == '1') - { + if($settings['customredirect']['enabled'] == '1') { $codes = getRedirectCodesArray(); - foreach($codes as $rc) - { + foreach($codes as $rc) { $redirectcode .= makeoption($rc['code']. ' ('.$lng['redirect_desc'][$rc['desc']].')', $rc['id'], $settings['customredirect']['default']); } } // check if we at least have one ssl-ip/port, #1179 $ssl_ipsandports = ''; - $resultX = $db->query_first("SELECT COUNT(*) as countSSL FROM `panel_ipsandports` WHERE `ssl`='1'"); + $ssl_ip_stmt = Database::prepare("SELECT COUNT(*) as countSSL FROM `panel_ipsandports` WHERE `ssl`='1'"); + Database::pexecute($ssl_ip_stmt); + $resultX = $ssl_ip_stmt->fetch(PDO::FETCH_ASSOC); if (isset($resultX['countSSL']) && (int)$resultX['countSSL'] > 0) { $ssl_ipsandports = 'notempty'; } @@ -434,62 +440,53 @@ elseif($page == 'domains') eval("echo \"" . getTemplate("domains/domains_add") . "\";"); } } - } - elseif($action == 'edit' - && $id != 0) - { - $result = $db->query_first("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`wwwserveralias`, `d`.`iswildcarddomain`, `d`.`parentdomainid`, `d`.`ssl_redirect`, `d`.`aliasdomain`, `d`.`openbasedir`, `d`.`openbasedir_path`, `pd`.`subcanemaildomain` FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_DOMAINS . "` `pd` WHERE `d`.`customerid`='" . (int)$userinfo['customerid'] . "' AND `d`.`id`='" . (int)$id . "' AND ((`d`.`parentdomainid`!='0' AND `pd`.`id`=`d`.`parentdomainid`) OR (`d`.`parentdomainid`='0' AND `pd`.`id`=`d`.`id`)) AND `d`.`caneditdomain`='1'"); - $alias_check = $db->query_first('SELECT COUNT(`id`) AS count FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `aliasdomain`=\'' . (int)$result['id'] . '\''); + } elseif($action == 'edit' && $id != 0) { + $stmt = Database::prepare("SELECT `d`.`id`, `d`.`customerid`, `d`.`domain`, `d`.`documentroot`, `d`.`isemaildomain`, `d`.`wwwserveralias`, `d`.`iswildcarddomain`, + `d`.`parentdomainid`, `d`.`ssl_redirect`, `d`.`aliasdomain`, `d`.`openbasedir`, `d`.`openbasedir_path`, `pd`.`subcanemaildomain` + FROM `" . TABLE_PANEL_DOMAINS . "` `d`, `" . TABLE_PANEL_DOMAINS . "` `pd` + WHERE `d`.`customerid` = :customerid + AND `d`.`id` = :id + AND ((`d`.`parentdomainid`!='0' + AND `pd`.`id` = `d`.`parentdomainid`) + OR (`d`.`parentdomainid`='0' + AND `pd`.`id` = `d`.`id`)) + AND `d`.`caneditdomain`='1'"); + Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id)); + $result = $stmt->fetch(PDO::FETCH_ASSOC); + + $alias_stmt = Database::prepare("SELECT COUNT(`id`) AS count FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `aliasdomain`= :aliasdomain"); + Database::pexecute($alias_stmt, array("aliasdomain" => $result['id'])); + $alias_check = $alias_stmt->fetch(PDO::FETCH_ASSOC); $alias_check = $alias_check['count']; $_doredirect = false; - if(isset($result['customerid']) - && $result['customerid'] == $userinfo['customerid']) - { - if(isset($_POST['send']) - && $_POST['send'] == 'send') - { - if(isset($_POST['url']) - && $_POST['url'] != '' - && validateUrl($idna_convert->encode($_POST['url']))) - { + if(isset($result['customerid']) && $result['customerid'] == $userinfo['customerid']) { + if(isset($_POST['send']) && $_POST['send'] == 'send') { + if(isset($_POST['url']) && $_POST['url'] != '' && validateUrl($idna_convert->encode($_POST['url']))) { $path = $_POST['url']; $_doredirect = true; - } - else - { + } else { $path = validate($_POST['path'], 'path'); } - if(!preg_match('/^https?\:\/\//', $path) - || !validateUrl($idna_convert->encode($path))) - { + if(!preg_match('/^https?\:\/\//', $path) || !validateUrl($idna_convert->encode($path))) { // If path is empty or '/' and 'Use domain name as default value for DocumentRoot path' is enabled in settings, // set default path to subdomain or domain name - if((($path == '') || ($path == '/')) - && $settings['system']['documentroot_use_default_value'] == 1) - { + if((($path == '') || ($path == '/')) && $settings['system']['documentroot_use_default_value'] == 1) { $path = makeCorrectDir($userinfo['documentroot'] . '/' . $result['domain']); - } - else - { + } else { $path = makeCorrectDir($userinfo['documentroot'] . '/' . $path); } - if (strstr($path, ":") !== FALSE) - { + if (strstr($path, ":") !== FALSE) { standard_error('pathmaynotcontaincolon'); } - } - else - { + } else { $_doredirect = true; } $aliasdomain = intval($_POST['alias']); - if(isset($_POST['selectserveralias']) - && $result['parentdomainid'] == '0' - ) { + if(isset($_POST['selectserveralias']) && $result['parentdomainid'] == '0' ) { $iswildcarddomain = ($_POST['selectserveralias'] == '0') ? '1' : '0'; $wwwserveralias = ($_POST['selectserveralias'] == '1') ? '1' : '0'; } else { @@ -497,67 +494,55 @@ elseif($page == 'domains') $wwwserveralias = '0'; } - if($result['parentdomainid'] != '0' - && ($result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2') - && isset($_POST['isemaildomain'])) - { + if($result['parentdomainid'] != '0' && ($result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2') && isset($_POST['isemaildomain'])) { $isemaildomain = intval($_POST['isemaildomain']); - } - else - { + } else { $isemaildomain = $result['isemaildomain']; } - $aliasdomain_check = array( - 'id' => 0 - ); + $aliasdomain_check = array('id' => 0); - if($aliasdomain != 0) - { - $aliasdomain_check = $db->query_first('SELECT `id` FROM `' . TABLE_PANEL_DOMAINS . '` `d`,`' . TABLE_PANEL_CUSTOMERS . '` `c` WHERE `d`.`customerid`=\'' . (int)$result['customerid'] . '\' AND `d`.`aliasdomain` IS NULL AND `d`.`id`<>`c`.`standardsubdomain` AND `c`.`customerid`=\'' . (int)$result['customerid'] . '\' AND `d`.`id`=\'' . (int)$aliasdomain . '\''); + if($aliasdomain != 0) { + $aliasdomain_stmt = Database::prepare("SELECT `id` FROM `" . TABLE_PANEL_DOMAINS . "` `d`,`" . TABLE_PANEL_CUSTOMERS . "` `c` + WHERE `d`.`customerid`= :customerid + AND `d`.`aliasdomain` IS NULL + AND `d`.`id`<>`c`.`standardsubdomain` + AND `c`.`customerid`= :customerid + AND `d`.`id`= :id" + ); + Database::pexecute($aliasdomain_stmt, array("customerid" => $result['customerid'], "id" => $aliasdomain)); + $aliasdomain_check = $aliasdomain_stmt->fetch(PDO::FETCH_ASSOC); } - if($aliasdomain_check['id'] != $aliasdomain) - { + if($aliasdomain_check['id'] != $aliasdomain) { standard_error('domainisaliasorothercustomer'); } - if(isset($_POST['openbasedir_path']) - && $_POST['openbasedir_path'] == '1') - { + if(isset($_POST['openbasedir_path']) && $_POST['openbasedir_path'] == '1') { $openbasedir_path = '1'; - } - else - { + } else { $openbasedir_path = '0'; } - if(isset($_POST['ssl_redirect']) - && $_POST['ssl_redirect'] == '1') - { + if(isset($_POST['ssl_redirect']) && $_POST['ssl_redirect'] == '1') { $ssl_redirect = '1'; - } - else - { + } else { $ssl_redirect = '0'; } - if($path == '') - { + if($path == '') { standard_error('patherror'); - } - else - { - if(($result['isemaildomain'] == '1') - && ($isemaildomain == '0')) - { - $db->query("DELETE FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `domainid`='" . (int)$id . "'"); - $db->query("DELETE FROM `" . TABLE_MAIL_VIRTUAL . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `domainid`='" . (int)$id . "'"); + } else { + if(($result['isemaildomain'] == '1') && ($isemaildomain == '0')) { + $params = array("customerid" => $userinfo['customerid'], "domainid" => $id); + $stmt = Database::prepare("DELETE FROM `" . TABLE_MAIL_USERS . "` WHERE `customerid`= :customerid AND `domainid`= :domainid"); + Database::pexecute($stmt, $params); + $stmt = Database::prepare("DELETE FROM `" . TABLE_MAIL_VIRTUAL . "` WHERE `customerid`= :customerid AND `domainid`= :domainid"); + Database::pexecute($stmt, $params); $log->logAction(USR_ACTION, LOG_NOTICE, "automatically deleted mail-table entries for '" . $idna_convert->decode($result['domain']) . "'"); } - if($_doredirect) - { + if($_doredirect) { $redirect = isset($_POST['redirectcode']) ? (int)$_POST['redirectcode'] : false; updateRedirectOfDomain($id, $redirect); } @@ -568,19 +553,32 @@ elseif($page == 'domains') || $iswildcarddomain != $result['iswildcarddomain'] || $aliasdomain != $result['aliasdomain'] || $openbasedir_path != $result['openbasedir_path'] - || $ssl_redirect != $result['ssl_redirect']) - { + || $ssl_redirect != $result['ssl_redirect']) { $log->logAction(USR_ACTION, LOG_INFO, "edited domain '" . $idna_convert->decode($result['domain']) . "'"); - $result = $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET - `documentroot`='" . $db->escape($path) . "', - `isemaildomain`='" . (int)$isemaildomain . "', - `wwwserveralias`='" . (int)$wwwserveralias . "', - `iswildcarddomain`='" . (int)$iswildcarddomain . "', - `aliasdomain`=" . (($aliasdomain != 0 && $alias_check == 0) ? '\'' . $db->escape($aliasdomain) . '\'' : 'NULL') . ", - `openbasedir_path`='" . $db->escape($openbasedir_path) . "', - `ssl_redirect`='" . $ssl_redirect . "' - WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'" + + $stmt = Database::prepare("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET + `documentroot`= :documentroot, + `isemaildomain`= :isemaildomain, + `wwwserveralias`= :wwwserveralias, + `iswildcarddomain`= :iswildcarddomain, + `aliasdomain`= :aliasdomain, + `openbasedir_path`= :openbasedir_path, + `ssl_redirect`= :ssl_redirect + WHERE `customerid`= :customerid + AND `id`= :id" ); + $params = array( + "documentroot" => $path, + "isemaildomain" => $isemaildomain, + "wwwserveralias" => $wwwserveralias, + "iswildcarddomain" => $iswildcarddomain, + "aliasdomain" => ($aliasdomain != 0 && $alias_check == 0) ? $aliasdomain : 'NULL', + "openbasedir_path" => $openbasedir_path, + "ssl_redirect" => $ssl_redirect, + "customerid" => $userinfo['customerid'], + "id" => $id + ); + Database::pexecute($stmt, $params); inserttask('1'); // Using nameserver, insert a task which rebuilds the server config @@ -590,54 +588,57 @@ elseif($page == 'domains') redirectTo($filename, Array('page' => $page, 's' => $s)); } - } - else - { + } else { $result['domain'] = $idna_convert->decode($result['domain']); $domains = makeoption($lng['domains']['noaliasdomain'], 0, $result['aliasdomain'], true); // also check ip/port combination to be the same, #176 - $result_domains = $db->query("SELECT `d`.`id`, `d`.`domain` FROM `" . TABLE_PANEL_DOMAINS . "` `d` , `" . TABLE_PANEL_CUSTOMERS . "` `c` , `".TABLE_DOMAINTOIP."` `dip` WHERE `d`.`aliasdomain` IS NULL AND `d`.`id` <> '".(int)$result['id']."' AND `c`.`standardsubdomain` <> `d`.`id` AND `d`.`customerid` = '" . (int)$userinfo['customerid'] . "' AND `c`.`customerid` = `d`.`customerid` AND `d`.`id` = `dip`.`id_domain` AND `dip`.`id_ipandports` IN (SELECT `id_ipandports` FROM `".TABLE_DOMAINTOIP."` WHERE `id_domain` = '".(int)$result['id']."') GROUP BY `d`.`domain` ORDER BY `d`.`domain` ASC"); + $domains_stmt = Database::prepare("SELECT `d`.`id`, `d`.`domain` FROM `" . TABLE_PANEL_DOMAINS . "` `d` , `" . TABLE_PANEL_CUSTOMERS . "` `c` , `".TABLE_DOMAINTOIP."` `dip` + WHERE `d`.`aliasdomain` IS NULL + AND `d`.`id` <> :id + AND `c`.`standardsubdomain` <> `d`.`id` + AND `d`.`customerid` = :customerid + AND `c`.`customerid` = `d`.`customerid` + AND `d`.`id` = `dip`.`id_domain` + AND `dip`.`id_ipandports` + IN (SELECT `id_ipandports` FROM `".TABLE_DOMAINTOIP."` + WHERE `id_domain` = :id) + GROUP BY `d`.`domain` + ORDER BY `d`.`domain` ASC" + ); + Database::pexecute($domains_stmt, array("id" => $result['id'], "customerid" => $userinfo['customerid'])); - while($row_domain = $db->fetch_array($result_domains)) - { - $domains.= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['id'], $result['aliasdomain']); + while($row_domain = $domains_stmt->fetch(PDO::FETCH_ASSOC)) { + $domains .= makeoption($idna_convert->decode($row_domain['domain']), $row_domain['id'], $result['aliasdomain']); } - if(preg_match('/^https?\:\/\//', $result['documentroot']) - && validateUrl($idna_convert->encode($result['documentroot'])) - ) { - if($settings['panel']['pathedit'] == 'Dropdown') - { + if(preg_match('/^https?\:\/\//', $result['documentroot']) && validateUrl($idna_convert->encode($result['documentroot']))) { + if($settings['panel']['pathedit'] == 'Dropdown') { $urlvalue = $result['documentroot']; $pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit']); - } - else - { + } else { $urlvalue = ''; $pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], $result['documentroot'], true); } - } - else - { + } else { $urlvalue = ''; $pathSelect = makePathfield($userinfo['documentroot'], $userinfo['guid'], $userinfo['guid'], $settings['panel']['pathedit'], $result['documentroot']); } $redirectcode = ''; - if($settings['customredirect']['enabled'] == '1') - { + if($settings['customredirect']['enabled'] == '1') { $def_code = getDomainRedirectId($id); $codes = getRedirectCodesArray(); - foreach($codes as $rc) - { + foreach($codes as $rc) { $redirectcode .= makeoption($rc['code']. ' ('.$lng['redirect_desc'][$rc['desc']].')', $rc['id'], $def_code); } } // check if we at least have one ssl-ip/port, #1179 $ssl_ipsandports = ''; - $resultX = $db->query_first("SELECT COUNT(*) as countSSL FROM `panel_ipsandports` WHERE `ssl`='1'"); + $ssl_ip_stmt = Database::prepare("SELECT COUNT(*) as countSSL FROM `panel_ipsandports` WHERE `ssl`='1'"); + Database::pexecute($ssl_ip_stmt); + $resultX = $ssl_ip_stmt->fetch(PDO::FETCH_ASSOC); if (isset($resultX['countSSL']) && (int)$resultX['countSSL'] > 0) { $ssl_ipsandports = 'notempty'; } @@ -655,10 +656,16 @@ elseif($page == 'domains') $serveraliasoptions .= makeoption($lng['domains']['serveraliasoption_wildcard'], '0', $_value, true, true); $serveraliasoptions .= makeoption($lng['domains']['serveraliasoption_www'], '1', $_value, true, true); $serveraliasoptions .= makeoption($lng['domains']['serveraliasoption_none'], '2', $_value, true, true); - - $resultips = $db->query("SELECT `p`.`ip` AS `ip` FROM `".TABLE_PANEL_IPSANDPORTS."` `p` LEFT JOIN `".TABLE_DOMAINTOIP."` `dip` ON ( `dip`.`id_ipandports` = `p`.`id` ) WHERE `dip`.`id_domain` = '".(int)$result['id']."' GROUP BY `p`.`ip`"); + + $ips_stmt = Database::prepare("SELECT `p`.`ip` AS `ip` FROM `".TABLE_PANEL_IPSANDPORTS."` `p` + LEFT JOIN `".TABLE_DOMAINTOIP."` `dip` + ON ( `dip`.`id_ipandports` = `p`.`id` ) + WHERE `dip`.`id_domain` = :id_domain + GROUP BY `p`.`ip`" + ); + Database::pexecute($ips_stmt, array("id_domain" => $result['id'])); $result_ipandport['ip'] = ''; - while ($rowip = $db->fetch_array($resultips)) { + while ($rowip = $ips_stmt->fetch(PDO::FETCH_ASSOC)) { $result_ipandport['ip'] .= $rowip['ip'] . "
"; } @@ -673,21 +680,14 @@ elseif($page == 'domains') eval("echo \"" . getTemplate("domains/domains_edit") . "\";"); } - } - else - { + } else { standard_error('domains_canteditdomain'); } } -} -elseif ($page == 'domainssleditor') { +} elseif ($page == 'domainssleditor') { - if ($action == '' - || $action == 'view' - ) { - if (isset($_POST['send']) - && $_POST['send'] == 'send' - ) { + if ($action == '' || $action == 'view') { + if (isset($_POST['send']) && $_POST['send'] == 'send') { $ssl_cert_file = isset($_POST['ssl_cert_file']) ? $_POST['ssl_cert_file'] : ''; $ssl_key_file = isset($_POST['ssl_key_file']) ? $_POST['ssl_key_file'] : ''; @@ -716,10 +716,7 @@ elseif ($page == 'domainssleditor') { // subject name, issuer name, purposes, valid from and valid to dates etc. $cert_content = openssl_x509_parse($ssl_cert_file); - if (is_array($cert_content) - && isset($cert_content['subject']) - && isset($cert_content['subject']['CN']) - ) { + if (is_array($cert_content) && isset($cert_content['subject']) && isset($cert_content['subject']['CN'])) { // TODO self-signed certs might differ and don't need/want this /* $domain = $db->query_first("SELECT * FROM `".TABLE_PANEL_DOMAINS."` WHERE `id`='".(int)$id."'"); @@ -761,13 +758,21 @@ elseif ($page == 'domainssleditor') { $qrystart = "INSERT INTO "; $qrywhere = ", "; } - $db->query($qrystart." `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` SET - `ssl_cert_file` = '".$db->escape($ssl_cert_file)."', - `ssl_key_file` = '".$db->escape($ssl_key_file)."', - `ssl_ca_file` = '".$db->escape($ssl_ca_file)."', - `ssl_cert_chainfile` = '".$db->escape($ssl_cert_chainfile)."' - ".$qrywhere." `domainid`='".(int)$id."';" + $stmt = Database::prepare($qrystart." `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` SET + `ssl_cert_file` = :ssl_cert_file, + `ssl_key_file` = :ssl_key_file, + `ssl_ca_file` = :ssl_ca_file, + `ssl_cert_chainfile` = :ssl_cert_chainfile + ".$qrywhere." `domainid`= :domainid" ); + $params = array( + "ssl_cert_file" => $ssl_cert_file, + "ssl_key_file" => $ssl_key_file, + "ssl_ca_file" => $ssl_ca_file, + "ssl_cert_chainfile" => $ssl_cert_chainfile, + "domainid" => $id + ); + Database::pexecute($stmt, $params); // insert task to re-generate webserver-configs (#1260) inserttask('1'); @@ -776,9 +781,11 @@ elseif ($page == 'domainssleditor') { redirectTo($filename, array('page' => 'domains', 's' => $s)); } - $result = $db->query_first("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` - WHERE `domainid`='".(int)$id."';" + $stmt = Database::prepare("SELECT * FROM `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` + WHERE `domainid`= :domainid" ); + Database::pexecute($stmt, array("domainid" => $id)); + $result = $stmt->fetch(PDO::FETCH_ASSOC); $do_insert = false; // if no entry can be found, behave like we have empty values diff --git a/customer_index.php b/customer_index.php index 2e2cc872..c4871568 100644 --- a/customer_index.php +++ b/customer_index.php @@ -27,22 +27,40 @@ require('./lib/init.php'); if ($action == 'logout') { $log->logAction(USR_ACTION, LOG_NOTICE, 'logged out'); - $query = "DELETE FROM `" . TABLE_PANEL_SESSIONS . "` WHERE `userid` = '" . (int)$userinfo['customerid'] . "' AND `adminsession` = '0'"; + $params = array("customerid" => $userinfo['customerid']); if ($settings['session']['allow_multiple_login'] == '1') { - $query .= " AND `hash` = '" . $s . "'"; + $stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` + WHERE `userid` = :customerid + AND `adminsession` = '0' + AND `hash` = :hash" + ); + $params["hash"] = $s; + } else { + $stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_SESSIONS . "` + WHERE `userid` = :customerid + AND `adminsession` = '0'" + ); } - $db->query($query); + Database::pexecute($stmt, $params); + redirectTo('index.php'); exit; } if ($page == 'overview') { $log->logAction(USR_ACTION, LOG_NOTICE, "viewed customer_index"); + + $domain_stmt = Database::prepare("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` + WHERE `customerid` = :customerid + AND `parentdomainid` = '0' + AND `id` <> :standardsubdomain" + ); + Database::pexecute($domain_stmt, array("customerid" => $userinfo['customerid'], "standardsubdomain" => $userinfo['standardsubdomain'])); + $domains = ''; - $result = $db->query("SELECT `domain` FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `parentdomainid`='0' AND `id` <> '" . (int)$userinfo['standardsubdomain'] . "' "); $domainArray = array(); - while ($row = $db->fetch_array($result)) { + while ($row = $domain_stmt->fetch(PDO::FETCH_ASSOC)) { $domainArray[] = $idna_convert->decode($row['domain']); } @@ -52,9 +70,6 @@ if ($page == 'overview') { $yesterday = time() - (60 * 60 * 24); $month = date('M Y', $yesterday); - /* $traffic=$db->query_first("SELECT SUM(http) AS http_sum, SUM(ftp_up) AS ftp_up_sum, SUM(ftp_down) AS ftp_down_sum, SUM(mail) AS mail_sum FROM ".TABLE_PANEL_TRAFFIC." WHERE year='".date('Y')."' AND month='".date('m')."' AND day<='".date('d')."' AND customerid='".$userinfo['customerid']."'"); - $userinfo['traffic_used']=$traffic['http_sum']+$traffic['ftp_up_sum']+$traffic['ftp_down_sum']+$traffic['mail_sum'];*/ - $userinfo['diskspace'] = round($userinfo['diskspace'] / 1024, $settings['panel']['decimal_places']); $userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $settings['panel']['decimal_places']); $userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']); @@ -91,28 +106,57 @@ if ($page == 'overview') { } elseif($new_password != $new_password_confirm) { standard_error('newpasswordconfirmerror'); } else { - $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `password`='" . md5($new_password) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `password`='" . md5($old_password) . "'"); + // Update user password + $stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` + SET `password` = :newpassword + WHERE `customerid` = :customerid + AND `password` = :oldpassword" + ); + $params = array( + "newpassword" => md5($new_password), + "customerid" => $userinfo['customerid'], + "oldpassword" => md5($old_password) + ); + Database::pexecute($stmt, $params); $log->logAction(USR_ACTION, LOG_NOTICE, 'changed password'); - if (isset($_POST['change_main_ftp']) - && $_POST['change_main_ftp'] == 'true' - ) { + // Update ftp password + if (isset($_POST['change_main_ftp']) && $_POST['change_main_ftp'] == 'true') { $cryptPassword = makeCryptPassword($new_password); - $db->query("UPDATE `" . TABLE_FTP_USERS . "` SET `password`='" . $db->escape($cryptPassword) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `username`='" . $db->escape($userinfo['loginname']) . "'"); + $stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "` + SET `password` = :password + WHERE `customerid` = :customerid + AND `username` = :username" + ); + $params = array( + "password" => $cryptPassword, + "customerid" => $userinfo['customerid'], + "username" => $userinfo['loginname'] + ); + Database::pexecute($stmt, $params); $log->logAction(USR_ACTION, LOG_NOTICE, 'changed main ftp password'); } - if (isset($_POST['change_webalizer']) - && $_POST['change_webalizer'] == 'true' - ) { + // Update webalizer password + if (isset($_POST['change_webalizer']) && $_POST['change_webalizer'] == 'true') { if (CRYPT_STD_DES == 1) { $saltfordescrypt = substr(md5(uniqid(microtime(), 1)), 4, 2); $new_webalizer_password = crypt($new_password, $saltfordescrypt); } else { $new_webalizer_password = crypt($new_password); } - - $db->query("UPDATE `" . TABLE_PANEL_HTPASSWDS . "` SET `password`='" . $db->escape($new_webalizer_password) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `username`='" . $db->escape($userinfo['loginname']) . "'"); + + $stmt = Database::prepare("UPDATE `" . TABLE_PANEL_HTPASSWDS . "` + SET `password` = :password + WHERE `customerid` = :customerid + AND `username` = :username" + ); + $params = array( + "password" => $new_webalizer_password, + "customerid" => $userinfo['customerid'], + "username" => $userinfo['loginname'] + ); + Database::pexecute($stmt, $params); } redirectTo($filename, Array('s' => $s)); @@ -124,8 +168,18 @@ if ($page == 'overview') { if (isset($_POST['send']) && $_POST['send'] == 'send') { $def_language = validate($_POST['def_language'], 'default language'); if (isset($languages[$def_language])) { - $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `def_language`='" . $db->escape($def_language) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "'"); - $db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `language`='" . $db->escape($def_language) . "' WHERE `hash`='" . $db->escape($s) . "'"); + $stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` + SET `def_language` = :lang + WHERE `customerid` = :customerid" + ); + Database::pexecute($stmt, array("lang" => $def_language, "customerid" => $userinfo['customerid'])); + + $stmt = Database::prepare("UPDATE `" . TABLE_PANEL_SESSIONS . "` + SET `language` = :lang + WHERE `hash` = :hash" + ); + Database::pexecute($stmt, array("lang" => $def_language, "hash" => $s)); + $log->logAction(USR_ACTION, LOG_NOTICE, "changed default language to '" . $def_language . "'"); } @@ -147,8 +201,18 @@ if ($page == 'overview') { if (isset($_POST['send']) && $_POST['send'] == 'send') { $theme = validate($_POST['theme'], 'theme'); - $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "'"); - $db->query("UPDATE `" . TABLE_PANEL_SESSIONS . "` SET `theme`='" . $db->escape($theme) . "' WHERE `hash`='" . $db->escape($s) . "'"); + $stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` + SET `theme` = :theme + WHERE `customerid` = :customerid" + ); + Database::pexecute($stmt, array("theme" => $theme, "customerid" => $userinfo['customerid'])); + + $stmt = Database::prepare("UPDATE `" . TABLE_PANEL_SESSIONS . "` + SET `theme` = :theme + WHERE `hash` = :hash" + ); + Database::pexecute($stmt, array("theme" => $theme, "hash" => $s)); + $log->logAction(USR_ACTION, LOG_NOTICE, "changed default theme to '" . $theme . "'"); redirectTo($filename, Array('s' => $s)); } else { diff --git a/templates/Sparkle/admin/admins/admins.tpl b/templates/Sparkle/admin/admins/admins.tpl index e0b9c320..d4e98ae2 100644 --- a/templates/Sparkle/admin/admins/admins.tpl +++ b/templates/Sparkle/admin/admins/admins.tpl @@ -16,7 +16,7 @@ $header
-   + {$lng['admin']['admin_add']}
@@ -55,7 +55,7 @@ $header
-   + {$lng['admin']['admin_add']}
diff --git a/templates/Sparkle/admin/customers/customers.tpl b/templates/Sparkle/admin/customers/customers.tpl index 72b43f83..26383551 100644 --- a/templates/Sparkle/admin/customers/customers.tpl +++ b/templates/Sparkle/admin/customers/customers.tpl @@ -11,16 +11,16 @@ $header
- -
-   - {$lng['admin']['customer_add']} -
- -
{$searchcode}
+ + +
+   + {$lng['admin']['customer_add']} +
+ @@ -63,7 +63,7 @@ $header
-   +   {$lng['admin']['customer_add']}
diff --git a/templates/Sparkle/admin/domains/domains.tpl b/templates/Sparkle/admin/domains/domains.tpl index 99e4bd2e..e853c5fe 100644 --- a/templates/Sparkle/admin/domains/domains.tpl +++ b/templates/Sparkle/admin/domains/domains.tpl @@ -17,7 +17,7 @@
-   +   {$lng['admin']['domain_add']}
@@ -63,7 +63,7 @@
-   +   {$lng['admin']['domain_add']}
diff --git a/templates/Sparkle/admin/index/change_password.tpl b/templates/Sparkle/admin/index/change_password.tpl index 06056f55..b25df796 100644 --- a/templates/Sparkle/admin/index/change_password.tpl +++ b/templates/Sparkle/admin/index/change_password.tpl @@ -2,7 +2,7 @@ $header

-   +   {$lng['menue']['main']['changepassword']}

diff --git a/templates/Sparkle/admin/ipsandports/ipsandports.tpl b/templates/Sparkle/admin/ipsandports/ipsandports.tpl index 505f97ca..32b9a7ac 100644 --- a/templates/Sparkle/admin/ipsandports/ipsandports.tpl +++ b/templates/Sparkle/admin/ipsandports/ipsandports.tpl @@ -2,7 +2,7 @@ $header

-   +   {$lng['admin']['ipsandports']['ipsandports']}

@@ -16,7 +16,7 @@ $header
-   +   {$lng['admin']['ipsandports']['add']}
@@ -55,7 +55,7 @@ $header
-   +   {$lng['admin']['ipsandports']['add']}
diff --git a/templates/Sparkle/admin/logger/logger.tpl b/templates/Sparkle/admin/logger/logger.tpl index b5ba3828..6c4a3c83 100644 --- a/templates/Sparkle/admin/logger/logger.tpl +++ b/templates/Sparkle/admin/logger/logger.tpl @@ -17,7 +17,7 @@ $header
-   +   {$lng['logger']['truncate']}
@@ -45,7 +45,7 @@ $header
-   +   {$lng['logger']['truncate']}
diff --git a/templates/Sparkle/admin/phpconfig/overview.tpl b/templates/Sparkle/admin/phpconfig/overview.tpl index 72c48ed7..dc957005 100644 --- a/templates/Sparkle/admin/phpconfig/overview.tpl +++ b/templates/Sparkle/admin/phpconfig/overview.tpl @@ -10,7 +10,7 @@ $header
-   +   {$lng['admin']['phpsettings']['addnew']}
@@ -30,7 +30,7 @@ $header
-   +   {$lng['admin']['phpsettings']['addnew']}
diff --git a/templates/Sparkle/admin/phpconfig/overview_add.tpl b/templates/Sparkle/admin/phpconfig/overview_add.tpl index 618c1587..21e990f6 100644 --- a/templates/Sparkle/admin/phpconfig/overview_add.tpl +++ b/templates/Sparkle/admin/phpconfig/overview_add.tpl @@ -2,7 +2,7 @@ $header

- {$title}  + {$title}  {$title}

diff --git a/templates/Sparkle/admin/phpconfig/overview_edit.tpl b/templates/Sparkle/admin/phpconfig/overview_edit.tpl index 5150c087..1c5d077d 100644 --- a/templates/Sparkle/admin/phpconfig/overview_edit.tpl +++ b/templates/Sparkle/admin/phpconfig/overview_edit.tpl @@ -2,7 +2,7 @@ $header

- {$title}  + {$title}  {$title}

diff --git a/templates/Sparkle/admin/templates/templates.tpl b/templates/Sparkle/admin/templates/templates.tpl index 88e6a726..61657d65 100644 --- a/templates/Sparkle/admin/templates/templates.tpl +++ b/templates/Sparkle/admin/templates/templates.tpl @@ -10,7 +10,7 @@ $header
-   +   {$lng['admin']['templates']['template_add']}
@@ -42,7 +42,7 @@ $header
-   +   {$lng['admin']['templates']['template_add']}
diff --git a/templates/Sparkle/admin/tickets/archived_tickets.tpl b/templates/Sparkle/admin/tickets/archived_tickets.tpl index e5d2174e..fd025b67 100644 --- a/templates/Sparkle/admin/tickets/archived_tickets.tpl +++ b/templates/Sparkle/admin/tickets/archived_tickets.tpl @@ -6,7 +6,7 @@
diff --git a/templates/Sparkle/admin/tickets/categories.tpl b/templates/Sparkle/admin/tickets/categories.tpl index 45a4f132..ea8a9288 100644 --- a/templates/Sparkle/admin/tickets/categories.tpl +++ b/templates/Sparkle/admin/tickets/categories.tpl @@ -16,7 +16,7 @@ $header
-   +   {$lng['ticket']['ticket_newcateory']}
@@ -51,7 +51,7 @@ $header
-   +   {$lng['ticket']['ticket_newcateory']}
diff --git a/templates/Sparkle/admin/tickets/tickets.tpl b/templates/Sparkle/admin/tickets/tickets.tpl index 31d7d02a..27f2f797 100644 --- a/templates/Sparkle/admin/tickets/tickets.tpl +++ b/templates/Sparkle/admin/tickets/tickets.tpl @@ -17,7 +17,7 @@ $header
-   +   {$lng['ticket']['ticket_new']}
@@ -56,7 +56,7 @@ $header
-   +   {$lng['ticket']['ticket_new']}
diff --git a/templates/Sparkle/admin/tickets/tickets_tickets.tpl b/templates/Sparkle/admin/tickets/tickets_tickets.tpl index 2dd54cb5..d618966d 100644 --- a/templates/Sparkle/admin/tickets/tickets_tickets.tpl +++ b/templates/Sparkle/admin/tickets/tickets_tickets.tpl @@ -8,24 +8,24 @@
{$ticket['priority']} - {$lng['ticket']['show']} + {$lng['ticket']['show']}
- {$lng['ticket']['show']} + {$lng['ticket']['show']} - {$lng['ticket']['answer']} + {$lng['ticket']['answer']}   - {$lng['ticket']['close']} + {$lng['ticket']['close']}   - {$lng['ticket']['reopen']} + {$lng['ticket']['reopen']}   - {$lng['ticket']['archive']} + {$lng['ticket']['archive']}   {$lng['panel']['delete']} diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css index 00a66f3e..becb223a 100644 --- a/templates/Sparkle/assets/css/main.css +++ b/templates/Sparkle/assets/css/main.css @@ -197,12 +197,8 @@ footer img { margin: 10px !important; } -.tinyform input { - /*width:50%;*/ -} - -.tinyform input[type="checkbox"] { - width:auto; +table.tinyform input { + width:120px; } .fullform,.midform,.installsec { @@ -667,7 +663,7 @@ input[type="text"], input[type="password"] { } input[type="password"] { - background:#fff url(../img/icons/password.png) no-repeat 5px 4px; + background:#fff url(../img/icons/lock.png) no-repeat 5px 4px; } /* @@ -680,7 +676,7 @@ input[type="button"],input[type="submit"],input[type="reset"] { border: 0; background-color: #eee; min-width: 80px; - height: 26px; + height: 28px; background-image: none; border-width: 0px; } diff --git a/templates/Sparkle/assets/img/icons/sort_up.png b/templates/Sparkle/assets/img/icons/add.png similarity index 83% rename from templates/Sparkle/assets/img/icons/sort_up.png rename to templates/Sparkle/assets/img/icons/add.png index 956e1d4a..63a3f17e 100644 Binary files a/templates/Sparkle/assets/img/icons/sort_up.png and b/templates/Sparkle/assets/img/icons/add.png differ diff --git a/templates/Sparkle/assets/img/icons/aps.png b/templates/Sparkle/assets/img/icons/archive.png similarity index 77% rename from templates/Sparkle/assets/img/icons/aps.png rename to templates/Sparkle/assets/img/icons/archive.png index 95b23e7d..671ff139 100644 Binary files a/templates/Sparkle/assets/img/icons/aps.png and b/templates/Sparkle/assets/img/icons/archive.png differ diff --git a/templates/Sparkle/assets/img/icons/archive_ticket.png b/templates/Sparkle/assets/img/icons/archive_ticket.png deleted file mode 100644 index 38ccf819..00000000 Binary files a/templates/Sparkle/assets/img/icons/archive_ticket.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/autoresponder.png b/templates/Sparkle/assets/img/icons/autoresponder.png deleted file mode 100644 index 7d9c6420..00000000 Binary files a/templates/Sparkle/assets/img/icons/autoresponder.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/autoresponder_add.png b/templates/Sparkle/assets/img/icons/autoresponder_add.png deleted file mode 100644 index b4163f29..00000000 Binary files a/templates/Sparkle/assets/img/icons/autoresponder_add.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/autoresponder_edit.png b/templates/Sparkle/assets/img/icons/autoresponder_edit.png deleted file mode 100644 index 1e9a31b4..00000000 Binary files a/templates/Sparkle/assets/img/icons/autoresponder_edit.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/backup.png b/templates/Sparkle/assets/img/icons/backup.png deleted file mode 100644 index 913ab437..00000000 Binary files a/templates/Sparkle/assets/img/icons/backup.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/categories.png b/templates/Sparkle/assets/img/icons/categories.png deleted file mode 100644 index 913ab437..00000000 Binary files a/templates/Sparkle/assets/img/icons/categories.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/categories_add.png b/templates/Sparkle/assets/img/icons/categories_add.png deleted file mode 100644 index 25bacbe4..00000000 Binary files a/templates/Sparkle/assets/img/icons/categories_add.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/categories_edit.png b/templates/Sparkle/assets/img/icons/categories_edit.png deleted file mode 100644 index 0fca50f6..00000000 Binary files a/templates/Sparkle/assets/img/icons/categories_edit.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/clock_add.png b/templates/Sparkle/assets/img/icons/clock_add.png deleted file mode 100644 index ed98a65e..00000000 Binary files a/templates/Sparkle/assets/img/icons/clock_add.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/clock_add_big.png b/templates/Sparkle/assets/img/icons/clock_add_big.png deleted file mode 100644 index 23aaa99c..00000000 Binary files a/templates/Sparkle/assets/img/icons/clock_add_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/clock_delete.png b/templates/Sparkle/assets/img/icons/clock_delete.png deleted file mode 100644 index a9556459..00000000 Binary files a/templates/Sparkle/assets/img/icons/clock_delete.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/clock_delete_big.png b/templates/Sparkle/assets/img/icons/clock_delete_big.png deleted file mode 100644 index 1ec63ff3..00000000 Binary files a/templates/Sparkle/assets/img/icons/clock_delete_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/clock_edit.png b/templates/Sparkle/assets/img/icons/clock_edit.png deleted file mode 100644 index e1733730..00000000 Binary files a/templates/Sparkle/assets/img/icons/clock_edit.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/clock_error.png b/templates/Sparkle/assets/img/icons/clock_error.png deleted file mode 100644 index 0d4ff82c..00000000 Binary files a/templates/Sparkle/assets/img/icons/clock_error.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/clock_go.png b/templates/Sparkle/assets/img/icons/clock_go.png deleted file mode 100644 index 8465083b..00000000 Binary files a/templates/Sparkle/assets/img/icons/clock_go.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/clock_link.png b/templates/Sparkle/assets/img/icons/clock_link.png deleted file mode 100644 index 481cf04c..00000000 Binary files a/templates/Sparkle/assets/img/icons/clock_link.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/clock_pause.png b/templates/Sparkle/assets/img/icons/clock_pause.png deleted file mode 100644 index c469d03e..00000000 Binary files a/templates/Sparkle/assets/img/icons/clock_pause.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/clock_play.png b/templates/Sparkle/assets/img/icons/clock_play.png deleted file mode 100644 index 62063bf8..00000000 Binary files a/templates/Sparkle/assets/img/icons/clock_play.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/clock_red.png b/templates/Sparkle/assets/img/icons/clock_red.png deleted file mode 100644 index 2842cc33..00000000 Binary files a/templates/Sparkle/assets/img/icons/clock_red.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/clock_stop.png b/templates/Sparkle/assets/img/icons/clock_stop.png deleted file mode 100644 index 6fe8a6f9..00000000 Binary files a/templates/Sparkle/assets/img/icons/clock_stop.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/delete_big.png b/templates/Sparkle/assets/img/icons/delete_big.png deleted file mode 100644 index 8c2df452..00000000 Binary files a/templates/Sparkle/assets/img/icons/delete_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/display.png b/templates/Sparkle/assets/img/icons/display.png deleted file mode 100644 index 4855df01..00000000 Binary files a/templates/Sparkle/assets/img/icons/display.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/domain_add.png b/templates/Sparkle/assets/img/icons/domain_add.png deleted file mode 100644 index c9b8de3a..00000000 Binary files a/templates/Sparkle/assets/img/icons/domain_add.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/domain_edit.png b/templates/Sparkle/assets/img/icons/domain_edit.png deleted file mode 100644 index 93796b2e..00000000 Binary files a/templates/Sparkle/assets/img/icons/domain_edit.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/domains.png b/templates/Sparkle/assets/img/icons/domains.png deleted file mode 100644 index 3f5a02bd..00000000 Binary files a/templates/Sparkle/assets/img/icons/domains.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/edit_big.png b/templates/Sparkle/assets/img/icons/edit_big.png deleted file mode 100644 index 577a3ed8..00000000 Binary files a/templates/Sparkle/assets/img/icons/edit_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/email_add.png b/templates/Sparkle/assets/img/icons/email_add.png deleted file mode 100644 index 21989cd3..00000000 Binary files a/templates/Sparkle/assets/img/icons/email_add.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/email_edit.png b/templates/Sparkle/assets/img/icons/email_edit.png deleted file mode 100644 index 090bc682..00000000 Binary files a/templates/Sparkle/assets/img/icons/email_edit.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/email_forwarder_add.png b/templates/Sparkle/assets/img/icons/email_forwarder_add.png deleted file mode 100644 index 97ded37c..00000000 Binary files a/templates/Sparkle/assets/img/icons/email_forwarder_add.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/emails.png b/templates/Sparkle/assets/img/icons/emails.png deleted file mode 100644 index d60f46c4..00000000 Binary files a/templates/Sparkle/assets/img/icons/emails.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/error.png b/templates/Sparkle/assets/img/icons/error.png deleted file mode 100644 index 1f010b77..00000000 Binary files a/templates/Sparkle/assets/img/icons/error.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/find.png b/templates/Sparkle/assets/img/icons/find.png deleted file mode 100644 index 6896a4bd..00000000 Binary files a/templates/Sparkle/assets/img/icons/find.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/find_big.png b/templates/Sparkle/assets/img/icons/find_big.png deleted file mode 100644 index 6fcc05a4..00000000 Binary files a/templates/Sparkle/assets/img/icons/find_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/folder.gif b/templates/Sparkle/assets/img/icons/folder.gif deleted file mode 100644 index 648dfcd9..00000000 Binary files a/templates/Sparkle/assets/img/icons/folder.gif and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/group_edit.png b/templates/Sparkle/assets/img/icons/group_edit.png deleted file mode 100644 index 4c66760d..00000000 Binary files a/templates/Sparkle/assets/img/icons/group_edit.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/help.png b/templates/Sparkle/assets/img/icons/help.png deleted file mode 100644 index d42f972a..00000000 Binary files a/templates/Sparkle/assets/img/icons/help.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/htaccess.png b/templates/Sparkle/assets/img/icons/htaccess.png deleted file mode 100644 index 3c722765..00000000 Binary files a/templates/Sparkle/assets/img/icons/htaccess.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/htaccess_add.png b/templates/Sparkle/assets/img/icons/htaccess_add.png deleted file mode 100644 index 627580ab..00000000 Binary files a/templates/Sparkle/assets/img/icons/htaccess_add.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/htaccess_edit_big copy.png b/templates/Sparkle/assets/img/icons/htaccess_edit_big copy.png deleted file mode 100644 index fc218367..00000000 Binary files a/templates/Sparkle/assets/img/icons/htaccess_edit_big copy.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/htpasswd.png b/templates/Sparkle/assets/img/icons/htpasswd.png deleted file mode 100644 index 3c722765..00000000 Binary files a/templates/Sparkle/assets/img/icons/htpasswd.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/htpasswd_add.png b/templates/Sparkle/assets/img/icons/htpasswd_add.png deleted file mode 100644 index 627580ab..00000000 Binary files a/templates/Sparkle/assets/img/icons/htpasswd_add.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/htpasswd_edit.png b/templates/Sparkle/assets/img/icons/htpasswd_edit.png deleted file mode 100644 index dbcfacd8..00000000 Binary files a/templates/Sparkle/assets/img/icons/htpasswd_edit.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/htpasswd_edit_big copy.png b/templates/Sparkle/assets/img/icons/htpasswd_edit_big copy.png deleted file mode 100644 index fc218367..00000000 Binary files a/templates/Sparkle/assets/img/icons/htpasswd_edit_big copy.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/info.png b/templates/Sparkle/assets/img/icons/info.png deleted file mode 100644 index 97a405c4..00000000 Binary files a/templates/Sparkle/assets/img/icons/info.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ipsports.png b/templates/Sparkle/assets/img/icons/ipsports.png deleted file mode 100644 index 2c161f29..00000000 Binary files a/templates/Sparkle/assets/img/icons/ipsports.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ipsports_add.png b/templates/Sparkle/assets/img/icons/ipsports_add.png deleted file mode 100644 index 43998539..00000000 Binary files a/templates/Sparkle/assets/img/icons/ipsports_add.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ipsports_edit.png b/templates/Sparkle/assets/img/icons/ipsports_edit.png deleted file mode 100644 index 6a454563..00000000 Binary files a/templates/Sparkle/assets/img/icons/ipsports_edit.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/link.gif b/templates/Sparkle/assets/img/icons/link.gif deleted file mode 100644 index 7640489a..00000000 Binary files a/templates/Sparkle/assets/img/icons/link.gif and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/link.png b/templates/Sparkle/assets/img/icons/link.png deleted file mode 100644 index 045b1a55..00000000 Binary files a/templates/Sparkle/assets/img/icons/link.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/link_big.png b/templates/Sparkle/assets/img/icons/link_big.png deleted file mode 100644 index f200b700..00000000 Binary files a/templates/Sparkle/assets/img/icons/link_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/encrypted.png b/templates/Sparkle/assets/img/icons/lock.png similarity index 100% rename from templates/Sparkle/assets/img/icons/encrypted.png rename to templates/Sparkle/assets/img/icons/lock.png diff --git a/templates/Sparkle/assets/img/icons/encrypted_big.png b/templates/Sparkle/assets/img/icons/lock_big.png similarity index 100% rename from templates/Sparkle/assets/img/icons/encrypted_big.png rename to templates/Sparkle/assets/img/icons/lock_big.png diff --git a/templates/Sparkle/assets/img/icons/mail.png b/templates/Sparkle/assets/img/icons/mail.png deleted file mode 100644 index d60f46c4..00000000 Binary files a/templates/Sparkle/assets/img/icons/mail.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/mail_big.png b/templates/Sparkle/assets/img/icons/mail_big.png deleted file mode 100644 index 36cf4091..00000000 Binary files a/templates/Sparkle/assets/img/icons/mail_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/messages.png b/templates/Sparkle/assets/img/icons/messages.png deleted file mode 100644 index 152da025..00000000 Binary files a/templates/Sparkle/assets/img/icons/messages.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/mysql.png b/templates/Sparkle/assets/img/icons/mysql.png deleted file mode 100644 index af2ce4a1..00000000 Binary files a/templates/Sparkle/assets/img/icons/mysql.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/mysql_add.png b/templates/Sparkle/assets/img/icons/mysql_add.png deleted file mode 100644 index c77b9938..00000000 Binary files a/templates/Sparkle/assets/img/icons/mysql_add.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/mysql_edit.png b/templates/Sparkle/assets/img/icons/mysql_edit.png deleted file mode 100644 index fa00fdbc..00000000 Binary files a/templates/Sparkle/assets/img/icons/mysql_edit.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/mysqls.png b/templates/Sparkle/assets/img/icons/mysqls.png deleted file mode 100644 index 58b85a87..00000000 Binary files a/templates/Sparkle/assets/img/icons/mysqls.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/mysqls_big.png b/templates/Sparkle/assets/img/icons/mysqls_big.png deleted file mode 100644 index 28f74c99..00000000 Binary files a/templates/Sparkle/assets/img/icons/mysqls_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/parent.gif b/templates/Sparkle/assets/img/icons/parent.gif deleted file mode 100644 index 33ad0253..00000000 Binary files a/templates/Sparkle/assets/img/icons/parent.gif and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/password.png b/templates/Sparkle/assets/img/icons/password.png deleted file mode 100644 index e08c49ad..00000000 Binary files a/templates/Sparkle/assets/img/icons/password.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/password_big.png b/templates/Sparkle/assets/img/icons/password_big.png deleted file mode 100644 index 0b715edb..00000000 Binary files a/templates/Sparkle/assets/img/icons/password_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/phpsettings.png b/templates/Sparkle/assets/img/icons/phpsettings.png deleted file mode 100644 index ab47c874..00000000 Binary files a/templates/Sparkle/assets/img/icons/phpsettings.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/phpsettings_add.png b/templates/Sparkle/assets/img/icons/phpsettings_add.png deleted file mode 100644 index e4c13b3c..00000000 Binary files a/templates/Sparkle/assets/img/icons/phpsettings_add.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/phpsettings_edit.png b/templates/Sparkle/assets/img/icons/phpsettings_edit.png deleted file mode 100644 index f1fbe24b..00000000 Binary files a/templates/Sparkle/assets/img/icons/phpsettings_edit.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/phpsettings_edit_big copy.png b/templates/Sparkle/assets/img/icons/phpsettings_edit_big copy.png deleted file mode 100644 index 07649f7e..00000000 Binary files a/templates/Sparkle/assets/img/icons/phpsettings_edit_big copy.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/rename.gif b/templates/Sparkle/assets/img/icons/rename.gif deleted file mode 100644 index eb0971f0..00000000 Binary files a/templates/Sparkle/assets/img/icons/rename.gif and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/res_recalculate.png b/templates/Sparkle/assets/img/icons/res_recalculate.png deleted file mode 100644 index 419ca2f2..00000000 Binary files a/templates/Sparkle/assets/img/icons/res_recalculate.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/settings.png b/templates/Sparkle/assets/img/icons/settings.png deleted file mode 100644 index 2c7200b0..00000000 Binary files a/templates/Sparkle/assets/img/icons/settings.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/sort_both.png b/templates/Sparkle/assets/img/icons/sort_both.png deleted file mode 100644 index f20ab2e8..00000000 Binary files a/templates/Sparkle/assets/img/icons/sort_both.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/sort_down.png b/templates/Sparkle/assets/img/icons/sort_down.png deleted file mode 100644 index 5f49df2a..00000000 Binary files a/templates/Sparkle/assets/img/icons/sort_down.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ssl.png b/templates/Sparkle/assets/img/icons/ssl.png deleted file mode 100644 index e08c49ad..00000000 Binary files a/templates/Sparkle/assets/img/icons/ssl.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ssl_big.png b/templates/Sparkle/assets/img/icons/ssl_big.png deleted file mode 100644 index 0b715edb..00000000 Binary files a/templates/Sparkle/assets/img/icons/ssl_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ssl_customer_big.png b/templates/Sparkle/assets/img/icons/ssl_customer_big.png deleted file mode 100644 index 2c1b2de1..00000000 Binary files a/templates/Sparkle/assets/img/icons/ssl_customer_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ssl_global_big.png b/templates/Sparkle/assets/img/icons/ssl_global_big.png deleted file mode 100644 index 010e7f89..00000000 Binary files a/templates/Sparkle/assets/img/icons/ssl_global_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ssl_shared_big.png b/templates/Sparkle/assets/img/icons/ssl_shared_big.png deleted file mode 100644 index 50cb4b9f..00000000 Binary files a/templates/Sparkle/assets/img/icons/ssl_shared_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/syslog.png b/templates/Sparkle/assets/img/icons/syslog.png deleted file mode 100644 index d343a8ce..00000000 Binary files a/templates/Sparkle/assets/img/icons/syslog.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/syslog_truncate.png b/templates/Sparkle/assets/img/icons/syslog_truncate.png deleted file mode 100644 index 416e0622..00000000 Binary files a/templates/Sparkle/assets/img/icons/syslog_truncate.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/syslog_truncate_big.png b/templates/Sparkle/assets/img/icons/syslog_truncate_big.png deleted file mode 100644 index bf897ccd..00000000 Binary files a/templates/Sparkle/assets/img/icons/syslog_truncate_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/tag_orange.png b/templates/Sparkle/assets/img/icons/tag_orange.png deleted file mode 100644 index e69c9812..00000000 Binary files a/templates/Sparkle/assets/img/icons/tag_orange.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/templates.png b/templates/Sparkle/assets/img/icons/templates.png deleted file mode 100644 index 49d406a9..00000000 Binary files a/templates/Sparkle/assets/img/icons/templates.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/templates_add.png b/templates/Sparkle/assets/img/icons/templates_add.png deleted file mode 100644 index b733906f..00000000 Binary files a/templates/Sparkle/assets/img/icons/templates_add.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/templates_edit.png b/templates/Sparkle/assets/img/icons/templates_edit.png deleted file mode 100644 index 9158452e..00000000 Binary files a/templates/Sparkle/assets/img/icons/templates_edit.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_add.png b/templates/Sparkle/assets/img/icons/ticket_add.png deleted file mode 100644 index e3146dc6..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_add.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_answer.png b/templates/Sparkle/assets/img/icons/ticket_answer.png deleted file mode 100644 index 314f2e8f..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_answer.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_answer_big.png b/templates/Sparkle/assets/img/icons/ticket_answer_big.png deleted file mode 100644 index ceb667a8..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_answer_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_archive.png b/templates/Sparkle/assets/img/icons/ticket_archive.png deleted file mode 100644 index db002caf..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_archive.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_archive_search.png b/templates/Sparkle/assets/img/icons/ticket_archive_search.png deleted file mode 100644 index f4a500c5..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_archive_search.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_archive_search_big.png b/templates/Sparkle/assets/img/icons/ticket_archive_search_big.png deleted file mode 100644 index add6c33b..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_archive_search_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_close.png b/templates/Sparkle/assets/img/icons/ticket_close.png deleted file mode 100644 index 0366b9cf..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_close.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_close_big.png b/templates/Sparkle/assets/img/icons/ticket_close_big.png deleted file mode 100644 index 74379900..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_close_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_new.png b/templates/Sparkle/assets/img/icons/ticket_new.png deleted file mode 100644 index e3146dc6..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_new.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_new_big.png b/templates/Sparkle/assets/img/icons/ticket_new_big.png deleted file mode 100644 index 4873a072..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_new_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_reopen.png b/templates/Sparkle/assets/img/icons/ticket_reopen.png deleted file mode 100644 index 1e47a9d7..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_reopen.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_reopen_big.png b/templates/Sparkle/assets/img/icons/ticket_reopen_big.png deleted file mode 100644 index e4531f38..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_reopen_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_reply.png b/templates/Sparkle/assets/img/icons/ticket_reply.png deleted file mode 100644 index 314f2e8f..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_reply.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_show.png b/templates/Sparkle/assets/img/icons/ticket_show.png deleted file mode 100644 index f4a500c5..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_show.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/ticket_show_big.png b/templates/Sparkle/assets/img/icons/ticket_show_big.png deleted file mode 100644 index add6c33b..00000000 Binary files a/templates/Sparkle/assets/img/icons/ticket_show_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/tickets.png b/templates/Sparkle/assets/img/icons/tickets.png deleted file mode 100644 index 45089ee4..00000000 Binary files a/templates/Sparkle/assets/img/icons/tickets.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/traffic.png b/templates/Sparkle/assets/img/icons/traffic.png deleted file mode 100644 index 8ccd347c..00000000 Binary files a/templates/Sparkle/assets/img/icons/traffic.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/traffic_big_old.png b/templates/Sparkle/assets/img/icons/traffic_big_old.png deleted file mode 100644 index ad44f5a7..00000000 Binary files a/templates/Sparkle/assets/img/icons/traffic_big_old.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/trash.png b/templates/Sparkle/assets/img/icons/trash.png deleted file mode 100644 index 86c3a002..00000000 Binary files a/templates/Sparkle/assets/img/icons/trash.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/trash_big.png b/templates/Sparkle/assets/img/icons/trash_big.png deleted file mode 100644 index 113a1e4e..00000000 Binary files a/templates/Sparkle/assets/img/icons/trash_big.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/user.png b/templates/Sparkle/assets/img/icons/user.png deleted file mode 100644 index d20bc799..00000000 Binary files a/templates/Sparkle/assets/img/icons/user.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/user_add.png b/templates/Sparkle/assets/img/icons/user_add.png deleted file mode 100644 index c0c92a0e..00000000 Binary files a/templates/Sparkle/assets/img/icons/user_add.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/user_edit.png b/templates/Sparkle/assets/img/icons/user_edit.png deleted file mode 100644 index 371f1bfe..00000000 Binary files a/templates/Sparkle/assets/img/icons/user_edit.png and /dev/null differ diff --git a/templates/Sparkle/assets/img/icons/aps_upload.png b/templates/Sparkle/assets/img/icons/view.png similarity index 76% rename from templates/Sparkle/assets/img/icons/aps_upload.png rename to templates/Sparkle/assets/img/icons/view.png index 4f7fd9d0..d6d3bfd3 100644 Binary files a/templates/Sparkle/assets/img/icons/aps_upload.png and b/templates/Sparkle/assets/img/icons/view.png differ diff --git a/templates/Sparkle/assets/img/icons/warning.png b/templates/Sparkle/assets/img/icons/warning.png deleted file mode 100644 index 8031ec99..00000000 Binary files a/templates/Sparkle/assets/img/icons/warning.png and /dev/null differ diff --git a/templates/Sparkle/customer/autoresponder/autoresponder.tpl b/templates/Sparkle/customer/autoresponder/autoresponder.tpl index 1e44a12e..46d90a1c 100644 --- a/templates/Sparkle/customer/autoresponder/autoresponder.tpl +++ b/templates/Sparkle/customer/autoresponder/autoresponder.tpl @@ -11,7 +11,7 @@
-   +   {$lng['autoresponder']['autoresponder_add']}
@@ -33,7 +33,7 @@
-   +   {$lng['autoresponder']['autoresponder_add']}
diff --git a/templates/Sparkle/customer/domains/domain_ssleditor.tpl b/templates/Sparkle/customer/domains/domain_ssleditor.tpl index 45fee2b8..328d06b4 100644 --- a/templates/Sparkle/customer/domains/domain_ssleditor.tpl +++ b/templates/Sparkle/customer/domains/domain_ssleditor.tpl @@ -2,7 +2,7 @@ $header

- {$title}  + {$title}  {$title}

diff --git a/templates/Sparkle/customer/domains/domainlist.tpl b/templates/Sparkle/customer/domains/domainlist.tpl index 68b2a787..2075e679 100644 --- a/templates/Sparkle/customer/domains/domainlist.tpl +++ b/templates/Sparkle/customer/domains/domainlist.tpl @@ -17,7 +17,7 @@
-   +   {$lng['domains']['subdomain_add']}
@@ -51,7 +51,7 @@
-   +   {$lng['domains']['subdomain_add']}
diff --git a/templates/Sparkle/customer/email/emails.tpl b/templates/Sparkle/customer/email/emails.tpl index a1584c3d..38efae08 100644 --- a/templates/Sparkle/customer/email/emails.tpl +++ b/templates/Sparkle/customer/email/emails.tpl @@ -18,7 +18,7 @@
-   +   {$lng['emails']['emails_add']}
@@ -57,7 +57,7 @@
-   +   {$lng['emails']['emails_add']}
diff --git a/templates/Sparkle/customer/extras/htaccess.tpl b/templates/Sparkle/customer/extras/htaccess.tpl index a8c691c0..41e3de5c 100644 --- a/templates/Sparkle/customer/extras/htaccess.tpl +++ b/templates/Sparkle/customer/extras/htaccess.tpl @@ -16,7 +16,7 @@
-   +   {$lng['extras']['pathoptions_add']}
@@ -53,7 +53,7 @@
-   +   {$lng['extras']['pathoptions_add']}
diff --git a/templates/Sparkle/customer/extras/htpasswds.tpl b/templates/Sparkle/customer/extras/htpasswds.tpl index 3dbf7259..5a9c212b 100644 --- a/templates/Sparkle/customer/extras/htpasswds.tpl +++ b/templates/Sparkle/customer/extras/htpasswds.tpl @@ -17,7 +17,7 @@
-   +   {$lng['extras']['directoryprotection_add']}
@@ -50,7 +50,7 @@
-   +   {$lng['extras']['directoryprotection_add']}
diff --git a/templates/Sparkle/customer/ftp/accounts.tpl b/templates/Sparkle/customer/ftp/accounts.tpl index ad866211..65447ed5 100644 --- a/templates/Sparkle/customer/ftp/accounts.tpl +++ b/templates/Sparkle/customer/ftp/accounts.tpl @@ -17,7 +17,7 @@
-   +   {$lng['ftp']['account_add']}
@@ -51,7 +51,7 @@
-   +   {$lng['ftp']['account_add']}
diff --git a/templates/Sparkle/customer/index/change_password.tpl b/templates/Sparkle/customer/index/change_password.tpl index 9f99a39b..ed1a51c6 100644 --- a/templates/Sparkle/customer/index/change_password.tpl +++ b/templates/Sparkle/customer/index/change_password.tpl @@ -2,7 +2,7 @@ $header

-   +   {$lng['menue']['main']['changepassword']}

diff --git a/templates/Sparkle/customer/index/change_theme.tpl b/templates/Sparkle/customer/index/change_theme.tpl index b1c41e61..329ecdb5 100644 --- a/templates/Sparkle/customer/index/change_theme.tpl +++ b/templates/Sparkle/customer/index/change_theme.tpl @@ -2,7 +2,7 @@ $header

-   +   {$lng['menue']['main']['changetheme']}

diff --git a/templates/Sparkle/customer/mysql/mysqls.tpl b/templates/Sparkle/customer/mysql/mysqls.tpl index 92f3ab0d..869c2e42 100644 --- a/templates/Sparkle/customer/mysql/mysqls.tpl +++ b/templates/Sparkle/customer/mysql/mysqls.tpl @@ -17,7 +17,7 @@
-   +   {$lng['mysql']['database_create']}
@@ -53,7 +53,7 @@
-   +   {$lng['mysql']['database_create']}
diff --git a/templates/Sparkle/customer/tickets/tickets.tpl b/templates/Sparkle/customer/tickets/tickets.tpl index 4b6ad6b8..55995a7b 100644 --- a/templates/Sparkle/customer/tickets/tickets.tpl +++ b/templates/Sparkle/customer/tickets/tickets.tpl @@ -30,7 +30,7 @@ $header
-   +   {$lng['ticket']['ticket_new']}
@@ -69,7 +69,7 @@ $header
-   +   {$lng['ticket']['ticket_new']}
diff --git a/templates/Sparkle/customer/tickets/tickets_tickets.tpl b/templates/Sparkle/customer/tickets/tickets_tickets.tpl index e02bbc7a..0e9e4145 100644 --- a/templates/Sparkle/customer/tickets/tickets_tickets.tpl +++ b/templates/Sparkle/customer/tickets/tickets_tickets.tpl @@ -8,20 +8,20 @@
- {$lng['ticket']['show']} + {$lng['ticket']['show']} - {$lng['ticket']['answer']} + {$lng['ticket']['answer']}   - {$lng['ticket']['close']} + {$lng['ticket']['close']}   - {$lng['ticket']['reopen']} + {$lng['ticket']['reopen']}