diff --git a/www/admin/cache b/www/admin/cache deleted file mode 120000 index a32eef45..00000000 --- a/www/admin/cache +++ /dev/null @@ -1 +0,0 @@ -../cache/ \ No newline at end of file diff --git a/www/admin/edit_base.inc b/www/admin/edit_base.inc index a2bb2b06..14bf0850 100644 --- a/www/admin/edit_base.inc +++ b/www/admin/edit_base.inc @@ -307,7 +307,12 @@ $CONTENT_DATA = array_merge($HEADER, $DATA, $DEBUG_DATA); while (list($key, $value) = each($CONTENT_DATA)) { $smarty->assign($key, $value); } - +if (is_dir(BASE.TEMPLATES_C)) { + $smarty->setCompileDir(BASE.TEMPLATES_C); +} +if (is_dir(BASE.CACHE)) { + $smarty->setCacheDir(BASE.CACHE); +} $smarty->display('edit_body.tpl'); // debug output diff --git a/www/admin/files.php b/www/admin/files.php index c8c14916..489fef2a 100644 --- a/www/admin/files.php +++ b/www/admin/files.php @@ -202,10 +202,10 @@ if ($cms->action == 'save') { $file = DEV_SCHEMA."_".$file_uid; // now upload the file if ($_FILES['file_up']['name']) { - $upload_file = ROOT.MEDIA.$cms->data_path[$file_type].$file; + $upload_file = BASE.MEDIA.$cms->data_path[$file_type].$file; // wipe out any old tmp data for this new upload - if (is_array(glob(ROOT.TMP."thumb_".$file."*"))) { - foreach (glob(ROOT.TMP."thumb_".$file."*") as $filename) { + if (is_array(glob(BASE.TMP."thumb_".$file."*"))) { + foreach (glob(BASE.TMP."thumb_".$file."*") as $filename) { @unlink($filename); } } @@ -242,7 +242,7 @@ if ($cms->action == 'save') { } $q .= ") VALUES ('".$cms->queue_name."', '".$file_uid."', 'file_uid', '".$sql_action."', 'file', '".$cms->db_escape_string($sql_data)."', '".$cms->queue_key."', '".$cms->action."'"; if ($_FILES['file_up']['name']) { - $q .= ", '".ROOT.MEDIA.$cms->data_path[$file_type].$file."#".ROOT.MEDIA.$cms->data_path[$file_type].PUBLIC_SCHEMA."_".$file_uid."'"; + $q .= ", '".BASE.MEDIA.$cms->data_path[$file_type].$file."#".BASE.MEDIA.$cms->data_path[$file_type].PUBLIC_SCHEMA."_".$file_uid."'"; } $q .= ")"; $cms->db_exec($q); @@ -262,9 +262,9 @@ if ($cms->action == 'delete' && $cms->action_yes == 'true') { } if (QUEUE == 'live_queue') { $q = "INSERT INTO ".GLOBAL_DB_SCHEMA.".live_queue (queue_key, key_value, key_name, type, target, data, group_key, action, file) VALUES ("; - $q .= "'".$cms->queue_name."', '".$file_uid."', 'file_uid', 'DELETE', 'file', '', '".$cms->queue_key."', '".$cms->action."', '".ROOT.MEDIA.$cms->data_path[$file_type].PUBLIC_SCHEMA."_".$file_uid."')"; + $q .= "'".$cms->queue_name."', '".$file_uid."', 'file_uid', 'DELETE', 'file', '', '".$cms->queue_key."', '".$cms->action."', '".BASE.MEDIA.$cms->data_path[$file_type].PUBLIC_SCHEMA."_".$file_uid."')"; } - @unlink(ROOT.MEDIA.$cms->data_path[$file_type].DEV_SCHEMA."_".$file_uid); + @unlink(BASE.MEDIA.$cms->data_path[$file_type].DEV_SCHEMA."_".$file_uid); unset($file_uid); unset($file_id); $delete_done = 1; @@ -296,7 +296,7 @@ if ($cms->action_flag == 'set_live' && $cms->action = 'set_delete') { while ($res = $cms->db_return($q)) { $q_del = "DELETE FROM ".PUBLIC_SCHEMA.".file WHERE file_uid = '".$res['pkid'].'"'; $cms->db_exec($q_del); - @unlink(ROOT.MEDIA.$cms->data_path[$res['type']].PUBLIC_SCHEMA."_".$res['file_uid']); + @unlink(BASE.MEDIA.$cms->data_path[$res['type']].PUBLIC_SCHEMA."_".$res['file_uid']); } $q = "DELETE FROM ".LOGIN_DB_SCHEMA.".set_live WHERE table_name = '".$cms->page_name."' AND delete_flag = 't'"; $cms->db_exec($q); diff --git a/www/admin/log b/www/admin/log deleted file mode 120000 index 3355f402..00000000 --- a/www/admin/log +++ /dev/null @@ -1 +0,0 @@ -../log/ \ No newline at end of file diff --git a/www/admin/smarty.inc b/www/admin/smarty.inc index a873e2ac..b6b7707e 100644 --- a/www/admin/smarty.inc +++ b/www/admin/smarty.inc @@ -93,4 +93,10 @@ $cms->CONTENT_DATA = array_merge($cms->HEADER, $cms->DATA, $cms->DEBUG_DATA); while (list($key, $value) = each($cms->CONTENT_DATA)) { $smarty->assign($key, $value); } +if (is_dir(BASE.TEMPLATES_C)) { + $smarty->setCompileDir(BASE.TEMPLATES_C); +} +if (is_dir(BASE.CACHE)) { + $smarty->setCacheDir(BASE.CACHE); +} $smarty->display($MASTER_TEMPLATE_NAME, $TEMPLATE.$lang, $TEMPLATE.$lang); diff --git a/www/admin/templates_c b/www/admin/templates_c deleted file mode 120000 index fb1dd32a..00000000 --- a/www/admin/templates_c +++ /dev/null @@ -1 +0,0 @@ -../templates_c/ \ No newline at end of file diff --git a/www/admin/tmp b/www/admin/tmp deleted file mode 120000 index b684689e..00000000 --- a/www/admin/tmp +++ /dev/null @@ -1 +0,0 @@ -../tmp/ \ No newline at end of file