maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- fixed double-declaration of variable causing nginx-cron to fail on mysql_fetch_array() for htpasswd-entries, fixes #516

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-12-09 11:49:07 +00:00
parent 59bf7ba22f
commit 8202cc96e7
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -524,7 +524,7 @@ class nginx
$query = "SELECT * FROM " . TABLE_PANEL_HTPASSWDS . " WHERE `customerid`='" . $domain['customerid'] . "'"; $query = "SELECT * FROM " . TABLE_PANEL_HTPASSWDS . " WHERE `customerid`='" . $domain['customerid'] . "'";
$result = $this->db->query($query); $result = $this->db->query($query);
$result = array(); $returnval = array();
$x = 0; $x = 0;
while($row_htpasswds = $this->db->fetch_array($result)) while($row_htpasswds = $this->db->fetch_array($result))
{ {
@@ -544,13 +544,13 @@ class nginx
$path = makeCorrectDir(substr($row['path'], strlen($domain['documentroot']) - 1)); $path = makeCorrectDir(substr($row['path'], strlen($domain['documentroot']) - 1));
$result[$x]['path'] = $path; $returnval[$x]['path'] = $path;
$result[$x]['root'] = makeCorrectDir($domain['documentroot']); $returnval[$x]['root'] = makeCorrectDir($domain['documentroot']);
$result[$x]['usrf'] = $htpasswd_filename; $returnval[$x]['usrf'] = $htpasswd_filename;
$x++; $x++;
} }
} }
return $result; return $returnval;
} }
protected function composePhpOptions($domain) protected function composePhpOptions($domain)