Merge pull request #1485 from mafoo/WhitespaceClean-others
WhitespaceClean-others
This commit is contained in:
@@ -252,15 +252,15 @@ if(!function_exists('fax_enqueue')) {
|
|||||||
$date_utc_now_sql = "datetime('now')";
|
$date_utc_now_sql = "datetime('now')";
|
||||||
}
|
}
|
||||||
$sql = <<<HERE
|
$sql = <<<HERE
|
||||||
INSERT INTO v_fax_tasks( fax_task_uuid, fax_uuid,
|
INSERT INTO v_fax_tasks( fax_task_uuid, fax_uuid,
|
||||||
task_next_time, task_lock_time,
|
task_next_time, task_lock_time,
|
||||||
task_fax_file, task_wav_file, task_uri, task_dial_string, task_dtmf,
|
task_fax_file, task_wav_file, task_uri, task_dial_string, task_dtmf,
|
||||||
task_interrupted, task_status, task_no_answer_counter, task_no_answer_retry_counter, task_retry_counter,
|
task_interrupted, task_status, task_no_answer_counter, task_no_answer_retry_counter, task_retry_counter,
|
||||||
task_reply_address, task_description)
|
task_reply_address, task_description)
|
||||||
VALUES (?, ?,
|
VALUES (?, ?,
|
||||||
$date_utc_now_sql, NULL,
|
$date_utc_now_sql, NULL,
|
||||||
?, ?, ?, ?, ?,
|
?, ?, ?, ?, ?,
|
||||||
'false', 0, 0, 0, 0,
|
'false', 0, 0, 0, 0,
|
||||||
?, ?);
|
?, ?);
|
||||||
HERE;
|
HERE;
|
||||||
$stmt = $db->prepare($sql);
|
$stmt = $db->prepare($sql);
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ if ($domains_processed == 1) {
|
|||||||
if ($x > 300) { break; };
|
if ($x > 300) { break; };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!$set_session_theme){
|
if(!$set_session_theme){
|
||||||
//get default settings
|
//get default settings
|
||||||
$sql = "select * from v_default_settings ";
|
$sql = "select * from v_default_settings ";
|
||||||
@@ -56,7 +56,7 @@ if ($domains_processed == 1) {
|
|||||||
$prep_statement->execute();
|
$prep_statement->execute();
|
||||||
$default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED);
|
$default_settings = $prep_statement->fetchAll(PDO::FETCH_NAMED);
|
||||||
unset($prep_statement);
|
unset($prep_statement);
|
||||||
|
|
||||||
$background_image_enabled = false;
|
$background_image_enabled = false;
|
||||||
//add theme default settings
|
//add theme default settings
|
||||||
foreach ($array as $row) {
|
foreach ($array as $row) {
|
||||||
|
|||||||
Reference in New Issue
Block a user