Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 511

Show
Ignore:
Timestamp:
04/18/07 11:31:07 (2 years ago)
Author:
rats
Message:

- DOCS:

  • SuSE: updated installation

- GUI:

  • fixed stupid default domain error
  • fixed bug #165: encoding not set
  • added link to admin-panel in default e-mail
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r509 r511  
    1111\_________________________________________________________________/ 
    1212 
    13 2007-04-16 Benedikt Heintel 
     132007-04-17 Benedikt Heintel 
     14        - DOCS: 
     15                * SuSE: updated installation 
     16        - GUI: 
     17                * fixed stupid default domain error 
     18                * fixed bug #165: encoding not set 
     19                * added link to admin-panel in default e-mail 
     20 
     212007-04-17 Benedikt Heintel 
    1422        - CONFIGS: 
    1523                * fixed bug #174: master not longer reachable on adding Domain 

  • trunk/docs/SuSE/INSTALL

    r478 r511  
    1 ISPCP ω (OMEGA) HowTo Install for RedHat (Enterprise), CentOS 
     1ISPCP ω (OMEGA) HowTo Install for SuSE, SLES 
    22================================================================================ 
    33For other Linux distributions please check the other INSTALL files. 
    …… 
    17171) Version Info 
    1818--------------- 
    19 ISPCP ω Version:               1.0.0 
    20 INSTALL Skript:         0.9 
     19ISPCP ω Version:        1.0.0 
     20INSTALL Skript:         1.0 
    2121Maintainer: 
    2222Homepage:                       http://isp-contol.net 
    23 Linux Distris:          RedHat (Enterprise), CentOS 
     23Linux Distris:          SuSE, SLES 
    2424 
    2525================================================================================ 
    …… 
    3333Debian (or even any other *NIX-Distribution) 
    3434 
    35 All RedHat (Professional), CentOS required packages are listed in 
    36 ./docs/RedHat/redhat-packages 
     35All SuSE, SLES required packages are listed in 
     36./docs/SuSE/suse-packages 
    3737 
    3838================================================================================ 
    …… 
    6262 
    63633. Install the required modules: 
    64         # yum upgrade 
    65         # wget http://dag.wieers.com/rpm/packages/rpmforge-release/rpmforge-release-0.3.6-1.el4.rf.i386.rpm 
    66         # yum remove sendmail 
    67         # yum install `cat ./docs/RedHat/redhat-packages` 
     64        # yast upgrade 
     65        # yast -i `cat ./docs/SuSE/suse-packages` 
    6866 
    69674. Now there are two ways of install ISPCP ω 

  • trunk/engine/ispcp-dmn-mngr

    r479 r511  
    20292029 
    20302030                my $index_tpl = ''; 
     2031                my $vhost = $main::cfg{'BASE_SERVER_VHOST'}; 
    20312032 
    20322033                ($rs, $index_tpl) = get_file("$root_dir/gui/domain_default_page/index.html"); 
    …… 
    20352036 
    20362037                $index_tpl =~ s/{DOMAIN_NAME}/$dmn_name/gi; 
    2037                 $index_tpl =~ s/{BASE_SERVER_VHOST}/$main::cfg{'BASE_SERVER_VHOST'}/gi; 
     2038                $index_tpl =~ s/{BASE_SERVER_VHOST}/$vhost/gi; 
    20382039 
    20392040                ($rs, $rdata) = store_file( 

  • trunk/gui/domain_default_page/index.html

    r491 r511  
    8888  <tr> 
    8989    <td>&nbsp;</td> 
    90     <td>If you are the Administrator of this domain, please login <a href="{BASE_SERVER_VHOST}" class="link">here</a>.</td> 
     90    <td>If you are the Administrator of this domain, please login <a href="http://{BASE_SERVER_VHOST}" class="link">here</a>.</td> 
    9191    <td>&nbsp;</td> 
    9292  </tr> 

  • trunk/gui/include/admin-functions.php

    r474 r511  
    11<?php 
    22/** 
    3  *  ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 *  ispCP (OMEGA) a Virtual Hosting Control Panel 
    44 * 
    55 *  @copyright  2001-2006 by moleSoftware GmbH 
    66 *  @copyright  2006-2007 by ispCP | http://isp-control.net 
    77 *  @link               http://isp-control.net 
    8  *  @author             ispCP Team (2007) 
     8 *  @author             Benedikt Heintel, ispCP Team (2007) 
    99 * 
    1010 *  @license 
    …… 
    16991699                $headers = "From: ISPCP  Logging Daemon <$admin_email>\n"; 
    17001700 
    1701                        $headers .= "MIME-Version: 1.0\nContent-Type: text/plain\nContent-Transfer-Encoding: 7bit\n"; 
    1702  
    1703                                $headers .=    "X-Mailer: ISPCP $Version Logging Mailer"; 
     1701                $headers .= "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 7bit\n"; 
     1702 
     1703                $headers .=   "X-Mailer: ISPCP $Version Logging Mailer"; 
    17041704 
    17051705                $mail_result = mail($to, $subject, $message, $headers); 
    …… 
    17211721        $admin_login = $_SESSION['user_logged']; 
    17221722 
    1723                $data = get_welcome_email($admin_id); 
    1724  
    1725                $from_name = $data['sender_name']; 
    1726  
    1727                $from_email = $data['sender_email']; 
     1723        $data = get_welcome_email($admin_id); 
     1724 
     1725        $from_name = $data['sender_name']; 
     1726 
     1727        $from_email = $data['sender_email']; 
    17281728 
    17291729        $subject = $data['subject']; 
    17301730 
    17311731        $message = $data['message']; 
     1732 
     1733        $base_vhost = $cfg['BASE_SERVER_VHOST']; 
    17321734 
    17331735        if ($from_name) { 
    …… 
    17631765        $message = preg_replace("/\{NAME\}/", $name, $message); 
    17641766        $message = preg_replace("/\{PASSWORD\}/", $password, $message); 
     1767        $message = preg_replace("/\{BASE_SERVER_VHOST\}/", $base_vhost, $message); 
    17651768 
    17661769        $headers = "From: $from\n"; 
    17671770 
    1768         $headers .= "MIME-Version: 1.0\nContent-Type: text/plain\nContent-Transfer-Encoding: 7bit\n"; 
    1769  
    1770                $headers .=    "X-Mailer: ISPCP ".$cfg['Version']." Service Mailer"; 
     1771        $headers .= "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 7bit\n"; 
     1772 
     1773        $headers .=   "X-Mailer: ISPCP ".$cfg['Version']." Service Mailer"; 
    17711774 
    17721775        $mail_result = mail($to, $subject, $message, $headers); 
    …… 
    27532756        $headers = "From: $from\n"; 
    27542757 
    2755         $headers .= "MIME-Version: 1.0\nContent-Type: text/plain\nContent-Transfer-Encoding: 7bit\n"; 
    2756  
    2757                $headers .=    "X-Mailer: ISPCP ".$cfg['Version']." Tickets Mailer"; 
     2758        $headers .= "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 7bit\n"; 
     2759 
     2760        $headers .=   "X-Mailer: ISPCP ".$cfg['Version']." Tickets Mailer"; 
    27582761 
    27592762        $mail_result = mail($to, $subject, $message, $headers); 
    …… 
    27902793} 
    27912794 
    2792  
    27932795?> 

  • trunk/gui/include/emailtpl-functions.php

    r474 r511  
    11<?php 
    22/** 
    3  *  ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 *  ispCP (OMEGA) a Virtual Hosting Control Panel 
    44 * 
    55 *  @copyright  2001-2006 by moleSoftware GmbH 
    66 *  @copyright  2006-2007 by ispCP | http://isp-control.net 
    77 *  @link               http://isp-control.net 
    8  *  @author             ispCP Team (2007) 
     8 *  @author             Benedikt Heintel, ispCP Team (2007) 
    99 * 
    1010 *  @license 
    …… 
    5555                } 
    5656 
    57         }                       
     57        } 
    5858 
    5959  $data['sender_email'] = $rs->fields('email'); 
    …… 
    7979 
    8080        } else { 
    81                  
     81 
    8282                $data['subject'] = ''; 
    83                  
     83 
    8484                $data['message'] = ''; 
    85                  
    86         } 
    87          
     85 
     86        } 
     87 
    8888        return $data; 
    8989 
    …… 
    133133 
    134134        exec_query($sql, $query, array($data['subject'], $data['message'], $admin_id, $tpl_name)); 
    135          
     135 
    136136} 
    137137 
    …… 
    142142        if (!$data['subject']) { 
    143143 
    144                 $data['subject'] = 'Welcome new ISPCP user {USERNAME} !'; 
    145  
    146         } 
    147          
    148         if (!$data['message']) { 
    149  
    150         $data['message'] = <<<MSG 
    151  
    152 Hello {NAME} ! 
    153  
    154 Your ISPCP user type is: {USERTYPE} 
    155 Your ISPCP login is: {USERNAME} 
    156 Your ISPCP password is: {PASSWORD} 
    157  
    158  
    159 Good luck with ISPCP Pro system! 
    160 ISPCP Team. 
     144                $data['subject'] = 'Welcome new ISPCP user {USERNAME}!'; 
     145 
     146        } 
     147 
     148        if (!$data['message']) { 
     149 
     150        $data['message'] = <<<MSG 
     151 
     152Hello {NAME}! 
     153 
     154Your ispCP user type is: {USERTYPE} 
     155Your ispCP login is: {USERNAME} 
     156Your ispCP password is: {PASSWORD} 
     157 
     158You can login at http://{BASE_SERVER_VHOST} 
     159 
     160Good luck with the ispCP system! 
     161The ispCP Team. 
    161162 
    162163MSG; 
    …… 
    171172 
    172173        set_email_tpl_data($admin_id, 'add-user-auto-msg', $data); 
    173          
     174 
    174175} 
    175176 
    …… 
    183184 
    184185        } 
    185          
    186         if (!$data['message']) { 
    187  
    188         $data['message'] = <<<MSG 
    189  
    190 Hello {NAME} ! 
     186 
     187        if (!$data['message']) { 
     188 
     189        $data['message'] = <<<MSG 
     190 
     191Hello {NAME}! 
    191192Use this link to activate your new ISPCP password: 
    192193 
    193194{LINK} 
    194195 
    195  
    196 Good Luck with ISPCP Pro System 
    197 Hosting Provider Team 
     196Good Luck with the ispCP System 
     197The ispCP Team 
    198198 
    199199MSG; 
    …… 
    220220 
    221221        } 
    222          
    223         if (!$data['message']) { 
    224  
    225         $data['message'] = <<<MSG 
    226  
    227 Hello {NAME} ! 
    228  
    229 Your ISPCP login is: {USERNAME} 
    230 Your ISPCP password is: {PASSWORD} 
    231  
    232  
    233 Good Luck with ISPCP Pro System 
    234 Hosting Provider Team 
     222 
     223        if (!$data['message']) { 
     224 
     225        $data['message'] = <<<MSG 
     226 
     227Hello {NAME}! 
     228 
     229Your ispCP login is: {USERNAME} 
     230Your ispCP password is: {PASSWORD} 
     231 
     232You can login at http://{BASE_SERVER_VHOST} 
     233 
     234Good Luck with the ispCP System 
     235The ispCP Team 
    235236 
    236237MSG; 
    …… 
    257258 
    258259        } 
    259          
     260 
    260261        if (!$data['message']) { 
    261262 
    …… 
    263264 
    264265Dear {NAME}, 
    265 This is an automatic confirmation for the order of the domain  : 
     266This is an automatic confirmation for the order of the domain: 
    266267 
    267268{DOMAIN} 
    268269 
    269 Thank you for using ISPCP services. 
    270 Your ISPCP Team 
     270Thank you for using ispCP services. 
     271The ISPCP Team 
    271272 
    272273MSG; 

  • trunk/gui/include/lostpassword-functions.php

    r474 r511  
    11<?php 
    22/** 
    3  *  ispCP (OMEGA) - Virtual Hosting Control System | Omega Version 
     3 *  ispCP (OMEGA) a Virtual Hosting Control Panel 
    44 * 
    55 *  @copyright  2001-2006 by moleSoftware GmbH 
    66 *  @copyright  2006-2007 by ispCP | http://isp-control.net 
    77 *  @link               http://isp-control.net 
    8  *  @author             ispCP Team (2007) 
     8 *  @author             BenediktHeintel, ispCP Team (2007) 
    99 * 
    1010 *  @license 
    …… 
    3333 
    3434function captcha_fontfile_exists() { 
    35          
     35 
    3636        global $cfg; 
    3737 
    3838        if (file_exists($cfg['LOSTPASSWORD_CAPTCHA_FONT'])) 
    39          
     39 
    4040                return true; 
    4141 
    …… 
    4343 
    4444                return false; 
    45                  
     45 
    4646} 
    4747 
    …… 
    130130 
    131131        } 
    132                  
     132 
    133133        $_SESSION[$strSessionVar] = $str; 
    134134 
    …… 
    279279    $rs = exec_query($sql, $query, array('', '', $uniqkey)); 
    280280 
    281                if ($created_by == 0) $created_by = 1; 
    282  
    283                $data = get_lostpassword_password_email($created_by); 
    284                  
    285                $from_name = $data['sender_name']; 
    286  
    287                $from_email = $data['sender_email']; 
     281        if ($created_by == 0) $created_by = 1; 
     282 
     283        $data = get_lostpassword_password_email($created_by); 
     284 
     285        $from_name = $data['sender_name']; 
     286 
     287        $from_email = $data['sender_email']; 
    288288 
    289289    $subject = $data['subject']; 
    …… 
    291291    $message = $data['message']; 
    292292 
     293        $base_vhost = $cfg['BASE_SERVER_VHOST']; 
     294 
    293295    if ($from_name) { 
    294296 
    295297        $from = $from_name . "<" . $from_email . ">"; 
    296298 
    297     } else { 
     299    } 
     300        else { 
    298301 
    299302        $from = $from_email; 
    300                } 
     303        } 
    301304 
    302305    $subject = preg_replace("/\{USERNAME\}/", $admin_name, $subject); 
    303  
    304306    $message = preg_replace("/\{USERNAME\}/", $admin_name, $message); 
    305  
    306307    $message = preg_replace("/\{NAME\}/", $admin_fname . " " . $admin_lname, $message); 
    307  
    308308    $message = preg_replace("/\{PASSWORD\}/", $upass, $message); 
     309    $message = preg_replace("/\{BASE_SERVER_VHOST\}/", $base_vhost, $message); 
    309310 
    310311    $headers = "From: $from\n"; 
    311312 
    312     $headers .= "MIME-Version: 1.0\nContent-Type: text/plain\nContent-Transfer-Encoding: 7bit\n"; 
     313    $headers .= "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 7bit\n"; 
    313314 
    314315    $headers .= "X-Mailer: ISPCP Pro lostpassword mailer"; 
    …… 
    332333        global $sql; 
    333334 
    334   $query = <<<SQL_QUERY 
     335       $query = <<<SQL_QUERY 
    335336                        SELECT 
    336337                created_by, fname, lname, email 
    …… 
    341342SQL_QUERY; 
    342343 
    343   $res = exec_query($sql, $query, array($admin_name)); 
     344       $res = exec_query($sql, $query, array($admin_name)); 
    344345 
    345346        if ($res -> RecordCount() == 1) { 
    346347 
    347           $created_by = $res -> fields['created_by']; 
    348  
    349           $admin_fname = $res -> fields['fname']; 
     348        $created_by = $res -> fields['created_by']; 
     349 
     350        $admin_fname = $res -> fields['fname']; 
    350351 
    351352        $admin_lname = $res -> fields['lname']; 
    …… 
    353354        $to = $res -> fields['email']; 
    354355 
    355                $uniqkey = uniqkeygen(); 
    356  
    357                setUniqKey($admin_name, $uniqkey); 
     356        $uniqkey = uniqkeygen(); 
     357 
     358        setUniqKey($admin_name, $uniqkey); 
    358359 
    359360    write_log("Lostpassword: ".$admin_name.": uniqkey created"); 
    360361 
    361                if ($created_by == 0) $created_by = 1; 
    362  
    363                $data = get_lostpassword_activation_email($created_by); 
    364                  
    365                $from_name = $data['sender_name']; 
    366  
    367                $from_email = $data['sender_email']; 
     362        if ($created_by == 0) $created_by = 1; 
     363 
     364        $data = get_lostpassword_activation_email($created_by); 
     365 
     366        $from_name = $data['sender_name']; 
     367 
     368        $from_email = $data['sender_email']; 
    368369 
    369370    $subject = $data['subject']; 
    …… 
    371372    $message = $data['message']; 
    372373 
     374    $base_vhost = $cfg['BASE_SERVER_VHOST']; 
     375 
    373376    if ($from_name) { 
    374377 
    375378        $from = $from_name . "<" . $from_email . ">"; 
    376379 
    377     } else { 
     380    } 
     381        else { 
    378382 
    379383        $from = $from_email; 
    380                } 
    381  
    382                switch( $_SERVER["SERVER_PORT"] ) { 
    383                          
    384                        case "80": $prot = "http://"; 
    385  
     384        } 
     385 
     386        switch( $_SERVER["SERVER_PORT"] ) { 
     387 
     388                case "80": 
     389                        $prot = "http://"; 
    386390                        break; 
    387  
    388                         case "443": $prot = "https://"; 
    389  
     391                case "443": 
     392                        $prot = "https://"; 
    390393                        break; 
    391  
    392                 } 
    393  
    394                 $link = $prot . $_SERVER["HTTP_HOST"] . $_SERVER["PHP_SELF"] . "?key=" . $uniqkey; 
     394        } 
     395 
     396        $link = $prot . $_SERVER["HTTP_HOST"] . $_SERVER["PHP_SELF"] . "?key=" . $uniqkey; 
    395397 
    396398    $subject = preg_replace("/\{USERNAME\}/", $admin_name, $subject); 
    397  
    398399    $message = preg_replace("/\{NAME\}/", $admin_fname . " " . $admin_lname, $message); 
    399  
    400400    $message = preg_replace("/\{LINK\}/", $link, $message); 
     401        $message = preg_replace("/\{BASE_SERVER_VHOST\}/", $base_vhost, $message); 
    401402 
    402403    $headers = "From: $from\n"; 
    403404 
    404     $headers .= "MIME-Version: 1.0\nContent-Type: text/plain\nContent-Transfer-Encoding: 7bit\n"; 
    405  
    406     $headers .= "X-Mailer: ISPCP Pro lostpassword mailer"; 
     405    $headers .= "MIME-Version: 1.0\nContent-Type: text/plain; charset=utf-8\nContent-Transfer-Encoding: 7bit\n"; 
     406 
     407    $headers .= "X-Mailer: ISPCP lostpassword mailer"; 
    407408 
    408409    $mail_result = mail($to, $subject, $message, $headers);