<?xml version="1.0" encoding="UTF-8"?>
<config>
- <version>0.11.3</version>
+ <version>0.11.4</version>
<bdd>
<table_prefix_code>#--</table_prefix_code>
$env = $this->env();
$start_action = $env->config("start_action");
if($start_action){
- $start_action_params = $env->config("start_action_params");
- if($start_action_params && is_array($start_action_params)){
- foreach($start_action_params as $key => $value) $_GET[$key] = $value;
+ if($env->get_controller($start_action)){
+ $start_action_params = $env->config("start_action_params");
+ if($start_action_params && is_array($start_action_params)){
+ foreach($start_action_params as $key => $value) $_GET[$key] = $value;
+ }
+ $env->run($start_action);
}
- $env->run($start_action);
}
}
$data = $env->data();
$env->set_out("data_version", $data->version("mtweb"));
$env->set_out("env_version", $env->version("mtweb"));
+ $env->set_out("data_upgrades", $env->data_upgrades());
}
function confirm_upgrade(){
return $desc;
}
- function table_exists($table){\r
+ function table_exists($table_name){\r
if(!$this->link) $this->connect($this->host, $this->base, $this->user, $this->password);\r
- $rst = $this->query("SHOW TABLES");\r
- while($v_rst = mysql_fetch_array($rst)){\r
- if(strcmp($v_rst[0], $table) == 0) return true;\r
- }\r
- mysql_free_result($rst);\r
- return false;\r
+ $EXISTS = false;
+ try{
+ $rst = $this->query("SHOW TABLES");
+ while($v_rst = mysql_fetch_row($rst)){\r
+ if($v_rst[0] == $table_name){
+ $EXISTS = true;
+ break;
+ }\r
+ }\r
+ $this->free_result($rst);
+ }
+ catch(Exception $e){
+ throw new Exception($this->exception_out("Impossible de savoir si la table existe"));
+ }
+ return $EXISTS;
}
function field_exists($table_name, $field_name){
- if(!$this->link) $this->connect($this->host, $this->base, $this->user, $this->password);
- $sql = "SHOW COLUMNS FROM `".$table_name."` LIKE ".$field_name;
- $rst = $this->query($sql);
- $exists = false;
- $v_rst = $this->fetch_assoc($rst);
- if($v_rst) $exists = true;
- $this->free_result($rst);
- return $exists;
+ if(!$this->link) $this->connect($this->host, $this->base, $this->user, $this->password);\r
+ if(!($desc = $this->desc_table($table_name))){
+ throw new Exception($this->exception_out("Impossible de lire la description de la table"));
+ }
+ $EXISTS = false;
+ foreach($desc["attributs"] as $attribut_name => $attribut){
+ if($field_name == $attribut_name){
+ $EXISTS = true;
+ break;
+ }
+ }
+ return $EXISTS;
}
function query($query_string){\r
}
function desc_table($table_name){
- $sql = "SELECT * from information_schema.columns where table_name='".$table_name."'";
- $rst = $this->query($sql);
+ if(strpos($table_name, "'") !== false){
+ throw new Exception($this->exception_out("nom de table avec un simple quote"));
+ }
$desc = array(
"name" => $table_name,
"attributs" => array()
);
+ $sql = "PRAGMA table_info(".$table_name.")";
try{
- while($v_rst = $this->fetch_assoc($rst)){\r
- $desc["attributs"][$v_rst["COLUMN_NAME"]] = array(
- "name" => $v_rst["COLUMN_NAME"],
- "prymary_key" => $v_rst["COLUMN_KEY"] == "PRI" ? true : false,
- "auto_increment" => $v_rst["EXTRA"] == "auto_increment" ? true : false
+ $rst = $this->query($sql);
+ while($v_rst = $this->fetch_assoc($rst)){
+ $desc["attributs"][$v_rst["name"]] = array(
+ "name" => $v_rst["name"],
+ "prymary_key" => isset($v_rst["pk"]) && $v_rst["pk"] ? true : false
);
- }\r
+ }
$this->free_result($rst);
}
catch(Exception $e){
- throw new Exception($this->exception_out("Impossible de lire la description de la table"));
+ throw new Exception($this->exception_out("impossible de lire les champs de la table ".$table_name));
}
return $desc;
}
+++ /dev/null
-<?php
-
- class mw_data_check_instance extends mw_data{
-
- function check_instance(){
-// return $this->check_instance_normalise_config();
- return true;
- }
-
- function check_instance_normalise_config(){
- $env = $this->env();
- if($env->bdd("sgbd") == "xml"){
- debug("start normalise config");
- $data = $env->data();
- $sgbd = $data->sgbd();
- $configs = array();
- $erreur = false;
- if($rst = $sgbd->open_data("config")){
- while($v_rst = $sgbd->fetch_data($rst)){
- if(!isset($v_rst)){
- $erreur = "erreur lors de la lecture de la configuration (check_instance)";
- break;
- }
- if(!isset($v_rst["key"]) || !isset($v_rst["value"])){
- foreach($v_rst as $config_key => $config_value){
- $configs[$v_rst["id"]] = array(
- "key" => $config_key,
- "value" => $config_value
- );
- break;
- }
- }
- }
- $sgbd->close_data($rst);
- }
- else return "impossible de lire la configuration (check_instance)";
- if($erreur) return $erreur;
- foreach($configs as $config_id => $config){
- if(!$sgbd->set_data("config", $config_id, $config)){
- return "erreur lors de l'enregistrement de la configuration";
- }
- }
- return "end normalise config";
- }
- }
-
- }
-
-?>
\ No newline at end of file
class mw_data_sql_crud extends mw_data{
# ----------------------------------------------------------------------------------------
+ # parametres du sgbd
+ #
+
+ function set_sgbd_param($key, $value){
+ $env = $this->env();
+ if(($env->bdd("sgbd") == "pdo_mysql") || ($env->bdd("sgbd") == "mysql")){
+ return $this->set_sgbd_mysql_param($key, $value);
+ }
+ return false;
+ }
+
+ function set_sgbd_mysql_param($key, $value){
+ $sgbd = $this->sgbd();
+ $sql = "SET ".$key."=\"".$value."\"";
+ try{
+ $sgbd->query($sql);
+ }
+ catch(Exception $e){
+ return false;
+ }
+ return true;
+ }
+
+ # ----------------------------------------------------------------------------------------
+ # create table
+ #
+
+ function data_create_table($params){
+ $env = $this->env();
+ if($env->bdd("sgbd") == "pdo_sqlite"){
+ return $this->data_create_sqlite_table($params);
+ }
+ return $this->data_create_mysql_table($params);
+ }
+
+ function data_create_mysql_table($params){
+ $sgbd = $this->sgbd();
+ $table_name = isset($params["table_name"]) ? $params["table_name"] : "";
+ $fields = isset($params["fields"]) ? $params["fields"] : array();
+ $keys = isset($params["keys"]) ? $params["keys"] : array();
+ $options = isset($params["options"]) ? $params["options"] : array();
+ if(!$table_name || !$fields) return false;
+ $sql_fields = "";
+ $sql_keys = "";
+ $sql_options = "";\r
+ foreach($fields as $field_name => $field){
+ if(!preg_match("/^[a-z]+[a-z_0-9]*$/", $field_name)) return false;
+ if(!isset($field["type"])) return false;
+ $sql_field = "";
+ switch($field["type"]){
+ case "int":
+ $value = isset($field["value"]) ? $field["value"] : "11";
+ if(!preg_match("/^[0-9]+$/", $value)) return false;
+ $sql_field .= "`".$field_name."` int(".$value.")";
+ break;
+ case "varchar":
+ $value = isset($field["value"]) ? $field["value"] : "255";
+ if(!preg_match("/^[0-9]+$/", $value)) return false;
+ $sql_field .= "`".$field_name."` varchar(".$value.")";
+ break;
+ case "text":
+ $sql_field .= "`".$field_name."` text";
+ break;
+ case "date":
+ $sql_field .= "`".$field_name."` date";
+ break;
+ case "datetime":
+ $sql_field .= "`".$field_name."` datetime";
+ break;
+ }
+ if($sql_field){
+ $null = isset($field["null"]) ? $field["null"] : false;
+ $sql_field .= ($null ? " DEFAULT" : " NOT")." NULL";
+ if($null && isset($field["default"])){
+ $sql_field .= " DEFAULT ".$this->eq($field["default"]);
+ }
+ if(isset($field["autoincrement"]) && $field["autoincrement"]){
+ $sql_field .= " AUTO_INCREMENT";
+ }
+ $sql_fields .= ($sql_fields ? ", " : "").$sql_field;
+ }
+ }
+ $key_index = 0;
+ foreach($keys as $key){
+ $key_index++;
+ $sql_key_fields = "";
+ foreach($key["fields"] as $key_field){
+ $sql_key_fields .= ($sql_key_fields ? "," : "")."`".$key_field."`";
+ }
+ $sql_key = "KEY `#--".$table_name."_".$key_index."`(".$sql_key_fields.")";
+ if(isset($key["primary"]) && $key["primary"]){
+ $sql_key = "PRIMARY ".$sql_key;
+ }
+ $sql_keys .= ($sql_keys ? ", " : "").$sql_key;
+ }
+ foreach($options as $option_name => $option_value){
+ switch($option_name){
+ case "default_charset":
+ $sql_options .= " DEFAULT CHARSET=".$option_value;
+ break;
+ }
+ }
+ $sql = "CREATE TABLE `#--".$table_name."`(".$sql_fields.", ".$sql_keys.")".$sql_options;
+ try{
+ $sgbd->query($sql);
+ }
+ catch(Exception $e){
+ return false;
+ }
+ return true;
+ }
+
+ function data_create_sqlite_table($params){
+ $sgbd = $this->sgbd();
+ $table_name = isset($params["table_name"]) ? $params["table_name"] : "";
+ $fields = isset($params["fields"]) ? $params["fields"] : array();
+ $keys = isset($params["keys"]) ? $params["keys"] : array();
+ $options = isset($params["options"]) ? $params["options"] : array();
+ if(!$table_name || !$fields) return false;
+ $sql_fields = "";
+ $sql_keys = "";
+ $sql_options = "";\r
+ foreach($fields as $field_name => $field){
+ if(!preg_match("/^[a-z]+[a-z_0-9]*$/", $field_name)) return false;
+ if(!isset($field["type"])) return false;
+ $sql_field = "";
+ switch($field["type"]){
+ case "int":
+ $sql_field .= "`".$field_name."` INTEGER";
+ break;
+ case "varchar":
+ case "text":
+ case "date":
+ case "datetime":
+ $sql_field .= "`".$field_name."` TEXT";
+ break;
+ }
+ if($sql_field){
+ $null = isset($field["null"]) ? $field["null"] : false;
+ $sql_field .= ($null ? " DEFAULT" : " NOT")." NULL";
+ if($null && isset($field["default"])){
+ $sql_field .= " DEFAULT ".$this->eq($field["default"]);
+ }
+ $sql_fields .= ($sql_fields ? ", " : "").$sql_field;
+ }
+ }
+ $key_index = 0;
+ foreach($keys as $key){
+ if(isset($key["primary"]) && $key["primary"]){
+ $key_index++;
+ $sql_key_fields = "";
+ foreach($key["fields"] as $key_field){
+ $sql_key_fields .= ($sql_key_fields ? "," : "")."`".$key_field."`";
+ }
+ $sql_key = "PRIMARY KEY (".$sql_key_fields.")";
+ $sql_keys .= ($sql_keys ? ", " : "").$sql_key;
+ }
+ }
+ $sql = "CREATE TABLE `#--".$table_name."`(".$sql_fields.", ".$sql_keys.")".$sql_options;
+ try{
+ $sgbd->query($sql);
+ }
+ catch(Exception $e){
+ return false;
+ }
+ return true;
+ }
+
+ # ----------------------------------------------------------------------------------------
# description
#
--- /dev/null
+<?php
+
+ class mtweb_sql_version_0_11_2 extends mw_data_version{
+
+ function version(){
+ return "0.11.2";
+ }
+
+ function do_upgrade(){
+
+ $env = $this->env();
+ $data = $env->data();
+ $sgbd = $data->sgbd();
+
+ if(($env->bdd("sgbd") == "pdo_mysql") || ($env->bdd("sgbd") == "mysql")){
+ if(!$data->set_sgbd_param("SQL_MODE", "NO_AUTO_VALUE_ON_ZERO")){
+ return "imposible de parametrer SQL_MODE en NO_AUTO_VALUE_ON_ZERO";
+ }
+ }
+
+ /* ----------------------------------------------------------------------
+ action_status
+ devient actions_roles
+ element id_status devient id_role
+ */
+
+ if(!$sgbd->table_exists("#--actions_roles")){
+ if(!$sgbd->table_exists("#--action_status")){
+ return "impossible de trouver la table action_status";
+ }
+ if(
+ !$data->data_create_table(
+ array(
+ "table_name" => "actions_roles",
+ "fields" => array(
+ "id" => array("type" => "int", "autoincrement" => true),
+ "action" => array("type" => "varchar"),
+ "id_role" => array("type" => "int")
+ ),
+ "keys" => array(
+ array(
+ "fields" => array("id"),
+ "primary" => true
+ ),
+ array(
+ "fields" => array("id_role")
+ )
+ ),
+ "options" => array("default_charset" => "utf8")
+ )
+ )
+ ){
+ return "impossible de créer la table actions_roles";
+ }
+
+ $sql =
+ "INSERT INTO #--actions_roles(action, id_role)"
+ ." SELECT action, id_status"
+ ." FROM #--action_status";
+ try{
+ $sgbd->query($sql);
+ }
+ catch(Exception $e){
+ return "impossible d'importer action_status dans actions_roles";
+ }
+ $sql =
+ "INSERT INTO #--actions_roles(action, id_role) VALUES('config', 3)";
+ try{
+ $sgbd->query($sql);
+ }
+ catch(Exception $e){
+ return "impossible d'ajouter la protection d'accès webmaster dans actions_roles";
+ }
+ try{
+ $sgbd->query("DROP TABLE #--action_status");
+ }
+ catch(Exception $e){
+ return "impossible de supprimer la table action_status";
+ }
+ }
+
+ /* ----------------------------------------------------------------------
+ user_status
+ devient roles
+ plus d'element creation_default
+ nouvel element intitule
+ */
+
+ if(!$sgbd->table_exists("#--roles")){
+ if(!$sgbd->table_exists("#--user_status")){
+ return "impossible de trouver la table user_status";
+ }
+ if(
+ !$data->data_create_table(
+ array(
+ "table_name" => "roles",
+ "fields" => array(
+ "id" => array("type" => "int", "autoincrement" => true),
+ "nom" => array("type" => "varchar"),
+ "intitule" => array("type" => "varchar")
+ ),
+ "keys" => array(
+ array(
+ "fields" => array("id"),
+ "primary" => true
+ )
+ ),
+ "options" => array("default_charset" => "utf8")
+ )
+ )
+ ){
+ return "impossible de créer la table roles";
+ }
+ try{
+ $sql = "INSERT INTO #--roles(id, nom, intitule) VALUES (0, 'guest', 'invité')";\r
+ $sgbd->query($sql);
+ $sql = "INSERT INTO #--roles(id, nom, intitule) VALUES (1, 'admin', 'administrateur')";
+ $sgbd->query($sql);\r
+ $sql = "INSERT INTO #--roles(id, nom, intitule) VALUES (2, 'membre', 'membre')";
+ $sgbd->query($sql);\r
+ $sql = "INSERT INTO #--roles(id, nom, intitule) VALUES (3, 'webmaster', 'webmaster')";
+ $sgbd->query($sql);
+ }
+ catch(Exception $e){
+ return "impossible de remplir la table roles";
+ }
+ try{
+ $sgbd->query("DROP TABLE #--user_status");
+ }
+ catch(Exception $e){
+ return "impossible de supprimer la table user_status";
+ }
+ }
+
+ /* ----------------------------------------------------------------------
+ nouvelle table users_roles
+ importer users.status dans users_roles.id_role
+ */
+
+ if(!$sgbd->table_exists("#--users_roles")){
+ if(
+ !$data->data_create_table(
+ array(
+ "table_name" => "users_roles",
+ "fields" => array(
+ "id_user" => array("type" => "int"),
+ "id_role" => array("type" => "int")
+ ),
+ "keys" => array(
+ array(
+ "fields" => array("id_user", "id_role"),
+ "primary" => true
+ ),
+ array(
+ "fields" => array("id_role")
+ )
+ ),
+ "options" => array("default_charset" => "utf8")
+ )
+ )
+ ){
+ return "impossible de créer la table users_roles";
+ }
+ if(($users = $data->data_list(array("table_name" => "users"))) === false){
+ return "impossible de lire la table des utilisateurs";
+ }
+ foreach($users["list"] as $user){
+ if(
+ !$data->data_insert(
+ array(
+ "table_name" => "users_roles",
+ "values" => array(
+ "id_user" => $user["id"],
+ "id_role" => $user["status"]
+ )
+ )
+ )
+ ){
+ return "erreur lors de l'insertion des roles dans users_roles";
+ }
+ }
+ $sql = "ALTER TABLE #--users RENAME TO #--users_tmp";
+ try{
+ $sgbd->query($sql);
+ }
+ catch(Exception $e){
+ return "impossible de renommer la table users en users_tmp";
+ }
+ if(
+ !$data->data_create_table(
+ array(
+ "table_name" => "users",
+ "fields" => array(
+ "id" => array("type" => "int", "autoincrement" => true),
+ "login" => array("type" => "varchar"),
+ "password" => array("type" => "varchar"),
+ "email" => array("type" => "varchar")
+ ),
+ "keys" => array(
+ array(
+ "fields" => array("id"),
+ "primary" => true
+ )
+ ),
+ "options" => array("default_charset" => "utf8")
+ )
+ )
+ ){
+ return "impossible de créer la table users";
+ }
+ $sql =
+ "INSERT INTO #--users(id, login, password, email)"
+ ." SELECT id, login, password, email"
+ ." FROM #--users_tmp";
+ try{
+ $sgbd->query($sql);
+ }
+ catch(Exception $e){
+ return "impossible d'importer users_tmp dans users";
+ }
+ try{
+ $sgbd->query("DROP TABLE #--users_tmp");
+ }
+ catch(Exception $e){
+ return "impossible de supprimer la table users_tmp";
+ }
+ }
+
+ /* ----------------------------------------------------------------------
+ nouvelle table versions
+ */
+
+ if(!$sgbd->table_exists("#--versions")){
+ if(
+ !$data->data_create_table(
+ array(
+ "table_name" => "versions",
+ "fields" => array(
+ "id" => array("type" => "int", "autoincrement" => true),
+ "application" => array("type" => "varchar"),
+ "version" => array("type" => "varchar")
+ ),
+ "keys" => array(
+ array(
+ "fields" => array("id"),
+ "primary" => true
+ )
+ ),
+ "options" => array("default_charset" => "utf8")
+ )
+ )
+ ){
+ return "impossible de créer la table versions";
+ }
+ }
+
+ return true;
+ }
+
+ }
}
}
}
+ if(
+ !$sgbd->add_data(
+ "actions_roles",
+ array(
+ "action" => "config",
+ "id_role" => 3
+ )
+ )
+ ){
+ return "impossible d'ajouter la protection d'accès webmaster dans actions_roles";
+ }
if(!$sgbd->remove_data("action_status")){
return "impossible de supprimer la table action_status, dans ".get_class($this);
}
<h2>Mise à jour des données</h2>
<p>
- La base de données doit être mise à jour pour
- <strong>mtweb.<?php echo $this->out["env_version"]; ?></strong>.
+ La base de données doit être mise à jour pour :
</p>
-<br /><br />
+
+<?php
+
+ foreach($this->out["data_upgrades"] as $application_name => $data_upgrade) :
+ if($data_upgrade->upgrade_required()) :
+
+?>
+
+<?php debug($application_name); ?>
+
+<?php endif; endforeach; ?>
+<br />
<?php
<?php else : ?>
<p>
- <strong>Cette opération est risquée</strong>.
+ <strong>Cette opération va faire des modifications dans la base de données</strong>.
</p>
<br />
<pre class="debug">faites une sauvegarde de vos données
if(!$this->bdd("sgbd")) return "aucun sgbd defini";
$data = $this->data();
if(!$data) return "objet data non defini";
- if(!$this->version("mtweb")) return "impossible de lire la version de mtweb";
- if($data->version("mtweb") != $this->version("mtweb")) return "la version de la base et du code sont différentes";
+ if(($res = $this->data_upgrade_required()) !== false){
+ if($res === true){
+ return "la base de donnees doit etre mise a jour";
+ }
+ else return $res;
+ }
return true;
}
class mw_env_data_upgrade extends mw_env{
var $data_upgrades;
+ var $UPGRADE_REQUIRED;
+
+ function data_upgrades(){
+ return $this->data_upgrades;
+ }
function init_data_upgrades(){
- $data_upgrade = new mw_data_upgrade($this);
$impl_dir = ($this->bdd("sgbd") == "xml" ? "xml" : "sql")."/";
$versions_dir = $this->path("mw_dir")."app/data/upgrades/".$impl_dir;
- if(!is_dir($versions_dir)){
- return false;
+ if(is_dir($versions_dir)){
+ $data_upgrade = new mw_data_upgrade($this, "mtweb");
+ if(!$data_upgrade->load_versions($versions_dir)){
+ return "erreur lors de la lecture des versions";
+ }
+ if(!isset($this->data_upgrades)) $this->data_upgrades = array();
+ $this->data_upgrades["mtweb"] = $data_upgrade;
+
}
- if(!$data_upgrade->load_versions("mtweb", $versions_dir)){
- return false;
+ if(($plugins = $this->plugins("ASC")) === false){
+ return "impossible de lire les upgrades pour les plugins";
+ }
+ foreach($plugins as $plugin_name => $plugin){
+ if(
+ $plugin["installed"]
+ && $plugin["enabled"]
+ ){
+ $versions_dir = $this->path("mw_dir")."plugins/".$plugin_name."/app/data/upgrades/".$impl_dir;
+ if(!is_dir($versions_dir)){
+ continue;
+ }
+ $data_upgrade = new mw_data_upgrade($this, $plugin_name);
+ if(!$data_upgrade->load_versions($versions_dir)){
+ return "erreur lors de la lecture des versions pour le plugin ".$plugin_name;
+ }
+ if(!isset($this->data_upgrades)) $this->data_upgrades = array();
+ $this->data_upgrades[$plugin_name] = $data_upgrade;
+ }
}
if(!isset($this->data_upgrades)) $this->data_upgrades = array();
- $this->data_upgrades[] = $data_upgrade;
return true;
}
- function data_upgrade_required(){
- if(!isset($this->data_upgrades)) return false;
- foreach($this->data_upgrades as $data_upgrade){
- if($data_upgrade->upgrade_required()){
- return true;
+ function data_upgrade_required($RELOAD = false){
+ if(!isset($this->data_upgrades)){
+ if(($res = $this->init_data_upgrades()) !== true){
+ return $res;
}
}
- return false;
+ if(!isset($this->data_upgrades)){
+ return "impossible de charger les upgrades";
+ }
+ if($RELOAD || !isset($this->UPGRADE_REQUIRED)){
+ $this->UPGRADE_REQUIRED = false;
+ foreach($this->data_upgrades as $data_upgrade){
+ if($data_upgrade->upgrade_required()){
+ $this->UPGRADE_REQUIRED = true;
+ break;
+ }
+ }
+ }
+ return $this->UPGRADE_REQUIRED;
}
function do_data_upgrade(){
class mw_data_upgrade{
+ var $application_name;
var $versions;
var $env;
- function mw_data_upgrade($env){
+ function mw_data_upgrade($env, $application_name){
$this->env = $env;
+ $this->application_name = $application_name;
}
function env(){
return isset($this->env) ? $this->env : false;
}
- function load_versions($application_name, $versions_dir){
+ function load_versions($versions_dir){
if($dh = opendir($versions_dir)){
$versions_dir .= $versions_dir && substr($versions_dir, -1) != "/" ? "/" : "";
while(($file = readdir($dh)) !== false){
substr($file, 0, 1) != "."
&& !is_dir($versions_dir.$file)
&& strcmp(substr($file, -4), ".php") == 0
- ) $this->load_version($application_name, $versions_dir, $file);
+ ) $this->load_version($versions_dir, $file);
}
closedir($dh);
}
return true;
}
- function load_version($application_name, $versions_dir, $version_file){
+ function load_version($versions_dir, $version_file){
if(
!$version_file
|| !file_exists($versions_dir.$version_file)
$class_name = substr($version_file, 0, -4);
if(!class_exists($class_name)) require_once $versions_dir.$version_file;
if(!class_exists($class_name)) return false;
- $version = new $class_name($this->env(), $application_name);
+ $version = new $class_name($this->env(), $this->application_name);
return $this->add_version($version);
}
function upgrade_required(){
if(!isset($this->versions)) return false;
- foreach($this->versions as $version_number => $version){
+ foreach($this->versions as $version){
if($version->upgrade_required()) return true;
}
return false;
function do_upgrade(){
if(!isset($this->versions)) return true;
- foreach($this->versions as $version_number => $version){
+ foreach($this->versions as $version){
if($version->upgrade_required() && ($res = $version->do_upgrade()) !== true){
return $res." (dans ".get_class($version).")";
}
if(!$version->set_data_version()){
- return "impossible de mettre a jour la version des donnees pour ".$version->application_name();
+ return "impossible de mettre a jour la version des donnees pour ".$this->application_name." ".$version->version();
}
}
return true;
function upgrade_required(){
if(!isset($this->application_name)) return false;
+ if(!$this->version()) return false;
$env = $this->env();
$data = $env->data();
- if(!($env_version = $env->version($this->application_name))) return false;
if(!($data_version = $data->version($this->application_name))) return true;
- return version_compare($data_version, $env_version) < 0;
+ return version_compare($data_version, $this->version()) < 0;
}
function do_upgrade(){
function set_data_version(){
if(!isset($this->application_name)) return false;
+ if(!$this->version()) return false;
$env = $this->env();
$data = $env->data();
return $data->set_version($this->application_name, $this->version());
return $this->get_error();
}
$env = $this->env();
- if($env->data_upgrade_required()){
+ if(($res = $env->data_upgrade_required()) === true){
$this->upgrade();
exit;
}
+ else{
+ if($res !== false){
+ $this->error($res);
+ return $this->get_error();
+ }
+ }
return true;
}
$env->load_versions();
$env->load_config($this->bdd, $this->config);
$env->init();
- $env->init_data_upgrades();
+ if(($res = $env->init_data_upgrades()) !== true){
+ $this->error("impossible de lire les upgrades. ".$res);
+ return false;
+ }
return true;
}
+++ /dev/null
-<?php
-
- /*
- * Cette classe decrit un plugin "vide" et peut servir de base
- * au developpement d'un nouveau plugin.
- *
- *
- * pour creer un nouveau plugin (par exemple "mon_plugin") :
- *
- * - creez un dossier "mon_plugin" dans le dossier "mw/plugins"
- *
- * - copiez dans ce dossier le fichier "mw_minimal.php" et renommez-le
- * en "mon_plugin.php"
- *
- * - dans "mon_plugin.php", renommez la classe en :
- *
- * class mon_plugin extends mw_plugin
- *
- * vous aurez alors un nouveau plugin, activable dans l'administration
- * du site.
- *
- *
- * Votre dossier de plugin peut contenir des dossiers :
- *
- * - app/controllers
- * - app/data
- * - app/out
- * - app/observers
- * - ...
- *
- * ces dossiers seront traites de le meme facon que ceux de
- * l'application principale (dans le dossier mw/app)
- *
- */
-
- class mw_minimal extends mw_plugin{
-
- /*
- * retourne une chaine de caracteres avec le nom du plugin
- * tel qu'il apparaitra dans l'administration du site
- *
- */
- function title(){
- return "Minimal";
- }
-
- /*
- * retourne une chaine de caracteres avec la description du plugin
- * telle qu'elle apparaitra dans l'administration du site
- *
- */
- function description(){
- return "Un plugin 'vide'";
- }
-
- /*
- * Cette methode sera appelee lors du clic sur le lien "installer"
- * dans l'administration, pour ce plugin.
- *
- * l'objet $env est fourni en parametre par l'application au moment
- * de l'appel.
- *
- * retourne :
- * - une chaine de caracteres avec un message d'erreur en cas d'erreur
- * - TRUE en cas de succes
- *
- */
- function install($env){
- return true;
- }
-
- /*
- * Cette methode sera appelee lors du clic sur le lien "desinstaller"
- * dans l'administration, pour ce plugin.
- *
- * l'objet $env est fourni en parametre par l'application au moment
- * de l'appel.
- *
- * retourne :
- * - une chaine de caracteres avec un message d'erreur en cas d'erreur
- * - TRUE en cas de succes
- *
- */
- function uninstall($env){
- return true;
- }
-
- /*
- * Cette methode sera appelee lors du clic sur le lien "activer"
- * dans l'administration, pour ce plugin.
- *
- * l'objet $env est fourni en parametre par l'application au moment
- * de l'appel.
- *
- * retourne :
- * - une chaine de caracteres avec un message d'erreur en cas d'erreur
- * - TRUE en cas de succes
- *
- */
- function enable($env){
- return true;
- }
-
- /*
- * Cette methode sera appelee lors du clic sur le lien "desctiver"
- * dans l'administration, pour ce plugin.
- *
- * l'objet $env est fourni en parametre par l'application au moment
- * de l'appel.
- *
- * retourne :
- * - une chaine de caracteres avec un message d'erreur en cas d'erreur
- * - TRUE en cas de succes
- *
- */
- function disable($env){
- return true;
- }
-
- /*
- * Cette methode sera appelee a chaque requete, avant le traitement
- * de l'action demandee
- *
- * l'objet $env est fourni en parametre par l'application au moment
- * de l'appel.
- *
- * retourne :
- * - FALSE en cas d'erreur
- * - TRUE en cas de succes
- *
- */
- function init($env){
- return true;
- }
-
- }
-
-?>
\ No newline at end of file
projects / mtweb / commitdiff