From fe66a759d5ef0212cfd4873091dd83926a2f0dfd Mon Sep 17 00:00:00 2001
From: Antonio de la Rosa <webmaster@web-t-sys.com>
Date: Tue, 18 Aug 2015 01:44:38 +0200
Subject: [PATCH] Added padmin how bin file

---
 bin/padmin       | 472 +++++++++++++++++++++++++++++++++++++++++
 bin/padmin.php   | 536 -----------------------------------------------
 composer.json    |   3 +-
 src/Webmodel.php |  20 +-
 4 files changed, 481 insertions(+), 550 deletions(-)
 create mode 100755 bin/padmin
 delete mode 100644 bin/padmin.php

diff --git a/bin/padmin b/bin/padmin
new file mode 100755
index 0000000..b66d9a1
--- /dev/null
+++ b/bin/padmin
@@ -0,0 +1,472 @@
+#!/usr/bin/php
+<?php
+
+
+if (file_exists(__DIR__.'/../../../autoload.php')) 
+{
+	require __DIR__.'/../../../autoload.php';
+    
+} 
+else 
+{
+	require __DIR__.'/vendor/autoload.php';
+}
+
+use PhangoApp\PhaModels\SQLClass;
+use PhangoApp\PhaModels\Webmodel;
+use League\CLImate\CLImate;
+
+$options=getopt('', array('model:'));
+
+padminConsole($options);
+
+function padminConsole($options)
+{
+
+	#$options=get_opts_console('', $arr_opts=array('model:'));
+	
+	$climate = new League\CLImate\CLImate;
+	
+	if(!isset($options['model']))
+	{
+	
+		//echo "Use: php console.php -m=padmin -c=padmin --model=module/model\n";
+		
+		$climate->white()->backgroundBlack()->out("Use: padmin --model=module/model");
+		
+		die;
+	
+	}
+	
+	$arr_option=explode('/', $options['model']);
+
+	settype($arr_option[0], 'string');
+	settype($arr_option[1], 'string');
+	
+	Webmodel::$model_path='./modules/';
+	
+	$model_file=Webmodel::$model_path.$arr_option[0].'/models/models_'.$arr_option[1].'.php';
+	
+	if(!is_file($model_file))
+	{
+
+		$climate->white()->backgroundRed()->out("Error: cannot find the model file in ".$arr_option[0]."/models/models_".$arr_option[1].".php");
+	
+		die();
+
+	}
+
+
+	WebModel::load_model($options['model']);
+
+	try {
+
+		$first_item=current(Webmodel::$model);
+		
+		$first_item->connect_to_db();
+		
+	} catch(Exception $e)
+	{
+		$climate->white()->backgroundRed()->out($e->getMessage());
+		//echo $e->getMessage()."\n";
+		die;
+
+	}
+
+	//print_r(get_declared_classes());
+
+
+
+	update_table();
+
+	$post_install_script=Webmodel::$model_path.$arr_option[0].'/install/post_install.php';
+
+	$post_install_lock=Webmodel::$model_path.$arr_option[0].'/install/lock';
+
+	if(file_exists($post_install_script) && !file_exists($post_install_lock))
+	{
+
+		//echo "Executing post_install script...\n";
+		
+		$climate->white()->backgroundBlack()->out('Executing post_install script...');
+
+		include($post_install_script);
+
+		if(post_install())
+		{
+		
+			if(!file_put_contents($post_install_lock, 'installed'))
+			{
+			
+				//echo "Done, but cannot create this file: ".$arr_option[0].'/install/lock'.". Check your permissions and create the file if the script executed satisfally \n";
+				$climate->white()->backgroundBlack()->out("Done, but cannot create this file: ".$arr_option[0].'/install/lock'.". Check your permissions and create the file if the script executed satisfally");
+			
+			}
+			else
+			{
+			
+				//echo "Done\n";
+				$climate->white()->backgroundBlack()->out('Done');
+			
+			}
+		
+		}
+		else
+		{
+		
+			//echo "Error, please, check ${post_install_script} file and execute padmin.php again\n";
+			$climate->white()->backgroundRed()->out("Error, please, check ${post_install_script} file and execute padmin.php again");
+		
+		}
+
+	}
+
+	//echo "All things done\n";
+	
+	$climate->white()->backgroundBlack()->out("All things done");
+
+}
+
+/**
+* This Function is used for padmin.php for create new tables and fields based in Webmodel class.
+*
+* @param Webmodel $model The model used for create or update a sql table.
+*/
+
+function update_table()
+{
+	//include(__DIR__.'/../src/Databases/'.Webmodel::$type_db.'.php');
+	
+	Webmodel::$arr_sql_index=array();
+	Webmodel::$arr_sql_set_index=array();
+	
+	Webmodel::$arr_sql_unique=array();
+	Webmodel::$arr_sql_set_unique=array();
+	
+	$arr_etable=array();
+	
+	$query=SQLClass::webtsys_query("show tables");
+		
+	while(list($table)=SQLClass::webtsys_fetch_row($query))
+	{
+	
+		$arr_etable[$table]=1;
+	
+	}
+	
+	foreach(Webmodel::$model as $key => $thing)
+	{
+		
+		$arr_table=array();
+		
+		$allfields=array();
+		$fields=array();
+		$types=array();
+	
+		$field="";
+		$type=""; 
+		$null=""; 
+		$key_db=""; 
+		$default=""; 
+		$extra="";
+		$key_field_old=Webmodel::$model[$key]->idmodel;
+		
+		if(!isset($arr_etable[$key]))
+		{
+			//If table not exists make this
+			
+			echo "Creating table $key\n";
+			
+			Webmodel::$model[$key]->create_table();
+
+		}
+		else
+		if(isset(Webmodel::$model[$key]))
+		{
+			//Obtain all fields of model
+		
+			foreach(Webmodel::$model[$key]->components as $kfield => $value)
+			{
+		
+				$allfields[$kfield]=1;
+				
+			}
+		
+			//unset($allfields['Id'.ucfirst($key)]);
+			
+			$arr_null['NO']='NOT NULL';
+			$arr_null['YES']='NULL';
+
+			unset($allfields[Webmodel::$model[$key]->idmodel]);
+		
+			$query=SQLClass::webtsys_query("describe `".$key."`");
+			
+			list($key_field_old, $type, $null, $key_db, $default, $extra)=SQLClass::webtsys_fetch_row($query);
+		
+			while(list($field, $type, $null, $key_db, $default, $extra)=SQLClass::webtsys_fetch_row($query))
+			{
+		
+				$fields[]=$field;
+				$types[$field]=$type;
+				$keys[$field]=$key_db;
+				
+				$null_set[$field]=$arr_null[$null];
+				
+			}
+			
+			foreach($fields as $field)
+			{
+		
+				if(isset($allfields[$field]))
+				{
+		
+					$type=strtoupper($types[$field]);
+					
+					unset($allfields[$field]);
+					
+					if(Webmodel::$model[$key]->components[$field]->get_type_sql()!=($type.' '.$null_set[$field]))
+					{
+						
+						$query=SQLClass::webtsys_query('alter table `'.$key.'` modify `'.$field.'` '.Webmodel::$model[$key]->components[$field]->get_type_sql());
+						
+						echo "Upgrading ".$field." from ".$key."...\n";
+						
+				
+					}
+					
+					//Check if indexed
+				
+					if(Webmodel::$model[$key]->components[$field]->indexed==true && $keys[$field]=='')
+					{
+					
+						Webmodel::$arr_sql_index[$key][$field]='CREATE INDEX `index_'.$key.'_'.$field.'` ON `'.$key.'`(`'.$field.'`);';
+						Webmodel::$arr_sql_set_index[$key][$field]='';
+					
+					}
+					
+					//Check if unique
+				
+					if(Webmodel::$model[$key]->components[$field]->unique==true && $keys[$field]=='')
+					{
+					
+						Webmodel::$arr_sql_unique[$key][$field]=' ALTER TABLE `'.$key.'` ADD UNIQUE (`'.$field.'`)';
+						Webmodel::$arr_sql_set_unique[$key][$field]='';
+					
+					}
+
+					//Set index
+
+					if(isset(Webmodel::$model[$key]->components[$field]->related_model) && $keys[$field]=='')
+					{
+
+						
+						Webmodel::$arr_sql_index[$key][$field]='CREATE INDEX `index_'.$key.'_'.$field.'` ON `'.$key.'`(`'.$field.'`);';
+					
+						$table_related=Webmodel::$model[$key]->components[$field]->related_model->name;
+						
+						$id_table_related=Webmodel::load_id_model_related(Webmodel::$model[$key]->components[$field], $model);
+						
+						Webmodel::$arr_sql_set_index[$key][$field]='ALTER TABLE `'.$key.'` ADD CONSTRAINT `'.$field.'_'.$key.'IDX` FOREIGN KEY ( `'.$field.'` ) REFERENCES `'.$table_related.'` (`'.$id_table_related.'`) ON DELETE RESTRICT ON UPDATE RESTRICT;';
+						
+
+					}
+					
+					if(!isset(Webmodel::$model[$key]->components[$field]->related_model) && $keys[$field]!='' && Webmodel::$model[$key]->components[$field]->indexed==false && Webmodel::$model[$key]->components[$field]->unique!=true)
+					{
+						
+						echo "---Delete index for ".$field." from ".$key."\n";
+						
+						$query=SQLClass::webtsys_query('DROP INDEX `index_'.$key.'_'.$field.'` ON '.$key);
+
+					}
+		
+				}
+		
+				else
+				
+				{
+		
+					$allfields[$field]=0;
+		
+				}
+		
+			}
+		
+		}
+
+		//Check if new id...
+
+		if($key_field_old!=Webmodel::$model[$key]->idmodel)
+		{
+
+			$query=SQLClass::webtsys_query('alter table `'.$key.'` change `'.$key_field_old.'` `'.Webmodel::$model[$key]->idmodel.'` INT NOT NULL AUTO_INCREMENT');
+
+			echo "Renaming id for this model to ".Webmodel::$model[$key]->idmodel."...\n";
+
+		}
+
+		//Check if new fields...
+	
+		foreach($allfields as $new_field => $new)
+		{
+				
+			if($allfields[$new_field]==1)
+			{
+		
+				$query=SQLClass::webtsys_query('alter table `'.$key.'` add `'.$new_field.'` '.Webmodel::$model[$key]->components[$new_field]->get_type_sql());
+
+				echo "Adding ".$new_field." to ".$key."...\n";
+				
+				//Check if indexed
+				
+				if(Webmodel::$model[$key]->components[$new_field]->indexed==true)
+				{
+				
+					Webmodel::$arr_sql_index[$key][$new_field]='CREATE INDEX `index_'.$key.'_'.$new_field.'` ON `'.$key.'`(`'.$new_field.'`);';
+					Webmodel::$arr_sql_set_index[$key][$new_field]='';
+				
+				}
+
+				if(isset(Webmodel::$model[$key]->components[$new_field]->related_model) )
+				{
+
+					/*echo "---Creating index for ".$new_field." from ".$key."\n";
+
+					$query=SQLClass::webtsys_query('CREATE INDEX index_'.$key.'_'.$new_field.' ON '.$key.'('.$new_field.')');*/
+					
+					Webmodel::$arr_sql_index[$key][$new_field]='CREATE INDEX `index_'.$key.'_'.$new_field.'` ON `'.$key.'`(`'.$new_field.'`);';
+					
+					$table_related=Webmodel::$model[$key]->components[$new_field]->related_model->name;
+					
+					$id_table_related=Webmodel::load_id_model_related(Webmodel::$model[$key]->components[$new_field], $model);
+					
+					Webmodel::$arr_sql_set_index[$key][$new_field]='ALTER TABLE `'.$key.'` ADD CONSTRAINT `'.$new_field.'_'.$key.'IDX` FOREIGN KEY ( `'.$new_field.'` ) REFERENCES `'.$table_related.'` (`'.$id_table_related.'`) ON DELETE RESTRICT ON UPDATE RESTRICT;';
+
+				}
+		
+			}
+		
+			else
+		
+			{
+			
+				/*if(isset(Webmodel::$model[$key]->components[$new_field]->related_model) )
+				{*/
+				
+					//Drop foreignkeyfield
+					
+				//Bug, need fixed.
+				if($keys[$new_field]!='')
+				{
+				
+					$query=SQLClass::webtsys_query('ALTER TABLE `'.$key.'` DROP FOREIGN KEY '.$new_field.'_'.$key.'IDX');
+					
+				}
+					
+				
+				//}
+
+				$query=SQLClass::webtsys_query('alter table `'.$key.'` drop `'.$new_field.'`');
+			
+				echo "Deleting ".$new_field." from ".$key."...\n";
+		
+			}
+		
+		}
+		
+		$arr_etable[$key]=0;
+	
+	}
+	
+	//Create Indexes...
+	
+	foreach(Webmodel::$arr_sql_index as $model_name => $arr_index)
+	{
+		foreach(Webmodel::$arr_sql_index[$model_name] as $key_data => $sql_index)
+		{
+
+			echo "---Creating index for ".$key_data." on model ".$model_name."\n";
+
+			$query=SQLClass::webtsys_query($sql_index);
+			
+			if(Webmodel::$arr_sql_set_index[$model_name][$key_data]!='')
+			{
+				$query=SQLClass::webtsys_query(Webmodel::$arr_sql_set_index[$model_name][$key_data]);
+			}
+
+		}
+	}
+	
+	//Create Uniques...
+	
+	foreach(Webmodel::$arr_sql_unique as $model_name => $arr_index)
+	{
+		foreach(Webmodel::$arr_sql_unique[$model_name] as $key_data => $sql_index)
+		{
+
+			echo "---Creating unique for ".$key_data." on model ".$model_name."\n";
+
+			$query=SQLClass::webtsys_query($sql_index);
+			
+			if(Webmodel::$arr_sql_set_unique[$model_name][$key_data]!='')
+			{
+				$query=SQLClass::webtsys_query(Webmodel::$arr_sql_set_unique[$model_name][$key_data]);
+			}
+
+		}
+	}
+
+}
+
+function load_id_model_related($foreignkeyfield)
+{
+
+	//global $model;
+	
+	$table_related=$foreignkeyfield->related_model->name;
+	
+	$id_table_related='';
+					
+	if(!isset(Webmodel::$model[ $table_related ]->idmodel))
+	{
+		
+		//$id_table_related='Id'.ucfirst(PhangoVar::Webmodel::$model[$key]->components[$new_field]->related_model);
+		//Need load the model
+		
+		if(isset($foreignkeyfield->params_loading_mod['module']) && isset($foreignkeyfield->params_loading_mod['model']))
+		{
+		
+			$model=load_model($foreignkeyfield->params_loading_mod);
+			
+			//obtain id
+			
+			$id_table_related=Webmodel::$model[ $foreignkeyfield->params_loading_mod['model'] ]->idmodel;
+			
+			/*unset(PhangoVar::Webmodel::$model[ $foreignkeyfield->params_loading_mod['model'] ]);
+			
+			unset($cache_model);*/
+			
+		}
+	
+	}
+	else
+	{
+	
+		$id_table_related=Webmodel::$model[ $table_related ]->idmodel;
+	
+	}
+	
+	if($id_table_related=='')
+	{
+	
+		//Set standard...
+	
+		$id_table_related='Id'.ucfirst($table_related);
+	
+	}
+	
+	return $id_table_related;
+
+}
+
+?>
diff --git a/bin/padmin.php b/bin/padmin.php
deleted file mode 100644
index 15e0c2b..0000000
--- a/bin/padmin.php
+++ /dev/null
@@ -1,536 +0,0 @@
-<?php
-
-include(__DIR__.'/../../../../autoload.php');
-
-use PhangoApp\PhaRouter\Routes;
-use PhangoApp\PhaRouter\Controller;
-use PhangoApp\PhaModels\Webmodel;
-use PhangoApp\PhaModels\ModelForm;
-use PhangoApp\PhaView\View;
-use PhangoApp\PhaI18n\I18n;
-use PhangoApp\PhaUtils\Utils;
-use PhangoApp\PhaModels\MySQLClass;
-
-class_alias('PhangoApp\PhaRouter\Controller', 'ControllerSwitchClass');
-class_alias('PhangoApp\PhaRouter\Routes', 'Routes');
-class_alias('PhangoApp\PhaModels\Webmodel', 'Webmodel');
-class_alias('PhangoApp\PhaModels\ModelForm', 'ModelForm');
-class_alias('PhangoApp\PhaModels\MySQLClass', 'MySQLClass');
-class_alias('PhangoApp\PhaView\View', 'View');
-class_alias('PhangoApp\PhaUtils\Utils', 'Utils');
-class_alias('PhangoApp\PhaI18n\I18n', 'I18n');
-
-include(__DIR__.'/../../../../libraries/phangovar.php');
-
-$options = getopt("m:");
-
-if(!isset($options['m']))
-{
-
-	die("Use: php padmin.php -m app/model\n");
-
-}
-else
-if(strpos($options['m'], '/')===false)
-{
-
-	die("Use: php padmin.php -m app/model\n");
-
-}
-
-$arr_option=explode('/', $options['m']);
-
-settype($arr_option[0], 'string');
-settype($arr_option[1], 'string');
-
-//Load the config.
-
-include(__DIR__.'/../../../../config.php');
-
-Webmodel::$model_path=__DIR__.'/../../../../modules/';
-
-$model_file=Webmodel::$model_path.$arr_option[0].'/models/models_'.$arr_option[1].'.php';
-
-if(!is_file($model_file))
-{
-
-	die("Error: cannot find the model file in ".$arr_option[0]."/models/models_".$arr_option[1].".php\n");
-
-}
-
-
-WebModel::load_model($options['m']);
-
-try {
-
-	$first_item=current($model);
-	
-	$first_item->connect_to_db();
-	
-} catch(Exception $e)
-{
-
-	echo $e->getMessage()."\n";
-	die;
-
-}
-
-//print_r(get_declared_classes());
-
-
-
-update_table(Webmodel::$model);
-
-$post_install_script=Webmodel::$model_path.$arr_option[0].'/install/post_install.php';
-
-$post_install_lock=Webmodel::$model_path.$arr_option[0].'/install/lock';
-
-if(file_exists($post_install_script) && !file_exists($post_install_lock))
-{
-
-	echo "Executing post_install script...\n";
-
-	include($post_install_script);
-
-	if(post_install())
-	{
-	
-		if(!file_put_contents($post_install_lock, 'installed'))
-		{
-		
-			echo "Done, but cannot create this file: ".$arr_option[0].'/install/lock'.". Check your permissions and create the file if the script executed satisfally \n";
-		
-		}
-		else
-		{
-		
-			echo "Done\n";
-		
-		}
-	
-	}
-	else
-	{
-	
-		echo "Error, please, check ${post_install_script} file and execute padmin.php again\n";
-	
-	}
-
-}
-
-echo "All things done\n";
-
-/**
-* This Function is used for padmin.php for create new tables and fields based in Webmodel class.
-*
-* @param Webmodel $model The model used for create or update a sql table.
-*/
-
-function update_table($model)
-{
-	//include(__DIR__.'/../src/Databases/'.Webmodel::$type_db.'.php');
-	
-	$arr_sql_index=array();
-	$arr_sql_set_index=array();
-	
-	$arr_sql_unique=array();
-	$arr_sql_set_unique=array();
-	
-	$arr_etable=array();
-	
-	$query=MySQLClass::webtsys_query("show tables");
-		
-	while(list($table)=MySQLClass::webtsys_fetch_row($query))
-	{
-	
-		$arr_etable[$table]=1;
-	
-	}
-	
-	foreach($model as $key => $thing)
-	
-	{
-		
-		$arr_table=array();
-		
-		$allfields=array();
-		$fields=array();
-		$types=array();
-	
-		$field="";
-		$type=""; 
-		$null=""; 
-		$key_db=""; 
-		$default=""; 
-		$extra="";
-		$key_field_old=$model[$key]->idmodel;
-		
-		if(!isset($arr_etable[$key]))
-		{
-			//If table not exists make this
-			
-			foreach($model[$key]->components as $field => $data)
-			{
-			
-				$arr_table[]='`'.$field.'` '.$model[$key]->components[$field]->get_type_sql();
-
-				//Check if indexed
-				
-				if($model[$key]->components[$field]->indexed==true)
-				{
-				
-					$arr_sql_index[$key][$field]='CREATE INDEX `index_'.$key.'_'.$field.'` ON '.$key.'(`'.$field.'`);';
-					$arr_sql_set_index[$key][$field]='';
-				
-				}
-				
-				//Check if unique
-				
-				if($model[$key]->components[$field]->unique==true)
-				{
-				
-					$arr_sql_unique[$key][$field]=' ALTER TABLE `'.$key.'` ADD UNIQUE (`'.$field.'`)';
-					$arr_sql_set_unique[$key][$field]='';
-				
-				}
-				
-				//Check if foreignkeyfield...
-				if(isset($model[$key]->components[$field]->related_model))
-				{
-
-					//Create indexes...
-					
-					$arr_sql_index[$key][$field]='CREATE INDEX `index_'.$key.'_'.$field.'` ON '.$key.'(`'.$field.'`);';
-					
-					$table_related=$model[$key]->components[$field]->related_model->name;
-					
-					$id_table_related=load_id_model_related($model[$key]->components[$field], $model);
-
-					//'Id'.ucfirst($model[$key]->components[$field]->related_model);				
-					
-					$arr_sql_set_index[$key][$field]='ALTER TABLE `'.$key.'` ADD CONSTRAINT `'.$field.'_'.$key.'IDX` FOREIGN KEY ( `'.$field.'` ) REFERENCES `'.$table_related.'` (`'.$id_table_related.'`) ON DELETE RESTRICT ON UPDATE RESTRICT;';
-
-				}
-			}
-			
-			$sql_query="create table `$key` (\n".implode(",\n", $arr_table)."\n) DEFAULT CHARSET=utf8;\n";
-			
-			echo "Creating table $key\n";
-			
-			$query=MySQLClass::webtsys_query($sql_query);
-
-			/*foreach($arr_sql_index as $key_data => $sql_index)
-			{
-
-				echo "---Creating index for ".$key_data."\n";
-
-				$query=MySQLClass::webtsys_query($sql_index);
-				$query=MySQLClass::webtsys_query($arr_sql_set_index[$key_data]);
-
-			}*/
-
-		}
-		else
-		if(isset($model[$key]))
-		{
-			//Obtain all fields of model
-		
-			foreach($model[$key]->components as $kfield => $value)
-			{
-		
-				$allfields[$kfield]=1;
-				
-			}
-		
-			//unset($allfields['Id'.ucfirst($key)]);
-			
-			$arr_null['NO']='NOT NULL';
-			$arr_null['YES']='NULL';
-
-			unset($allfields[$model[$key]->idmodel]);
-		
-			$query=MySQLClass::webtsys_query("describe `".$key."`");
-			
-			list($key_field_old, $type, $null, $key_db, $default, $extra)=MySQLClass::webtsys_fetch_row($query);
-		
-			while(list($field, $type, $null, $key_db, $default, $extra)=MySQLClass::webtsys_fetch_row($query))
-			{
-		
-				$fields[]=$field;
-				$types[$field]=$type;
-				$keys[$field]=$key_db;
-				
-				$null_set[$field]=$arr_null[$null];
-				
-			}
-			
-			foreach($fields as $field)
-			{
-		
-				if(isset($allfields[$field]))
-				{
-		
-					$type=strtoupper($types[$field]);
-					
-					unset($allfields[$field]);
-					
-					if($model[$key]->components[$field]->get_type_sql()!=($type.' '.$null_set[$field]))
-					{
-						
-						$query=MySQLClass::webtsys_query('alter table `'.$key.'` modify `'.$field.'` '.$model[$key]->components[$field]->get_type_sql());
-						
-						echo "Upgrading ".$field." from ".$key."...\n";
-						
-				
-					}
-					
-					//Check if indexed
-				
-					if($model[$key]->components[$field]->indexed==true && $keys[$field]=='')
-					{
-					
-						$arr_sql_index[$key][$field]='CREATE INDEX `index_'.$key.'_'.$field.'` ON `'.$key.'`(`'.$field.'`);';
-						$arr_sql_set_index[$key][$field]='';
-					
-					}
-					
-					//Check if unique
-				
-					if($model[$key]->components[$field]->unique==true && $keys[$field]=='')
-					{
-					
-						$arr_sql_unique[$key][$field]=' ALTER TABLE `'.$key.'` ADD UNIQUE (`'.$field.'`)';
-						$arr_sql_set_unique[$key][$field]='';
-					
-					}
-
-					//Set index
-
-					if(isset($model[$key]->components[$field]->related_model) && $keys[$field]=='')
-					{
-
-						
-						$arr_sql_index[$key][$field]='CREATE INDEX `index_'.$key.'_'.$field.'` ON `'.$key.'`(`'.$field.'`);';
-					
-						$table_related=$model[$key]->components[$field]->related_model->name;
-						
-						$id_table_related=load_id_model_related($model[$key]->components[$field], $model);
-						
-						$arr_sql_set_index[$key][$field]='ALTER TABLE `'.$key.'` ADD CONSTRAINT `'.$field.'_'.$key.'IDX` FOREIGN KEY ( `'.$field.'` ) REFERENCES `'.$table_related.'` (`'.$id_table_related.'`) ON DELETE RESTRICT ON UPDATE RESTRICT;';
-						
-
-					}
-					
-					if(!isset($model[$key]->components[$field]->related_model) && $keys[$field]!='' && $model[$key]->components[$field]->indexed==false && $model[$key]->components[$field]->unique!=true)
-					{
-						
-						echo "---Delete index for ".$field." from ".$key."\n";
-						
-						$query=MySQLClass::webtsys_query('DROP INDEX `index_'.$key.'_'.$field.'` ON '.$key);
-
-					}
-		
-				}
-		
-				else
-				
-				{
-		
-					$allfields[$field]=0;
-		
-				}
-		
-			}
-		
-		}
-
-		//Check if new id...
-
-		if($key_field_old!=$model[$key]->idmodel)
-		{
-
-			$query=MySQLClass::webtsys_query('alter table `'.$key.'` change `'.$key_field_old.'` `'.$model[$key]->idmodel.'` INT NOT NULL AUTO_INCREMENT');
-
-			echo "Renaming id for this model to ".$model[$key]->idmodel."...\n";
-
-		}
-
-		//Check if new fields...
-	
-		foreach($allfields as $new_field => $new)
-		{
-				
-			if($allfields[$new_field]==1)
-			{
-		
-				$query=MySQLClass::webtsys_query('alter table `'.$key.'` add `'.$new_field.'` '.$model[$key]->components[$new_field]->get_type_sql());
-
-				echo "Adding ".$new_field." to ".$key."...\n";
-				
-				//Check if indexed
-				
-				if($model[$key]->components[$new_field]->indexed==true)
-				{
-				
-					$arr_sql_index[$key][$new_field]='CREATE INDEX `index_'.$key.'_'.$new_field.'` ON `'.$key.'`(`'.$new_field.'`);';
-					$arr_sql_set_index[$key][$new_field]='';
-				
-				}
-
-				if(isset($model[$key]->components[$new_field]->related_model) )
-				{
-
-					/*echo "---Creating index for ".$new_field." from ".$key."\n";
-
-					$query=MySQLClass::webtsys_query('CREATE INDEX index_'.$key.'_'.$new_field.' ON '.$key.'('.$new_field.')');*/
-					
-					$arr_sql_index[$key][$new_field]='CREATE INDEX `index_'.$key.'_'.$new_field.'` ON `'.$key.'`(`'.$new_field.'`);';
-					
-					$table_related=$model[$key]->components[$new_field]->related_model->name;
-					
-					$id_table_related=load_id_model_related($model[$key]->components[$new_field], $model);
-					
-					$arr_sql_set_index[$key][$new_field]='ALTER TABLE `'.$key.'` ADD CONSTRAINT `'.$new_field.'_'.$key.'IDX` FOREIGN KEY ( `'.$new_field.'` ) REFERENCES `'.$table_related.'` (`'.$id_table_related.'`) ON DELETE RESTRICT ON UPDATE RESTRICT;';
-
-				}
-		
-			}
-		
-			else
-		
-			{
-			
-				/*if(isset($model[$key]->components[$new_field]->related_model) )
-				{*/
-				
-					//Drop foreignkeyfield
-					
-				//Bug, need fixed.
-				if($keys[$new_field]!='')
-				{
-				
-					$query=MySQLClass::webtsys_query('ALTER TABLE `'.$key.'` DROP FOREIGN KEY '.$new_field.'_'.$key.'IDX');
-					
-				}
-					
-				
-				//}
-
-				$query=MySQLClass::webtsys_query('alter table `'.$key.'` drop `'.$new_field.'`');
-			
-				echo "Deleting ".$new_field." from ".$key."...\n";
-		
-			}
-		
-		}
-		
-		$arr_etable[$key]=0;
-	
-	}
-	
-	//Create Indexes...
-	
-	foreach($arr_sql_index as $model_name => $arr_index)
-	{
-		foreach($arr_sql_index[$model_name] as $key_data => $sql_index)
-		{
-
-			echo "---Creating index for ".$key_data." on model ".$model_name."\n";
-
-			$query=MySQLClass::webtsys_query($sql_index);
-			
-			if($arr_sql_set_index[$model_name][$key_data]!='')
-			{
-				$query=MySQLClass::webtsys_query($arr_sql_set_index[$model_name][$key_data]);
-			}
-
-		}
-	}
-	
-	//Create Uniques...
-	
-	foreach($arr_sql_unique as $model_name => $arr_index)
-	{
-		foreach($arr_sql_unique[$model_name] as $key_data => $sql_index)
-		{
-
-			echo "---Creating unique for ".$key_data." on model ".$model_name."\n";
-
-			$query=MySQLClass::webtsys_query($sql_index);
-			
-			if($arr_sql_set_unique[$model_name][$key_data]!='')
-			{
-				$query=MySQLClass::webtsys_query($arr_sql_set_unique[$model_name][$key_data]);
-			}
-
-		}
-	}
-	
-	/*foreach($arr_etable as $table => $value)
-	{
-	
-		if($value==1)
-		{
-		
-			$query=MySQLClass::webtsys_query('DROP TABLE `'.$table.'`');
-			
-			echo 'Deleting table '.$table."\n";
-		
-		}
-	
-	}*/
-
-}
-
-function load_id_model_related($foreignkeyfield, $model)
-{
-
-	//global $model;
-	
-	$table_related=$foreignkeyfield->related_model->name;
-	
-	$id_table_related='';
-					
-	if(!isset($model[ $table_related ]->idmodel))
-	{
-		
-		//$id_table_related='Id'.ucfirst(PhangoVar::$model[$key]->components[$new_field]->related_model);
-		//Need load the model
-		
-		if(isset($foreignkeyfield->params_loading_mod['module']) && isset($foreignkeyfield->params_loading_mod['model']))
-		{
-		
-			$model=load_model($foreignkeyfield->params_loading_mod);
-			
-			//obtain id
-			
-			$id_table_related=$model[ $foreignkeyfield->params_loading_mod['model'] ]->idmodel;
-			
-			/*unset(PhangoVar::$model[ $foreignkeyfield->params_loading_mod['model'] ]);
-			
-			unset($cache_model);*/
-			
-		}
-	
-	}
-	else
-	{
-	
-		$id_table_related=$model[ $table_related ]->idmodel;
-	
-	}
-	
-	if($id_table_related=='')
-	{
-	
-		//Set standard...
-	
-		$id_table_related='Id'.ucfirst($table_related);
-	
-	}
-	
-	return $id_table_related;
-
-}
-
-?>
\ No newline at end of file
diff --git a/composer.json b/composer.json
index a58213d..72a1afb 100644
--- a/composer.json
+++ b/composer.json
@@ -18,5 +18,6 @@
         "psr-4": {
             "PhangoApp\\PhaModels\\": "src"
         }
