Changeset 888
- Timestamp:
- 10/27/07 11:12:17 (13 months ago)
- Location:
- trunk
- Files:
-
- 10 modified
-
CHANGELOG (modified) (1 diff)
-
configs/awstats/awstats.ispcp_tpl.conf (modified) (1 diff)
-
engine/setup/ispcp-update (modified) (3 diffs)
-
gui/admin/circular.php (modified) (2 diffs)
-
gui/client/update_hp.php (modified) (1 diff)
-
gui/include/admin-functions.php (modified) (40 diffs)
-
gui/include/lostpassword-functions.php (modified) (14 diffs)
-
gui/include/reseller-functions.php (modified) (7 diffs)
-
gui/index.php (modified) (1 diff)
-
gui/reseller/circular.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/CHANGELOG
r885 r888 6 6 | * to fix: no errors on adding user (custom HP) | 7 7 \_________________________________________________________________/ 8 9 2007-10-27 Benedikt Heintel 10 - CONFIGS: 11 * Fixed #817: Wrong regex in awstats config 12 - ENGINE: 13 * Fixed: Error in AWStats Static 14 - GUI: 15 * Fixed #812: welcome mail for domain customers: "from" not rfc2822 conform 8 16 9 17 2007-10-24 Benedikt Heintel -
trunk/configs/awstats/awstats.ispcp_tpl.conf
r833 r888 166 166 # Example: "www.myserver.com localhost 127.0.0.1 REGEX[mydomain\.(net|org)$]" 167 167 # 168 HostAliases="www.{DOMAIN_NAME} REGEX[^.*\ \{DOMAIN_NAME}$]"168 HostAliases="www.{DOMAIN_NAME} REGEX[^.*\{DOMAIN_NAME}$]" 169 169 170 170 -
trunk/engine/setup/ispcp-update
r868 r888 46 46 print STDOUT "\tPlease enter path to vhcs2.conf [/etc/vhcs2/vhcs2.conf]: " 47 47 48 print STDOUT $welcome_message;49 50 48 $rdata = readline(\*STDIN); 51 49 chop($rdata); 52 50 53 if (!defined($rdata) || $ deceq '') {51 if (!defined($rdata) || $rdata eq '') { 54 52 $rdata = '/etc/vhcs2/vhcs2.conf'; 55 53 } … … 238 236 239 237 sub remove_vhcs2 { 238 my ($rs, $cmd) = (undef, undef); 239 240 240 push_el(\@main::el, 'remove_vhcs2()', 'Starting...'); 241 241 … … 349 349 } 350 350 # VHCS update 351 elif ( $main::ua{'update'} eq 1 || $main::ua{'update'} eq 2) {351 elif (($main::ua{'update'} eq 1) || ($main::ua{'update'} eq 2)) { 352 352 stop_services("/tmp/vhcs2-backup-all.lock"); 353 353 $rs = migrate_vhcs2(); -
trunk/gui/admin/circular.php
r824 r888 183 183 184 184 while (!$rs->EOF) { 185 $to = encode($rs->fields['fname'] . " " . $rs->fields['lname']) ." <" . $rs->fields['email'] . ">";186 send_circular_email($to, encode($sender_name) . " <$sender_email>", stripslashes($msg_subject), stripslashes($msg_text));185 $to = "\"" . encode($rs->fields['fname'] . " " . $rs->fields['lname']) . "\" <" . $rs->fields['email'] . ">"; 186 send_circular_email($to, "\"" . encode($sender_name) . "\" <" . $sender_email . ">", stripslashes($msg_subject), stripslashes($msg_text)); 187 187 $rs->MoveNext(); 188 188 } … … 192 192 $subject = encode($subject); 193 193 194 $headers = "From: $from\r\n";194 $headers = "From: " . $from . "\n"; 195 195 $headers .= "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit\n"; 196 196 $headers .= "X-Mailer: ispCP marketing mailer"; -
trunk/gui/client/update_hp.php
r767 r888 307 307 $from = $rs->fields['user_mail']; 308 308 309 $headers = "From: $from\n";309 $headers = "From: " . $from . "\n"; 310 310 $headers .= "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 7bit\n"; 311 311 $headers .= "X-Mailer: ispCP auto mailer"; -
trunk/gui/include/admin-functions.php
r884 r888 63 63 $tpl->define_dynamic('custom_buttons', 'menu'); 64 64 $tpl->assign( 65 array( 66 'TR_MENU_GENERAL_INFORMATION' => tr('General information'), 65 array('TR_MENU_GENERAL_INFORMATION' => tr('General information'), 67 66 'TR_MENU_HOSTING_PLANS' => tr('Manage hosting plans'), 68 67 'TR_MENU_SYSTEM_TOOLS' => tr('System tools'), … … 143 142 144 143 $tpl->assign( 145 array( 146 'BUTTON_LINK' => $menu_link, 144 array('BUTTON_LINK' => $menu_link, 147 145 'BUTTON_NAME' => $menu_name, 148 146 'BUTTON_TARGET' => $menu_target, … … 156 154 } // end while 157 155 } // end else 158 159 156 if (!$cfg['ISPCP_SUPPORT_SYSTEM']) { 160 157 $tpl->assign('ISACTIVE_SUPPORT', ''); … … 176 173 177 174 $tpl->assign( 178 array( 179 'TR_MENU_GENERAL_INFORMATION' => tr('General information'), 175 array('TR_MENU_GENERAL_INFORMATION' => tr('General information'), 180 176 'TR_MENU_CHANGE_PASSWORD' => tr('Change password'), 181 177 'TR_MENU_CHANGE_PERSONAL_DATA' => tr('Change personal data'), … … 247 243 248 244 $tpl->assign( 249 array( 250 'BUTTON_LINK' => $menu_link, 245 array('BUTTON_LINK' => $menu_link, 251 246 'BUTTON_NAME' => $menu_name, 252 247 'BUTTON_TARGET' => $menu_target, … … 321 316 SQL_QUERY; 322 317 323 $rs = exec_query($sql, $query, FALSE);318 $rs = exec_query($sql, $query, false); 324 319 325 320 return $rs->RecordCount(); … … 328 323 function get_admin_general_info(&$tpl, &$sql) { 329 324 $tpl->assign( 330 array( 331 'TR_GENERAL_INFORMATION' => tr('General information'), 325 array('TR_GENERAL_INFORMATION' => tr('General information'), 332 326 'TR_ACCOUNT_NAME' => tr('Account name'), 333 327 'TR_ADMIN_USERS' => tr('Admin users'), … … 394 388 if ($rs->RecordCount() == 0) { 395 389 $tpl->assign( 396 array( 397 'ADMIN_MESSAGE' => tr('Administrators list is empty!'), 390 array('ADMIN_MESSAGE' => tr('Administrators list is empty!'), 398 391 'ADMIN_LIST' => '' 399 392 ) … … 403 396 } else { 404 397 $tpl->assign( 405 array( 406 'TR_ADMIN_USERNAME' => tr('Username'), 398 array('TR_ADMIN_USERNAME' => tr('Username'), 407 399 'TR_ADMIN_CREATED_ON' => tr('Creation date'), 408 400 'TR_ADMIN_CREATED_BY' => tr('Created by'), … … 413 405 if ($i % 2 == 0) { 414 406 $tpl->assign( 415 array( 416 'ADMIN_CLASS' => 'content', 407 array('ADMIN_CLASS' => 'content', 417 408 ) 418 409 ); 419 410 } else { 420 411 $tpl->assign( 421 array( 422 'ADMIN_CLASS' => 'content2', 412 array('ADMIN_CLASS' => 'content2', 423 413 ) 424 414 ); … … 427 417 if ($rs->fields['created_by'] == '' || $rs->fields['admin_id'] == $_SESSION['user_id']) { 428 418 $tpl->assign( 429 array( 430 'ADMIN_DELETE_LINK' => '' 431 ) 432 ); 419 array('ADMIN_DELETE_LINK' => '' 420 ) 421 ); 433 422 $tpl->parse('ADMIN_DELETE_SHOW', 'admin_delete_show'); 434 423 } else { 435 424 $tpl->assign( 436 array( 437 'ADMIN_DELETE_SHOW' => '', 425 array('ADMIN_DELETE_SHOW' => '', 438 426 'TR_DELETE' => tr('Delete'), 439 427 'URL_DELETE_ADMIN' => "delete_user.php?delete_id=" . $rs->fields['admin_id'] . "&delete_username=" . $rs->fields['admin_name'], … … 445 433 446 434 $tpl->assign( 447 array( 448 'ADMIN_USERNAME' => $rs->fields['admin_name'], 435 array('ADMIN_USERNAME' => $rs->fields['admin_name'], 449 436 'ADMIN_CREATED_ON' => $admin_created, 450 'ADMIN_CREATED_BY' => ($rs->fields['created_by'] != NULL) ? $rs->fields['created_by'] : tr("System"),437 'ADMIN_CREATED_BY' => ($rs->fields['created_by'] != null) ? $rs->fields['created_by'] : tr("System"), 451 438 'URL_EDIT_ADMIN' => "edit_admin.php?edit_id=" . $rs->fields['admin_id'], 452 439 ) … … 485 472 if ($rs->RecordCount() == 0) { 486 473 $tpl->assign( 487 array( 488 'RSL_MESSAGE' => tr('Resellers list is empty!'), 474 array('RSL_MESSAGE' => tr('Resellers list is empty!'), 489 475 'RSL_LIST' => '' 490 476 ) … … 494 480 } else { 495 481 $tpl->assign( 496 array( 497 'TR_RSL_USERNAME' => tr('Username'), 482 array('TR_RSL_USERNAME' => tr('Username'), 498 483 'TR_RSL_CREATED_BY' => tr('Created by'), 499 484 'TR_RSL_OPTIONS' => tr('Options'), … … 503 488 if ($i % 2 == 0) { 504 489 $tpl->assign( 505 array( 506 'RSL_CLASS' => 'content', 490 array('RSL_CLASS' => 'content', 507 491 ) 508 492 ); 509 493 } else { 510 494 $tpl->assign( 511 array( 512 'RSL_CLASS' => 'content2', 495 array('RSL_CLASS' => 'content2', 513 496 ) 514 497 ); … … 517 500 if ($rs->fields['created_by'] == '') { 518 501 $tpl->assign( 519 array( 520 'TR_DELETE' => tr('Delete'), 502 array('TR_DELETE' => tr('Delete'), 521 503 'RSL_DELETE_LINK' => '', 522 504 ) … … 525 507 } else { 526 508 $tpl->assign( 527 array( 528 'RSL_DELETE_SHOW' => '', 509 array('RSL_DELETE_SHOW' => '', 529 510 'TR_DELETE' => tr('Delete'), 530 511 'URL_DELETE_RSL' => "delete_user.php?delete_id=" . $rs->fields['admin_id'] . "&delete_username=" . $rs->fields['admin_name'], … … 548 529 549 530 $tpl->assign( 550 array( 551 'RSL_USERNAME' => $rs->fields['admin_name'], 531 array('RSL_USERNAME' => $rs->fields['admin_name'], 552 532 'RESELLER_CREATED_ON' => $reseller_created, 553 533 'RSL_CREATED_BY' => $rs->fields['created_by'], … … 575 555 576 556 if (isset($_GET['psi'])) $start_index = $_GET['psi']; 577 578 557 // Search requet generated ?! 579 580 558 if (isset($_POST['uaction']) && !empty($_POST['uaction'])) { 581 559 $_SESSION['search_for'] = trim(clean_input($_POST['search_for'])); … … 588 566 } else { 589 567 if (isset($_SESSION['search_for']) && !isset($_GET['psi'])) { 590 591 568 // He have not got scroll through patient records. 592 593 569 unset($_SESSION['search_for']); 594 570 … … 632 608 if (isset($_SESSION['search_for'])) { 633 609 $tpl->assign( 634 array( 635 'USR_MESSAGE' => tr('Not found user records matching the search criteria!'), 610 array('USR_MESSAGE' => tr('Not found user records matching the search criteria!'), 636 611 'USR_LIST' => '', 637 612 'SCROLL_PREV' => '', … … 649 624 } else { 650 625 $tpl->assign( 651 array( 652 'USR_MESSAGE' => tr('Users list is empty!'), 626 array('USR_MESSAGE' => tr('Users list is empty!'), 653 627 'USR_LIST' => '', 654 628 'SCROLL_PREV' => '', … … 680 654 } else { 681 655 $tpl->assign( 682 array( 683 'SCROLL_NEXT_GRAY' => '', 656 array('SCROLL_NEXT_GRAY' => '', 684 657 'NEXT_PSI' => $next_si 685 658 ) … … 688 661 689 662 $tpl->assign( 690 array( 691 'TR_USR_USERNAME' => tr('Username'), 663 array('TR_USR_USERNAME' => tr('Username'), 692 664 'TR_USR_CREATED_BY' => tr('Created by'), 693 665 'TR_USR_OPTIONS' => tr('Options'), … … 729 701 if ($rs2->fields['admin_name'] == '') { 730 702 $tpl->assign( 731 array( 732 'TR_DELETE' => tr('Delete'), 703 array('TR_DELETE' => tr('Delete'), 733 704 'USR_DELETE_LINK' => '', 734 705 ) … … 737 708 } else { 738 709 $tpl->assign( 739 array( 740 'USR_DELETE_SHOW' => '', 710 array('USR_DELETE_SHOW' => '', 741 711 'DOMAIN_ID' => $rs->fields['domain_id'], 742 712 'TR_DELETE' => tr('Delete'), … … 785 755 786 756 $tpl->assign( 787 array( 788 'USR_USERNAME' => $admin_name, 757 array('USR_USERNAME' => $admin_name, 789 758 'USER_CREATED_ON' => $domain_created, 790 759 'USR_CREATED_BY' => $rs2->fields['admin_name'], … … 812 781 function get_admin_manage_users(&$tpl, &$sql) { 813 782 $tpl->assign( 814 array( 815 'TR_MANAGE_USERS' => tr('Manage users'), 783 array('TR_MANAGE_USERS' => tr('Manage users'), 816 784 'TR_ADMINISTRATORS' => tr('Administrators'), 817 785 'TR_RESELLERS' => tr('Resellers'), … … 1524 1492 AUTO_LOG_MSG; 1525 1493 1526 $headers = "From: ispCP Logging Daemon <$admin_email>\n";1494 $headers = "From: \"ispCP Logging Daemon\" <" . $admin_email . ">\n"; 1527 1495 1528 1496 $headers .= "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 7bit\n"; … … 1531 1499 1532 1500 $mail_result = mail($to, $subject, $message, $headers); 1533 1534 1501 // reduce admin log entries by only logging email notification if not successful 1535 1502 if (!$mail_result) { 1536 1537 1538 1539 1540 1503 $mail_status = ($mail_result) ? 'OK' : 'NOT OK'; 1504 1505 $log_message = "$admin_login: Logging Daemon Mail To: |$to|, From: |$admin_email|, Status: |$mail_status|!"; 1506 1507 exec_query($sql, "INSERT INTO log (log_time,log_message) VALUES(NOW(), ?)", $log_message, false); 1541 1508 } 1542 1509 } … … 1559 1526 1560 1527 if ($from_name) { 1561 $from = encode($from_name) ." <" . $from_email . ">";1528 $from = "\"" . encode($from_name) . "\" <" . $from_email . ">"; 1562 1529 } else { 1563 1530 $from = $from_email; … … 1565 1532 1566 1533 if ($ufname && $ulname) { 1567 $to = encode($ufname . ' ' . $ulname) . " <$uemail>"; 1568 1534 $to = "\"" . encode($ufname . ' ' . $ulname) . "\" <" . $uemail . ">"; 1569 1535 $name = "$ufname $ulname"; 1570 1536 } else { 1571 1537 $name = $uname; 1572 1573 1538 $to = $uemail; 1574 1539 } … … 1599 1564 $subject = encode($subject); 1600 1565 1601 $headers = "From: $from\n";1566 $headers = "From: " . $from . "\n"; 1602 1567 1603 1568 $headers .= "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 8bit\n"; … … 1784 1749 } 1785 1750 1786 function gen_admin_domain_query (&$search_query, &$count_query, 1751 function gen_admin_domain_query (&$search_query, &$count_query, $start_index, 1787 1752 $rows_per_page, $search_for, $search_common, $search_status) { 1788 1753 if ($search_for === 'n/a' && $search_common === 'n/a' && $search_status === 'n/a') { 1789 1790 1754 // We have pure list query; 1791 1792 1755 $count_query = <<<SQL_QUERY 1793 1756 SELECT … … 2191 2154 } 2192 2155 2193 function substract_from_reseller_props($reseller_id, $domain_id) 2194 { 2156 function substract_from_reseller_props($reseller_id, $domain_id) { 2195 2157 // function update reseller props bevore deleting account 2196 2158 list ($rdmn_current, $rdmn_max, … … 2267 2229 2268 2230 if ($rs->RecordCount() == 0) { 2269 2231 $title = tr("ispCP - Order Panel"); 2270 2232 $header = <<<RIC 2271 2233 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" … … 2302 2264 2303 2265 if ($encode) { 2304 2305 2266 $header = htmlentities($header, ENT_COMPAT, 'UTF-8'); 2267 $footer = htmlentities($footer, ENT_COMPAT, 'UTF-8'); 2306 2268 } 2307 2269 … … 2348 2310 $message = tr("Hello {TO_NAME} !\n\nYou have a new ticket to read"); 2349 2311 // Format adresses 2312 2350 2313 if ($from_fname && $from_lname) { 2351 $from = " $from_fname $from_lname <$from_email>";2314 $from = "\"" . encode($from_fname . ' ' . $from_lname) . "\" <" . $from_email . ">"; 2352 2315 $fromname = "$from_fname $from_lname"; 2353 2316 } else { … … 2355 2318 $fromname = $from_uname; 2356 2319 } 2320 2357 2321 if ($to_fname && $to_lname) { 2358 $to = " $to_fname $to_lname <$to_email>";2359 $ name = "$to_fname $to_lname";2322 $to = "\"" . encode($to_fname . ' ' . $to_lname) . "\" <" . $to_email . ">"; 2323 $toname = "$to_fname $to_lname"; 2360 2324 } else { 2361 2325 $name = $to_uname; 2362 2326 $to = $to_email; 2363 2327 } 2328 2364 2329 // Prepare and send mail 2365 2330 $search = array(); … … 2406 2371 $cfg[$name] = $value; 2407 2372 2408 return TRUE;2373 return true; 2409 2374 } 2410 2375 -
trunk/gui/include/lostpassword-functions.php
r849 r888 1 1 <?php 2 2 /** 3 * ispCP ω (OMEGA) a Virtual Hosting Control Panel3 * ispCP ω (OMEGA) a Virtual Hosting Control System 4 4 * 5 * 6 *