From: dj3c1t Date: Mon, 17 Dec 2012 20:05:05 +0000 (+0100) Subject: le dossier out passe dans le dossier app X-Git-Tag: mtweb.0.6.1 X-Git-Url: http://git.dj3c1t.com/index.cgi?a=commitdiff_plain;h=4947a4d83a2e96ee33135abdca8685b4c07e165c;p=mtweb le dossier out passe dans le dossier app --- diff --git a/mw/out/default/admin.php b/mw/app/out/default/admin.php similarity index 100% rename from mw/out/default/admin.php rename to mw/app/out/default/admin.php diff --git a/mw/out/default/compte.php b/mw/app/out/default/compte.php similarity index 100% rename from mw/out/default/compte.php rename to mw/app/out/default/compte.php diff --git a/mw/out/default/config.xml b/mw/app/out/default/config.xml similarity index 100% rename from mw/out/default/config.xml rename to mw/app/out/default/config.xml diff --git a/mw/out/default/content.php b/mw/app/out/default/content.php similarity index 100% rename from mw/out/default/content.php rename to mw/app/out/default/content.php diff --git a/mw/out/default/css/actions/admin.css b/mw/app/out/default/css/actions/admin.css similarity index 100% rename from mw/out/default/css/actions/admin.css rename to mw/app/out/default/css/actions/admin.css diff --git a/mw/out/default/css/actions/admin_plugins.css b/mw/app/out/default/css/actions/admin_plugins.css similarity index 100% rename from mw/out/default/css/actions/admin_plugins.css rename to mw/app/out/default/css/actions/admin_plugins.css diff --git a/mw/out/default/css/actions/forms_contact.css b/mw/app/out/default/css/actions/forms_contact.css similarity index 100% rename from mw/out/default/css/actions/forms_contact.css rename to mw/app/out/default/css/actions/forms_contact.css diff --git a/mw/out/default/css/actions/users.css b/mw/app/out/default/css/actions/users.css similarity index 100% rename from mw/out/default/css/actions/users.css rename to mw/app/out/default/css/actions/users.css diff --git a/mw/out/default/css/colorbox.css b/mw/app/out/default/css/colorbox.css similarity index 100% rename from mw/out/default/css/colorbox.css rename to mw/app/out/default/css/colorbox.css diff --git a/mw/out/default/css/colors.css b/mw/app/out/default/css/colors.css similarity index 100% rename from mw/out/default/css/colors.css rename to mw/app/out/default/css/colors.css diff --git a/mw/out/default/css/footer.css b/mw/app/out/default/css/footer.css similarity index 100% rename from mw/out/default/css/footer.css rename to mw/app/out/default/css/footer.css diff --git a/mw/out/default/css/general.css b/mw/app/out/default/css/general.css similarity index 100% rename from mw/out/default/css/general.css rename to mw/app/out/default/css/general.css diff --git a/mw/out/default/css/header.css b/mw/app/out/default/css/header.css similarity index 100% rename from mw/out/default/css/header.css rename to mw/app/out/default/css/header.css diff --git a/mw/out/default/css/main.css b/mw/app/out/default/css/main.css similarity index 100% rename from mw/out/default/css/main.css rename to mw/app/out/default/css/main.css diff --git a/mw/out/default/css/menu_top.css b/mw/app/out/default/css/menu_top.css similarity index 100% rename from mw/out/default/css/menu_top.css rename to mw/app/out/default/css/menu_top.css diff --git a/mw/out/default/css/style.css b/mw/app/out/default/css/style.css similarity index 100% rename from mw/out/default/css/style.css rename to mw/app/out/default/css/style.css diff --git a/mw/out/default/css/tinymce.css b/mw/app/out/default/css/tinymce.css similarity index 100% rename from mw/out/default/css/tinymce.css rename to mw/app/out/default/css/tinymce.css diff --git a/mw/out/default/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/mw/app/out/default/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png similarity index 100% rename from mw/out/default/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png rename to mw/app/out/default/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png diff --git a/mw/out/default/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/mw/app/out/default/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png similarity index 100% rename from mw/out/default/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png rename to mw/app/out/default/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png diff --git a/mw/out/default/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/mw/app/out/default/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png similarity index 100% rename from mw/out/default/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png rename to mw/app/out/default/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png diff --git a/mw/out/default/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/mw/app/out/default/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png similarity index 100% rename from mw/out/default/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png rename to mw/app/out/default/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png diff --git a/mw/out/default/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/mw/app/out/default/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png similarity index 100% rename from mw/out/default/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png rename to mw/app/out/default/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png diff --git a/mw/out/default/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/mw/app/out/default/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from mw/out/default/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png rename to mw/app/out/default/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/mw/out/default/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/mw/app/out/default/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png similarity index 100% rename from mw/out/default/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png rename to mw/app/out/default/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png diff --git a/mw/out/default/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/mw/app/out/default/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png similarity index 100% rename from mw/out/default/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png rename to mw/app/out/default/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png diff --git a/mw/out/default/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/mw/app/out/default/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png similarity index 100% rename from mw/out/default/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png rename to mw/app/out/default/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png diff --git a/mw/out/default/css/ui-lightness/images/ui-icons_222222_256x240.png b/mw/app/out/default/css/ui-lightness/images/ui-icons_222222_256x240.png similarity index 100% rename from mw/out/default/css/ui-lightness/images/ui-icons_222222_256x240.png rename to mw/app/out/default/css/ui-lightness/images/ui-icons_222222_256x240.png diff --git a/mw/out/default/css/ui-lightness/images/ui-icons_228ef1_256x240.png b/mw/app/out/default/css/ui-lightness/images/ui-icons_228ef1_256x240.png similarity index 100% rename from mw/out/default/css/ui-lightness/images/ui-icons_228ef1_256x240.png rename to mw/app/out/default/css/ui-lightness/images/ui-icons_228ef1_256x240.png diff --git a/mw/out/default/css/ui-lightness/images/ui-icons_ef8c08_256x240.png b/mw/app/out/default/css/ui-lightness/images/ui-icons_ef8c08_256x240.png similarity index 100% rename from mw/out/default/css/ui-lightness/images/ui-icons_ef8c08_256x240.png rename to mw/app/out/default/css/ui-lightness/images/ui-icons_ef8c08_256x240.png diff --git a/mw/out/default/css/ui-lightness/images/ui-icons_ffd27a_256x240.png b/mw/app/out/default/css/ui-lightness/images/ui-icons_ffd27a_256x240.png similarity index 100% rename from mw/out/default/css/ui-lightness/images/ui-icons_ffd27a_256x240.png rename to mw/app/out/default/css/ui-lightness/images/ui-icons_ffd27a_256x240.png diff --git a/mw/out/default/css/ui-lightness/images/ui-icons_ffffff_256x240.png b/mw/app/out/default/css/ui-lightness/images/ui-icons_ffffff_256x240.png similarity index 100% rename from mw/out/default/css/ui-lightness/images/ui-icons_ffffff_256x240.png rename to mw/app/out/default/css/ui-lightness/images/ui-icons_ffffff_256x240.png diff --git a/mw/out/default/css/ui-lightness/jquery-ui-1.8.12.custom.css b/mw/app/out/default/css/ui-lightness/jquery-ui-1.8.12.custom.css similarity index 100% rename from mw/out/default/css/ui-lightness/jquery-ui-1.8.12.custom.css rename to mw/app/out/default/css/ui-lightness/jquery-ui-1.8.12.custom.css diff --git a/mw/out/default/functions.php b/mw/app/out/default/functions.php similarity index 100% rename from mw/out/default/functions.php rename to mw/app/out/default/functions.php diff --git a/mw/out/default/html_reponse.php b/mw/app/out/default/html_reponse.php similarity index 100% rename from mw/out/default/html_reponse.php rename to mw/app/out/default/html_reponse.php diff --git a/mw/out/default/html_simple_reponse.php b/mw/app/out/default/html_simple_reponse.php similarity index 100% rename from mw/out/default/html_simple_reponse.php rename to mw/app/out/default/html_simple_reponse.php diff --git a/mw/out/default/icons/add.gif b/mw/app/out/default/icons/add.gif similarity index 100% rename from mw/out/default/icons/add.gif rename to mw/app/out/default/icons/add.gif diff --git a/mw/out/default/icons/ajax-loader.gif b/mw/app/out/default/icons/ajax-loader.gif similarity index 100% rename from mw/out/default/icons/ajax-loader.gif rename to mw/app/out/default/icons/ajax-loader.gif diff --git a/mw/out/default/icons/asc.gif b/mw/app/out/default/icons/asc.gif similarity index 100% rename from mw/out/default/icons/asc.gif rename to mw/app/out/default/icons/asc.gif diff --git a/mw/out/default/icons/del.gif b/mw/app/out/default/icons/del.gif similarity index 100% rename from mw/out/default/icons/del.gif rename to mw/app/out/default/icons/del.gif diff --git a/mw/out/default/icons/desc.gif b/mw/app/out/default/icons/desc.gif similarity index 100% rename from mw/out/default/icons/desc.gif rename to mw/app/out/default/icons/desc.gif diff --git a/mw/out/default/icons/edit.gif b/mw/app/out/default/icons/edit.gif similarity index 100% rename from mw/out/default/icons/edit.gif rename to mw/app/out/default/icons/edit.gif diff --git a/mw/out/default/icons/list.gif b/mw/app/out/default/icons/list.gif similarity index 100% rename from mw/out/default/icons/list.gif rename to mw/app/out/default/icons/list.gif diff --git a/mw/out/default/images/colorbox/border.png b/mw/app/out/default/images/colorbox/border.png similarity index 100% rename from mw/out/default/images/colorbox/border.png rename to mw/app/out/default/images/colorbox/border.png diff --git a/mw/out/default/images/colorbox/controls.png b/mw/app/out/default/images/colorbox/controls.png similarity index 100% rename from mw/out/default/images/colorbox/controls.png rename to mw/app/out/default/images/colorbox/controls.png diff --git a/mw/out/default/images/colorbox/ie6/borderBottomCenter.png b/mw/app/out/default/images/colorbox/ie6/borderBottomCenter.png similarity index 100% rename from mw/out/default/images/colorbox/ie6/borderBottomCenter.png rename to mw/app/out/default/images/colorbox/ie6/borderBottomCenter.png diff --git a/mw/out/default/images/colorbox/ie6/borderBottomLeft.png b/mw/app/out/default/images/colorbox/ie6/borderBottomLeft.png similarity index 100% rename from mw/out/default/images/colorbox/ie6/borderBottomLeft.png rename to mw/app/out/default/images/colorbox/ie6/borderBottomLeft.png diff --git a/mw/out/default/images/colorbox/ie6/borderBottomRight.png b/mw/app/out/default/images/colorbox/ie6/borderBottomRight.png similarity index 100% rename from mw/out/default/images/colorbox/ie6/borderBottomRight.png rename to mw/app/out/default/images/colorbox/ie6/borderBottomRight.png diff --git a/mw/out/default/images/colorbox/ie6/borderMiddleLeft.png b/mw/app/out/default/images/colorbox/ie6/borderMiddleLeft.png similarity index 100% rename from mw/out/default/images/colorbox/ie6/borderMiddleLeft.png rename to mw/app/out/default/images/colorbox/ie6/borderMiddleLeft.png diff --git a/mw/out/default/images/colorbox/ie6/borderMiddleRight.png b/mw/app/out/default/images/colorbox/ie6/borderMiddleRight.png similarity index 100% rename from mw/out/default/images/colorbox/ie6/borderMiddleRight.png rename to mw/app/out/default/images/colorbox/ie6/borderMiddleRight.png diff --git a/mw/out/default/images/colorbox/ie6/borderTopCenter.png b/mw/app/out/default/images/colorbox/ie6/borderTopCenter.png similarity index 100% rename from mw/out/default/images/colorbox/ie6/borderTopCenter.png rename to mw/app/out/default/images/colorbox/ie6/borderTopCenter.png diff --git a/mw/out/default/images/colorbox/ie6/borderTopLeft.png b/mw/app/out/default/images/colorbox/ie6/borderTopLeft.png similarity index 100% rename from mw/out/default/images/colorbox/ie6/borderTopLeft.png rename to mw/app/out/default/images/colorbox/ie6/borderTopLeft.png diff --git a/mw/out/default/images/colorbox/ie6/borderTopRight.png b/mw/app/out/default/images/colorbox/ie6/borderTopRight.png similarity index 100% rename from mw/out/default/images/colorbox/ie6/borderTopRight.png rename to mw/app/out/default/images/colorbox/ie6/borderTopRight.png diff --git a/mw/out/default/images/colorbox/loading.gif b/mw/app/out/default/images/colorbox/loading.gif similarity index 100% rename from mw/out/default/images/colorbox/loading.gif rename to mw/app/out/default/images/colorbox/loading.gif diff --git a/mw/out/default/images/colorbox/loading_background.png b/mw/app/out/default/images/colorbox/loading_background.png similarity index 100% rename from mw/out/default/images/colorbox/loading_background.png rename to mw/app/out/default/images/colorbox/loading_background.png diff --git a/mw/out/default/images/colorbox/overlay.png b/mw/app/out/default/images/colorbox/overlay.png similarity index 100% rename from mw/out/default/images/colorbox/overlay.png rename to mw/app/out/default/images/colorbox/overlay.png diff --git a/mw/out/default/index.php b/mw/app/out/default/index.php similarity index 100% rename from mw/out/default/index.php rename to mw/app/out/default/index.php diff --git a/mw/out/default/js/actions/admin.js b/mw/app/out/default/js/actions/admin.js similarity index 100% rename from mw/out/default/js/actions/admin.js rename to mw/app/out/default/js/actions/admin.js diff --git a/mw/out/default/js/actions/users.js b/mw/app/out/default/js/actions/users.js similarity index 100% rename from mw/out/default/js/actions/users.js rename to mw/app/out/default/js/actions/users.js diff --git a/mw/out/default/js/jquery-1.8.3.min.js b/mw/app/out/default/js/jquery-1.8.3.min.js similarity index 100% rename from mw/out/default/js/jquery-1.8.3.min.js rename to mw/app/out/default/js/jquery-1.8.3.min.js diff --git a/mw/out/default/js/jquery-ui-1.8.12.custom.min.js b/mw/app/out/default/js/jquery-ui-1.8.12.custom.min.js similarity index 100% rename from mw/out/default/js/jquery-ui-1.8.12.custom.min.js rename to mw/app/out/default/js/jquery-ui-1.8.12.custom.min.js diff --git a/mw/out/default/js/jquery.colorbox-min.js b/mw/app/out/default/js/jquery.colorbox-min.js similarity index 100% rename from mw/out/default/js/jquery.colorbox-min.js rename to mw/app/out/default/js/jquery.colorbox-min.js diff --git a/mw/out/default/js/login.js b/mw/app/out/default/js/login.js similarity index 100% rename from mw/out/default/js/login.js rename to mw/app/out/default/js/login.js diff --git a/mw/out/default/js/md5.js b/mw/app/out/default/js/md5.js similarity index 100% rename from mw/out/default/js/md5.js rename to mw/app/out/default/js/md5.js diff --git a/mw/out/default/js/menu.js b/mw/app/out/default/js/menu.js similarity index 100% rename from mw/out/default/js/menu.js rename to mw/app/out/default/js/menu.js diff --git a/mw/out/default/layouts/admin.xml b/mw/app/out/default/layouts/admin.xml similarity index 100% rename from mw/out/default/layouts/admin.xml rename to mw/app/out/default/layouts/admin.xml diff --git a/mw/out/default/layouts/content.xml b/mw/app/out/default/layouts/content.xml similarity index 100% rename from mw/out/default/layouts/content.xml rename to mw/app/out/default/layouts/content.xml diff --git a/mw/out/default/layouts/forms.xml b/mw/app/out/default/layouts/forms.xml similarity index 100% rename from mw/out/default/layouts/forms.xml rename to mw/app/out/default/layouts/forms.xml diff --git a/mw/out/default/layouts/index.xml b/mw/app/out/default/layouts/index.xml similarity index 100% rename from mw/out/default/layouts/index.xml rename to mw/app/out/default/layouts/index.xml diff --git a/mw/out/default/layouts/reponses.xml b/mw/app/out/default/layouts/reponses.xml similarity index 100% rename from mw/out/default/layouts/reponses.xml rename to mw/app/out/default/layouts/reponses.xml diff --git a/mw/out/default/layouts/users.xml b/mw/app/out/default/layouts/users.xml similarity index 100% rename from mw/out/default/layouts/users.xml rename to mw/app/out/default/layouts/users.xml diff --git a/mw/out/default/views/admin/colonne.php b/mw/app/out/default/views/admin/colonne.php similarity index 100% rename from mw/out/default/views/admin/colonne.php rename to mw/app/out/default/views/admin/colonne.php diff --git a/mw/out/default/views/admin/config.php b/mw/app/out/default/views/admin/config.php similarity index 100% rename from mw/out/default/views/admin/config.php rename to mw/app/out/default/views/admin/config.php diff --git a/mw/out/default/views/admin/index.php b/mw/app/out/default/views/admin/index.php similarity index 100% rename from mw/out/default/views/admin/index.php rename to mw/app/out/default/views/admin/index.php diff --git a/mw/out/default/views/admin/plugins/list.php b/mw/app/out/default/views/admin/plugins/list.php similarity index 100% rename from mw/out/default/views/admin/plugins/list.php rename to mw/app/out/default/views/admin/plugins/list.php diff --git a/mw/out/default/views/admin/users/add.php b/mw/app/out/default/views/admin/users/add.php similarity index 100% rename from mw/out/default/views/admin/users/add.php rename to mw/app/out/default/views/admin/users/add.php diff --git a/mw/out/default/views/admin/users/edit.php b/mw/app/out/default/views/admin/users/edit.php similarity index 100% rename from mw/out/default/views/admin/users/edit.php rename to mw/app/out/default/views/admin/users/edit.php diff --git a/mw/out/default/views/admin/users/list.php b/mw/app/out/default/views/admin/users/list.php similarity index 100% rename from mw/out/default/views/admin/users/list.php rename to mw/app/out/default/views/admin/users/list.php diff --git a/mw/out/default/views/erreur.php b/mw/app/out/default/views/erreur.php similarity index 100% rename from mw/out/default/views/erreur.php rename to mw/app/out/default/views/erreur.php diff --git a/mw/out/default/views/footer.php b/mw/app/out/default/views/footer.php similarity index 100% rename from mw/out/default/views/footer.php rename to mw/app/out/default/views/footer.php diff --git a/mw/out/default/views/forms/contact/index.php b/mw/app/out/default/views/forms/contact/index.php similarity index 100% rename from mw/out/default/views/forms/contact/index.php rename to mw/app/out/default/views/forms/contact/index.php diff --git a/mw/out/default/views/head.php b/mw/app/out/default/views/head.php similarity index 100% rename from mw/out/default/views/head.php rename to mw/app/out/default/views/head.php diff --git a/mw/out/default/views/header.php b/mw/app/out/default/views/header.php similarity index 100% rename from mw/out/default/views/header.php rename to mw/app/out/default/views/header.php diff --git a/mw/out/default/views/users/colonne.php b/mw/app/out/default/views/index/colonne.php similarity index 100% rename from mw/out/default/views/users/colonne.php rename to mw/app/out/default/views/index/colonne.php diff --git a/mw/out/default/views/login.php b/mw/app/out/default/views/login.php similarity index 100% rename from mw/out/default/views/login.php rename to mw/app/out/default/views/login.php diff --git a/mw/out/default/views/messages.php b/mw/app/out/default/views/messages.php similarity index 100% rename from mw/out/default/views/messages.php rename to mw/app/out/default/views/messages.php diff --git a/mw/out/default/views/navig.php b/mw/app/out/default/views/navig.php similarity index 100% rename from mw/out/default/views/navig.php rename to mw/app/out/default/views/navig.php diff --git a/mw/out/default/views/redirect_javascript.php b/mw/app/out/default/views/redirect_javascript.php similarity index 100% rename from mw/out/default/views/redirect_javascript.php rename to mw/app/out/default/views/redirect_javascript.php diff --git a/mw/out/default/views/tinymce.init.js.php b/mw/app/out/default/views/tinymce.init.js.php similarity index 100% rename from mw/out/default/views/tinymce.init.js.php rename to mw/app/out/default/views/tinymce.init.js.php diff --git a/mw/out/default/views/top_menu.php b/mw/app/out/default/views/top_menu.php similarity index 100% rename from mw/out/default/views/top_menu.php rename to mw/app/out/default/views/top_menu.php diff --git a/mw/out/default/views/index/colonne.php b/mw/app/out/default/views/users/colonne.php similarity index 100% rename from mw/out/default/views/index/colonne.php rename to mw/app/out/default/views/users/colonne.php diff --git a/mw/out/default/views/users/identification.php b/mw/app/out/default/views/users/identification.php similarity index 100% rename from mw/out/default/views/users/identification.php rename to mw/app/out/default/views/users/identification.php diff --git a/mw/out/default/views/users/infos/edit.php b/mw/app/out/default/views/users/infos/edit.php similarity index 100% rename from mw/out/default/views/users/infos/edit.php rename to mw/app/out/default/views/users/infos/edit.php diff --git a/mw/env/modules/mw_env_out.php b/mw/env/modules/mw_env_out.php index 12ab2ed..00f4a84 100644 --- a/mw/env/modules/mw_env_out.php +++ b/mw/env/modules/mw_env_out.php @@ -31,7 +31,7 @@ $pathes = array(); if(($plugins = $this->plugins()) !== false){ foreach($plugins as $plugin_name => $plugin){ - $out_dir = $this->path("mw_dir")."plugins/".$plugin_name."/out/"; + $out_dir = $this->path("mw_dir")."plugins/".$plugin_name."/app/out/"; if( $plugin["installed"] && $plugin["enabled"] @@ -42,7 +42,7 @@ } } if($pathes !== false){ - $pathes = $this->_out_pathes($this->path("mw_dir")."out/", $pathes); + $pathes = $this->_out_pathes($this->path("mw_dir")."app/out/", $pathes); } } else $pathes = false; @@ -82,12 +82,12 @@ function _out_file($file, $PRIORITE = "DESC"){ $out_file = false; if($PRIORITE == "ASC"){ - $tmp_out_file = "out/".$this->config("out")."/".$file; + $tmp_out_file = "app/out/".$this->config("out")."/".$file; if($file && file_exists($this->path("mw_dir").$tmp_out_file)){ $out_file = $tmp_out_file; } if(!$out_file){ - $tmp_out_file = "out/".$this->config("default_out")."/".$file; + $tmp_out_file = "app/out/".$this->config("default_out")."/".$file; if($file && file_exists($this->path("mw_dir").$tmp_out_file)){ $out_file = $tmp_out_file; } @@ -96,13 +96,13 @@ if($out_file) return $out_file; if(($plugins = $this->plugins($PRIORITE)) !== false){ foreach($plugins as $plugin_name => $plugin){ - $tmp_out_file = "plugins/".$plugin_name."/out/".$this->config("out")."/".$file; + $tmp_out_file = "plugins/".$plugin_name."/app/out/".$this->config("out")."/".$file; if($file && $plugin["installed"] && $plugin["enabled"] && file_exists($this->path("mw_dir").$tmp_out_file)){ $out_file = $tmp_out_file; break; } if(!$out_file){ - $tmp_out_file = "plugins/".$plugin_name."/out/".$this->config("default_out")."/".$file; + $tmp_out_file = "plugins/".$plugin_name."/app/out/".$this->config("default_out")."/".$file; if($file && $plugin["installed"] && $plugin["enabled"] && file_exists($this->path("mw_dir").$tmp_out_file)){ $out_file = $tmp_out_file; break; @@ -110,12 +110,12 @@ } } if($PRIORITE == "DESC" && !$out_file){ - $tmp_out_file = "out/".$this->config("out")."/".$file; + $tmp_out_file = "app/out/".$this->config("out")."/".$file; if($file && file_exists($this->path("mw_dir").$tmp_out_file)){ $out_file = $tmp_out_file; } if(!$out_file){ - $tmp_out_file = "out/".$this->config("default_out")."/".$file; + $tmp_out_file = "app/out/".$this->config("default_out")."/".$file; if($file && file_exists($this->path("mw_dir").$tmp_out_file)){ $out_file = $tmp_out_file; } @@ -160,13 +160,13 @@ foreach($plugins as $plugin_name => $plugin){ if($plugin["installed"] && $plugin["enabled"]){ $FOUND = false; - $functions_file = $this->path("mw_dir")."plugins/".$plugin_name."/out/".$this->config("out")."/functions.php"; + $functions_file = $this->path("mw_dir")."plugins/".$plugin_name."/app/out/".$this->config("out")."/functions.php"; if(file_exists($functions_file)){ $FOUND = true; require $functions_file; } if(!$FOUND){ - $functions_file = $this->path("mw_dir")."plugins/".$plugin_name."/out/".$this->config("default_out")."/functions.php"; + $functions_file = $this->path("mw_dir")."plugins/".$plugin_name."/app/out/".$this->config("default_out")."/functions.php"; if($plugin["installed"] && $plugin["enabled"] && file_exists($functions_file)){ require $functions_file; } @@ -174,13 +174,13 @@ } } $FOUND = false; - $functions_file = $this->path("mw_dir")."out/".$this->config("out")."/functions.php"; + $functions_file = $this->path("mw_dir")."app/out/".$this->config("out")."/functions.php"; if(file_exists($functions_file)){ $FOUND = true; require $functions_file; } if(!$FOUND){ - $functions_file = $this->path("mw_dir")."out/".$this->config("default_out")."/functions.php"; + $functions_file = $this->path("mw_dir")."app/out/".$this->config("default_out")."/functions.php"; if(file_exists($functions_file)){ require $functions_file; } @@ -204,20 +204,20 @@ function _init_layout($mod){ if(($plugins = $this->plugins("ASC")) !== false){ $layout_file = false; - $tmp_layout_file = $this->path("mw_dir")."out/".$this->config("out")."/layouts/".$mod.".xml"; + $tmp_layout_file = $this->path("mw_dir")."app/out/".$this->config("out")."/layouts/".$mod.".xml"; if(file_exists($tmp_layout_file)) $layout_file = $tmp_layout_file; if(!$layout_file){ - $tmp_layout_file = $this->path("mw_dir")."out/".$this->config("default_out")."/layouts/".$mod.".xml"; + $tmp_layout_file = $this->path("mw_dir")."app/out/".$this->config("default_out")."/layouts/".$mod.".xml"; if(file_exists($tmp_layout_file)) $layout_file = $tmp_layout_file; } if($layout_file) $this->load_layout($layout_file); foreach($plugins as $plugin_name => $plugin){ if($plugin["installed"] && $plugin["enabled"]){ $layout_file = false; - $tmp_layout_file = $this->path("mw_dir")."plugins/".$plugin_name."/out/".$this->config("out")."/layouts/".$mod.".xml"; + $tmp_layout_file = $this->path("mw_dir")."plugins/".$plugin_name."/app/out/".$this->config("out")."/layouts/".$mod.".xml"; if(file_exists($tmp_layout_file)) $layout_file = $tmp_layout_file; if(!$layout_file){ - $tmp_layout_file = $this->path("mw_dir")."plugins/".$plugin_name."/out/".$this->config("default_out")."/layouts/".$mod.".xml"; + $tmp_layout_file = $this->path("mw_dir")."plugins/".$plugin_name."/app/out/".$this->config("default_out")."/layouts/".$mod.".xml"; if(file_exists($tmp_layout_file)) $layout_file = $tmp_layout_file; } if($layout_file) $this->load_layout($layout_file);