Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 662

Show
Ignore:
Timestamp:
06/20/07 19:33:03 (1 year ago)
Author:
raphael
Message:

Fixed #410: Undefined subroutine &main::get_file called
Improved security and removed redundant stuff
Fixed #403: Can't remove Mysql database

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/gui/client/add_alias.php

    r645 r662  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 

  • trunk/gui/client/add_ftp_acc.php

    r645 r662  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
     20require '../include/ispcp-lib.php'; 
    2121require '../include/vfs.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/add_mail_acc.php

    r645 r662  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 

  • trunk/gui/client/add_sql_database.php

    r645 r662  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 

  • trunk/gui/client/add_subdomain.php

    r655 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/backup.php

    r645 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/catchall.php

    r645 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/change_password.php

    r645 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/change_personal.php

    r645 r662  
    9494} 
    9595 
    96 include '../include/ispcp-lib.php'; 
     96require '../include/ispcp-lib.php'; 
    9797 
    98 check_login(); 
     98check_login(__FILE__); 
    9999 
    100100$tpl = new pTemplate(); 

  • trunk/gui/client/change_user_interface.php

    r474 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525// lets back to admin or reseller interfase - am i admin/reseller or what ? :-) 
    …… 
    3030 
    3131        $from_id = $_SESSION['user_id']; 
    32          
     32 
    3333        $to_id = $_SESSION['logged_from_id']; 
    3434 
    3535        // SESSIONS are OK -> so lets go back 
    3636        $dest = change_user_interface($from_id, $to_id); 
    37          
     37 
    3838        if ($dest == false){ 
    39          
     39 
    4040                //dumpass - don't try to change your interface 
    4141                header('Location: index.php'); 
    4242                die(); 
    43          
     43 
    4444        } else { 
    45         // ------------------------------------------                           
    46         // ------------------------------------------           
     45        // ------------------------------------------ 
     46        // ------------------------------------------ 
    4747                if (isset($_SESSION['logged_from'])) 
    48                  
     48 
    4949                        unset($_SESSION['logged_from']); 
    50                                  
     50 
    5151                if (isset($_SESSION['logged_from_id'])) 
    52                  
     52 
    5353                        unset($_SESSION['logged_from_id']); 
    54         // ------------------------------------------                           
     54        // ------------------------------------------ 
    5555        // ------------------------------------------ 
    5656                if (isset($GLOBALS['logged_from'])) 
    57                  
     57 
    5858                        unset($GLOBALS['logged_from']); 
    59                                  
     59 
    6060                if (isset($GLOBALS['logged_from_id'])) 
    61                  
     61 
    6262                        unset($GLOBALS['logged_from_id']); 
    63         // ------------------------------------------                            
    6463        // ------------------------------------------ 
    65                  
     64        // ------------------------------------------ 
     65 
    6666        header("Location: $dest"); 
    67          
     67 
    6868        } 
    6969        die(); 

  • trunk/gui/client/create_catchall.php

    r645 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/cronjobs_add.php

    r645 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/cronjobs_edit.php

    r645 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/cronjobs_overview.php

    r645 r662  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626$tpl = new pTemplate(); 

  • trunk/gui/client/delete_als.php

    r474 r662  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
     20require '../include/ispcp-lib.php'; 
    2121 
    22 check_login(); 
     22check_login(__FILE__); 
    2323 
    2424if (isset($_GET['id']) && $_GET['id'] !== '') { 

  • trunk/gui/client/delete_catchall.php

    r474 r662  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626if (isset($_GET['id']) && $_GET['id'] !== '') { 

  • trunk/gui/client/delete_ftp_acc.php

    r653 r662  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626if (isset($_GET['id']) && $_GET['id'] !== '') { 

  • trunk/gui/client/delete_mail_acc.php

    r474 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525if (isset($_GET['id']) && $_GET['id'] !== '') { 

  • trunk/gui/client/delete_sql_database.php

    r474 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525if (isset($_GET['id'])) { 

  • trunk/gui/client/delete_sub.php

    r474 r662  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
     20require '../include/ispcp-lib.php'; 
    2121 
    22 check_login(); 
     22check_login(__FILE__); 
    2323 
    2424if (isset($_GET['id']) && $_GET['id'] !== '') { 

  • trunk/gui/client/delete_ticket.php

    r474 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525if (isset($_GET['ticket_id']) && $_GET['ticket_id'] !== '') { 

  • trunk/gui/client/disable_als_fwd.php

    r474 r662  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626if (isset($_GET['id']) && $_GET['id'] !== '') { 

  • trunk/gui/client/disable_mail_arsp.php

    r474 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525function check_email_user(&$sql) { 

  • trunk/gui/client/domain_statistics.php

    r645 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/edit_ftp_acc.php

    r653 r662  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424if (isset($_GET['id'])) { 

  • trunk/gui/client/edit_mail_acc.php

    r645 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/edit_mail_arsp.php

    r645 r662  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626$tpl = new pTemplate(); 

  • trunk/gui/client/email_accounts.php

    r660 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/enable_als_fwd.php

    r645 r662  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
    23  
    24 check_login(); 
     22require '../include/ispcp-lib.php'; 
     23 
     24check_login(__FILE__); 
    2525 
    2626$tpl = new pTemplate(); 

  • trunk/gui/client/enable_mail_arsp.php

    r645 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/error_edit.php

    r645 r662  
    1919 
    2020require '../include/vfs.php'; 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    2323function gen_error_page_data(&$tpl, &$sql, $user_id, $eid) 
    …… 
    4141 
    4242 
    43 include '../include/ispcp-lib.php'; 
     43require '../include/ispcp-lib.php'; 
    4444 
    45 check_login(); 
     45check_login(__FILE__); 
    4646 
    4747$tpl = new pTemplate(); 

  • trunk/gui/client/error_pages.php

    r645 r662  
    4141} 
    4242 
    43 include '../include/ispcp-lib.php'; 
     43require '../include/ispcp-lib.php'; 
    4444 
    45 check_login(); 
     45check_login(__FILE__); 
    4646 
    4747$tpl = new pTemplate(); 

  • trunk/gui/client/ftp_accounts.php

    r645 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/ftp_choose_dir.php

    r660 r662  
    1919 
    2020require '../include/vfs.php'; 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/index.php

    r645 r662  
    273273} 
    274274 
    275 include '../include/ispcp-lib.php'; 
    276  
    277 check_login(); 
     275require '../include/ispcp-lib.php'; 
     276 
     277check_login(__FILE__); 
    278278 
    279279$tpl = new pTemplate(); 

  • trunk/gui/client/language.php

    r645 r662  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
     20require '../include/ispcp-lib.php'; 
    2121 
    22 check_login(); 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 

  • trunk/gui/client/manage_domains.php

    r645 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/manage_sql.php

    r645 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/new_ticket.php

    r645 r662  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626$tpl = new pTemplate(); 

  • trunk/gui/client/protect_delete.php

    r474 r662  
    1717 *  http://opensource.org | osi@opensource.org 
    1818 **/ 
    19   
    20 include '../include/ispcp-lib.php'; 
    2119 
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424if (isset($_GET['id']) && $_GET['id'] !== '') { 

  • trunk/gui/client/protect_it.php

    r645 r662  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
     20require '../include/ispcp-lib.php'; 
    2121require '../include/vfs.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/protected_areas.php

    r645 r662  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626$tpl = new pTemplate(); 

  • trunk/gui/client/puser_assign.php

    r645 r662  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
    23  
    24 check_login(); 
     22require '../include/ispcp-lib.php'; 
     23 
     24check_login(__FILE__); 
    2525 
    2626$tpl = new pTemplate(); 

  • trunk/gui/client/puser_assign2.php

    r645 r662  
    1818 **/ 
    1919 
    20 include '../include/ispcp-lib.php'; 
    21  
    22 check_login(); 
     20require '../include/ispcp-lib.php'; 
     21 
     22check_login(__FILE__); 
    2323 
    2424$tpl = new pTemplate(); 

  • trunk/gui/client/puser_delete.php

    r474 r662  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626$dmn_id = get_user_domain_id($sql, $_SESSION['user_id']); 
    …… 
    5353        update 
    5454                htaccess_users 
    55         set  
    56                 status = ?     
    57         where  
     55        set 
     56                status = ? 
     57        where 
    5858                id = ? 
    5959                and 

  • trunk/gui/client/puser_edit.php

    r645 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22 
     23check_login(__FILE__); 
    2424 
    2525$tpl = new pTemplate(); 

  • trunk/gui/client/puser_gadd.php

    r645 r662  
    2020 
    2121 
    22 include '../include/ispcp-lib.php'; 
     22require '../include/ispcp-lib.php'; 
    2323 
    24 check_login(); 
     24check_login(__FILE__); 
    2525 
    2626$tpl = new pTemplate(); 

  • trunk/gui/client/puser_gdelete.php

    r474 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
     21require '../include/ispcp-lib.php'; 
    2222 
    23 check_login(); 
     23check_login(__FILE__); 
    2424 
    2525$dmn_id = get_user_domain_id($sql, $_SESSION['user_id']); 
    …… 
    3737 
    3838$query = <<<SQL_QUERY 
    39         update  
     39        update 
    4040                htaccess_groups 
    4141        set 
    4242                status = ? 
    43         where  
     43        where 
    4444            id = ? 
    4545                and 
    …… 
    6969                for ($i = 0; $i < count($grp_id_splited); $i++) { 
    7070                                //Does this group affect some htaccess ? 
    71                         if ($grp_id_splited[$i] == $group_id) {                 
    72                                 //oh -> our group was used in htaccess  
    73                                   if (count($grp_id_splited) < 2 && count($grp_id_splited) > 0){  
    74                             $status = $cfg['ITEM_DELETE_STATUS'];  
    75                           } else {      
     71                        if ($grp_id_splited[$i] == $group_id) { 
     72                                //oh -> our group was used in htaccess 
     73                                  if (count($grp_id_splited) < 2 && count($grp_id_splited) > 0){ 
     74                            $status = $cfg['ITEM_DELETE_STATUS']; 
     75                          } else { 
    7676                                        $grp_id = preg_replace("/$group_id/", "", "$grp_id"); 
    7777                                        $grp_id = preg_replace("/,,/", ",", "$grp_id"); 
    …… 
    9191 
    9292                $rs_update = exec_query($sql, $update_query, array($grp_id, $status, $ht_id)); 
    93                                  
    94                         }  
    95                          
     93 
     94                        } 
     95 
    9696 
    9797                } 
    …… 
    9999        $rs -> MoveNext(); 
    100100        } 
    101          
     101 
    102102        //we like to have our changes honoured to make group-deletion even without htaccess - relation possible! 
    103103                $status = $cfg['ITEM_CHANGE_STATUS']; 
    …… 
    108108                                                status = ? 
    109109                                        where 
    110                                                 dmn_id = ?  
    111                                         and  
     110                                                dmn_id = ? 
     111                                        and 
    112112                                                status NOT like 'delete' 
    113113SQL_QUERY; 
    114                  $rs = exec_query($sql, $query, array($status, $dmn_id));       
    115                  
     114                 $rs = exec_query($sql, $query, array($status, $dmn_id)); 
     115 
    116116 
    117117check_for_lock_file(); 

  • trunk/gui/client/puser_manage.php

    r645 r662  
    1919 
    2020 
    21 include '../include/ispcp-lib.php'; 
    22  
    23 check_login(); 
     21require '../include/ispcp-lib.php'; 
     22