entrouvert
/
univnautes
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Rewrite update_alias_url_data to be with small memory footprint. Also return the status if an update is performed to callers and remove the write_config call embedded here since its not good to have this by default.

This commit is contained in:
Ermal 2014-04-30 07:07:56 +00:00
parent 0ad946164c
commit 8422cdd583
2 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
etc/inc/pfsense-utils.inc
View File

@ -1893,8 +1893,10 @@ function update_alias_names_upon_change($section, $field, $new_alias_name, $orig
function update_alias_url_data() {
global $config, $g;
$updated = false;
/* item is a url type */
$lockkey = lock('config');
$lockkey = lock('aliasurl');
if (is_array($config['aliases']['alias'])) {
foreach ($config['aliases']['alias'] as $x => $alias) {
if (empty($alias['aliasurl']))
@ -1916,36 +1918,38 @@ function update_alias_url_data() {
else if (stristr($alias_url, ".zip"))
process_alias_unzip($temp_filename);
if (file_exists("{$temp_filename}/aliases")) {
$file_contents = file_get_contents("{$temp_filename}/aliases");
$file_contents = str_replace("#", "\n#", $file_contents);
$file_contents_split = explode("\n", $file_contents);
foreach ($file_contents_split as $fc) {
$tmp = trim($fc);
if (stristr($fc, "#")) {
$tmp_split = explode("#", $tmp);
$tmp = trim($tmp_split[0]);
}
if (trim($tmp) <> "") {
if ($isfirst == 1)
$address .= " ";
$address .= $tmp;
$isfirst = 1;
}
$fd = @fopen("{$temp_filename}/aliases");
if (!$fd) {
log_error(gettext("Could not process aliases from alias: {$alias_url}"));
continue;
}
/* NOTE: fgetss() is not a typo RTFM before being smart */
while (($fc = fgetss($fd)) !== FALSE) {
$tmp = trim($fc, " \t\n\r");
if (empty($tmp))
continue;
$tmp_str = strstr($tmp, '#', true);
if (!empty($tmp_str))
$tmp = $tmp_str;
if ($isfirst == 1)
$address .= ' ';
$address .= $tmp;
$isfirst = 1;
}
fclose($fd);
mwexec("/bin/rm -rf {$temp_filename}");
}
}
if($isfirst > 0) {
if (!empty($address)) {
$config['aliases']['alias'][$x]['address'] = $address;
$updated = true;
}
}
}
unlock($lockkey);
if ($updated) {
write_config();
send_event("filter reload");
}
/* Report status to callers as well */
return $updated;
}
function process_alias_unzip($temp_filename) {

6
etc/rc.update_alias_url_data
View File

@ -36,6 +36,8 @@
require_once("config.inc");
require_once("functions.inc");
update_alias_url_data();
if (update_alias_url_data()) {
write_config();
send_event("filter reload");
}
?>