Commit ed5cbf97 authored by Franco Fichtner's avatar Franco Fichtner

rc: fix a crash report

(cherry picked from commit 819cf47d)
(cherry picked from commit 83ec1073)
(cherry picked from commit 5f1d2078)
(cherry picked from commit 9dd1dd8e)
parent 64617a98
...@@ -445,7 +445,7 @@ function ipsec_configure($verbose = false) ...@@ -445,7 +445,7 @@ function ipsec_configure($verbose = false)
/* get the automatic ping_hosts.sh ready */ /* get the automatic ping_hosts.sh ready */
@unlink('/var/db/ipsecpinghosts'); @unlink('/var/db/ipsecpinghosts');
touch('/var/db/ipsecpinghosts'); @touch('/var/db/ipsecpinghosts');
// Prefer older IPsec SAs (advanced setting) // Prefer older IPsec SAs (advanced setting)
if (isset($config['ipsec']['preferoldsa'])) { if (isset($config['ipsec']['preferoldsa'])) {
......
...@@ -28,9 +28,11 @@ ...@@ -28,9 +28,11 @@
*/ */
require_once("config.inc"); require_once("config.inc");
require_once('auth.inc');
require_once("util.inc"); require_once("util.inc");
require_once("filter.inc"); require_once("filter.inc");
require_once("system.inc"); require_once("system.inc");
require_once('ipsec.inc');
require_once('openvpn.inc'); require_once('openvpn.inc');
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once("services.inc"); require_once("services.inc");
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
/* parse the configuration and include all functions used below */
require_once("config.inc"); require_once("config.inc");
require_once('auth.inc');
require_once("filter.inc"); require_once("filter.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
require_once('ipsec.inc'); require_once('ipsec.inc');
...@@ -37,10 +37,10 @@ require_once("util.inc"); ...@@ -37,10 +37,10 @@ require_once("util.inc");
require_once("system.inc"); require_once("system.inc");
require_once("services.inc"); require_once("services.inc");
function handle_argument_group($iface, $argument2) { function handle_argument_group($iface, $argument2)
{
global $config; global $config;
if (isset($config['interfaces'][$iface])) { if (isset($config['interfaces'][$iface])) {
// set defaults // set defaults
$ipaddr = null ; $ipaddr = null ;
......
...@@ -33,6 +33,7 @@ require_once("util.inc"); ...@@ -33,6 +33,7 @@ require_once("util.inc");
require_once("config.inc"); require_once("config.inc");
require_once("filter.inc"); require_once("filter.inc");
require_once('ipsec.inc'); require_once('ipsec.inc');
require_once('auth.inc');
require_once("interfaces.inc"); require_once("interfaces.inc");
/* make sure to wait until the boot scripts have finished */ /* make sure to wait until the boot scripts have finished */
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
/* parse the configuration and include all functions used below */
require_once("config.inc"); require_once("config.inc");
require_once('auth.inc');
require_once("filter.inc"); require_once("filter.inc");
require_once('ipsec.inc'); require_once('ipsec.inc');
require_once("openvpn.inc"); require_once("openvpn.inc");
......
...@@ -139,10 +139,8 @@ if (!empty($config['widgets']['rsswidgettextlength']) && is_numeric($config['wid ...@@ -139,10 +139,8 @@ if (!empty($config['widgets']['rsswidgettextlength']) && is_numeric($config['wid
<div id="rss-widgets" style="padding: 5px; height: <?=$rsswidgetheight?>px; overflow:scroll;"> <div id="rss-widgets" style="padding: 5px; height: <?=$rsswidgetheight?>px; overflow:scroll;">
<?php <?php
if (!is_dir("/tmp/simplepie")) { @mkdir('/tmp/simplepie');
mkdir("/tmp/simplepie"); @mkdir('/tmp/simplepie/cache');
mkdir("/tmp/simplepie/cache");
}
exec("chmod a+rw /tmp/simplepie/."); exec("chmod a+rw /tmp/simplepie/.");
exec("chmod a+rw /tmp/simplepie/cache/."); exec("chmod a+rw /tmp/simplepie/cache/.");
$feed = new SimplePie(); $feed = new SimplePie();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment