From: dj3c1t Date: Sun, 16 Dec 2012 19:49:11 +0000 (+0100) Subject: reorganisation des dossiers X-Git-Tag: mtweb.0.6.0 X-Git-Url: http://git.dj3c1t.com/?p=mtweb;a=commitdiff_plain;h=36ed114046cbe3d72a3589230e9f306a54fcc79d reorganisation des dossiers --- diff --git a/web/config.php b/config.php similarity index 50% rename from web/config.php rename to config.php index 3fba400..eb6ec07 100644 --- a/web/config.php +++ b/config.php @@ -1,39 +1,33 @@ + + diff --git a/web/content/data/xml/mw/config/34.xml b/content/data/xml/mw/config/34.xml similarity index 100% rename from web/content/data/xml/mw/config/34.xml rename to content/data/xml/mw/config/34.xml diff --git a/web/content/data/xml/mw/config/39.xml b/content/data/xml/mw/config/39.xml similarity index 100% rename from web/content/data/xml/mw/config/39.xml rename to content/data/xml/mw/config/39.xml diff --git a/web/content/data/xml/mw/config/40.xml b/content/data/xml/mw/config/40.xml similarity index 100% rename from web/content/data/xml/mw/config/40.xml rename to content/data/xml/mw/config/40.xml diff --git a/web/content/data/xml/mw/config/41.xml b/content/data/xml/mw/config/41.xml similarity index 100% rename from web/content/data/xml/mw/config/41.xml rename to content/data/xml/mw/config/41.xml diff --git a/web/content/data/xml/mw/config/55.xml b/content/data/xml/mw/config/55.xml similarity index 100% rename from web/content/data/xml/mw/config/55.xml rename to content/data/xml/mw/config/55.xml diff --git a/web/content/data/xml/mw/config/56.xml b/content/data/xml/mw/config/56.xml similarity index 100% rename from web/content/data/xml/mw/config/56.xml rename to content/data/xml/mw/config/56.xml diff --git a/web/content/data/xml/mw/config/57.xml b/content/data/xml/mw/config/57.xml similarity index 100% rename from web/content/data/xml/mw/config/57.xml rename to content/data/xml/mw/config/57.xml diff --git a/web/content/data/xml/mw/user_status/.index b/content/data/xml/mw/user_status/.index similarity index 100% rename from web/content/data/xml/mw/user_status/.index rename to content/data/xml/mw/user_status/.index diff --git a/web/content/data/xml/mw/user_status/1.xml b/content/data/xml/mw/user_status/1.xml similarity index 100% rename from web/content/data/xml/mw/user_status/1.xml rename to content/data/xml/mw/user_status/1.xml diff --git a/web/content/data/xml/mw/user_status/2.xml b/content/data/xml/mw/user_status/2.xml similarity index 100% rename from web/content/data/xml/mw/user_status/2.xml rename to content/data/xml/mw/user_status/2.xml diff --git a/web/content/data/xml/mw/users/.index b/content/data/xml/mw/users/.index similarity index 100% rename from web/content/data/xml/mw/users/.index rename to content/data/xml/mw/users/.index diff --git a/web/content/data/xml/mw/users/14.xml b/content/data/xml/mw/users/14.xml similarity index 100% rename from web/content/data/xml/mw/users/14.xml rename to content/data/xml/mw/users/14.xml diff --git a/web/index.php b/index.php similarity index 50% rename from web/index.php rename to index.php index 1320ff3..26b6745 100644 --- a/web/index.php +++ b/index.php @@ -1,8 +1,6 @@ \ No newline at end of file diff --git a/web/app/config.xml b/mw/app/config.xml similarity index 88% rename from web/app/config.xml rename to mw/app/config.xml index b862223..968bc45 100644 --- a/web/app/config.xml +++ b/mw/app/config.xml @@ -6,6 +6,7 @@ + default 1 diff --git a/web/app/data/impl/mw_mysql.php b/mw/app/data/impl/mw_mysql.php similarity index 100% rename from web/app/data/impl/mw_mysql.php rename to mw/app/data/impl/mw_mysql.php diff --git a/web/app/data/impl/mw_xml.php b/mw/app/data/impl/mw_xml.php similarity index 100% rename from web/app/data/impl/mw_xml.php rename to mw/app/data/impl/mw_xml.php diff --git a/web/app/data/impl/xml/mw_xml_data.php b/mw/app/data/impl/xml/mw_xml_data.php similarity index 100% rename from web/app/data/impl/xml/mw_xml_data.php rename to mw/app/data/impl/xml/mw_xml_data.php diff --git a/web/app/data/impl/xml/mw_xml_data_handler.php b/mw/app/data/impl/xml/mw_xml_data_handler.php similarity index 100% rename from web/app/data/impl/xml/mw_xml_data_handler.php rename to mw/app/data/impl/xml/mw_xml_data_handler.php diff --git a/web/app/data/modules/share/mw_data_check_instance.php b/mw/app/data/modules/share/mw_data_check_instance.php similarity index 100% rename from web/app/data/modules/share/mw_data_check_instance.php rename to mw/app/data/modules/share/mw_data_check_instance.php diff --git a/web/app/data/modules/share/mw_data_images.php b/mw/app/data/modules/share/mw_data_images.php similarity index 100% rename from web/app/data/modules/share/mw_data_images.php rename to mw/app/data/modules/share/mw_data_images.php diff --git a/web/app/data/modules/share/mw_data_init.php b/mw/app/data/modules/share/mw_data_init.php similarity index 100% rename from web/app/data/modules/share/mw_data_init.php rename to mw/app/data/modules/share/mw_data_init.php diff --git a/web/app/data/modules/share/mw_data_links.php b/mw/app/data/modules/share/mw_data_links.php similarity index 100% rename from web/app/data/modules/share/mw_data_links.php rename to mw/app/data/modules/share/mw_data_links.php diff --git a/web/app/data/modules/share/mw_data_out_config.php b/mw/app/data/modules/share/mw_data_out_config.php similarity index 100% rename from web/app/data/modules/share/mw_data_out_config.php rename to mw/app/data/modules/share/mw_data_out_config.php diff --git a/web/app/data/modules/share/mw_data_utils.php b/mw/app/data/modules/share/mw_data_utils.php similarity index 100% rename from web/app/data/modules/share/mw_data_utils.php rename to mw/app/data/modules/share/mw_data_utils.php diff --git a/web/app/data/modules/sql/mw_data_config.php b/mw/app/data/modules/sql/mw_data_config.php similarity index 100% rename from web/app/data/modules/sql/mw_data_config.php rename to mw/app/data/modules/sql/mw_data_config.php diff --git a/web/app/data/modules/sql/mw_data_users.php b/mw/app/data/modules/sql/mw_data_users.php similarity index 98% rename from web/app/data/modules/sql/mw_data_users.php rename to mw/app/data/modules/sql/mw_data_users.php index 3377c15..9623e09 100644 --- a/web/app/data/modules/sql/mw_data_users.php +++ b/mw/app/data/modules/sql/mw_data_users.php @@ -224,9 +224,10 @@ } function password_ok($user, $password){ + if(!$user) return false; return - strcmp(md5($user["password"].$_SESSION["id"]), $password) == 0 - && $_SESSION["ip"] == $_SERVER["REMOTE_ADDR"]; + strcmp(md5($user["password"].$_SESSION["id"]), $password) == 0 + && $_SESSION["ip"] == $_SERVER["REMOTE_ADDR"]; } # ---------------------------------------------------------------------------------------- diff --git a/web/app/data/modules/xml/mw_data_config.php b/mw/app/data/modules/xml/mw_data_config.php similarity index 100% rename from web/app/data/modules/xml/mw_data_config.php rename to mw/app/data/modules/xml/mw_data_config.php diff --git a/web/app/data/modules/xml/mw_data_users.php b/mw/app/data/modules/xml/mw_data_users.php similarity index 99% rename from web/app/data/modules/xml/mw_data_users.php rename to mw/app/data/modules/xml/mw_data_users.php index 30e1890..a55257a 100644 --- a/web/app/data/modules/xml/mw_data_users.php +++ b/mw/app/data/modules/xml/mw_data_users.php @@ -77,7 +77,7 @@ else $user = false; if($user !== false){ if(!isset($this->users)) $this->users = array(); - $this->users[$user["id"]] = $user; + if($user) $this->users[$user["id"]] = $user; } return $user; } @@ -280,6 +280,7 @@ function get_action_status($mod, $controller = "index", $action = "index", $set_status = array()){ $sgbd = $this->sgbd(); + $status = array(); if($rst = $sgbd->open_data("action_status")){ while($status !==false && $v_rst = $sgbd->fetch_data($rst)){ if(isset($v_rst) && isset($v_rst["action"]) && isset($v_rst["id_status"])){ diff --git a/web/app/data/mw_data.php b/mw/app/data/mw_data.php similarity index 100% rename from web/app/data/mw_data.php rename to mw/app/data/mw_data.php diff --git a/web/app/data/mw_sgbd.php b/mw/app/data/mw_sgbd.php similarity index 100% rename from web/app/data/mw_sgbd.php rename to mw/app/data/mw_sgbd.php diff --git a/web/app/init/0100_functions.php b/mw/app/init/0100_functions.php similarity index 100% rename from web/app/init/0100_functions.php rename to mw/app/init/0100_functions.php diff --git a/web/app/init/0200_inputs.php b/mw/app/init/0200_inputs.php similarity index 100% rename from web/app/init/0200_inputs.php rename to mw/app/init/0200_inputs.php diff --git a/web/app/init/0300_data.php b/mw/app/init/0300_data.php similarity index 73% rename from web/app/init/0300_data.php rename to mw/app/init/0300_data.php index afc41cc..8a28d16 100644 --- a/web/app/init/0300_data.php +++ b/mw/app/init/0300_data.php @@ -9,12 +9,12 @@ $data = new mw_data(true); foreach($plugins as $plugin_name => $plugin){ if($plugin["installed"] && $plugin["enabled"]){ - $data->load_modules($this->path("plugins").$plugin_name."/app/", "data/modules/share/"); - $data->load_modules($this->path("plugins").$plugin_name."/app/", "data/modules/".($this->bdd("sgbd") == "xml" ? "xml" : "sql")."/"); + $data->load_modules($this->path("mw_dir")."plugins/".$plugin_name."/app/", "data/modules/share/"); + $data->load_modules($this->path("mw_dir")."plugins/".$plugin_name."/app/", "data/modules/".($this->bdd("sgbd") == "xml" ? "xml" : "sql")."/"); } } - $data->load_modules($this->path("app"), "data/modules/share/"); - $data->load_modules($this->path("app"), "data/modules/".($this->bdd("sgbd") == "xml" ? "xml" : "sql")."/"); + $data->load_modules($this->path("mw_dir")."app/", "data/modules/share/"); + $data->load_modules($this->path("mw_dir")."app/", "data/modules/".($this->bdd("sgbd") == "xml" ? "xml" : "sql")."/"); $sgbd = new mw_sgbd( new $sgbd_impl( $this->bdd("host"), diff --git a/mw/app/init/0400_config.php b/mw/app/init/0400_config.php new file mode 100644 index 0000000..d16fba7 --- /dev/null +++ b/mw/app/init/0400_config.php @@ -0,0 +1,16 @@ +config()) !== false){ + $this->set_config($config); + $start_action_params_config = + $this->config("start_action_params") ? + @unserialize($this->config("start_action_params")) + : array(); + $this->set_config(array("start_action_params" => $start_action_params_config)); + if($this->set_out_config($data->out_config()) === false){ + $this->erreur("Impossible de lire la configuration du template"); + } + } + else $this->erreur("Impossible de lire la configuration en base", true); + +?> \ No newline at end of file diff --git a/web/app/init/0500_users.php b/mw/app/init/0500_users.php similarity index 100% rename from web/app/init/0500_users.php rename to mw/app/init/0500_users.php diff --git a/web/app/init/0600_check_instance.php b/mw/app/init/0600_check_instance.php similarity index 100% rename from web/app/init/0600_check_instance.php rename to mw/app/init/0600_check_instance.php diff --git a/web/app/init/0700_links.php b/mw/app/init/0700_links.php similarity index 100% rename from web/app/init/0700_links.php rename to mw/app/init/0700_links.php diff --git a/web/app/init/0800_init_plugins.php b/mw/app/init/0800_init_plugins.php similarity index 100% rename from web/app/init/0800_init_plugins.php rename to mw/app/init/0800_init_plugins.php diff --git a/web/app/init/0900_pre_run.php b/mw/app/init/0900_pre_run.php similarity index 100% rename from web/app/init/0900_pre_run.php rename to mw/app/init/0900_pre_run.php diff --git a/web/app/mods/admin/config.php b/mw/app/mods/admin/config.php similarity index 91% rename from web/app/mods/admin/config.php rename to mw/app/mods/admin/config.php index feb323d..20b34dc 100644 --- a/web/app/mods/admin/config.php +++ b/mw/app/mods/admin/config.php @@ -18,7 +18,7 @@ if($_POST){ $env->set_out("config", $_POST); if(preg_match("/^[0-9]+$/", $_POST["max_list"])){ - if(!$_POST["contact_form"] || trim($_POST["email"])){ + if(!isset($_POST["contact_form"]) || trim($_POST["email"])){ $CONTINUE = true; if($CONTINUE && $data->set_config("site_name", $_POST["site_name"])); else $CONTINUE = false; @@ -26,11 +26,11 @@ else $CONTINUE = false; if($CONTINUE && $data->set_config("max_list", $_POST["max_list"])); else $CONTINUE = false; - if($CONTINUE && $data->set_config("contact_form", $_POST["contact_form"] ? "1" : "0")); + if($CONTINUE && $data->set_config("contact_form", isset($_POST["contact_form"]) ? "1" : "0")); else $CONTINUE = false; if($CONTINUE && $data->set_config("email", $_POST["email"])); else $CONTINUE = false; - if($CONTINUE && $data->set_config("captcha", $_POST["captcha"] ? "1" : "0")); + if($CONTINUE && $data->set_config("captcha", isset($_POST["captcha"]) ? "1" : "0")); else $CONTINUE = false; if($CONTINUE && $data->set_config("out", $_POST["out"])); else $CONTINUE = false; diff --git a/web/app/mods/admin/index.php b/mw/app/mods/admin/index.php similarity index 100% rename from web/app/mods/admin/index.php rename to mw/app/mods/admin/index.php diff --git a/web/app/mods/admin/plugins.php b/mw/app/mods/admin/plugins.php similarity index 100% rename from web/app/mods/admin/plugins.php rename to mw/app/mods/admin/plugins.php diff --git a/web/app/mods/admin/users.php b/mw/app/mods/admin/users.php similarity index 90% rename from web/app/mods/admin/users.php rename to mw/app/mods/admin/users.php index 3559387..12f3e56 100644 --- a/web/app/mods/admin/users.php +++ b/mw/app/mods/admin/users.php @@ -16,9 +16,9 @@ $env->set_out( "users", $data->users( - $_GET[$env->param("start")] ? $_GET[$env->param("start")] : 0, - $_GET[$env->param("alpha")], - $_GET[$env->param("status")] + isset($_GET[$env->param("start")]) ? $_GET[$env->param("start")] : 0, + isset($_GET[$env->param("alpha")]) ? $_GET[$env->param("alpha")] : null, + isset($_GET[$env->param("status")]) ? $_GET[$env->param("status")] : null ) ) !== false ){ @@ -61,11 +61,12 @@ $_POST["email"], $_POST["status"] ) - ) - $env->redirect( - $env->url("admin/users"), - "l'utilisateur ".$_POST["login"]." a été ajouté" - ); + ){ + $env->redirect( + $env->url("admin/users"), + "l'utilisateur ".$_POST["login"]." a été ajouté" + ); + } else $env->erreur("Impossible d'ajouter l'utilisateur"); } } diff --git a/web/app/mods/forms/contact.php b/mw/app/mods/forms/contact.php similarity index 56% rename from web/app/mods/forms/contact.php rename to mw/app/mods/forms/contact.php index 69f3da8..85e5838 100644 --- a/web/app/mods/forms/contact.php +++ b/mw/app/mods/forms/contact.php @@ -5,21 +5,27 @@ function index(&$env){ if($env->config("contact_form") && $env->config("email")){ if($env->config("captcha")){ - if(file_exists($env->path("libs")."ptitcaptcha.php")){ - require $env->path("libs")."ptitcaptcha.php"; + if(file_exists($env->path("mw_dir")."libs/ptitcaptcha.php")){ + require $env->path("mw_dir")."libs/ptitcaptcha.php"; } else{ $env->erreur("fichier du captcha introuvable"); return; } } + $message = array( + "email" => "", + "message" => "" + ); if($_POST){ + $message["email"] = $_POST["email"]; + $message["message"] = $_POST["message"]; if( $this->__send_form( $env, - $_POST["email"], + $message["email"], "[".$env->config("site_name")."] nouveau message", - $_POST["message"], + $message["message"], $env->config("email"), $env->config("captcha") ) @@ -31,6 +37,7 @@ ); } } + $env->set_out("message", $message); } else $env->run("index"); } @@ -40,19 +47,22 @@ if(!$captcha || PtitCaptchaHelper::checkCaptcha()){ if($from){ if($dest){ - if( - @mail( - $dest, - $titre, - $message, - "From: ".$from."\r\n" - ."Reply-To: ".$from."\r\n" - ) - ){ - $env->set_out("ENVOYE", true); - return true; + if(filter_var($from, FILTER_VALIDATE_EMAIL)){ + if( + @mail( + $dest, + $titre, + $message, + "From: ".$from."\r\n" + ."Reply-To: ".$from."\r\n" + ) + ){ + $env->set_out("ENVOYE", true); + return true; + } + else $env->erreur("Erreur à l'envoi du mail"); } - else $env->erreur("Erreur à l'envoi du mail"); + else $env->message("Votre email ne semble pas etre valide"); } else $env->erreur("Impossible de trouver l'email du destinataire"); } diff --git a/web/app/mods/index/index.php b/mw/app/mods/index/index.php similarity index 100% rename from web/app/mods/index/index.php rename to mw/app/mods/index/index.php diff --git a/web/app/mods/mw_mod.php b/mw/app/mods/mw_mod.php similarity index 100% rename from web/app/mods/mw_mod.php rename to mw/app/mods/mw_mod.php diff --git a/web/app/mods/reponses/html.php b/mw/app/mods/reponses/html.php similarity index 100% rename from web/app/mods/reponses/html.php rename to mw/app/mods/reponses/html.php diff --git a/web/app/mods/users/compte.php b/mw/app/mods/users/compte.php similarity index 100% rename from web/app/mods/users/compte.php rename to mw/app/mods/users/compte.php diff --git a/web/app/mods/users/identification.php b/mw/app/mods/users/identification.php similarity index 100% rename from web/app/mods/users/identification.php rename to mw/app/mods/users/identification.php diff --git a/web/app/mods/users/index.php b/mw/app/mods/users/index.php similarity index 100% rename from web/app/mods/users/index.php rename to mw/app/mods/users/index.php diff --git a/web/app/mods/users/infos.php b/mw/app/mods/users/infos.php similarity index 100% rename from web/app/mods/users/infos.php rename to mw/app/mods/users/infos.php diff --git a/web/app/env/mw_env.php b/mw/env/modules/mw_env_app_files.php similarity index 53% rename from web/app/env/mw_env.php rename to mw/env/modules/mw_env_app_files.php index 1b8aaf1..bb5816c 100644 --- a/web/app/env/mw_env.php +++ b/mw/env/modules/mw_env_app_files.php @@ -1,6 +1,6 @@ _app_file($file, $PRIORITE); @@ -14,16 +14,21 @@ function _app_file($file, $PRIORITE = "ASC"){ $app_file = false; - if($PRIORITE == "ASC" && file_exists($this->path("app").$file)) return $this->path("app").$file; + if($PRIORITE == "ASC" && file_exists($this->path("mw_dir")."app/".$file)) return $this->path("mw_dir")."app/".$file; if(($plugins = $this->plugins($PRIORITE)) !== false){ foreach($plugins as $plugin_name => $plugin){ - if($file && $plugin["installed"] && $plugin["enabled"] && file_exists($this->path("plugins").$plugin_name."/app/".$file)){ - $app_file = $this->path("plugins").$plugin_name."/app/".$file; + if( + $file + && $plugin["installed"] + && $plugin["enabled"] + && file_exists($this->path("mw_dir")."plugins/".$plugin_name."/app/".$file) + ){ + $app_file = $this->path("mw_dir")."plugins/".$plugin_name."/app/".$file; break; } } if($PRIORITE == "DESC" && !$app_file){ - if(file_exists($this->path("app").$file)) $app_file = $this->path("app").$file; + if(file_exists($this->path("mw_dir")."app/".$file)) $app_file = $this->path("mw_dir")."app/".$file; } } return $app_file; diff --git a/mw/env/modules/mw_env_config.php b/mw/env/modules/mw_env_config.php new file mode 100644 index 0000000..64da6d3 --- /dev/null +++ b/mw/env/modules/mw_env_config.php @@ -0,0 +1,128 @@ +bdd = $bdd; + $this->bdd["table_prefix"] = array(); + $this->CONFIG = isset($CONFIG) ? $CONFIG : array(); + $this->PARAMS = array(); + $this->xml_parser = new sxml(); + $app_config_file = $this->path("mw_dir")."app/config.xml"; + if(file_exists($app_config_file)){ + $this->_load_config($app_config_file, $bdd); + } + if(($plugins = $this->plugins("ASC")) !== false){ + foreach($plugins as $plugin_name => $plugin){ + $app_config_file = $this->path("mw_dir")."plugins/".$plugin_name."/app/config.xml"; + if(file_exists($app_config_file) && $plugin["installed"] && $plugin["enabled"]){ + $this->_load_config($app_config_file, $bdd); + } + } + $this->init_additional_get_params(); + } + else $this->erreur("impossible de lire les fichiers de configuration pour les plugins", true); + } + else $this->erreur("impossible de trouver le fichier de configuration pour l'installation", true); + } + + function _load_config($app_config_file, $bdd){ + $this->xml_parser->parse(file_get_contents($app_config_file)); + $app_config = $this->xml_parser->data["config"][0]; + if(isset($app_config["subs"]["params"])){ + foreach($app_config["subs"]["params"][0]["subs"] as $param_key => $param_elt){ + $this->PARAMS[$param_key] = $param_elt[0]["data"]; + } + } + if(isset($app_config["subs"]["config"])){ + foreach($app_config["subs"]["config"][0]["subs"] as $config_key => $config_elt){ + $this->CONFIG[$config_key] = $config_elt[0]["data"]; + } + } + if(isset($app_config["subs"]["bdd"][0]["subs"]["table_prefix_code"])){ + $this->add_table_prefix( + array( + $app_config["subs"]["bdd"][0]["subs"]["table_prefix_code"][0]["data"] => $bdd["table_prefix"] + ) + ); + } + } + + function get_config_file(){ + return $this->config_file; + } + + function set_config_file($config_file){ + $this->config_file = $config_file; + } + + function get_PATHES(){ + return $this->PATHES; + } + + function path($name){ + return isset($this->PATHES[$name]) ? $this->PATHES[$name] : ""; + } + + function set_PATHES($PATHES){ + foreach($PATHES as $path_name => $path_value){ + if($path_value && substr($path_value, -1) != "/") $PATHES[$path_name] .= "/"; + } + $this->PATHES = $PATHES; + } + + function get_PARAMS(){ + return $this->PARAMS; + } + + function param($name){ + return isset($this->PARAMS[$name]) ? $this->PARAMS[$name] : ""; + } + + function get_CONFIG(){ + return $this->CONFIG; + } + + function config($name){ + return isset($this->CONFIG[$name]) ? $this->CONFIG[$name] : null; + } + + function set_config($config){ + if(is_array($config)){ + foreach($config as $key => $value) $this->CONFIG[$key] = $value; + return true; + } + return false; + } + + function get_bdd(){ + return $this->bdd; + } + + function bdd($name){ + return isset($this->bdd[$name]) ? $this->bdd[$name] : null; + } + + function set_bdd($key, $value){ + $this->bdd[$key] = $value; + } + + function add_table_prefix($table_prefix){ + if(is_array($table_prefix)){ + foreach($table_prefix as $prefix_code => $prefix) $this->bdd["table_prefix"][$prefix_code] = $prefix; + return true; + } + return false; + } + + } + +?> \ No newline at end of file diff --git a/web/app/env/modules/mw_env_data.php b/mw/env/modules/mw_env_data.php similarity index 100% rename from web/app/env/modules/mw_env_data.php rename to mw/env/modules/mw_env_data.php diff --git a/web/app/env/modules/mw_env_init.php b/mw/env/modules/mw_env_init.php similarity index 92% rename from web/app/env/modules/mw_env_init.php rename to mw/env/modules/mw_env_init.php index 6a555fa..3813511 100644 --- a/web/app/env/modules/mw_env_init.php +++ b/mw/env/modules/mw_env_init.php @@ -6,7 +6,7 @@ $init_files = array(); if(($plugins = $this->plugins()) !== false){ foreach($plugins as $plugin_name => $plugin){ - $init_path = $this->path("plugins").$plugin_name."/app/init/"; + $init_path = $this->path("mw_dir")."plugins/".$plugin_name."/app/init/"; if( $plugin["installed"] && $plugin["enabled"] @@ -29,7 +29,7 @@ } if($this->check_stop()) return; } - $init_path = $this->path("app")."init/"; + $init_path = $this->path("mw_dir")."app/init/"; if( file_exists($init_path) && is_dir($init_path) diff --git a/web/app/env/modules/mw_env_inputs.php b/mw/env/modules/mw_env_inputs.php similarity index 93% rename from web/app/env/modules/mw_env_inputs.php rename to mw/env/modules/mw_env_inputs.php index 0ebd042..e29720c 100644 --- a/web/app/env/modules/mw_env_inputs.php +++ b/mw/env/modules/mw_env_inputs.php @@ -4,7 +4,7 @@ function prepare_inputs(){ if($_POST){ - require_once $this->path("libs")."inputfilter.php"; + require_once $this->path("mw_dir")."libs/inputfilter.php"; $allowed_tags = array( "p", "span", "pre", "blockquote", "address", "hr", "br", "img", diff --git a/web/app/env/modules/mw_env_links.php b/mw/env/modules/mw_env_links.php similarity index 100% rename from web/app/env/modules/mw_env_links.php rename to mw/env/modules/mw_env_links.php diff --git a/web/app/env/modules/mw_env_messages.php b/mw/env/modules/mw_env_messages.php similarity index 100% rename from web/app/env/modules/mw_env_messages.php rename to mw/env/modules/mw_env_messages.php diff --git a/web/app/env/modules/mw_env_out.php b/mw/env/modules/mw_env_out.php similarity index 68% rename from web/app/env/modules/mw_env_out.php rename to mw/env/modules/mw_env_out.php index f4ae9d9..12ab2ed 100644 --- a/web/app/env/modules/mw_env_out.php +++ b/mw/env/modules/mw_env_out.php @@ -6,8 +6,13 @@ var $out_config; var $layout; + // --------------------------------------------------------------------------------- + // out vars + // + function set_out($key, $value){ - $this->out[$key] = $value; return $value; + $this->out[$key] = $value; + return $value; } function get_out(){ @@ -15,14 +20,39 @@ } function out($key){ - return $this->out[$key]; + return isset($this->out[$key]) ? $this->out[$key] : null; } + // --------------------------------------------------------------------------------- + // templates + // + function out_pathes(){ $pathes = array(); - if($dh = opendir($this->path("out"))){ + if(($plugins = $this->plugins()) !== false){ + foreach($plugins as $plugin_name => $plugin){ + $out_dir = $this->path("mw_dir")."plugins/".$plugin_name."/out/"; + if( + $plugin["installed"] + && $plugin["enabled"] + && file_exists($out_dir) + && is_dir($out_dir) + ){ + if(($pathes = $this->_out_pathes($out_dir, $pathes)) === false) break; + } + } + if($pathes !== false){ + $pathes = $this->_out_pathes($this->path("mw_dir")."out/", $pathes); + } + } + else $pathes = false; + return $pathes; + } + + function _out_pathes($out_dir, $pathes = array()){ + if($dh = opendir($out_dir)){ while(($file = readdir($dh)) !== false){ - if(is_dir($this->path("out").$file) && substr($file, 0 ,1) != ".") $pathes[] = $file; + if(is_dir($out_dir.$file) && substr($file, 0 ,1) != ".") $pathes[] = $file; } closedir($dh); } @@ -30,6 +60,10 @@ return $pathes; } + // --------------------------------------------------------------------------------- + // out files + // + function out_file_exists($file, $PRIORITE = "DESC"){ $out_file = $this->_out_file($file, $PRIORITE); return $out_file ? true : false; @@ -37,19 +71,24 @@ function out_file($file, $PRIORITE = "DESC"){ $out_file = $this->_out_file($file, $PRIORITE); - return $out_file ? $out_file : $file; + return $out_file ? $this->path("mw_dir").$out_file : $file; + } + + function out_url($file, $PRIORITE = "DESC"){ + $out_file = $this->_out_file($file, $PRIORITE); + return $out_file ? $this->path("mw_path").$out_file : $file; } function _out_file($file, $PRIORITE = "DESC"){ $out_file = false; if($PRIORITE == "ASC"){ - $tmp_out_file = $this->path("out").$this->config("out").$file; - if($file && file_exists($tmp_out_file)){ + $tmp_out_file = "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 = $this->path("out").$this->path("dist_out").$file; - if($file && file_exists($tmp_out_file)){ + $tmp_out_file = "out/".$this->config("default_out")."/".$file; + if($file && file_exists($this->path("mw_dir").$tmp_out_file)){ $out_file = $tmp_out_file; } } @@ -57,27 +96,27 @@ if($out_file) return $out_file; if(($plugins = $this->plugins($PRIORITE)) !== false){ foreach($plugins as $plugin_name => $plugin){ - $tmp_out_file = $this->path("plugins").$plugin_name."/out/".$this->config("out").$file; - if($file && $plugin["installed"] && $plugin["enabled"] && file_exists($tmp_out_file)){ + $tmp_out_file = "plugins/".$plugin_name."/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 = $this->path("plugins").$plugin_name."/out/".$this->path("dist_out").$file; - if($file && $plugin["installed"] && $plugin["enabled"] && file_exists($tmp_out_file)){ + $tmp_out_file = "plugins/".$plugin_name."/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; } } } if($PRIORITE == "DESC" && !$out_file){ - $tmp_out_file = $this->path("out").$this->config("out").$file; - if($file && file_exists($tmp_out_file)){ + $tmp_out_file = "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 = $this->path("out").$this->path("dist_out").$file; - if($file && file_exists($tmp_out_file)){ + $tmp_out_file = "out/".$this->config("default_out")."/".$file; + if($file && file_exists($this->path("mw_dir").$tmp_out_file)){ $out_file = $tmp_out_file; } } @@ -86,9 +125,9 @@ return $out_file; } - # --------------------------------------------------------------------------------- - # out config - # + // --------------------------------------------------------------------------------- + // out config + // function set_out_config($out_config){ $this->out_config = $out_config; @@ -107,9 +146,9 @@ return null; } - # --------------------------------------------------------------------------------- - # layouts - # + // --------------------------------------------------------------------------------- + // layouts + // function layout(){ return $this->layout; @@ -121,13 +160,13 @@ foreach($plugins as $plugin_name => $plugin){ if($plugin["installed"] && $plugin["enabled"]){ $FOUND = false; - $functions_file = $this->path("plugins").$plugin_name."/out/".$this->config("out")."functions.php"; + $functions_file = $this->path("mw_dir")."plugins/".$plugin_name."/out/".$this->config("out")."/functions.php"; if(file_exists($functions_file)){ $FOUND = true; require $functions_file; } if(!$FOUND){ - $functions_file = $this->path("plugins").$plugin_name."/out/".$this->path("dist_out")."functions.php"; + $functions_file = $this->path("mw_dir")."plugins/".$plugin_name."/out/".$this->config("default_out")."/functions.php"; if($plugin["installed"] && $plugin["enabled"] && file_exists($functions_file)){ require $functions_file; } @@ -135,13 +174,13 @@ } } $FOUND = false; - $functions_file = $this->path("out").$this->config("out")."functions.php"; + $functions_file = $this->path("mw_dir")."out/".$this->config("out")."/functions.php"; if(file_exists($functions_file)){ $FOUND = true; require $functions_file; } if(!$FOUND){ - $functions_file = $this->path("out").$this->path("dist_out")."functions.php"; + $functions_file = $this->path("mw_dir")."out/".$this->config("default_out")."/functions.php"; if(file_exists($functions_file)){ require $functions_file; } @@ -165,20 +204,20 @@ function _init_layout($mod){ if(($plugins = $this->plugins("ASC")) !== false){ $layout_file = false; - $tmp_layout_file = $this->path("out").$this->config("out")."layouts/".$mod.".xml"; + $tmp_layout_file = $this->path("mw_dir")."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("out").$this->path("dist_out")."layouts/".$mod.".xml"; + $tmp_layout_file = $this->path("mw_dir")."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("plugins").$plugin_name."/out/".$this->config("out")."layouts/".$mod.".xml"; + $tmp_layout_file = $this->path("mw_dir")."plugins/".$plugin_name."/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("plugins").$plugin_name."/out/".$this->path("dist_out")."layouts/".$mod.".xml"; + $tmp_layout_file = $this->path("mw_dir")."plugins/".$plugin_name."/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); diff --git a/web/app/env/modules/mw_env_plugins.php b/mw/env/modules/mw_env_plugins.php similarity index 62% rename from web/app/env/modules/mw_env_plugins.php rename to mw/env/modules/mw_env_plugins.php index 375e3c7..1df1834 100644 --- a/web/app/env/modules/mw_env_plugins.php +++ b/mw/env/modules/mw_env_plugins.php @@ -28,64 +28,62 @@ } $plugins = array(); if(!class_exists("mw_plugin")){ - require $this->path("app")."mw_plugin.php"; + require $this->path("mw_dir")."plugins/mw_plugin.php"; if(!class_exists("mw_plugin")){ $plugins = false; return; } } - if(file_exists($this->path("plugins"))){ - if($dh = opendir($this->path("plugins"))){ - $OK = true; - while($OK && ($plugin_name = readdir($dh)) !== false){ - if(substr($plugin_name, 0 ,1) !== "." && is_dir($this->path("plugins").$plugin_name)){ - if(!isset($plugins[$plugin_name])){ - if(($plugin = $this->plugin_data($plugin_name)) !== false){ - $MAJ = false; - if(!isset($plugin["installed"]) || !isset($plugin["enabled"])){ - $plugin["installed"] = false; - $plugin["enabled"] = false; - $plugin["priorite"] = 0; - $MAJ = true; - } - if(!$plugin["installed"] && $plugin["enabled"]){ - $plugin["enabled"] = false; - $MAJ = true; - } - if($MAJ) $OK = $this->set_plugin_data($plugin_name, $plugin); - if($OK){ - if(($plugin["impl"] = $this->plugin_impl($plugin_name)) !== false){ - $plugin["title"] = ($plugin_title = $this->plugin_call($plugin["impl"], "title")) ? $plugin_title : ""; - $plugin["description"] = ($plugin_description = $this->plugin_call($plugin["impl"], "description")) ? $plugin_description : ""; - $plugin["name"] = $plugin_name; - $plugins[$plugin_name] = $plugin; - } + if($dh = opendir($this->path("mw_dir")."plugins/")){ + $OK = true; + while($OK && ($plugin_name = readdir($dh)) !== false){ + if(substr($plugin_name, 0 ,1) !== "." && is_dir($this->path("mw_dir")."plugins/".$plugin_name)){ + if(!isset($plugins[$plugin_name])){ + if(($plugin = $this->plugin_data($plugin_name)) !== false){ + $MAJ = false; + if(!isset($plugin["installed"]) || !isset($plugin["enabled"])){ + $plugin["installed"] = false; + $plugin["enabled"] = false; + $plugin["priorite"] = 0; + $MAJ = true; + } + if(!$plugin["installed"] && $plugin["enabled"]){ + $plugin["enabled"] = false; + $MAJ = true; + } + if($MAJ) $OK = $this->set_plugin_data($plugin_name, $plugin); + if($OK){ + if(($plugin["impl"] = $this->plugin_impl($plugin_name)) !== false){ + $plugin["title"] = ($plugin_title = $this->plugin_call($plugin["impl"], "title")) ? $plugin_title : ""; + $plugin["description"] = ($plugin_description = $this->plugin_call($plugin["impl"], "description")) ? $plugin_description : ""; + $plugin["name"] = $plugin_name; + $plugins[$plugin_name] = $plugin; } } - else $OK = false; } + else $OK = false; } - if(!$OK) $plugins = false; } - closedir($dh); - if($plugins !== false){ - if(file_exists($this->plugins_data_dir()) && is_dir($this->plugins_data_dir())){ - if($dh = opendir($this->plugins_data_dir())){ - $plugins_data_files = array(); - $OK = true; - while($OK && ($plugin_name = readdir($dh)) !== false){ - if(substr($plugin_name, 0 ,1) != "." && !is_dir($this->plugin_data_file($plugin_name))){ - if(!$plugins[$plugin_name]) $this->del_plugin_data($plugin_name); - } - if(!$OK) $plugins = false; + if(!$OK) $plugins = false; + } + closedir($dh); + if($plugins !== false){ + if(file_exists($this->plugins_data_dir()) && is_dir($this->plugins_data_dir())){ + if($dh = opendir($this->plugins_data_dir())){ + $plugins_data_files = array(); + $OK = true; + while($OK && ($plugin_name = readdir($dh)) !== false){ + if(substr($plugin_name, 0 ,1) != "." && !is_dir($this->plugin_data_file($plugin_name))){ + if(!isset($plugins[$plugin_name])) $this->del_plugin_data($plugin_name); } - closedir($dh); + if(!$OK) $plugins = false; } + closedir($dh); } } } - else $plugins = false; } + else $plugins = false; if($plugins !== false){ if($PRIORITE == "ASC") $this->plugins_asc = $this->ordonne_plugins($plugins, $PRIORITE); elseif($PRIORITE == "DESC") $this->plugins_desc = $this->ordonne_plugins($plugins, $PRIORITE); @@ -129,10 +127,10 @@ function plugin_impl($plugin_name){ $plugin = false; - if(file_exists($this->path("plugins"))){ - if(substr($plugin_name, 0 ,1) !== "." && is_dir($this->path("plugins").$plugin_name)){ - if(file_exists($this->path("plugins").$plugin_name."/".$plugin_name.".php")){ - require $this->path("plugins").$plugin_name."/".$plugin_name.".php"; + if(file_exists($this->path("mw_dir")."plugins")){ + if(substr($plugin_name, 0 ,1) !== "." && is_dir($this->path("mw_dir")."plugins/".$plugin_name)){ + if(file_exists($this->path("mw_dir")."plugins/".$plugin_name."/".$plugin_name.".php")){ + require $this->path("mw_dir")."plugins/".$plugin_name."/".$plugin_name.".php"; if(class_exists($plugin_name)){ $plugin = new $plugin_name(); } diff --git a/web/app/env/modules/mw_env_run.php b/mw/env/modules/mw_env_run.php similarity index 90% rename from web/app/env/modules/mw_env_run.php rename to mw/env/modules/mw_env_run.php index 69360c2..51b6330 100644 --- a/web/app/env/modules/mw_env_run.php +++ b/mw/env/modules/mw_env_run.php @@ -92,17 +92,23 @@ ){ $action = $etat["mod"]."/".$etat["controller"]."/".$etat["action"]; if(isset($action_status[$action])){ - $OK = $action_status[$action][0] || (isset($action_status[$action][$user_status]) && $action_status[$action][$user_status]); + $OK = + (isset($action_status[$action][0]) && $action_status[$action][0]) + || (isset($action_status[$action][$user_status]) && $action_status[$action][$user_status]); } else{ $action = $etat["mod"]."/".$etat["controller"]; if(isset($action_status[$action])){ - $OK = $action_status[$action][0] || (isset($action_status[$action][$user_status]) && $action_status[$action][$user_status]); + $OK = + (isset($action_status[$action][0]) && $action_status[$action][0]) + || (isset($action_status[$action][$user_status]) && $action_status[$action][$user_status]); } else{ $action = $etat["mod"]; if(isset($action_status[$action])){ - $OK = $action_status[$action][0] || (isset($action_status[$action][$user_status]) && $action_status[$action][$user_status]); + $OK = + (isset($action_status[$action][0]) && $action_status[$action][0]) + || (isset($action_status[$action][$user_status]) && $action_status[$action][$user_status]); } } } diff --git a/web/app/env/modules/mw_env_urls.php b/mw/env/modules/mw_env_urls.php similarity index 100% rename from web/app/env/modules/mw_env_urls.php rename to mw/env/modules/mw_env_urls.php diff --git a/mw/env/mw_env.php b/mw/env/mw_env.php new file mode 100644 index 0000000..1addce4 --- /dev/null +++ b/mw/env/mw_env.php @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/web/libs/empty_class.php b/mw/libs/empty_class.php similarity index 100% rename from web/libs/empty_class.php rename to mw/libs/empty_class.php diff --git a/web/libs/inputfilter.php b/mw/libs/inputfilter.php similarity index 100% rename from web/libs/inputfilter.php rename to mw/libs/inputfilter.php diff --git a/web/libs/ptitcaptcha.php b/mw/libs/ptitcaptcha.php similarity index 93% rename from web/libs/ptitcaptcha.php rename to mw/libs/ptitcaptcha.php index 6e24126..0262931 100644 --- a/web/libs/ptitcaptcha.php +++ b/mw/libs/ptitcaptcha.php @@ -28,7 +28,7 @@ class PtitCaptchaHelper * @param string $baseuri : relative or absolute path to folder containing this file on web * @return IMG Tag */ - function generateImgTags($baseuri) + static function generateImgTags($baseuri) { return ""; } @@ -53,7 +53,7 @@ class PtitCaptchaHelper * * @return input tag */ - function generateInputTags() + static function generateInputTags() { return ""; } @@ -63,7 +63,7 @@ class PtitCaptchaHelper * * @return boolean (true=correct, false=incorrect) */ - function checkCaptcha() + static function checkCaptcha() { if( isset($_POST['ptitcaptcha_entry']) && $_POST['ptitcaptcha_entry'] == PtitCaptchaHelper::_getDisplayText($_POST['ptitcaptcha_key'])) @@ -79,7 +79,7 @@ class PtitCaptchaHelper * @param string $pck * @return string */ - function _getDisplayText($pck) // internal function + static function _getDisplayText($pck) // internal function { $src=md5(PTITCAPTCHA_ENTROPY.$pck); $txt=""; diff --git a/web/libs/sxml.php b/mw/libs/sxml.php similarity index 100% rename from web/libs/sxml.php rename to mw/libs/sxml.php diff --git a/web/libs/tiny_mce/langs/en.js b/mw/libs/tiny_mce/langs/en.js similarity index 100% rename from web/libs/tiny_mce/langs/en.js rename to mw/libs/tiny_mce/langs/en.js diff --git a/web/libs/tiny_mce/license.txt b/mw/libs/tiny_mce/license.txt similarity index 100% rename from web/libs/tiny_mce/license.txt rename to mw/libs/tiny_mce/license.txt diff --git a/web/libs/tiny_mce/plugins/advhr/css/advhr.css b/mw/libs/tiny_mce/plugins/advhr/css/advhr.css similarity index 100% rename from web/libs/tiny_mce/plugins/advhr/css/advhr.css rename to mw/libs/tiny_mce/plugins/advhr/css/advhr.css diff --git a/web/libs/tiny_mce/plugins/advhr/editor_plugin.js b/mw/libs/tiny_mce/plugins/advhr/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/advhr/editor_plugin.js rename to mw/libs/tiny_mce/plugins/advhr/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/advhr/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/advhr/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/advhr/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/advhr/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/advhr/js/rule.js b/mw/libs/tiny_mce/plugins/advhr/js/rule.js similarity index 100% rename from web/libs/tiny_mce/plugins/advhr/js/rule.js rename to mw/libs/tiny_mce/plugins/advhr/js/rule.js diff --git a/web/libs/tiny_mce/plugins/advhr/langs/en_dlg.js b/mw/libs/tiny_mce/plugins/advhr/langs/en_dlg.js similarity index 100% rename from web/libs/tiny_mce/plugins/advhr/langs/en_dlg.js rename to mw/libs/tiny_mce/plugins/advhr/langs/en_dlg.js diff --git a/web/libs/tiny_mce/plugins/advhr/rule.htm b/mw/libs/tiny_mce/plugins/advhr/rule.htm similarity index 100% rename from web/libs/tiny_mce/plugins/advhr/rule.htm rename to mw/libs/tiny_mce/plugins/advhr/rule.htm diff --git a/web/libs/tiny_mce/plugins/advimage/css/advimage.css b/mw/libs/tiny_mce/plugins/advimage/css/advimage.css similarity index 100% rename from web/libs/tiny_mce/plugins/advimage/css/advimage.css rename to mw/libs/tiny_mce/plugins/advimage/css/advimage.css diff --git a/web/libs/tiny_mce/plugins/advimage/editor_plugin.js b/mw/libs/tiny_mce/plugins/advimage/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/advimage/editor_plugin.js rename to mw/libs/tiny_mce/plugins/advimage/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/advimage/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/advimage/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/advimage/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/advimage/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/advimage/image.htm b/mw/libs/tiny_mce/plugins/advimage/image.htm similarity index 100% rename from web/libs/tiny_mce/plugins/advimage/image.htm rename to mw/libs/tiny_mce/plugins/advimage/image.htm diff --git a/web/libs/tiny_mce/plugins/advimage/img/sample.gif b/mw/libs/tiny_mce/plugins/advimage/img/sample.gif similarity index 100% rename from web/libs/tiny_mce/plugins/advimage/img/sample.gif rename to mw/libs/tiny_mce/plugins/advimage/img/sample.gif diff --git a/web/libs/tiny_mce/plugins/advimage/js/image.js b/mw/libs/tiny_mce/plugins/advimage/js/image.js similarity index 100% rename from web/libs/tiny_mce/plugins/advimage/js/image.js rename to mw/libs/tiny_mce/plugins/advimage/js/image.js diff --git a/web/libs/tiny_mce/plugins/advimage/langs/en_dlg.js b/mw/libs/tiny_mce/plugins/advimage/langs/en_dlg.js similarity index 100% rename from web/libs/tiny_mce/plugins/advimage/langs/en_dlg.js rename to mw/libs/tiny_mce/plugins/advimage/langs/en_dlg.js diff --git a/web/libs/tiny_mce/plugins/advlink/css/advlink.css b/mw/libs/tiny_mce/plugins/advlink/css/advlink.css similarity index 100% rename from web/libs/tiny_mce/plugins/advlink/css/advlink.css rename to mw/libs/tiny_mce/plugins/advlink/css/advlink.css diff --git a/web/libs/tiny_mce/plugins/advlink/editor_plugin.js b/mw/libs/tiny_mce/plugins/advlink/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/advlink/editor_plugin.js rename to mw/libs/tiny_mce/plugins/advlink/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/advlink/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/advlink/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/advlink/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/advlink/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/advlink/js/advlink.js b/mw/libs/tiny_mce/plugins/advlink/js/advlink.js similarity index 100% rename from web/libs/tiny_mce/plugins/advlink/js/advlink.js rename to mw/libs/tiny_mce/plugins/advlink/js/advlink.js diff --git a/web/libs/tiny_mce/plugins/advlink/langs/en_dlg.js b/mw/libs/tiny_mce/plugins/advlink/langs/en_dlg.js similarity index 100% rename from web/libs/tiny_mce/plugins/advlink/langs/en_dlg.js rename to mw/libs/tiny_mce/plugins/advlink/langs/en_dlg.js diff --git a/web/libs/tiny_mce/plugins/advlink/link.htm b/mw/libs/tiny_mce/plugins/advlink/link.htm similarity index 100% rename from web/libs/tiny_mce/plugins/advlink/link.htm rename to mw/libs/tiny_mce/plugins/advlink/link.htm diff --git a/web/libs/tiny_mce/plugins/advlist/editor_plugin.js b/mw/libs/tiny_mce/plugins/advlist/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/advlist/editor_plugin.js rename to mw/libs/tiny_mce/plugins/advlist/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/advlist/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/advlist/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/advlist/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/advlist/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/autoresize/editor_plugin.js b/mw/libs/tiny_mce/plugins/autoresize/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/autoresize/editor_plugin.js rename to mw/libs/tiny_mce/plugins/autoresize/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/autoresize/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/autoresize/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/autoresize/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/autoresize/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/autosave/editor_plugin.js b/mw/libs/tiny_mce/plugins/autosave/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/autosave/editor_plugin.js rename to mw/libs/tiny_mce/plugins/autosave/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/autosave/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/autosave/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/autosave/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/autosave/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/autosave/langs/en.js b/mw/libs/tiny_mce/plugins/autosave/langs/en.js similarity index 100% rename from web/libs/tiny_mce/plugins/autosave/langs/en.js rename to mw/libs/tiny_mce/plugins/autosave/langs/en.js diff --git a/web/libs/tiny_mce/plugins/bbcode/editor_plugin.js b/mw/libs/tiny_mce/plugins/bbcode/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/bbcode/editor_plugin.js rename to mw/libs/tiny_mce/plugins/bbcode/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/bbcode/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/bbcode/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/bbcode/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/bbcode/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/contextmenu/editor_plugin.js b/mw/libs/tiny_mce/plugins/contextmenu/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/contextmenu/editor_plugin.js rename to mw/libs/tiny_mce/plugins/contextmenu/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/contextmenu/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/contextmenu/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/contextmenu/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/contextmenu/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/directionality/editor_plugin.js b/mw/libs/tiny_mce/plugins/directionality/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/directionality/editor_plugin.js rename to mw/libs/tiny_mce/plugins/directionality/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/directionality/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/directionality/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/directionality/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/directionality/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/emotions/editor_plugin.js b/mw/libs/tiny_mce/plugins/emotions/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/editor_plugin.js rename to mw/libs/tiny_mce/plugins/emotions/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/emotions/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/emotions/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/emotions/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/emotions/emotions.htm b/mw/libs/tiny_mce/plugins/emotions/emotions.htm similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/emotions.htm rename to mw/libs/tiny_mce/plugins/emotions/emotions.htm diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-cool.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-cool.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-cool.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-cool.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-cry.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-cry.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-cry.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-cry.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-embarassed.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-embarassed.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-embarassed.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-embarassed.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-frown.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-frown.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-frown.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-frown.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-innocent.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-innocent.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-innocent.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-innocent.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-kiss.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-kiss.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-kiss.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-kiss.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-laughing.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-laughing.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-laughing.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-laughing.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-sealed.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-sealed.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-sealed.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-sealed.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-smile.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-smile.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-smile.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-smile.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-surprised.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-surprised.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-surprised.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-surprised.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-undecided.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-undecided.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-undecided.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-undecided.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-wink.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-wink.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-wink.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-wink.gif diff --git a/web/libs/tiny_mce/plugins/emotions/img/smiley-yell.gif b/mw/libs/tiny_mce/plugins/emotions/img/smiley-yell.gif similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/img/smiley-yell.gif rename to mw/libs/tiny_mce/plugins/emotions/img/smiley-yell.gif diff --git a/web/libs/tiny_mce/plugins/emotions/js/emotions.js b/mw/libs/tiny_mce/plugins/emotions/js/emotions.js similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/js/emotions.js rename to mw/libs/tiny_mce/plugins/emotions/js/emotions.js diff --git a/web/libs/tiny_mce/plugins/emotions/langs/en_dlg.js b/mw/libs/tiny_mce/plugins/emotions/langs/en_dlg.js similarity index 100% rename from web/libs/tiny_mce/plugins/emotions/langs/en_dlg.js rename to mw/libs/tiny_mce/plugins/emotions/langs/en_dlg.js diff --git a/web/libs/tiny_mce/plugins/example/dialog.htm b/mw/libs/tiny_mce/plugins/example/dialog.htm similarity index 100% rename from web/libs/tiny_mce/plugins/example/dialog.htm rename to mw/libs/tiny_mce/plugins/example/dialog.htm diff --git a/web/libs/tiny_mce/plugins/example/editor_plugin.js b/mw/libs/tiny_mce/plugins/example/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/example/editor_plugin.js rename to mw/libs/tiny_mce/plugins/example/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/example/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/example/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/example/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/example/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/example/img/example.gif b/mw/libs/tiny_mce/plugins/example/img/example.gif similarity index 100% rename from web/libs/tiny_mce/plugins/example/img/example.gif rename to mw/libs/tiny_mce/plugins/example/img/example.gif diff --git a/web/libs/tiny_mce/plugins/example/js/dialog.js b/mw/libs/tiny_mce/plugins/example/js/dialog.js similarity index 100% rename from web/libs/tiny_mce/plugins/example/js/dialog.js rename to mw/libs/tiny_mce/plugins/example/js/dialog.js diff --git a/web/libs/tiny_mce/plugins/example/langs/en.js b/mw/libs/tiny_mce/plugins/example/langs/en.js similarity index 100% rename from web/libs/tiny_mce/plugins/example/langs/en.js rename to mw/libs/tiny_mce/plugins/example/langs/en.js diff --git a/web/libs/tiny_mce/plugins/example/langs/en_dlg.js b/mw/libs/tiny_mce/plugins/example/langs/en_dlg.js similarity index 100% rename from web/libs/tiny_mce/plugins/example/langs/en_dlg.js rename to mw/libs/tiny_mce/plugins/example/langs/en_dlg.js diff --git a/web/libs/tiny_mce/plugins/fullpage/css/fullpage.css b/mw/libs/tiny_mce/plugins/fullpage/css/fullpage.css similarity index 100% rename from web/libs/tiny_mce/plugins/fullpage/css/fullpage.css rename to mw/libs/tiny_mce/plugins/fullpage/css/fullpage.css diff --git a/web/libs/tiny_mce/plugins/fullpage/editor_plugin.js b/mw/libs/tiny_mce/plugins/fullpage/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/fullpage/editor_plugin.js rename to mw/libs/tiny_mce/plugins/fullpage/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/fullpage/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/fullpage/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/fullpage/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/fullpage/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/fullpage/fullpage.htm b/mw/libs/tiny_mce/plugins/fullpage/fullpage.htm similarity index 100% rename from web/libs/tiny_mce/plugins/fullpage/fullpage.htm rename to mw/libs/tiny_mce/plugins/fullpage/fullpage.htm diff --git a/web/libs/tiny_mce/plugins/fullpage/js/fullpage.js b/mw/libs/tiny_mce/plugins/fullpage/js/fullpage.js similarity index 100% rename from web/libs/tiny_mce/plugins/fullpage/js/fullpage.js rename to mw/libs/tiny_mce/plugins/fullpage/js/fullpage.js diff --git a/web/libs/tiny_mce/plugins/fullpage/langs/en_dlg.js b/mw/libs/tiny_mce/plugins/fullpage/langs/en_dlg.js similarity index 100% rename from web/libs/tiny_mce/plugins/fullpage/langs/en_dlg.js rename to mw/libs/tiny_mce/plugins/fullpage/langs/en_dlg.js diff --git a/web/libs/tiny_mce/plugins/fullscreen/editor_plugin.js b/mw/libs/tiny_mce/plugins/fullscreen/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/fullscreen/editor_plugin.js rename to mw/libs/tiny_mce/plugins/fullscreen/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/fullscreen/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/fullscreen/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/fullscreen/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/fullscreen/fullscreen.htm b/mw/libs/tiny_mce/plugins/fullscreen/fullscreen.htm similarity index 100% rename from web/libs/tiny_mce/plugins/fullscreen/fullscreen.htm rename to mw/libs/tiny_mce/plugins/fullscreen/fullscreen.htm diff --git a/web/libs/tiny_mce/plugins/iespell/editor_plugin.js b/mw/libs/tiny_mce/plugins/iespell/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/iespell/editor_plugin.js rename to mw/libs/tiny_mce/plugins/iespell/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/iespell/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/iespell/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/iespell/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/iespell/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/inlinepopups/editor_plugin.js b/mw/libs/tiny_mce/plugins/inlinepopups/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/inlinepopups/editor_plugin.js rename to mw/libs/tiny_mce/plugins/inlinepopups/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/inlinepopups/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/inlinepopups/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/inlinepopups/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/inlinepopups/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif similarity index 100% rename from web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif rename to mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif diff --git a/web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif similarity index 100% rename from web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif rename to mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif diff --git a/web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif b/mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif similarity index 100% rename from web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif rename to mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif diff --git a/web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif b/mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif similarity index 100% rename from web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif rename to mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif diff --git a/web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif b/mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif similarity index 100% rename from web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif rename to mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif diff --git a/web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif b/mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif similarity index 100% rename from web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif rename to mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif diff --git a/web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif b/mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif similarity index 100% rename from web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif rename to mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif diff --git a/web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css b/mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css similarity index 100% rename from web/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css rename to mw/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css diff --git a/web/libs/tiny_mce/plugins/inlinepopups/template.htm b/mw/libs/tiny_mce/plugins/inlinepopups/template.htm similarity index 100% rename from web/libs/tiny_mce/plugins/inlinepopups/template.htm rename to mw/libs/tiny_mce/plugins/inlinepopups/template.htm diff --git a/web/libs/tiny_mce/plugins/insertdatetime/editor_plugin.js b/mw/libs/tiny_mce/plugins/insertdatetime/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/insertdatetime/editor_plugin.js rename to mw/libs/tiny_mce/plugins/insertdatetime/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/insertdatetime/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/insertdatetime/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/insertdatetime/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/insertdatetime/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/layer/editor_plugin.js b/mw/libs/tiny_mce/plugins/layer/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/layer/editor_plugin.js rename to mw/libs/tiny_mce/plugins/layer/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/layer/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/layer/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/layer/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/layer/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/legacyoutput/editor_plugin.js b/mw/libs/tiny_mce/plugins/legacyoutput/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/legacyoutput/editor_plugin.js rename to mw/libs/tiny_mce/plugins/legacyoutput/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/legacyoutput/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/legacyoutput/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/legacyoutput/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/legacyoutput/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/media/css/content.css b/mw/libs/tiny_mce/plugins/media/css/content.css similarity index 100% rename from web/libs/tiny_mce/plugins/media/css/content.css rename to mw/libs/tiny_mce/plugins/media/css/content.css diff --git a/web/libs/tiny_mce/plugins/media/css/media.css b/mw/libs/tiny_mce/plugins/media/css/media.css similarity index 100% rename from web/libs/tiny_mce/plugins/media/css/media.css rename to mw/libs/tiny_mce/plugins/media/css/media.css diff --git a/web/libs/tiny_mce/plugins/media/editor_plugin.js b/mw/libs/tiny_mce/plugins/media/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/media/editor_plugin.js rename to mw/libs/tiny_mce/plugins/media/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/media/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/media/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/media/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/media/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/media/img/flash.gif b/mw/libs/tiny_mce/plugins/media/img/flash.gif similarity index 100% rename from web/libs/tiny_mce/plugins/media/img/flash.gif rename to mw/libs/tiny_mce/plugins/media/img/flash.gif diff --git a/web/libs/tiny_mce/plugins/media/img/flv_player.swf b/mw/libs/tiny_mce/plugins/media/img/flv_player.swf similarity index 100% rename from web/libs/tiny_mce/plugins/media/img/flv_player.swf rename to mw/libs/tiny_mce/plugins/media/img/flv_player.swf diff --git a/web/libs/tiny_mce/plugins/media/img/quicktime.gif b/mw/libs/tiny_mce/plugins/media/img/quicktime.gif similarity index 100% rename from web/libs/tiny_mce/plugins/media/img/quicktime.gif rename to mw/libs/tiny_mce/plugins/media/img/quicktime.gif diff --git a/web/libs/tiny_mce/plugins/media/img/realmedia.gif b/mw/libs/tiny_mce/plugins/media/img/realmedia.gif similarity index 100% rename from web/libs/tiny_mce/plugins/media/img/realmedia.gif rename to mw/libs/tiny_mce/plugins/media/img/realmedia.gif diff --git a/web/libs/tiny_mce/plugins/media/img/shockwave.gif b/mw/libs/tiny_mce/plugins/media/img/shockwave.gif similarity index 100% rename from web/libs/tiny_mce/plugins/media/img/shockwave.gif rename to mw/libs/tiny_mce/plugins/media/img/shockwave.gif diff --git a/web/libs/tiny_mce/plugins/pagebreak/img/trans.gif b/mw/libs/tiny_mce/plugins/media/img/trans.gif similarity index 100% rename from web/libs/tiny_mce/plugins/pagebreak/img/trans.gif rename to mw/libs/tiny_mce/plugins/media/img/trans.gif diff --git a/web/libs/tiny_mce/plugins/media/img/windowsmedia.gif b/mw/libs/tiny_mce/plugins/media/img/windowsmedia.gif similarity index 100% rename from web/libs/tiny_mce/plugins/media/img/windowsmedia.gif rename to mw/libs/tiny_mce/plugins/media/img/windowsmedia.gif diff --git a/web/libs/tiny_mce/plugins/preview/jscripts/embed.js b/mw/libs/tiny_mce/plugins/media/js/embed.js similarity index 100% rename from web/libs/tiny_mce/plugins/preview/jscripts/embed.js rename to mw/libs/tiny_mce/plugins/media/js/embed.js diff --git a/web/libs/tiny_mce/plugins/media/js/media.js b/mw/libs/tiny_mce/plugins/media/js/media.js similarity index 100% rename from web/libs/tiny_mce/plugins/media/js/media.js rename to mw/libs/tiny_mce/plugins/media/js/media.js diff --git a/web/libs/tiny_mce/plugins/media/langs/en_dlg.js b/mw/libs/tiny_mce/plugins/media/langs/en_dlg.js similarity index 100% rename from web/libs/tiny_mce/plugins/media/langs/en_dlg.js rename to mw/libs/tiny_mce/plugins/media/langs/en_dlg.js diff --git a/web/libs/tiny_mce/plugins/media/media.htm b/mw/libs/tiny_mce/plugins/media/media.htm similarity index 100% rename from web/libs/tiny_mce/plugins/media/media.htm rename to mw/libs/tiny_mce/plugins/media/media.htm diff --git a/web/libs/tiny_mce/plugins/nonbreaking/editor_plugin.js b/mw/libs/tiny_mce/plugins/nonbreaking/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/nonbreaking/editor_plugin.js rename to mw/libs/tiny_mce/plugins/nonbreaking/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/nonbreaking/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/nonbreaking/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/nonbreaking/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/nonbreaking/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/noneditable/editor_plugin.js b/mw/libs/tiny_mce/plugins/noneditable/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/noneditable/editor_plugin.js rename to mw/libs/tiny_mce/plugins/noneditable/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/noneditable/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/noneditable/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/noneditable/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/noneditable/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/pagebreak/css/content.css b/mw/libs/tiny_mce/plugins/pagebreak/css/content.css similarity index 100% rename from web/libs/tiny_mce/plugins/pagebreak/css/content.css rename to mw/libs/tiny_mce/plugins/pagebreak/css/content.css diff --git a/web/libs/tiny_mce/plugins/pagebreak/editor_plugin.js b/mw/libs/tiny_mce/plugins/pagebreak/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/pagebreak/editor_plugin.js rename to mw/libs/tiny_mce/plugins/pagebreak/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/pagebreak/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/pagebreak/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/pagebreak/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/pagebreak/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/pagebreak/img/pagebreak.gif b/mw/libs/tiny_mce/plugins/pagebreak/img/pagebreak.gif similarity index 100% rename from web/libs/tiny_mce/plugins/pagebreak/img/pagebreak.gif rename to mw/libs/tiny_mce/plugins/pagebreak/img/pagebreak.gif diff --git a/web/libs/tiny_mce/plugins/media/img/trans.gif b/mw/libs/tiny_mce/plugins/pagebreak/img/trans.gif similarity index 100% rename from web/libs/tiny_mce/plugins/media/img/trans.gif rename to mw/libs/tiny_mce/plugins/pagebreak/img/trans.gif diff --git a/web/libs/tiny_mce/plugins/paste/editor_plugin.js b/mw/libs/tiny_mce/plugins/paste/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/paste/editor_plugin.js rename to mw/libs/tiny_mce/plugins/paste/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/paste/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/paste/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/paste/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/paste/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/paste/js/pastetext.js b/mw/libs/tiny_mce/plugins/paste/js/pastetext.js similarity index 100% rename from web/libs/tiny_mce/plugins/paste/js/pastetext.js rename to mw/libs/tiny_mce/plugins/paste/js/pastetext.js diff --git a/web/libs/tiny_mce/plugins/paste/js/pasteword.js b/mw/libs/tiny_mce/plugins/paste/js/pasteword.js similarity index 100% rename from web/libs/tiny_mce/plugins/paste/js/pasteword.js rename to mw/libs/tiny_mce/plugins/paste/js/pasteword.js diff --git a/web/libs/tiny_mce/plugins/paste/langs/en_dlg.js b/mw/libs/tiny_mce/plugins/paste/langs/en_dlg.js similarity index 100% rename from web/libs/tiny_mce/plugins/paste/langs/en_dlg.js rename to mw/libs/tiny_mce/plugins/paste/langs/en_dlg.js diff --git a/web/libs/tiny_mce/plugins/paste/pastetext.htm b/mw/libs/tiny_mce/plugins/paste/pastetext.htm similarity index 100% rename from web/libs/tiny_mce/plugins/paste/pastetext.htm rename to mw/libs/tiny_mce/plugins/paste/pastetext.htm diff --git a/web/libs/tiny_mce/plugins/paste/pasteword.htm b/mw/libs/tiny_mce/plugins/paste/pasteword.htm similarity index 100% rename from web/libs/tiny_mce/plugins/paste/pasteword.htm rename to mw/libs/tiny_mce/plugins/paste/pasteword.htm diff --git a/web/libs/tiny_mce/plugins/preview/editor_plugin.js b/mw/libs/tiny_mce/plugins/preview/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/preview/editor_plugin.js rename to mw/libs/tiny_mce/plugins/preview/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/preview/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/preview/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/preview/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/preview/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/preview/example.html b/mw/libs/tiny_mce/plugins/preview/example.html similarity index 100% rename from web/libs/tiny_mce/plugins/preview/example.html rename to mw/libs/tiny_mce/plugins/preview/example.html diff --git a/web/libs/tiny_mce/plugins/media/js/embed.js b/mw/libs/tiny_mce/plugins/preview/jscripts/embed.js similarity index 100% rename from web/libs/tiny_mce/plugins/media/js/embed.js rename to mw/libs/tiny_mce/plugins/preview/jscripts/embed.js diff --git a/web/libs/tiny_mce/plugins/preview/preview.html b/mw/libs/tiny_mce/plugins/preview/preview.html similarity index 100% rename from web/libs/tiny_mce/plugins/preview/preview.html rename to mw/libs/tiny_mce/plugins/preview/preview.html diff --git a/web/libs/tiny_mce/plugins/print/editor_plugin.js b/mw/libs/tiny_mce/plugins/print/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/print/editor_plugin.js rename to mw/libs/tiny_mce/plugins/print/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/print/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/print/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/print/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/print/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/save/editor_plugin.js b/mw/libs/tiny_mce/plugins/save/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/save/editor_plugin.js rename to mw/libs/tiny_mce/plugins/save/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/save/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/save/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/save/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/save/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/searchreplace/css/searchreplace.css b/mw/libs/tiny_mce/plugins/searchreplace/css/searchreplace.css similarity index 100% rename from web/libs/tiny_mce/plugins/searchreplace/css/searchreplace.css rename to mw/libs/tiny_mce/plugins/searchreplace/css/searchreplace.css diff --git a/web/libs/tiny_mce/plugins/searchreplace/editor_plugin.js b/mw/libs/tiny_mce/plugins/searchreplace/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/searchreplace/editor_plugin.js rename to mw/libs/tiny_mce/plugins/searchreplace/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/searchreplace/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/searchreplace/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/searchreplace/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/searchreplace/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/searchreplace/js/searchreplace.js b/mw/libs/tiny_mce/plugins/searchreplace/js/searchreplace.js similarity index 100% rename from web/libs/tiny_mce/plugins/searchreplace/js/searchreplace.js rename to mw/libs/tiny_mce/plugins/searchreplace/js/searchreplace.js diff --git a/web/libs/tiny_mce/plugins/searchreplace/langs/en_dlg.js b/mw/libs/tiny_mce/plugins/searchreplace/langs/en_dlg.js similarity index 100% rename from web/libs/tiny_mce/plugins/searchreplace/langs/en_dlg.js rename to mw/libs/tiny_mce/plugins/searchreplace/langs/en_dlg.js diff --git a/web/libs/tiny_mce/plugins/searchreplace/searchreplace.htm b/mw/libs/tiny_mce/plugins/searchreplace/searchreplace.htm similarity index 100% rename from web/libs/tiny_mce/plugins/searchreplace/searchreplace.htm rename to mw/libs/tiny_mce/plugins/searchreplace/searchreplace.htm diff --git a/web/libs/tiny_mce/plugins/spellchecker/css/content.css b/mw/libs/tiny_mce/plugins/spellchecker/css/content.css similarity index 100% rename from web/libs/tiny_mce/plugins/spellchecker/css/content.css rename to mw/libs/tiny_mce/plugins/spellchecker/css/content.css diff --git a/web/libs/tiny_mce/plugins/spellchecker/editor_plugin.js b/mw/libs/tiny_mce/plugins/spellchecker/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/spellchecker/editor_plugin.js rename to mw/libs/tiny_mce/plugins/spellchecker/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/spellchecker/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/spellchecker/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/spellchecker/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/spellchecker/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/spellchecker/img/wline.gif b/mw/libs/tiny_mce/plugins/spellchecker/img/wline.gif similarity index 100% rename from web/libs/tiny_mce/plugins/spellchecker/img/wline.gif rename to mw/libs/tiny_mce/plugins/spellchecker/img/wline.gif diff --git a/web/libs/tiny_mce/plugins/style/css/props.css b/mw/libs/tiny_mce/plugins/style/css/props.css similarity index 100% rename from web/libs/tiny_mce/plugins/style/css/props.css rename to mw/libs/tiny_mce/plugins/style/css/props.css diff --git a/web/libs/tiny_mce/plugins/style/editor_plugin.js b/mw/libs/tiny_mce/plugins/style/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/style/editor_plugin.js rename to mw/libs/tiny_mce/plugins/style/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/style/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/style/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/style/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/style/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/style/js/props.js b/mw/libs/tiny_mce/plugins/style/js/props.js similarity index 100% rename from web/libs/tiny_mce/plugins/style/js/props.js rename to mw/libs/tiny_mce/plugins/style/js/props.js diff --git a/web/libs/tiny_mce/plugins/style/langs/en_dlg.js b/mw/libs/tiny_mce/plugins/style/langs/en_dlg.js similarity index 100% rename from web/libs/tiny_mce/plugins/style/langs/en_dlg.js rename to mw/libs/tiny_mce/plugins/style/langs/en_dlg.js diff --git a/web/libs/tiny_mce/plugins/style/props.htm b/mw/libs/tiny_mce/plugins/style/props.htm similarity index 100% rename from web/libs/tiny_mce/plugins/style/props.htm rename to mw/libs/tiny_mce/plugins/style/props.htm diff --git a/web/libs/tiny_mce/plugins/tabfocus/editor_plugin.js b/mw/libs/tiny_mce/plugins/tabfocus/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/tabfocus/editor_plugin.js rename to mw/libs/tiny_mce/plugins/tabfocus/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/tabfocus/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/tabfocus/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/tabfocus/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/tabfocus/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/table/cell.htm b/mw/libs/tiny_mce/plugins/table/cell.htm similarity index 100% rename from web/libs/tiny_mce/plugins/table/cell.htm rename to mw/libs/tiny_mce/plugins/table/cell.htm diff --git a/web/libs/tiny_mce/plugins/table/css/cell.css b/mw/libs/tiny_mce/plugins/table/css/cell.css similarity index 100% rename from web/libs/tiny_mce/plugins/table/css/cell.css rename to mw/libs/tiny_mce/plugins/table/css/cell.css diff --git a/web/libs/tiny_mce/plugins/table/css/row.css b/mw/libs/tiny_mce/plugins/table/css/row.css similarity index 100% rename from web/libs/tiny_mce/plugins/table/css/row.css rename to mw/libs/tiny_mce/plugins/table/css/row.css diff --git a/web/libs/tiny_mce/plugins/table/css/table.css b/mw/libs/tiny_mce/plugins/table/css/table.css similarity index 100% rename from web/libs/tiny_mce/plugins/table/css/table.css rename to mw/libs/tiny_mce/plugins/table/css/table.css diff --git a/web/libs/tiny_mce/plugins/table/editor_plugin.js b/mw/libs/tiny_mce/plugins/table/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/table/editor_plugin.js rename to mw/libs/tiny_mce/plugins/table/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/table/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/table/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/table/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/table/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/table/js/cell.js b/mw/libs/tiny_mce/plugins/table/js/cell.js similarity index 100% rename from web/libs/tiny_mce/plugins/table/js/cell.js rename to mw/libs/tiny_mce/plugins/table/js/cell.js diff --git a/web/libs/tiny_mce/plugins/table/js/merge_cells.js b/mw/libs/tiny_mce/plugins/table/js/merge_cells.js similarity index 100% rename from web/libs/tiny_mce/plugins/table/js/merge_cells.js rename to mw/libs/tiny_mce/plugins/table/js/merge_cells.js diff --git a/web/libs/tiny_mce/plugins/table/js/row.js b/mw/libs/tiny_mce/plugins/table/js/row.js similarity index 100% rename from web/libs/tiny_mce/plugins/table/js/row.js rename to mw/libs/tiny_mce/plugins/table/js/row.js diff --git a/web/libs/tiny_mce/plugins/table/js/table.js b/mw/libs/tiny_mce/plugins/table/js/table.js similarity index 100% rename from web/libs/tiny_mce/plugins/table/js/table.js rename to mw/libs/tiny_mce/plugins/table/js/table.js diff --git a/web/libs/tiny_mce/plugins/table/langs/en_dlg.js b/mw/libs/tiny_mce/plugins/table/langs/en_dlg.js similarity index 100% rename from web/libs/tiny_mce/plugins/table/langs/en_dlg.js rename to mw/libs/tiny_mce/plugins/table/langs/en_dlg.js diff --git a/web/libs/tiny_mce/plugins/table/merge_cells.htm b/mw/libs/tiny_mce/plugins/table/merge_cells.htm similarity index 100% rename from web/libs/tiny_mce/plugins/table/merge_cells.htm rename to mw/libs/tiny_mce/plugins/table/merge_cells.htm diff --git a/web/libs/tiny_mce/plugins/table/row.htm b/mw/libs/tiny_mce/plugins/table/row.htm similarity index 100% rename from web/libs/tiny_mce/plugins/table/row.htm rename to mw/libs/tiny_mce/plugins/table/row.htm diff --git a/web/libs/tiny_mce/plugins/table/table.htm b/mw/libs/tiny_mce/plugins/table/table.htm similarity index 100% rename from web/libs/tiny_mce/plugins/table/table.htm rename to mw/libs/tiny_mce/plugins/table/table.htm diff --git a/web/libs/tiny_mce/plugins/template/blank.htm b/mw/libs/tiny_mce/plugins/template/blank.htm similarity index 100% rename from web/libs/tiny_mce/plugins/template/blank.htm rename to mw/libs/tiny_mce/plugins/template/blank.htm diff --git a/web/libs/tiny_mce/plugins/template/css/template.css b/mw/libs/tiny_mce/plugins/template/css/template.css similarity index 100% rename from web/libs/tiny_mce/plugins/template/css/template.css rename to mw/libs/tiny_mce/plugins/template/css/template.css diff --git a/web/libs/tiny_mce/plugins/template/editor_plugin.js b/mw/libs/tiny_mce/plugins/template/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/template/editor_plugin.js rename to mw/libs/tiny_mce/plugins/template/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/template/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/template/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/template/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/template/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/template/js/template.js b/mw/libs/tiny_mce/plugins/template/js/template.js similarity index 100% rename from web/libs/tiny_mce/plugins/template/js/template.js rename to mw/libs/tiny_mce/plugins/template/js/template.js diff --git a/web/libs/tiny_mce/plugins/template/langs/en_dlg.js b/mw/libs/tiny_mce/plugins/template/langs/en_dlg.js similarity index 100% rename from web/libs/tiny_mce/plugins/template/langs/en_dlg.js rename to mw/libs/tiny_mce/plugins/template/langs/en_dlg.js diff --git a/web/libs/tiny_mce/plugins/template/template.htm b/mw/libs/tiny_mce/plugins/template/template.htm similarity index 100% rename from web/libs/tiny_mce/plugins/template/template.htm rename to mw/libs/tiny_mce/plugins/template/template.htm diff --git a/web/libs/tiny_mce/plugins/tinybrowser/config_tinybrowser.php b/mw/libs/tiny_mce/plugins/tinybrowser/config_tinybrowser.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/config_tinybrowser.php rename to mw/libs/tiny_mce/plugins/tinybrowser/config_tinybrowser.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/css/style_tinybrowser.css.php b/mw/libs/tiny_mce/plugins/tinybrowser/css/style_tinybrowser.css.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/css/style_tinybrowser.css.php rename to mw/libs/tiny_mce/plugins/tinybrowser/css/style_tinybrowser.css.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/css/stylefull_tinybrowser.css b/mw/libs/tiny_mce/plugins/tinybrowser/css/stylefull_tinybrowser.css similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/css/stylefull_tinybrowser.css rename to mw/libs/tiny_mce/plugins/tinybrowser/css/stylefull_tinybrowser.css diff --git a/web/libs/tiny_mce/plugins/tinybrowser/edit.php b/mw/libs/tiny_mce/plugins/tinybrowser/edit.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/edit.php rename to mw/libs/tiny_mce/plugins/tinybrowser/edit.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/flexupload.swf b/mw/libs/tiny_mce/plugins/tinybrowser/flexupload.swf similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/flexupload.swf rename to mw/libs/tiny_mce/plugins/tinybrowser/flexupload.swf diff --git a/web/libs/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php b/mw/libs/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php rename to mw/libs/tiny_mce/plugins/tinybrowser/fns_tinybrowser.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/folders.php b/mw/libs/tiny_mce/plugins/tinybrowser/folders.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/folders.php rename to mw/libs/tiny_mce/plugins/tinybrowser/folders.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/img/asc.gif b/mw/libs/tiny_mce/plugins/tinybrowser/img/asc.gif similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/img/asc.gif rename to mw/libs/tiny_mce/plugins/tinybrowser/img/asc.gif diff --git a/web/libs/tiny_mce/plugins/tinybrowser/img/back.png b/mw/libs/tiny_mce/plugins/tinybrowser/img/back.png similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/img/back.png rename to mw/libs/tiny_mce/plugins/tinybrowser/img/back.png diff --git a/web/libs/tiny_mce/plugins/tinybrowser/img/desc.gif b/mw/libs/tiny_mce/plugins/tinybrowser/img/desc.gif similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/img/desc.gif rename to mw/libs/tiny_mce/plugins/tinybrowser/img/desc.gif diff --git a/web/libs/tiny_mce/plugins/tinybrowser/img/preview.gif b/mw/libs/tiny_mce/plugins/tinybrowser/img/preview.gif similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/img/preview.gif rename to mw/libs/tiny_mce/plugins/tinybrowser/img/preview.gif diff --git a/web/libs/tiny_mce/plugins/tinybrowser/img/rotate_ac.gif b/mw/libs/tiny_mce/plugins/tinybrowser/img/rotate_ac.gif similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/img/rotate_ac.gif rename to mw/libs/tiny_mce/plugins/tinybrowser/img/rotate_ac.gif diff --git a/web/libs/tiny_mce/plugins/tinybrowser/img/rotate_c.gif b/mw/libs/tiny_mce/plugins/tinybrowser/img/rotate_c.gif similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/img/rotate_c.gif rename to mw/libs/tiny_mce/plugins/tinybrowser/img/rotate_c.gif diff --git a/web/libs/tiny_mce/themes/advanced/skins/default/img/tabs.gif b/mw/libs/tiny_mce/plugins/tinybrowser/img/tabs.gif similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/default/img/tabs.gif rename to mw/libs/tiny_mce/plugins/tinybrowser/img/tabs.gif diff --git a/web/libs/tiny_mce/plugins/tinybrowser/js/swfobject.js b/mw/libs/tiny_mce/plugins/tinybrowser/js/swfobject.js similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/js/swfobject.js rename to mw/libs/tiny_mce/plugins/tinybrowser/js/swfobject.js diff --git a/web/libs/tiny_mce/plugins/tinybrowser/js/tinybrowser.js.php b/mw/libs/tiny_mce/plugins/tinybrowser/js/tinybrowser.js.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/js/tinybrowser.js.php rename to mw/libs/tiny_mce/plugins/tinybrowser/js/tinybrowser.js.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/cs.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/cs.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/cs.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/cs.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/da.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/da.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/da.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/da.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/de.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/de.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/de.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/de.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/en.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/en.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/en.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/en.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/es.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/es.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/es.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/es.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/fi.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/fi.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/fi.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/fi.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/fr.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/fr.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/fr.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/fr.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/hr.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/hr.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/hr.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/hr.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/hu.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/hu.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/hu.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/hu.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/it.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/it.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/it.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/it.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/lv.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/lv.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/lv.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/lv.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/nl.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/nl.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/nl.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/nl.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/pl.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/pl.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/pl.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/pl.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/pt.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/pt.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/pt.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/pt.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/ru.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/ru.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/ru.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/ru.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/sk.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/sk.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/sk.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/sk.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/sv.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/sv.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/sv.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/sv.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/zh-cn.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/zh-cn.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/zh-cn.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/zh-cn.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/langs/zh-tw.php b/mw/libs/tiny_mce/plugins/tinybrowser/langs/zh-tw.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/langs/zh-tw.php rename to mw/libs/tiny_mce/plugins/tinybrowser/langs/zh-tw.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/readme.txt b/mw/libs/tiny_mce/plugins/tinybrowser/readme.txt similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/readme.txt rename to mw/libs/tiny_mce/plugins/tinybrowser/readme.txt diff --git a/web/libs/tiny_mce/plugins/tinybrowser/tb_standalone.js.php b/mw/libs/tiny_mce/plugins/tinybrowser/tb_standalone.js.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/tb_standalone.js.php rename to mw/libs/tiny_mce/plugins/tinybrowser/tb_standalone.js.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/tb_tinymce.js.php b/mw/libs/tiny_mce/plugins/tinybrowser/tb_tinymce.js.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/tb_tinymce.js.php rename to mw/libs/tiny_mce/plugins/tinybrowser/tb_tinymce.js.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/tinybrowser.php b/mw/libs/tiny_mce/plugins/tinybrowser/tinybrowser.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/tinybrowser.php rename to mw/libs/tiny_mce/plugins/tinybrowser/tinybrowser.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/upload.php b/mw/libs/tiny_mce/plugins/tinybrowser/upload.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/upload.php rename to mw/libs/tiny_mce/plugins/tinybrowser/upload.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/upload_file.php b/mw/libs/tiny_mce/plugins/tinybrowser/upload_file.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/upload_file.php rename to mw/libs/tiny_mce/plugins/tinybrowser/upload_file.php diff --git a/web/libs/tiny_mce/plugins/tinybrowser/upload_process.php b/mw/libs/tiny_mce/plugins/tinybrowser/upload_process.php similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/upload_process.php rename to mw/libs/tiny_mce/plugins/tinybrowser/upload_process.php diff --git a/web/libs/tiny_mce/plugins/visualchars/editor_plugin.js b/mw/libs/tiny_mce/plugins/visualchars/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/visualchars/editor_plugin.js rename to mw/libs/tiny_mce/plugins/visualchars/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/visualchars/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/visualchars/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/visualchars/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/visualchars/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/wordcount/editor_plugin.js b/mw/libs/tiny_mce/plugins/wordcount/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/wordcount/editor_plugin.js rename to mw/libs/tiny_mce/plugins/wordcount/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/wordcount/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/wordcount/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/wordcount/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/wordcount/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/abbr.htm b/mw/libs/tiny_mce/plugins/xhtmlxtras/abbr.htm similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/abbr.htm rename to mw/libs/tiny_mce/plugins/xhtmlxtras/abbr.htm diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/acronym.htm b/mw/libs/tiny_mce/plugins/xhtmlxtras/acronym.htm similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/acronym.htm rename to mw/libs/tiny_mce/plugins/xhtmlxtras/acronym.htm diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/attributes.htm b/mw/libs/tiny_mce/plugins/xhtmlxtras/attributes.htm similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/attributes.htm rename to mw/libs/tiny_mce/plugins/xhtmlxtras/attributes.htm diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/cite.htm b/mw/libs/tiny_mce/plugins/xhtmlxtras/cite.htm similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/cite.htm rename to mw/libs/tiny_mce/plugins/xhtmlxtras/cite.htm diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/css/attributes.css b/mw/libs/tiny_mce/plugins/xhtmlxtras/css/attributes.css similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/css/attributes.css rename to mw/libs/tiny_mce/plugins/xhtmlxtras/css/attributes.css diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/css/popup.css b/mw/libs/tiny_mce/plugins/xhtmlxtras/css/popup.css similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/css/popup.css rename to mw/libs/tiny_mce/plugins/xhtmlxtras/css/popup.css diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/del.htm b/mw/libs/tiny_mce/plugins/xhtmlxtras/del.htm similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/del.htm rename to mw/libs/tiny_mce/plugins/xhtmlxtras/del.htm diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/editor_plugin.js b/mw/libs/tiny_mce/plugins/xhtmlxtras/editor_plugin.js similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/editor_plugin.js rename to mw/libs/tiny_mce/plugins/xhtmlxtras/editor_plugin.js diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js b/mw/libs/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js rename to mw/libs/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/ins.htm b/mw/libs/tiny_mce/plugins/xhtmlxtras/ins.htm similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/ins.htm rename to mw/libs/tiny_mce/plugins/xhtmlxtras/ins.htm diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/js/abbr.js b/mw/libs/tiny_mce/plugins/xhtmlxtras/js/abbr.js similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/js/abbr.js rename to mw/libs/tiny_mce/plugins/xhtmlxtras/js/abbr.js diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/js/acronym.js b/mw/libs/tiny_mce/plugins/xhtmlxtras/js/acronym.js similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/js/acronym.js rename to mw/libs/tiny_mce/plugins/xhtmlxtras/js/acronym.js diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/js/attributes.js b/mw/libs/tiny_mce/plugins/xhtmlxtras/js/attributes.js similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/js/attributes.js rename to mw/libs/tiny_mce/plugins/xhtmlxtras/js/attributes.js diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/js/cite.js b/mw/libs/tiny_mce/plugins/xhtmlxtras/js/cite.js similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/js/cite.js rename to mw/libs/tiny_mce/plugins/xhtmlxtras/js/cite.js diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/js/del.js b/mw/libs/tiny_mce/plugins/xhtmlxtras/js/del.js similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/js/del.js rename to mw/libs/tiny_mce/plugins/xhtmlxtras/js/del.js diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/mw/libs/tiny_mce/plugins/xhtmlxtras/js/element_common.js similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/js/element_common.js rename to mw/libs/tiny_mce/plugins/xhtmlxtras/js/element_common.js diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/js/ins.js b/mw/libs/tiny_mce/plugins/xhtmlxtras/js/ins.js similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/js/ins.js rename to mw/libs/tiny_mce/plugins/xhtmlxtras/js/ins.js diff --git a/web/libs/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js b/mw/libs/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js similarity index 100% rename from web/libs/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js rename to mw/libs/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js diff --git a/web/libs/tiny_mce/themes/advanced/about.htm b/mw/libs/tiny_mce/themes/advanced/about.htm similarity index 100% rename from web/libs/tiny_mce/themes/advanced/about.htm rename to mw/libs/tiny_mce/themes/advanced/about.htm diff --git a/web/libs/tiny_mce/themes/advanced/anchor.htm b/mw/libs/tiny_mce/themes/advanced/anchor.htm similarity index 100% rename from web/libs/tiny_mce/themes/advanced/anchor.htm rename to mw/libs/tiny_mce/themes/advanced/anchor.htm diff --git a/web/libs/tiny_mce/themes/advanced/charmap.htm b/mw/libs/tiny_mce/themes/advanced/charmap.htm similarity index 100% rename from web/libs/tiny_mce/themes/advanced/charmap.htm rename to mw/libs/tiny_mce/themes/advanced/charmap.htm diff --git a/web/libs/tiny_mce/themes/advanced/color_picker.htm b/mw/libs/tiny_mce/themes/advanced/color_picker.htm similarity index 100% rename from web/libs/tiny_mce/themes/advanced/color_picker.htm rename to mw/libs/tiny_mce/themes/advanced/color_picker.htm diff --git a/web/libs/tiny_mce/themes/advanced/editor_template.js b/mw/libs/tiny_mce/themes/advanced/editor_template.js similarity index 100% rename from web/libs/tiny_mce/themes/advanced/editor_template.js rename to mw/libs/tiny_mce/themes/advanced/editor_template.js diff --git a/web/libs/tiny_mce/themes/advanced/editor_template_src.js b/mw/libs/tiny_mce/themes/advanced/editor_template_src.js similarity index 100% rename from web/libs/tiny_mce/themes/advanced/editor_template_src.js rename to mw/libs/tiny_mce/themes/advanced/editor_template_src.js diff --git a/web/libs/tiny_mce/themes/advanced/image.htm b/mw/libs/tiny_mce/themes/advanced/image.htm similarity index 100% rename from web/libs/tiny_mce/themes/advanced/image.htm rename to mw/libs/tiny_mce/themes/advanced/image.htm diff --git a/web/libs/tiny_mce/themes/advanced/img/colorpicker.jpg b/mw/libs/tiny_mce/themes/advanced/img/colorpicker.jpg similarity index 100% rename from web/libs/tiny_mce/themes/advanced/img/colorpicker.jpg rename to mw/libs/tiny_mce/themes/advanced/img/colorpicker.jpg diff --git a/web/libs/tiny_mce/themes/advanced/img/icons.gif b/mw/libs/tiny_mce/themes/advanced/img/icons.gif similarity index 100% rename from web/libs/tiny_mce/themes/advanced/img/icons.gif rename to mw/libs/tiny_mce/themes/advanced/img/icons.gif diff --git a/web/libs/tiny_mce/themes/advanced/js/about.js b/mw/libs/tiny_mce/themes/advanced/js/about.js similarity index 100% rename from web/libs/tiny_mce/themes/advanced/js/about.js rename to mw/libs/tiny_mce/themes/advanced/js/about.js diff --git a/web/libs/tiny_mce/themes/advanced/js/anchor.js b/mw/libs/tiny_mce/themes/advanced/js/anchor.js similarity index 100% rename from web/libs/tiny_mce/themes/advanced/js/anchor.js rename to mw/libs/tiny_mce/themes/advanced/js/anchor.js diff --git a/web/libs/tiny_mce/themes/advanced/js/charmap.js b/mw/libs/tiny_mce/themes/advanced/js/charmap.js similarity index 100% rename from web/libs/tiny_mce/themes/advanced/js/charmap.js rename to mw/libs/tiny_mce/themes/advanced/js/charmap.js diff --git a/web/libs/tiny_mce/themes/advanced/js/color_picker.js b/mw/libs/tiny_mce/themes/advanced/js/color_picker.js similarity index 100% rename from web/libs/tiny_mce/themes/advanced/js/color_picker.js rename to mw/libs/tiny_mce/themes/advanced/js/color_picker.js diff --git a/web/libs/tiny_mce/themes/advanced/js/image.js b/mw/libs/tiny_mce/themes/advanced/js/image.js similarity index 100% rename from web/libs/tiny_mce/themes/advanced/js/image.js rename to mw/libs/tiny_mce/themes/advanced/js/image.js diff --git a/web/libs/tiny_mce/themes/advanced/js/link.js b/mw/libs/tiny_mce/themes/advanced/js/link.js similarity index 100% rename from web/libs/tiny_mce/themes/advanced/js/link.js rename to mw/libs/tiny_mce/themes/advanced/js/link.js diff --git a/web/libs/tiny_mce/themes/advanced/js/source_editor.js b/mw/libs/tiny_mce/themes/advanced/js/source_editor.js similarity index 100% rename from web/libs/tiny_mce/themes/advanced/js/source_editor.js rename to mw/libs/tiny_mce/themes/advanced/js/source_editor.js diff --git a/web/libs/tiny_mce/themes/advanced/langs/en.js b/mw/libs/tiny_mce/themes/advanced/langs/en.js similarity index 100% rename from web/libs/tiny_mce/themes/advanced/langs/en.js rename to mw/libs/tiny_mce/themes/advanced/langs/en.js diff --git a/web/libs/tiny_mce/themes/advanced/langs/en_dlg.js b/mw/libs/tiny_mce/themes/advanced/langs/en_dlg.js similarity index 100% rename from web/libs/tiny_mce/themes/advanced/langs/en_dlg.js rename to mw/libs/tiny_mce/themes/advanced/langs/en_dlg.js diff --git a/web/libs/tiny_mce/themes/advanced/link.htm b/mw/libs/tiny_mce/themes/advanced/link.htm similarity index 100% rename from web/libs/tiny_mce/themes/advanced/link.htm rename to mw/libs/tiny_mce/themes/advanced/link.htm diff --git a/web/libs/tiny_mce/themes/advanced/skins/default/content.css b/mw/libs/tiny_mce/themes/advanced/skins/default/content.css similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/default/content.css rename to mw/libs/tiny_mce/themes/advanced/skins/default/content.css diff --git a/web/libs/tiny_mce/themes/advanced/skins/default/dialog.css b/mw/libs/tiny_mce/themes/advanced/skins/default/dialog.css similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/default/dialog.css rename to mw/libs/tiny_mce/themes/advanced/skins/default/dialog.css diff --git a/web/libs/tiny_mce/themes/advanced/skins/default/img/buttons.png b/mw/libs/tiny_mce/themes/advanced/skins/default/img/buttons.png similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/default/img/buttons.png rename to mw/libs/tiny_mce/themes/advanced/skins/default/img/buttons.png diff --git a/web/libs/tiny_mce/themes/advanced/skins/default/img/items.gif b/mw/libs/tiny_mce/themes/advanced/skins/default/img/items.gif similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/default/img/items.gif rename to mw/libs/tiny_mce/themes/advanced/skins/default/img/items.gif diff --git a/web/libs/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif b/mw/libs/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif rename to mw/libs/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif diff --git a/web/libs/tiny_mce/themes/advanced/skins/default/img/menu_check.gif b/mw/libs/tiny_mce/themes/advanced/skins/default/img/menu_check.gif similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/default/img/menu_check.gif rename to mw/libs/tiny_mce/themes/advanced/skins/default/img/menu_check.gif diff --git a/web/libs/tiny_mce/themes/advanced/skins/default/img/progress.gif b/mw/libs/tiny_mce/themes/advanced/skins/default/img/progress.gif similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/default/img/progress.gif rename to mw/libs/tiny_mce/themes/advanced/skins/default/img/progress.gif diff --git a/web/libs/tiny_mce/plugins/tinybrowser/img/tabs.gif b/mw/libs/tiny_mce/themes/advanced/skins/default/img/tabs.gif similarity index 100% rename from web/libs/tiny_mce/plugins/tinybrowser/img/tabs.gif rename to mw/libs/tiny_mce/themes/advanced/skins/default/img/tabs.gif diff --git a/web/libs/tiny_mce/themes/advanced/skins/default/ui.css b/mw/libs/tiny_mce/themes/advanced/skins/default/ui.css similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/default/ui.css rename to mw/libs/tiny_mce/themes/advanced/skins/default/ui.css diff --git a/web/libs/tiny_mce/themes/advanced/skins/o2k7/content.css b/mw/libs/tiny_mce/themes/advanced/skins/o2k7/content.css similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/o2k7/content.css rename to mw/libs/tiny_mce/themes/advanced/skins/o2k7/content.css diff --git a/web/libs/tiny_mce/themes/advanced/skins/o2k7/dialog.css b/mw/libs/tiny_mce/themes/advanced/skins/o2k7/dialog.css similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/o2k7/dialog.css rename to mw/libs/tiny_mce/themes/advanced/skins/o2k7/dialog.css diff --git a/web/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png b/mw/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png rename to mw/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png diff --git a/web/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png b/mw/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png rename to mw/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png diff --git a/web/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png b/mw/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png rename to mw/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png diff --git a/web/libs/tiny_mce/themes/advanced/skins/o2k7/ui.css b/mw/libs/tiny_mce/themes/advanced/skins/o2k7/ui.css similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/o2k7/ui.css rename to mw/libs/tiny_mce/themes/advanced/skins/o2k7/ui.css diff --git a/web/libs/tiny_mce/themes/advanced/skins/o2k7/ui_black.css b/mw/libs/tiny_mce/themes/advanced/skins/o2k7/ui_black.css similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/o2k7/ui_black.css rename to mw/libs/tiny_mce/themes/advanced/skins/o2k7/ui_black.css diff --git a/web/libs/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css b/mw/libs/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css similarity index 100% rename from web/libs/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css rename to mw/libs/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css diff --git a/web/libs/tiny_mce/themes/advanced/source_editor.htm b/mw/libs/tiny_mce/themes/advanced/source_editor.htm similarity index 100% rename from web/libs/tiny_mce/themes/advanced/source_editor.htm rename to mw/libs/tiny_mce/themes/advanced/source_editor.htm diff --git a/web/libs/tiny_mce/themes/simple/editor_template.js b/mw/libs/tiny_mce/themes/simple/editor_template.js similarity index 100% rename from web/libs/tiny_mce/themes/simple/editor_template.js rename to mw/libs/tiny_mce/themes/simple/editor_template.js diff --git a/web/libs/tiny_mce/themes/simple/editor_template_src.js b/mw/libs/tiny_mce/themes/simple/editor_template_src.js similarity index 100% rename from web/libs/tiny_mce/themes/simple/editor_template_src.js rename to mw/libs/tiny_mce/themes/simple/editor_template_src.js diff --git a/web/libs/tiny_mce/themes/simple/img/icons.gif b/mw/libs/tiny_mce/themes/simple/img/icons.gif similarity index 100% rename from web/libs/tiny_mce/themes/simple/img/icons.gif rename to mw/libs/tiny_mce/themes/simple/img/icons.gif diff --git a/web/libs/tiny_mce/themes/simple/langs/en.js b/mw/libs/tiny_mce/themes/simple/langs/en.js similarity index 100% rename from web/libs/tiny_mce/themes/simple/langs/en.js rename to mw/libs/tiny_mce/themes/simple/langs/en.js diff --git a/web/libs/tiny_mce/themes/simple/skins/default/content.css b/mw/libs/tiny_mce/themes/simple/skins/default/content.css similarity index 100% rename from web/libs/tiny_mce/themes/simple/skins/default/content.css rename to mw/libs/tiny_mce/themes/simple/skins/default/content.css diff --git a/web/libs/tiny_mce/themes/simple/skins/default/ui.css b/mw/libs/tiny_mce/themes/simple/skins/default/ui.css similarity index 100% rename from web/libs/tiny_mce/themes/simple/skins/default/ui.css rename to mw/libs/tiny_mce/themes/simple/skins/default/ui.css diff --git a/web/libs/tiny_mce/themes/simple/skins/o2k7/content.css b/mw/libs/tiny_mce/themes/simple/skins/o2k7/content.css similarity index 100% rename from web/libs/tiny_mce/themes/simple/skins/o2k7/content.css rename to mw/libs/tiny_mce/themes/simple/skins/o2k7/content.css diff --git a/web/libs/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png b/mw/libs/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png similarity index 100% rename from web/libs/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png rename to mw/libs/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png diff --git a/web/libs/tiny_mce/themes/simple/skins/o2k7/ui.css b/mw/libs/tiny_mce/themes/simple/skins/o2k7/ui.css similarity index 100% rename from web/libs/tiny_mce/themes/simple/skins/o2k7/ui.css rename to mw/libs/tiny_mce/themes/simple/skins/o2k7/ui.css diff --git a/web/libs/tiny_mce/tiny_mce.js b/mw/libs/tiny_mce/tiny_mce.js similarity index 100% rename from web/libs/tiny_mce/tiny_mce.js rename to mw/libs/tiny_mce/tiny_mce.js diff --git a/web/libs/tiny_mce/tiny_mce_popup.js b/mw/libs/tiny_mce/tiny_mce_popup.js similarity index 100% rename from web/libs/tiny_mce/tiny_mce_popup.js rename to mw/libs/tiny_mce/tiny_mce_popup.js diff --git a/web/libs/tiny_mce/tiny_mce_src.js b/mw/libs/tiny_mce/tiny_mce_src.js similarity index 100% rename from web/libs/tiny_mce/tiny_mce_src.js rename to mw/libs/tiny_mce/tiny_mce_src.js diff --git a/web/libs/tiny_mce/utils/editable_selects.js b/mw/libs/tiny_mce/utils/editable_selects.js similarity index 100% rename from web/libs/tiny_mce/utils/editable_selects.js rename to mw/libs/tiny_mce/utils/editable_selects.js diff --git a/web/libs/tiny_mce/utils/form_utils.js b/mw/libs/tiny_mce/utils/form_utils.js similarity index 100% rename from web/libs/tiny_mce/utils/form_utils.js rename to mw/libs/tiny_mce/utils/form_utils.js diff --git a/web/libs/tiny_mce/utils/mctabs.js b/mw/libs/tiny_mce/utils/mctabs.js similarity index 100% rename from web/libs/tiny_mce/utils/mctabs.js rename to mw/libs/tiny_mce/utils/mctabs.js diff --git a/web/libs/tiny_mce/utils/validate.js b/mw/libs/tiny_mce/utils/validate.js similarity index 100% rename from web/libs/tiny_mce/utils/validate.js rename to mw/libs/tiny_mce/utils/validate.js diff --git a/mw/main.php b/mw/main.php new file mode 100644 index 0000000..92b92e0 --- /dev/null +++ b/mw/main.php @@ -0,0 +1,37 @@ +load_modules($PATHES["mw_dir"], "env/modules/"); + $env->set_config_file($config_file); + $env->set_PATHES($PATHES); + $env->init_plugins(); + $env->load_config($bdd, $CONFIG); + $env->init(); + $etat = ($etat === false ? false : ($etat ? $etat : (isset($_GET[$env->param("e")]) ? $_GET[$env->param("e")] : ""))); + if($etat !== false) $env->run($etat); + return $env; + } + else echo "
impossible de trouver le fichier env/mw_env.php
"; + } + else echo "
impossible de trouver le fichier libs/empty_class.php
"; + } + else echo "
impossible de trouver le fichier libs/sxml.php
"; + return false; + } + + function __mw_display($env){ + if($env->etat_is_valid()) $env->render_layout($env->init_layout()); + } + +?> \ No newline at end of file diff --git a/web/out/dist/admin.php b/mw/out/default/admin.php similarity index 79% rename from web/out/dist/admin.php rename to mw/out/default/admin.php index 0c60ada..5fb93c9 100644 --- a/web/out/dist/admin.php +++ b/mw/out/default/admin.php @@ -2,8 +2,8 @@ out_file("views/head.php"); ?> - - + + diff --git a/web/out/dist/compte.php b/mw/out/default/compte.php similarity index 79% rename from web/out/dist/compte.php rename to mw/out/default/compte.php index 604a9ca..e938159 100644 --- a/web/out/dist/compte.php +++ b/mw/out/default/compte.php @@ -2,8 +2,8 @@ out_file("views/head.php"); ?> - - + + diff --git a/web/out/dist/config.xml b/mw/out/default/config.xml similarity index 100% rename from web/out/dist/config.xml rename to mw/out/default/config.xml diff --git a/web/out/dist/content.php b/mw/out/default/content.php similarity index 100% rename from web/out/dist/content.php rename to mw/out/default/content.php diff --git a/web/out/dist/css/actions/admin.css b/mw/out/default/css/actions/admin.css similarity index 100% rename from web/out/dist/css/actions/admin.css rename to mw/out/default/css/actions/admin.css diff --git a/web/out/dist/css/actions/admin_plugins.css b/mw/out/default/css/actions/admin_plugins.css similarity index 100% rename from web/out/dist/css/actions/admin_plugins.css rename to mw/out/default/css/actions/admin_plugins.css diff --git a/web/out/dist/css/actions/forms_contact.css b/mw/out/default/css/actions/forms_contact.css similarity index 100% rename from web/out/dist/css/actions/forms_contact.css rename to mw/out/default/css/actions/forms_contact.css diff --git a/web/out/dist/css/actions/users.css b/mw/out/default/css/actions/users.css similarity index 100% rename from web/out/dist/css/actions/users.css rename to mw/out/default/css/actions/users.css diff --git a/web/out/dist/css/colorbox.css b/mw/out/default/css/colorbox.css similarity index 100% rename from web/out/dist/css/colorbox.css rename to mw/out/default/css/colorbox.css diff --git a/web/out/dist/css/colors.css b/mw/out/default/css/colors.css similarity index 100% rename from web/out/dist/css/colors.css rename to mw/out/default/css/colors.css diff --git a/web/out/dist/css/footer.css b/mw/out/default/css/footer.css similarity index 100% rename from web/out/dist/css/footer.css rename to mw/out/default/css/footer.css diff --git a/web/out/dist/css/general.css b/mw/out/default/css/general.css similarity index 100% rename from web/out/dist/css/general.css rename to mw/out/default/css/general.css diff --git a/web/out/dist/css/header.css b/mw/out/default/css/header.css similarity index 100% rename from web/out/dist/css/header.css rename to mw/out/default/css/header.css diff --git a/web/out/dist/css/main.css b/mw/out/default/css/main.css similarity index 100% rename from web/out/dist/css/main.css rename to mw/out/default/css/main.css diff --git a/web/out/dist/css/menu_top.css b/mw/out/default/css/menu_top.css similarity index 100% rename from web/out/dist/css/menu_top.css rename to mw/out/default/css/menu_top.css diff --git a/web/out/dist/css/style.css b/mw/out/default/css/style.css similarity index 100% rename from web/out/dist/css/style.css rename to mw/out/default/css/style.css diff --git a/web/out/dist/css/tinymce.css b/mw/out/default/css/tinymce.css similarity index 100% rename from web/out/dist/css/tinymce.css rename to mw/out/default/css/tinymce.css diff --git a/web/out/dist/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/mw/out/default/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png similarity index 100% rename from web/out/dist/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png rename to mw/out/default/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png diff --git a/web/out/dist/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/mw/out/default/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png similarity index 100% rename from web/out/dist/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png rename to mw/out/default/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png diff --git a/web/out/dist/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/mw/out/default/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png similarity index 100% rename from web/out/dist/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png rename to mw/out/default/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png diff --git a/web/out/dist/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/mw/out/default/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png similarity index 100% rename from web/out/dist/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png rename to mw/out/default/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png diff --git a/web/out/dist/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/mw/out/default/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png similarity index 100% rename from web/out/dist/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png rename to mw/out/default/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png diff --git a/web/out/dist/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/mw/out/default/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from web/out/dist/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png rename to mw/out/default/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/web/out/dist/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/mw/out/default/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png similarity index 100% rename from web/out/dist/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png rename to mw/out/default/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png diff --git a/web/out/dist/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/mw/out/default/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png similarity index 100% rename from web/out/dist/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png rename to mw/out/default/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png diff --git a/web/out/dist/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/mw/out/default/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png similarity index 100% rename from web/out/dist/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png rename to mw/out/default/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png diff --git a/web/out/dist/css/ui-lightness/images/ui-icons_222222_256x240.png b/mw/out/default/css/ui-lightness/images/ui-icons_222222_256x240.png similarity index 100% rename from web/out/dist/css/ui-lightness/images/ui-icons_222222_256x240.png rename to mw/out/default/css/ui-lightness/images/ui-icons_222222_256x240.png diff --git a/web/out/dist/css/ui-lightness/images/ui-icons_228ef1_256x240.png b/mw/out/default/css/ui-lightness/images/ui-icons_228ef1_256x240.png similarity index 100% rename from web/out/dist/css/ui-lightness/images/ui-icons_228ef1_256x240.png rename to mw/out/default/css/ui-lightness/images/ui-icons_228ef1_256x240.png diff --git a/web/out/dist/css/ui-lightness/images/ui-icons_ef8c08_256x240.png b/mw/out/default/css/ui-lightness/images/ui-icons_ef8c08_256x240.png similarity index 100% rename from web/out/dist/css/ui-lightness/images/ui-icons_ef8c08_256x240.png rename to mw/out/default/css/ui-lightness/images/ui-icons_ef8c08_256x240.png diff --git a/web/out/dist/css/ui-lightness/images/ui-icons_ffd27a_256x240.png b/mw/out/default/css/ui-lightness/images/ui-icons_ffd27a_256x240.png similarity index 100% rename from web/out/dist/css/ui-lightness/images/ui-icons_ffd27a_256x240.png rename to mw/out/default/css/ui-lightness/images/ui-icons_ffd27a_256x240.png diff --git a/web/out/dist/css/ui-lightness/images/ui-icons_ffffff_256x240.png b/mw/out/default/css/ui-lightness/images/ui-icons_ffffff_256x240.png similarity index 100% rename from web/out/dist/css/ui-lightness/images/ui-icons_ffffff_256x240.png rename to mw/out/default/css/ui-lightness/images/ui-icons_ffffff_256x240.png diff --git a/web/out/dist/css/ui-lightness/jquery-ui-1.8.12.custom.css b/mw/out/default/css/ui-lightness/jquery-ui-1.8.12.custom.css similarity index 100% rename from web/out/dist/css/ui-lightness/jquery-ui-1.8.12.custom.css rename to mw/out/default/css/ui-lightness/jquery-ui-1.8.12.custom.css diff --git a/web/out/dist/functions.php b/mw/out/default/functions.php similarity index 72% rename from web/out/dist/functions.php rename to mw/out/default/functions.php index a44889a..6d94ffa 100644 --- a/web/out/dist/functions.php +++ b/mw/out/default/functions.php @@ -1,22 +1,22 @@ $max) - { if(isset($legende)) - { $navig .= + function mw_navig($current, $total, $max, $base_url, $start_param, $legende = null){ + $navig = ""; + if($max && $total > $max){ + if(isset($legende)){ + $navig .= $legende." ".($current + 1)." à " .(($current + $max) > $total ? $total : $current + $max) ." sur ".$total." - aller à la "; } $get_params = array(); - if(($q = strpos($base_url, "?")) !== false) - { $v_query = explode("&", substr($base_url, $q + 1)); + if(($q = strpos($base_url, "?")) !== false){ + $v_query = explode("&", substr($base_url, $q + 1)); $base_url = substr($base_url, 0, $q); - foreach($v_query as $query) - { if($query) - { $v = explode("=", $query); + foreach($v_query as $query){ + if($query){ + $v = explode("=", $query); $get_params[$v[0]] = $v[1]; } } @@ -30,8 +30,8 @@ ."\n"; - if($current >= $max) - { $navig .= + if($current >= $max){ + $navig .= "«\n"; } - if($current < $total - $max) - { $navig .= + if($current < $total - $max){ + $navig .= "»\n"; } } diff --git a/web/out/dist/html_reponse.php b/mw/out/default/html_reponse.php similarity index 100% rename from web/out/dist/html_reponse.php rename to mw/out/default/html_reponse.php diff --git a/web/out/dist/html_simple_reponse.php b/mw/out/default/html_simple_reponse.php similarity index 100% rename from web/out/dist/html_simple_reponse.php rename to mw/out/default/html_simple_reponse.php diff --git a/web/out/dist/icons/add.gif b/mw/out/default/icons/add.gif similarity index 100% rename from web/out/dist/icons/add.gif rename to mw/out/default/icons/add.gif diff --git a/web/out/dist/icons/ajax-loader.gif b/mw/out/default/icons/ajax-loader.gif similarity index 100% rename from web/out/dist/icons/ajax-loader.gif rename to mw/out/default/icons/ajax-loader.gif diff --git a/web/out/dist/icons/asc.gif b/mw/out/default/icons/asc.gif similarity index 100% rename from web/out/dist/icons/asc.gif rename to mw/out/default/icons/asc.gif diff --git a/web/out/dist/icons/del.gif b/mw/out/default/icons/del.gif similarity index 100% rename from web/out/dist/icons/del.gif rename to mw/out/default/icons/del.gif diff --git a/web/out/dist/icons/desc.gif b/mw/out/default/icons/desc.gif similarity index 100% rename from web/out/dist/icons/desc.gif rename to mw/out/default/icons/desc.gif diff --git a/web/out/dist/icons/edit.gif b/mw/out/default/icons/edit.gif similarity index 100% rename from web/out/dist/icons/edit.gif rename to mw/out/default/icons/edit.gif diff --git a/web/out/dist/icons/list.gif b/mw/out/default/icons/list.gif similarity index 100% rename from web/out/dist/icons/list.gif rename to mw/out/default/icons/list.gif diff --git a/web/out/dist/images/colorbox/border.png b/mw/out/default/images/colorbox/border.png similarity index 100% rename from web/out/dist/images/colorbox/border.png rename to mw/out/default/images/colorbox/border.png diff --git a/web/out/dist/images/colorbox/controls.png b/mw/out/default/images/colorbox/controls.png similarity index 100% rename from web/out/dist/images/colorbox/controls.png rename to mw/out/default/images/colorbox/controls.png diff --git a/web/out/dist/images/colorbox/ie6/borderBottomCenter.png b/mw/out/default/images/colorbox/ie6/borderBottomCenter.png similarity index 100% rename from web/out/dist/images/colorbox/ie6/borderBottomCenter.png rename to mw/out/default/images/colorbox/ie6/borderBottomCenter.png diff --git a/web/out/dist/images/colorbox/ie6/borderBottomLeft.png b/mw/out/default/images/colorbox/ie6/borderBottomLeft.png similarity index 100% rename from web/out/dist/images/colorbox/ie6/borderBottomLeft.png rename to mw/out/default/images/colorbox/ie6/borderBottomLeft.png diff --git a/web/out/dist/images/colorbox/ie6/borderBottomRight.png b/mw/out/default/images/colorbox/ie6/borderBottomRight.png similarity index 100% rename from web/out/dist/images/colorbox/ie6/borderBottomRight.png rename to mw/out/default/images/colorbox/ie6/borderBottomRight.png diff --git a/web/out/dist/images/colorbox/ie6/borderMiddleLeft.png b/mw/out/default/images/colorbox/ie6/borderMiddleLeft.png similarity index 100% rename from web/out/dist/images/colorbox/ie6/borderMiddleLeft.png rename to mw/out/default/images/colorbox/ie6/borderMiddleLeft.png diff --git a/web/out/dist/images/colorbox/ie6/borderMiddleRight.png b/mw/out/default/images/colorbox/ie6/borderMiddleRight.png similarity index 100% rename from web/out/dist/images/colorbox/ie6/borderMiddleRight.png rename to mw/out/default/images/colorbox/ie6/borderMiddleRight.png diff --git a/web/out/dist/images/colorbox/ie6/borderTopCenter.png b/mw/out/default/images/colorbox/ie6/borderTopCenter.png similarity index 100% rename from web/out/dist/images/colorbox/ie6/borderTopCenter.png rename to mw/out/default/images/colorbox/ie6/borderTopCenter.png diff --git a/web/out/dist/images/colorbox/ie6/borderTopLeft.png b/mw/out/default/images/colorbox/ie6/borderTopLeft.png similarity index 100% rename from web/out/dist/images/colorbox/ie6/borderTopLeft.png rename to mw/out/default/images/colorbox/ie6/borderTopLeft.png diff --git a/web/out/dist/images/colorbox/ie6/borderTopRight.png b/mw/out/default/images/colorbox/ie6/borderTopRight.png similarity index 100% rename from web/out/dist/images/colorbox/ie6/borderTopRight.png rename to mw/out/default/images/colorbox/ie6/borderTopRight.png diff --git a/web/out/dist/images/colorbox/loading.gif b/mw/out/default/images/colorbox/loading.gif similarity index 100% rename from web/out/dist/images/colorbox/loading.gif rename to mw/out/default/images/colorbox/loading.gif diff --git a/web/out/dist/images/colorbox/loading_background.png b/mw/out/default/images/colorbox/loading_background.png similarity index 100% rename from web/out/dist/images/colorbox/loading_background.png rename to mw/out/default/images/colorbox/loading_background.png diff --git a/web/out/dist/images/colorbox/overlay.png b/mw/out/default/images/colorbox/overlay.png similarity index 100% rename from web/out/dist/images/colorbox/overlay.png rename to mw/out/default/images/colorbox/overlay.png diff --git a/web/out/dist/index.php b/mw/out/default/index.php similarity index 92% rename from web/out/dist/index.php rename to mw/out/default/index.php index 2ddd92e..240b05a 100644 --- a/web/out/dist/index.php +++ b/mw/out/default/index.php @@ -28,7 +28,7 @@ -
out_config("colonne") ? "" : " class=\"no_colonne\"" ?>> +
out_config("colonne") ? "" : " class=\"no_colonne\""; ?>> out_file("views/messages.php"); ?> data(); if(($admin_menu = $data->get_link("admin")) && $admin_menu["subs"]) : ?> \ No newline at end of file diff --git a/mw/out/default/views/admin/config.php b/mw/out/default/views/admin/config.php new file mode 100644 index 0000000..e71d355 --- /dev/null +++ b/mw/out/default/views/admin/config.php @@ -0,0 +1,86 @@ +

