| install/install.php | ●●●●● patch | view | raw | blame | history | |
| install/lib/installer_base.lib.php | ●●●●● patch | view | raw | blame | history | |
| install/update.php | ●●●●● patch | view | raw | blame | history | |
| interface/lib/classes/plugin_listview.inc.php | ●●●●● patch | view | raw | blame | history | |
| interface/web/dns/templates/dns_a_list.htm | ●●●●● patch | view | raw | blame | history | |
| interface/web/dns/templates/dns_soa_list.htm | ●●●●● patch | view | raw | blame | history |
install/install.php
@@ -68,6 +68,7 @@ //** Install logfile define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log'); define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../')); //**************************************************************************************************** //** Installer Interface @@ -140,7 +141,7 @@ //* Configure postfix $inst->configure_postfix(); //* Configure postfix //* Configure jailkit swriteln('Configuring Jailkit'); $inst->configure_jailkit(); @@ -271,6 +272,12 @@ system($conf['init_scripts'].'/'.$conf['courier']['courier-pop-ssl'].' restart'); } //** Configure Jailkit if(strtolower($inst->simple_query('Configure Jailkit', array('y','n'),'y') ) == 'y') { swriteln('Configuring Jailkit'); $inst->configure_jailkit(); } //** Configure Pureftpd if(strtolower($inst->simple_query('Configure FTP Server', array('y','n'),'y') ) == 'y') { swriteln('Configuring Pureftpd'); install/lib/installer_base.lib.php
@@ -132,10 +132,10 @@ $this->error('Stopped: Database already contains some tables.'); } else { if($cf['admin_password'] == '') { caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' '".$cf['database']."' < 'sql/ispconfig3.sql' &> /dev/null", caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql'); } else { caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' -p'".$cf['admin_password']."' '".$cf['database']."' < 'sql/ispconfig3.sql' &> /dev/null", caselog("mysql -h '".$cf['host']."' -u '".$cf['admin_user']."' -p'".$cf['admin_password']."' '".$cf['database']."' < '".ISPC_INSTALL_ROOT."/install/sql/ispconfig3.sql' &> /dev/null", __FILE__, __LINE__, 'read in ispconfig3.sql', 'could not read in ispconfig3.sql'); } $db_tables = $this->db->getTables(); install/update.php
@@ -52,6 +52,7 @@ //** Installer/updater logfile define('ISPC_LOG_FILE', '/var/log/ispconfig_install.log'); define('ISPC_INSTALL_ROOT', realpath(dirname(__FILE__).'/../')); //** Check for ISPConfig 2.x versions if(is_dir('/root/ispconfig') || is_dir('/home/admispconfig')) { @@ -144,7 +145,7 @@ } // create a backup copy of the ispconfig database in the root folder $backup_db_name = '/root/ispconfig_db_backup_'.date('Y-m-d').'.sql'; $backup_db_name = '/root/ispconfig_db_backup_'.@date('Y-m-d_h-i').'.sql'; copy('existing_db.sql',$backup_db_name); exec("chmod 700 $backup_db_name"); exec("chown root:root $backup_db_name"); @@ -157,9 +158,11 @@ $tpl_ini_array = ini_to_array(rf('tpl/server.ini.master')); // update the new template with the old values foreach($old_ini_array as $tmp_section_name => $tmp_section_content) { foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) { $tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content; if(is_array($old_ini_array)) { foreach($old_ini_array as $tmp_section_name => $tmp_section_content) { foreach($tmp_section_content as $tmp_var_name => $tmp_var_content) { $tpl_ini_array[$tmp_section_name][$tmp_var_name] = $tmp_var_content; } } }
@@ -76,7 +76,7 @@ if($field['formtype'] == "SELECT") { if(strtolower($rec[$key]) == 'y' or strtolower($rec[$key]) == 'n') { // Set a additional image variable for bolean fields $rec['_'.$key.'_'] = (strtolower($rec[$key]) == 'y')?'list_icon_true.png':'list_icon_false.png'; $rec['_'.$key.'_'] = (strtolower($rec[$key]) == 'y')?'x16/tick_circle.png':'x16/cross_circle.png'; } //* substitute value for select field @$rec[$key] = $field['value'][$rec[$key]]; interface/web/dns/templates/dns_a_list.htm
@@ -1,82 +1,82 @@ <div class="pnl_toolsarea"> <fieldset><legend>Tools</legend> <div class="buttons"> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');"> <span>A</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}');"> <span>ALIAS</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}');"> <span>CNAME</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}');"> <span>HINFO</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}');"> <span>MX</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}');"> <span>NS</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}');"> <span>PTR</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}');"> <span>RP</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}');"> <span>SRV</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}');"> <span>TXT</span> </button> </div> </fieldset> </div> <div class="pnl_listarea"> <fieldset><legend><tmpl_var name="list_head_txt"></legend> <table class="list"> <thead> <tr> <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th> <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th> <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th> <th class="tbl_col_data" scope="col"><tmpl_var name="data_txt"></th> <th class="tbl_col_aux" scope="col"><tmpl_var name="aux_txt"></th> <th class="tbl_col_buttons" scope="col"> </th> </tr> <tr> <td class="tbl_col_active"><select name="search_active" onChange="submitForm('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_active'}</select></td> <td class="tbl_col_type"><select name="search_server_id" onChange="submitForm('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_type'}</select></td> <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td> <td class="tbl_col_data"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" /></td> <td class="tbl_col_aux"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></td> <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td> </tr> </thead> <tbody> <tmpl_loop name="records"> <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>"> <td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td> <td class="tbl_col_type"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td> <td class="tbl_col_name"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td> <td class="tbl_col_data"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td> <td class="tbl_col_aux"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mbox"}</a></td> <td class="tbl_col_buttons"> <div class="buttons icons16"> <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_rr_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a> </div> </td> </tr> </tmpl_loop> </tbody> <tfoot> <tr> <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td> </tr> </tfoot> </table> </fieldset> </div> <div class="pnl_toolsarea"> <fieldset><legend>Tools</legend> <div class="buttons"> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_a_edit.php?zone={tmpl_var name='parent_id'}');"> <span>A</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_alias_edit.php?zone={tmpl_var name='parent_id'}');"> <span>ALIAS</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_cname_edit.php?zone={tmpl_var name='parent_id'}');"> <span>CNAME</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_hinfo_edit.php?zone={tmpl_var name='parent_id'}');"> <span>HINFO</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_mx_edit.php?zone={tmpl_var name='parent_id'}');"> <span>MX</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ns_edit.php?zone={tmpl_var name='parent_id'}');"> <span>NS</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_ptr_edit.php?zone={tmpl_var name='parent_id'}');"> <span>PTR</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_rp_edit.php?zone={tmpl_var name='parent_id'}');"> <span>RP</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_srv_edit.php?zone={tmpl_var name='parent_id'}');"> <span>SRV</span> </button> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_txt_edit.php?zone={tmpl_var name='parent_id'}');"> <span>TXT</span> </button> </div> </fieldset> </div> <div class="pnl_listarea"> <fieldset><legend><tmpl_var name="list_head_txt"></legend> <table class="list"> <thead> <tr> <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th> <th class="tbl_col_type" scope="col"><tmpl_var name="type_txt"></th> <th class="tbl_col_name" scope="col"><tmpl_var name="name_txt"></th> <th class="tbl_col_data" scope="col"><tmpl_var name="data_txt"></th> <th class="tbl_col_aux" scope="col"><tmpl_var name="aux_txt"></th> <th class="tbl_col_buttons" scope="col"> </th> </tr> <tr> <td class="tbl_col_active"><select name="search_active" onChange="changeTab('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_active'}</select></td> <td class="tbl_col_type"><select name="search_server_id" onChange="changeTab('dns_records','dns/dns_soa_edit.php');">{tmpl_var name='search_type'}</select></td> <td class="tbl_col_name"><input type="text" name="search_name" value="{tmpl_var name='search_name'}" /></td> <td class="tbl_col_data"><input type="text" name="search_data" value="{tmpl_var name='search_data'}" /></td> <td class="tbl_col_aux"><input type="text" name="search_aux" value="{tmpl_var name='search_aux'}" /></td> <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_edit.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td> </tr> </thead> <tbody> <tmpl_loop name="records"> <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>"> <td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td> <td class="tbl_col_type"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="type"}</a></td> <td class="tbl_col_name"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="name"}</a></td> <td class="tbl_col_data"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="data"}</a></td> <td class="tbl_col_aux"><a href="#" onClick="loadContent('dns/dns_{tmpl_var name='type_lowercase'}_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="aux"}</a></td> <td class="tbl_col_buttons"> <div class="buttons icons16"> <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_rr_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a> </div> </td> </tr> </tmpl_loop> </tbody> <tfoot> <tr> <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td> </tr> </tfoot> </table> </fieldset> </div> interface/web/dns/templates/dns_soa_list.htm
@@ -1,61 +1,61 @@ <h2><tmpl_var name="list_head_txt"></h2> <div class="panel panel_list_dns_soa"> <div class="pnl_toolsarea"> <fieldset><legend>Tools</legend> <div class="buttons"> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_soa_edit.php');"> <span>{tmpl_var name="add_new_record_txt"}</span> </button> </div> </fieldset> </div> <div class="pnl_listarea"> <fieldset><legend><tmpl_var name="list_head_txt"></legend> <table class="list"> <thead> <tr> <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th> <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th> <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th> <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th> <th class="tbl_col_mbox" scope="col"><tmpl_var name="mbox_txt"></th> <th class="tbl_col_buttons" scope="col"> </th> </tr> <tr> <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_active'}</select></td> <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_server_id'}</select></td> <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td> <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td> <td class="tbl_col_mbox"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></td> <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td> </tr> </thead> <tbody> <tmpl_loop name="records"> <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>"> <td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="active"}</a></td> <td class="tbl_col_server_id"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td> <td class="tbl_col_origin"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td> <td class="tbl_col_ns"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td> <td class="tbl_col_mbox"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mbox"}</a></td> <td class="tbl_col_buttons"> <div class="buttons icons16"> <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a> </div> </td> </tr> </tmpl_loop> </tbody> <tfoot> <tr> <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td> </tr> </tfoot> </table> </fieldset> </div> </div> <h2><tmpl_var name="list_head_txt"></h2> <div class="panel panel_list_dns_soa"> <div class="pnl_toolsarea"> <fieldset><legend>Tools</legend> <div class="buttons"> <button class="iconstxt icoAdd" type="button" onClick="loadContent('dns/dns_soa_edit.php');"> <span>{tmpl_var name="add_new_record_txt"}</span> </button> </div> </fieldset> </div> <div class="pnl_listarea"> <fieldset><legend><tmpl_var name="list_head_txt"></legend> <table class="list"> <thead> <tr> <th class="tbl_col_active" scope="col"><tmpl_var name="active_txt"></th> <th class="tbl_col_server_id" scope="col"><tmpl_var name="server_id_txt"></th> <th class="tbl_col_origin" scope="col"><tmpl_var name="origin_txt"></th> <th class="tbl_col_ns" scope="col"><tmpl_var name="ns_txt"></th> <th class="tbl_col_mbox" scope="col"><tmpl_var name="mbox_txt"></th> <th class="tbl_col_buttons" scope="col"> </th> </tr> <tr> <td class="tbl_col_active"><select name="search_active" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_active'}</select></td> <td class="tbl_col_server_id"><select name="search_server_id" onChange="submitForm('pageForm','dns/dns_soa_list.php');">{tmpl_var name='search_server_id'}</select></td> <td class="tbl_col_origin"><input type="text" name="search_origin" value="{tmpl_var name='search_origin'}" /></td> <td class="tbl_col_ns"><input type="text" name="search_ns" value="{tmpl_var name='search_ns'}" /></td> <td class="tbl_col_mbox"><input type="text" name="search_mbox" value="{tmpl_var name='search_mbox'}" /></td> <td class="tbl_col_buttons"><div class="buttons"><button type="button" class="icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onClick="submitForm('pageForm','dns/dns_soa_list.php');"><span>{tmpl_var name="filter_txt"}</span></button></div></td> </tr> </thead> <tbody> <tmpl_loop name="records"> <tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>"> <td class="tbl_col_active"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td> <td class="tbl_col_server_id"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="server_id"}</a></td> <td class="tbl_col_origin"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="origin"}</a></td> <td class="tbl_col_ns"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="ns"}</a></td> <td class="tbl_col_mbox"><a href="#" onClick="loadContent('dns/dns_soa_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="mbox"}</a></td> <td class="tbl_col_buttons"> <div class="buttons icons16"> <a class="icons16 icoDelete" href="javascript: del_record('dns/dns_soa_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span>{tmpl_var name='delete_txt'}</span></a> </div> </td> </tr> </tmpl_loop> </tbody> <tfoot> <tr> <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td> </tr> </tfoot> </table> </fieldset> </div> </div>
