diff -Nru forest-1.2.3/README.md forest-1.2.4/README.md --- forest-1.2.3/README.md 2013-09-25 23:29:12.000000000 +0000 +++ forest-1.2.4/README.md 2013-10-02 15:41:22.000000000 +0000 @@ -5,7 +5,8 @@ The client gathers information about available updates and reports them to the server over http(s). Updates can then be accepted via a web interface on the -server. The system can also report that a client needs to be rebooted. +server. The system can also report that a client needs to be rebooted. For more +information, visit [http://www.njcrawford.com/programs/forest/](http://www.njcrawford.com/programs/forest/). Both client and server depend on cron to run daily reports. The server depends on Codeigniter 3.0. Codeigniter can be installed anywhere on the server, just diff -Nru forest-1.2.3/client/Windows/ConfigurationGUI/Properties/version.cs forest-1.2.4/client/Windows/ConfigurationGUI/Properties/version.cs --- forest-1.2.3/client/Windows/ConfigurationGUI/Properties/version.cs 2013-09-25 23:29:12.000000000 +0000 +++ forest-1.2.4/client/Windows/ConfigurationGUI/Properties/version.cs 2013-10-02 15:41:22.000000000 +0000 @@ -1,5 +1,5 @@ // This file is automatically generated by update-version script. // Any changes will be overwritten next time the script is run. using System.Reflection; -[assembly: AssemblyVersion("1.2.3.0")] -[assembly: AssemblyFileVersion("1.2.3.0")] +[assembly: AssemblyVersion("1.2.4.0")] +[assembly: AssemblyFileVersion("1.2.4.0")] diff -Nru forest-1.2.3/client/Windows/ForestInstaller/ForestInstaller/Version.wxi forest-1.2.4/client/Windows/ForestInstaller/ForestInstaller/Version.wxi --- forest-1.2.3/client/Windows/ForestInstaller/ForestInstaller/Version.wxi 2013-09-25 23:29:12.000000000 +0000 +++ forest-1.2.4/client/Windows/ForestInstaller/ForestInstaller/Version.wxi 2013-10-02 15:41:22.000000000 +0000 @@ -2,5 +2,5 @@ - + diff -Nru forest-1.2.3/client/Windows/version1.rc forest-1.2.4/client/Windows/version1.rc --- forest-1.2.3/client/Windows/version1.rc 2013-09-25 23:29:12.000000000 +0000 +++ forest-1.2.4/client/Windows/version1.rc 2013-10-02 15:41:22.000000000 +0000 @@ -1,4 +1,4 @@ // This file is automatically generated by update-version script. // Any changes will be overwritten next time the script is run. -FILEVERSION 1,2,3,0 -PRODUCTVERSION 1,2,3,0 +FILEVERSION 1,2,4,0 +PRODUCTVERSION 1,2,4,0 diff -Nru forest-1.2.3/client/Windows/version2.rc forest-1.2.4/client/Windows/version2.rc --- forest-1.2.3/client/Windows/version2.rc 2013-09-25 23:29:12.000000000 +0000 +++ forest-1.2.4/client/Windows/version2.rc 2013-10-02 15:41:22.000000000 +0000 @@ -1,4 +1,4 @@ // This file is automatically generated by update-version script. // Any changes will be overwritten next time the script is run. -VALUE "FileVersion", "1.2.3.0" -VALUE "ProductVersion", "1.2.3.0" +VALUE "FileVersion", "1.2.4.0" +VALUE "ProductVersion", "1.2.4.0" diff -Nru forest-1.2.3/client/version.h forest-1.2.4/client/version.h --- forest-1.2.3/client/version.h 2013-09-25 23:29:12.000000000 +0000 +++ forest-1.2.4/client/version.h 2013-10-02 15:41:22.000000000 +0000 @@ -1,3 +1,3 @@ // This file is automatically generated by update-version script. // Any changes will be overwritten next time the script is run. -#define FOREST_VERSION "1.2.3" +#define FOREST_VERSION "1.2.4" diff -Nru forest-1.2.3/debian/changelog forest-1.2.4/debian/changelog --- forest-1.2.3/debian/changelog 2013-09-26 19:25:15.000000000 +0000 +++ forest-1.2.4/debian/changelog 2013-10-08 01:14:52.000000000 +0000 @@ -1,3 +1,9 @@ +forest (1.2.4-0ppa1~raring1) raring; urgency=low + + * Release 1.2.4 for raring + + -- Nathan Crawford Mon, 07 Oct 2013 21:13:00 -0400 + forest (1.2.3-0ppa1~raring1) raring; urgency=low * Release 1.2.3 for raring diff -Nru forest-1.2.3/server/www/application/config/config.php forest-1.2.4/server/www/application/config/config.php --- forest-1.2.3/server/www/application/config/config.php 2013-09-25 23:29:12.000000000 +0000 +++ forest-1.2.4/server/www/application/config/config.php 2013-10-02 15:41:22.000000000 +0000 @@ -52,7 +52,7 @@ | variable so that it is blank. | */ -$config['index_page'] = 'index.php'; +$config['index_page'] = ''; /* |-------------------------------------------------------------------------- diff -Nru forest-1.2.3/server/www/application/config/version.php forest-1.2.4/server/www/application/config/version.php --- forest-1.2.3/server/www/application/config/version.php 2013-09-25 23:29:12.000000000 +0000 +++ forest-1.2.4/server/www/application/config/version.php 2013-10-02 15:41:22.000000000 +0000 @@ -1,4 +1,4 @@ _require_login(); - $page_data['action'] = "Clear updates from system " . $system_id . "?"; + $this->load->model('forest_db'); + + $system_info = $this->forest_db->get_system_info($system_id); + + $page_data['action'] = "clear available updates from system '" . $system_info->name . "'?"; $page_data['system_id'] = $system_id; $page_data['post_url'] = site_url("browser/clear_updates"); $page_data['back_url'] = site_url("browser/view_system/" . $system_id); - $header_data['page_title'] = "Clear updates from system " . $system_id . "?"; + $header_data['page_title'] = "Clear available updates from " . $system_info->name . "?"; $this->load->view('header', $header_data); $this->load->view('confirm', $page_data); $this->load->view('footer'); @@ -238,12 +242,16 @@ { $this->_require_login(); - $page_data['action'] = "Delete system " . $system_id . "?"; + $this->load->model('forest_db'); + + $system_info = $this->forest_db->get_system_info($system_id); + + $page_data['action'] = "delete system '" . $system_info->name . "'?"; $page_data['system_id'] = $system_id; $page_data['post_url'] = site_url("browser/delete_system"); $page_data['back_url'] = site_url("browser/view_system/" . $system_id); - $header_data['page_title'] = "Delete system " . $system_id . "?"; + $header_data['page_title'] = "Delete " . $system_info->name . "?"; $this->load->view('header', $header_data); $this->load->view('confirm', $page_data); $this->load->view('footer'); @@ -450,7 +458,7 @@ } elseif($this->config->item('login_source') == "ldap") { - $ds=ldap_connect($forest_config['ldap_server']); + $ds=ldap_connect($this->config->item('ldap_server')); if (!$ds) { die('Cannot connect to LDAP server.'); @@ -466,8 +474,7 @@ $lderr = ldap_error($ds); if($lderr != "Invalid credentials") { - echo "Error: " . ldap_error($ds) . "

"; - die('Check your user name and password and try again.'); + die("Error: " . ldap_error($ds) . "

" . 'Check your user name and password and try again.'); } } elseif(!empty($ldap_allowed_users)) diff -Nru forest-1.2.3/server/www/application/controllers/Cron.php forest-1.2.4/server/www/application/controllers/Cron.php --- forest-1.2.3/server/www/application/controllers/Cron.php 2013-09-25 23:29:12.000000000 +0000 +++ forest-1.2.4/server/www/application/controllers/Cron.php 2013-10-02 15:41:22.000000000 +0000 @@ -41,8 +41,7 @@ $this->load->model('forest_db'); $this->load->library('email'); - $output_message = ""; - $output_message .= $this->config->item('base_url') . "\n"; + $output_message = base_url() . "\n"; $output_message .= "Forest version " . $this->config->item('forest_version') . "\n\n"; $update_message = ""; diff -Nru forest-1.2.3/server/www/application/views/header.php forest-1.2.4/server/www/application/views/header.php --- forest-1.2.3/server/www/application/views/header.php 2013-09-25 23:29:12.000000000 +0000 +++ forest-1.2.4/server/www/application/views/header.php 2013-10-02 15:41:22.000000000 +0000 @@ -28,10 +28,11 @@ $page_title = "(Page Title)"; } ?> + <?= $page_title ?> - Forest - + - + diff -Nru forest-1.2.3/version.txt forest-1.2.4/version.txt --- forest-1.2.3/version.txt 2013-09-25 23:29:12.000000000 +0000 +++ forest-1.2.4/version.txt 2013-10-02 15:41:22.000000000 +0000 @@ -1 +1 @@ -1.2.3 +1.2.4