Configuration

+ +

Générale

+ +
" method="post"> +
    +
  • + +

    + " /> +

    +
    • +
  • + +

    + +

    +
    • +
  • + +

    + out["config"]["contact_form"] ? " checked=\"checked\"" : ""; ?> /> +

    +
    • +
  • out["config"]["contact_form"] ? "" : " style=\"display:none;\""; ?>> + +
    +

    + " />
    +
    out["config"]["captcha"] ? " checked=\"checked\"" : ""; ?> /> anti-spam +

    +
    +
    • +
  • + +

    + nombre d'éléments à afficher dans une liste avant de paginer : + " /> +

    +
    • +
+ +

Affichage du site

+ +
    + +
  • + +config("out"); + $FOUND = false; + foreach($this->out["out_pathes"] as $out_path) { if($template == $out_path) { $FOUND = true; break; } } + if(!$FOUND) $template = $this->config("default_out"); + +?> +

    +out["out_pathes"]) : ?> + + + Aucun dossier d'affichage ! ... ? + + +

    +
    • + +out["out_config"] as $key => $config) : ?> + +
  • + +

    + " id=""out["config"]["out_".$key]) ? $this->out["config"]["out_".$key] : $config["default"]) ? " checked=\"checked\"" : ""; ?> /> + +

    +
    • + + +
  • + +
    • +
