[Astlinux-commits] SF.net SVN: astlinux:[7369] branches/1.0/package/webinterface/altweb

[<abe...@us...>]

Revision: 7369
          http://sourceforge.net/p/astlinux/code/7369
Author:   abelbeck
Date:     2015-12-04 22:56:04 +0000 (Fri, 04 Dec 2015)
Log Message:
-----------
web interface, Add Prefs tab option 'Disable faster "kernel-reboot" System Reboot'

Modified Paths:
--------------
    branches/1.0/package/webinterface/altweb/admin/prefs.php
    branches/1.0/package/webinterface/altweb/common/functions.php

Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php	2015-12-04 21:56:02 UTC (rev 7368)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php	2015-12-04 22:56:04 UTC (rev 7369)
@@ -344,6 +344,10 @@
       $value = 'system_backup_temp_disk = yes';
       fwrite($fp, $value."\n");
     }
+    if (isset($_POST['reboot_classic_full'])) {
+      $value = 'system_reboot_classic_full = yes';
+      fwrite($fp, $value."\n");
+    }
     $value = 'system_reboot_timer_adjust = "'.$_POST['reboot_timer'].'"';
     fwrite($fp, $value."\n");
     $value = 'system_asterisk_reload_cmdstr = "'.tuqp($_POST['asterisk_reload']).'"';
@@ -1019,6 +1023,9 @@
   putHtml('<tr class="dtrow1"><td style="text-align: right;">');
   $sel = (getPREFdef($global_prefs, 'system_backup_temp_disk') === 'yes') ? ' checked="checked"' : '';
   putHtml('<input type="checkbox" value="backup_temp" name="backup_temp"'.$sel.' /></td><td colspan="5">Backup temporary file uses /mnt/kd/ instead of /tmp/</td></tr>');
+  putHtml('<tr class="dtrow1"><td style="text-align: right;">');
+  $sel = (getPREFdef($global_prefs, 'system_reboot_classic_full') === 'yes') ? ' checked="checked"' : '';
+  putHtml('<input type="checkbox" value="reboot_classic_full" name="reboot_classic_full"'.$sel.' /></td><td colspan="5">Disable faster "kernel-reboot" System Reboot</td></tr>');
 
   putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="3">System Reboot Timer:</td><td colspan="3">');
   if (($value = getPREFdef($global_prefs, 'system_reboot_timer_adjust')) === '') {

Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php	2015-12-04 21:56:02 UTC (rev 7368)
+++ branches/1.0/package/webinterface/altweb/common/functions.php	2015-12-04 22:56:04 UTC (rev 7369)
@@ -180,7 +180,7 @@
   }
 
   $cmd = '/sbin/kernel-reboot';
-  if (! is_executable($cmd)) {
+  if (! is_executable($cmd) || (getPREFdef($global_prefs, 'system_reboot_classic_full') === 'yes')) {
     $cmd = '/sbin/reboot';
     $count_down_secs += 30;                                     
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.