-    }
+    },
+    "bin": ["bin/padmin"]
 }
diff --git a/src/Webmodel.php b/src/Webmodel.php
index e9fe798..0daa7ec 100644
--- a/src/Webmodel.php
+++ b/src/Webmodel.php
@@ -294,11 +294,11 @@ class Webmodel {
 	*
 	*/
 	
-	static public function load_model($model)
+	static public function load_model($model_path)
 	{
 		
-		$app_model=$model;
-		
+		//$app_model=$model;
+		/*
 		if(strpos($model, '/'))
 		{
 			
@@ -309,10 +309,11 @@ class Webmodel {
 			$model=$arr_model[1];
 		
 		}
+		*/
 		
-		$path_model=Webmodel::$model_path.$app_model.'/'.Webmodel::$model_folder.'/models_'.$model.'.php';
+		$path_model=$model_path.'.php';
 	
-		if(!isset(Webmodel::$cache_model[$app_model.'/'.$model]))
+		if(!isset(Webmodel::$cache_model[$path_model]))
 		{
 	
 			if(is_file($path_model))
@@ -320,7 +321,7 @@ class Webmodel {
 			
 				include($path_model);
 				
-				Webmodel::$cache_model[$app_model.'/'.$model]=1;
+				Webmodel::$cache_model[$path_model]=1;
 			
 			}
 			else
@@ -365,13 +366,6 @@ class Webmodel {
 			$output=ob_get_contents();
 			
 			ob_clean();
-
-			//$text_error='<p>Output: '.$output.'</p>';
-
-			/*$arr_error_sql[0]='<p>Error: Cannot connect to MySQL db.</p>';    
-			$arr_error_sql[1]='<p>Error: Cannot connect to MySQL db, '.$output.'</p>';
-		
-			show_error($arr_error_sql[0], $arr_error_sql[1]);*/
 			
 			throw new \Exception('Error: cannot connect to database');