+
diff --git a/web/out/dist/views/admin/index.php b/mw/out/default/views/admin/index.php similarity index 100% rename from web/out/dist/views/admin/index.php rename to mw/out/default/views/admin/index.php diff --git a/mw/out/default/views/admin/plugins/list.php b/mw/out/default/views/admin/plugins/list.php new file mode 100644 index 0000000..e3d027b --- /dev/null +++ b/mw/out/default/views/admin/plugins/list.php @@ -0,0 +1,44 @@ +

Les plugins

+ +out["plugins"]) : ?> + +
" method="post"> + +
+ + + +

Aucun plugin pour le moment.

+ + diff --git a/web/out/dist/views/admin/users/add.php b/mw/out/default/views/admin/users/add.php similarity index 54% rename from web/out/dist/views/admin/users/add.php rename to mw/out/default/views/admin/users/add.php index dc3d038..4ec5d2a 100644 --- a/web/out/dist/views/admin/users/add.php +++ b/mw/out/default/views/admin/users/add.php @@ -1,28 +1,28 @@

Nouvel utilisateur

-
" method="post"> +" method="post">
  • - out["user"]["login"] : "" ?>" /> + out["user"]["login"] : ""; ?>" />
  • - out["user"]["email"] : "" ?>" /> + out["user"]["email"] : ""; ?>" />
  • diff --git a/web/out/dist/views/admin/users/edit.php b/mw/out/default/views/admin/users/edit.php similarity index 56% rename from web/out/dist/views/admin/users/edit.php rename to mw/out/default/views/admin/users/edit.php index fe3561e..fd51cc6 100644 --- a/web/out/dist/views/admin/users/edit.php +++ b/mw/out/default/views/admin/users/edit.php @@ -1,32 +1,32 @@

    Modifier un utilisateur

    - $_GET[$this->param("id")])) ?>" method="post"> + $_GET[$this->param("id")])); ?>" method="post">
    • - " disabled="disabled" /> + " disabled="disabled" />
    • - " /> + " />
    • - /> + />
    • diff --git a/mw/out/default/views/admin/users/list.php b/mw/out/default/views/admin/users/list.php new file mode 100644 index 0000000..f961e9f --- /dev/null +++ b/mw/out/default/views/admin/users/list.php @@ -0,0 +1,77 @@ +

      Les utilisateurs

      + + + +param("status")])) $users_params["status"] = $_GET[$this->param("status")]; + +?> +
        +
      • Afficher les utilisateurs pour
        • +
      • + +
        • + out["status"]) : + if(isset($_GET[$this->param("alpha")])) $users_params["alpha"] = $_GET[$this->param("alpha")]; + else unset($users_params["alpha"]); + unset($users_params["status"]); + +?> +
      • + +
        • + +
      + +out_file("views/navig.php"); ?> + +out["users"]["list"]) : ?> + + + + + + + + + out["users"]["list"] as $id_user => $user) : ?> + + + + + + + + +
      loginemailstatutactions
      ">out["status"][$user["status"]]["nom"]; ?> + $user["login"])); ?>" + class="admin_link" + title="modifier cet utilisateur">" /> + + $user["login"])); ?>" + class="admin_link" + title="supprimer cet utilisateur">" + onclick="return confirm('Supprimer cet utilisateur ?')"/> +
      + + + +

      Aucun utilisateur pour le moment...

      + + diff --git a/web/out/dist/views/erreur.php b/mw/out/default/views/erreur.php similarity index 85% rename from web/out/dist/views/erreur.php rename to mw/out/default/views/erreur.php index 7c17e17..ac0f76f 100644 --- a/web/out/dist/views/erreur.php +++ b/mw/out/default/views/erreur.php @@ -3,7 +3,7 @@ out["erreur"]["messages"]) && $this->out["erreur"]["messages"]) : ?>
        out["erreur"]["messages"] as $message) : ?> -
        • +
      diff --git a/mw/out/default/views/footer.php b/mw/out/default/views/footer.php new file mode 100644 index 0000000..de091ed --- /dev/null +++ b/mw/out/default/views/footer.php @@ -0,0 +1,19 @@ + + +

      +user())) : ?> + ">s'identifier + + Bienvenue + | ">compte +status_ok("admin")) : ?> + | ">admin + + | ">deconnexion + + | mtweb +

      diff --git a/web/out/dist/views/forms/contact/index.php b/mw/out/default/views/forms/contact/index.php similarity index 54% rename from web/out/dist/views/forms/contact/index.php rename to mw/out/default/views/forms/contact/index.php index a65d378..19e8236 100644 --- a/web/out/dist/views/forms/contact/index.php +++ b/mw/out/default/views/forms/contact/index.php @@ -2,27 +2,27 @@

      Contact

      - " method="post"> + " method="post">

      • - " /> + " />

      • - +

        • config("captcha")) : ?>

      • - path("libs")) ?> - - + path("mw_path")."libs/"); ?> + +

        • diff --git a/mw/out/default/views/head.php b/mw/out/default/views/head.php new file mode 100644 index 0000000..bbaadfc --- /dev/null +++ b/mw/out/default/views/head.php @@ -0,0 +1,32 @@ + + <?php echo $this->config("site_name"); ?> + " /> + + + + + + + +out_file_exists("js/actions/".$this->etat("mod")."_".$this->etat("controller")."_".$this->etat("action").".js")) : ?> + + +out_file_exists("js/actions/".$this->etat("mod")."_".$this->etat("controller").".js")) : ?> + + +out_file_exists("js/actions/".$this->etat("mod").".js")) : ?> + + + " /> + " /> + " /> + " /> +out_file_exists("css/actions/".$this->etat("mod")."_".$this->etat("controller")."_".$this->etat("action").".css")) : ?> + etat("mod")."_".$this->etat("controller")."_".$this->etat("action").".css"); ?>" /> + +out_file_exists("css/actions/".$this->etat("mod")."_".$this->etat("controller").".css")) : ?> + etat("mod")."_".$this->etat("controller").".css"); ?>" /> + +out_file_exists("css/actions/".$this->etat("mod").".css")) : ?> + etat("mod").".css"); ?>" /> + diff --git a/mw/out/default/views/header.php b/mw/out/default/views/header.php new file mode 100644 index 0000000..1126493 --- /dev/null +++ b/mw/out/default/views/header.php @@ -0,0 +1 @@ +

        config("site_name"); ?>

        diff --git a/web/out/dist/views/users/colonne.php b/mw/out/default/views/index/colonne.php similarity index 100% rename from web/out/dist/views/users/colonne.php rename to mw/out/default/views/index/colonne.php diff --git a/web/out/dist/views/login.php b/mw/out/default/views/login.php similarity index 54% rename from web/out/dist/views/login.php rename to mw/out/default/views/login.php index 7ae47d4..b245a06 100644 --- a/web/out/dist/views/login.php +++ b/mw/out/default/views/login.php @@ -1,11 +1,11 @@
        user())) : ?> " + action="url("users/identification/login"); ?>" method="post">
        - " /> + " />
        @@ -17,21 +17,21 @@ - +
        ')" />')" />
        - Bienvenue + Bienvenue
        -
        \ No newline at end of file +
diff --git a/web/out/dist/views/messages.php b/mw/out/default/views/messages.php similarity index 78% rename from web/out/dist/views/messages.php rename to mw/out/default/views/messages.php index a95ff7e..b8a572c 100644 --- a/web/out/dist/views/messages.php +++ b/mw/out/default/views/messages.php @@ -2,7 +2,7 @@
    out["messages"] as $message) : ?> -
    • +
diff --git a/web/out/dist/views/navig.php b/mw/out/default/views/navig.php similarity index 100% rename from web/out/dist/views/navig.php rename to mw/out/default/views/navig.php diff --git a/mw/out/default/views/redirect_javascript.php b/mw/out/default/views/redirect_javascript.php new file mode 100644 index 0000000..4cd4c4e --- /dev/null +++ b/mw/out/default/views/redirect_javascript.php @@ -0,0 +1,16 @@ +
+
+ out["redirect"]["message"]; ?> +


+ ---------------------------------------------------
+ Vous allez être redirigé vers ">out["redirect"]["url"]; ?> + dans out["redirect"]["wait"]; ?> secondes.
+ (cliquez sur le lien si la redirection ne se fait pas) +
+
+ diff --git a/web/out/dist/views/tinymce.init.js.php b/mw/out/default/views/tinymce.init.js.php similarity index 90% rename from web/out/dist/views/tinymce.init.js.php rename to mw/out/default/views/tinymce.init.js.php index 77f4dec..8d8aa89 100644 --- a/web/out/dist/views/tinymce.init.js.php +++ b/mw/out/default/views/tinymce.init.js.php @@ -16,9 +16,9 @@ theme_advanced_resizing : true, // Example content CSS (should be your site CSS) -out_file_exists("css/tinymce.css")) : ?> - content_css : "out_file("css/tinymce.css") ?>", - + out_file_exists("css/tinymce.css")) : ?> + content_css : "out_url("css/tinymce.css"); ?>", + // Drop lists for link/image/media/template dialogs template_external_list_url : "lists/template_list.js", diff --git a/web/out/dist/views/top_menu.php b/mw/out/default/views/top_menu.php similarity index 67% rename from web/out/dist/views/top_menu.php rename to mw/out/default/views/top_menu.php index 135f272..cad5e72 100644 --- a/web/out/dist/views/top_menu.php +++ b/mw/out/default/views/top_menu.php @@ -1,7 +1,7 @@ data(); if(($menu_top = $data->get_link("menu_top")) && $menu_top["subs"]) : ?> \ No newline at end of file diff --git a/web/out/dist/views/index/colonne.php b/mw/out/default/views/users/colonne.php similarity index 100% rename from web/out/dist/views/index/colonne.php rename to mw/out/default/views/users/colonne.php diff --git a/web/out/dist/views/users/identification.php b/mw/out/default/views/users/identification.php similarity index 63% rename from web/out/dist/views/users/identification.php rename to mw/out/default/views/users/identification.php index 287ba6c..05ce24d 100644 --- a/web/out/dist/views/users/identification.php +++ b/mw/out/default/views/users/identification.php @@ -2,6 +2,6 @@

Identification

out_file("views/login.php"); ?>
\ No newline at end of file diff --git a/web/out/dist/views/users/infos/edit.php b/mw/out/default/views/users/infos/edit.php similarity index 58% rename from web/out/dist/views/users/infos/edit.php rename to mw/out/default/views/users/infos/edit.php index 98968bf..2559e69 100644 --- a/web/out/dist/views/users/infos/edit.php +++ b/mw/out/default/views/users/infos/edit.php @@ -1,22 +1,22 @@ -

Informations du compte

+

Informations du compte

-
" method="post"> +" method="post">